diff --git a/.gitignore b/.gitignore index 5ede28a..40bdc48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bash-4.1.tar.gz /bash-4.2-rc2.tar.gz +/bash-4.2.tar.gz diff --git a/bash-4.2-rc2-logout.patch b/bash-4.2-rc2-logout.patch new file mode 100644 index 0000000..2029cad --- /dev/null +++ b/bash-4.2-rc2-logout.patch @@ -0,0 +1,12 @@ +diff -up bash-4.2-rc2/config-top.h.logout bash-4.2-rc2/config-top.h +--- bash-4.2-rc2/config-top.h.logout 2011-02-14 20:29:19.000000000 +0100 ++++ bash-4.2-rc2/config-top.h 2011-02-14 20:29:30.000000000 +0100 +@@ -80,7 +80,7 @@ + /* #define SYS_BASHRC "/etc/bash.bashrc" */ + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ diff --git a/bash.spec b/bash.spec index 27c2c6a..b41373d 100644 --- a/bash.spec +++ b/bash.spec @@ -1,4 +1,4 @@ -%define beta_tag rc2 +#% define beta_tag rc2 %define patchleveltag .0 %define baseversion 4.2 %bcond_without tests @@ -6,11 +6,11 @@ Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell -Release: 0.1.%{beta_tag}%{?dist} +Release: 2%{?dist} Group: System Environment/Shells License: GPLv3+ Url: http://www.gnu.org/software/bash -Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}-%{beta_tag}.tar.gz +Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz # For now there isn't any doc #Source2: ftp://ftp.gnu.org/gnu/bash/bash-doc-%{version}.tar.gz @@ -51,6 +51,13 @@ Patch124: bash-4.1-examples.patch # when output does not succeed due to EPIPE Patch126: bash-4.1-broken_pipe.patch +# Enable system-wide .bash_logout for login shells +Patch127: bash-4.2-rc2-logout.patch + +# Patch from upstream, some pattern matching glitch +# See http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html +Patch128: patmatch.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: texinfo bison @@ -75,7 +82,7 @@ This package contains documentation files for %{name}. %prep #%setup -q -a 2 -%setup -q -n %{name}-%{baseversion}-%{beta_tag} +%setup -q -n %{name}-%{baseversion} # Official upstream patches # none yet @@ -100,6 +107,9 @@ This package contains documentation files for %{name}. %patch123 -p1 -b .nobits %patch124 -p1 -b .examples %patch126 -p1 -b .broken_pipe +%patch127 -p1 -b .logout +%patch128 -p0 -b .patmatch + echo %{version} > _distribution echo %{release} > _patchlevel @@ -277,6 +287,15 @@ fi #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Wed Feb 16 2011 Roman Rakus - 4.2.0-2 +- pattern matching glitch, patch from upstream + +* Wed Feb 16 2011 Roman Rakus - 4.2.0-1 +- Release bash-4.2 + +* Mon Feb 14 2011 Roman Rakus - 4.2.0-0.2.rc2 +- Enable system-wide .bash_logout for login shells + * Wed Feb 09 2011 Roman Rakus - 4.2.0-0.1.rc2 - Update to bash-4.2-rc2 diff --git a/patmatch.patch b/patmatch.patch new file mode 100644 index 0000000..e3a6106 --- /dev/null +++ b/patmatch.patch @@ -0,0 +1,18 @@ +*** ../bash-4.2/lib/glob/gmisc.c 2011-02-05 16:11:17.000000000 -0500 +--- lib/glob/gmisc.c 2011-02-15 20:50:43.000000000 -0500 +*************** +*** 126,129 **** +--- 126,130 ---- + { + matlen += wpat - wbrack - 1; /* incremented below */ ++ wpat--; /* back up to NUL */ + break; + } +*************** +*** 262,265 **** +--- 263,267 ---- + { + matlen += pat - brack - 1; /* incremented below */ ++ pat--; /* back up to NUL */ + break; + } diff --git a/sources b/sources index d87b910..42b0157 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -844214d7928f5be3caa46fac177347ce bash-4.2-rc2.tar.gz +3fb927c7c33022f1c327f14a81c0d4b0 bash-4.2.tar.gz