- rel 2; additional non-upstream hardening (from FC)

[packages/bash.git] / bash.spec

diff --git a/bash.spec b/bash.spec
index feef2c555a3208f4fa298eb35f9eb5a2e01ddf47..fbc278596d7369cbe34ba4f7df13a6c7b13337fb 100644 (file)
--- a/bash.spec
+++ b/bash.spec
@@ -1,10 +1,12 @@
+#
 # Conditional build:
 %bcond_without static          # don't build static version
 %bcond_with    bash_history    # build with additional history in /var/log/bash_hist ;)
 %bcond_without tests   # do not perform "make test"
 
-%define                ver             4.2
-%define                patchlevel      45
+# NOTE: when updating patchleve, do not forget to update 'sources' file!
+%define                ver             4.3
+%define                patchlevel      26
 %define                rel             2
 Summary:       GNU Bourne Again Shell (bash)
 Summary(fr.UTF-8):     Le shell Bourne Again de GNU
@@ -15,7 +17,7 @@ Release:      %{rel}%{?with_bash_history:inv}
 License:       GPL
 Group:         Applications/Shells
 Source0:       http://ftp.gnu.org/gnu/bash/%{name}-%{ver}.tar.gz
-# Source0-md5: 3fb927c7c33022f1c327f14a81c0d4b0
+# Source0-md5: 81348932d5da294953e15d4814c74dd1
 Source1:       %{name}rc
 Source2:       %{name}-skel-.bash_logout
 Source3:       %{name}-skel-.bash_profile
@@ -34,15 +36,16 @@ Patch9:             %{name}-backup_history.patch
 Patch10:       %{name}-act_like_sh.patch
 Patch11:       %{name}-elinks_cont.patch
 Patch12:       %{name}-pl.po-update.patch
-Patch13:       %{name}-format-string.patch
-Patch14:       %{name}-4.2-missing_closes.patch
-%patchset_source -f http://ftp.gnu.org/gnu/bash/bash-4.2-patches/bash42-%03g 1 %{patchlevel}
+# http://www.openwall.com/lists/oss-security/2014/09/25/13 ; patches from FC
+Patch13:       bash-4.2-cve-2014-7169-1.patch
+Patch14:       bash-4.2-cve-2014-7169-2.patch
+%patchset_source -f https://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-%03g 1 %{patchlevel}
 URL:           http://www.gnu.org/software/bash/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: ncurses-devel >= 5.2
-BuildRequires: readline-devel >= 6.2
+BuildRequires: readline-devel >= 6.3
 BuildRequires: rpmbuild(macros) >= 1.462
 BuildRequires: sed >= 4.0
 BuildRequires: texinfo
@@ -50,9 +53,9 @@ BuildRequires:        texinfo
 # Require static library only for static build
 BuildRequires: glibc-static >= 2.2
 BuildRequires: ncurses-static >= 5.2
-BuildRequires: readline-static >= 6.2
+BuildRequires: readline-static >= 6.3
 %endif
-Requires:      readline >= 6.2
+Requires:      readline >= 6.3
 Requires:      setup >= 2.4.6-2
 Obsoletes:     bash-doc
 Obsoletes:     bash2
@@ -194,8 +197,10 @@ tym pakiecie jest wersja basha skonsolidowana statycznie.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
+%patch13 -p0
+%patch14 -p0
+
+sed -i -e 's#/usr/bin/printf#/bin/printf#g' tests/intl2.sub
 
 %build
 cp -f /usr/share/automake/config.* support