Browse Source

bash: update to 4.2.45

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7561 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
0d7c48a9e3
1 changed files with 51 additions and 4 deletions
  1. 51 4
      b/bash/bash-vl.spec

+ 51 - 4
b/bash/bash-vl.spec

@@ -1,12 +1,12 @@
 %define bashversion 4.2
-%define patchlevel 37
+%define patchlevel 45
 
 Summary:      The GNU Bourne Again shell (bash).
 Summary(ja):  GNU Bourne Again シェル (bash).
 
 Name:         bash
 Version:      %{bashversion}.%{patchlevel}
-Release:      2%{?_dist_release}
+Release:      1%{?_dist_release}
 
 Group:        System Environment/Shells
 License:      GPLv3+
@@ -56,6 +56,14 @@ Patch34: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-034
 Patch35: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-035
 Patch36: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-036
 Patch37: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-037
+Patch38: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-038
+Patch39: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-039
+Patch40: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-040
+Patch41: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-041
+Patch42: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-042
+Patch43: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-043
+Patch44: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-044
+Patch45: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-045
 
 # Other patches
 Patch101: bash-2.02-security.patch
@@ -91,6 +99,21 @@ Patch120: bash-4.2-rc2-logout.patch
 # Static analyzis shows some issues in bash-2.05a-interpreter.patch
 Patch121: bash-4.2-coverity.patch
 
+# Don't call malloc in signal handler
+Patch122: bash-4.1-defer-sigchld-trap.patch
+
+# 799958, updated info about trap
+Patch123: bash-4.2-manpage_trap.patch
+
+# 695656, block the signal and unblock it after the new handler is installed
+Patch124: bash-4.2-signal.patch
+
+# https://www.securecoding.cert.org/confluence/display/seccode/INT32-C.+Ensure+that+operations+on+signed+integers+do+not+result+in+overflow
+Patch125: bash-4.2-size_type.patch
+
+# 903833, Fix missing close(), fixes fd leaks
+Patch126: bash-4.2-missing_closes.patch
+
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
 BuildRequires: texinfo, bison, ncurses-devel, autoconf, gettext
 Obsoletes:    bash <= 1.14.7
@@ -165,6 +188,14 @@ Again shell.
 %patch35 -p0 -b .035
 %patch36 -p0 -b .036
 %patch37 -p0 -b .037
+%patch38 -p0 -b .038
+%patch39 -p0 -b .039
+%patch40 -p0 -b .040
+%patch41 -p0 -b .041
+%patch42 -p0 -b .042
+%patch43 -p0 -b .043
+%patch44 -p0 -b .044
+%patch45 -p0 -b .045
 
 # Other patches
 %patch101 -p1 -b .security
@@ -188,6 +219,11 @@ Again shell.
 %patch119 -p1 -b .broken_pipe
 %patch120 -p1 -b .logout
 %patch121 -p1 -b .coverity
+%patch122 -p1 -b .defer_sigchld_trap
+%patch123 -p1
+%patch124 -p1 -b .signal
+%patch125 -p1 -b .size_type
+%patch126 -p1 -b .missing_closes
 
 echo %{version} > _distribution
 echo %{release} |sed 's/vl.*//' > _patchlevel
@@ -317,6 +353,17 @@ f:close()
 
 
 %changelog
+* Mon Mar 18 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 4.2.45-1
+- update to 4.2 patch level 45
+- import some patch from fedora package (122-127)
+  - patch122: Don't call malloc in signal handler
+  - patch123: #799958, updated info about trap
+  - patch124: #695656, block the signal and unblock it after the
+    new handler is installed
+  - patch125: Use unsigned type for size
+    https://www.securecoding.cert.org/confluence/display/seccode/INT32-C.+Ensure+that+operations+on+signed+integers+do+not+result+in+overflow
+  - patch126: #903833, Fix missing close(), fixes fd leaks
+
 * Sat Oct  6 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.2.37-2
 - remove postun lua script because bash will be never uninstalled
 
@@ -355,7 +402,7 @@ f:close()
 * Mon Apr 27 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2-3
 - add Requires(post): ncurses (should be added by find-requires..)
 
-* Mon Mar 29 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2-2
+* Sun Mar 29 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2-2
 - add upstream patch (from 040 to 048)
 - build against ncurses-devel (libtinfo)
 - spec in utf-8
@@ -487,7 +534,7 @@ f:close()
 * Wed Mar 22 2000 Yasuyuki Furukawa <furukawa@vinelinux.org>
 - updated to 2.04
 
-* Fri Sep 14 1999 Dale Lovelace <dale@redhat.com>
+* Tue Sep 14 1999 Dale Lovelace <dale@redhat.com>
 - Remove annoying ^H's from documentation
 
 * Fri Jul 16 1999 Ken Estes <kestes@staff.mail.com>