bash: update to 4.1 patchlevel 007

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1751 ec354946-7b23-47d6-9f5a-488ba84defc7

b/bash/bash-vl.spec

@@ -2,8 +2,8 @@ Summary:      The GNU Bourne Again shell (bash).
 Summary(ja):  GNU Bourne Again シェル (bash).
 
 Name:         bash
-Version:      3.2
+Version:      4.1
-Release:      9%{?_dist_release}
+Release:      1%{?_dist_release}
 
 Group:        System Environment/Shells
 License:      GPLv2+
@@ -12,75 +12,35 @@ Vendor:       Project Vine
 Distribution: Vine Linux
 
 Source0:      ftp://ftp.gnu.org/pub/gnu/bash/bash-%{version}.tar.gz
-Source2:      ftp://ftp.gnu.org/pub/gnu/bash/bash-doc-%{version}.tar.gz
+#Source2:      ftp://ftp.gnu.org/pub/gnu/bash/bash-doc-%{version}.tar.gz
 Source6:      http://www.caliban.org/files/bash/bash-completion-20060301.tar.bz2
 Source10:     bashrc-vine
 
 # Official upstream patches
-Patch1: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001
+Patch1: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-001
-Patch2: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002
+Patch2: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-002
-Patch3: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003
+Patch3: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-003
-Patch4: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004
+Patch4: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-004
-Patch5: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005
+Patch5: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-005
-Patch6: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006
+Patch6: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-006
-Patch7: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007
+Patch7: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.1-patches/bash41-007
-Patch8: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008
+
-Patch9: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009
-Patch10: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010
-Patch11: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011
-Patch12: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012
-Patch13: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013
-Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014
-Patch15: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015
-Patch16: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016
-Patch17: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017
-Patch18: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018
-Patch19: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019
-Patch20: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020
-Patch21: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021
-Patch22: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022
-Patch23: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023
-Patch24: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024
-Patch25: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025
-Patch26: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-026
-Patch27: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-027
-Patch28: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-028
-Patch29: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-029
-Patch30: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-030
-Patch31: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031
-Patch32: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032
-Patch33: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033
-Patch34: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034
-Patch35: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035
-Patch36: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036
-Patch37: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037
-Patch38: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038
-Patch39: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039
-Patch40: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-040
-Patch41: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-041
-Patch42: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-042
-Patch43: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-043
-Patch44: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-044
-Patch45: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-045
-Patch46: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-046
-Patch47: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-047
-Patch48: ftp://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-048
 # Other patches
-Patch100: bash-2.03-paths.patch
 Patch101: bash-2.02-security.patch
-Patch102: bash-2.03-profile.patch
+Patch102: bash-2.03-paths.patch
-Patch107: bash-2.05a-interpreter.patch
+Patch103: bash-2.03-profile.patch
+Patch104: bash-2.05a-interpreter.patch
+Patch105: bash-2.05b-debuginfo.patch
+Patch106: bash-2.05b-manso.patch
+Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
-Patch114: bash-2.05b-xcc.patch
+Patch109: bash-2.05b-xcc.patch
-Patch115: bash-2.05b-pgrp_sync.patch
+Patch110: bash-3.2-audit.patch
-Patch116: bash-2.05b-manso.patch
+Patch112: bash-3.2-ssh_source_bash.patch
-Patch117: bash-2.05b-debuginfo.patch
+Patch113: bash-bashbug.patch
-Patch118: bash-tty-tests.patch
+Patch115: bash-infotags.patch
-Patch126: bash-setlocale.patch
+Patch116: bash-requires.patch
-Patch130: bash-infotags.patch
+Patch117: bash-setlocale.patch
-Patch131: bash-cond-rmatch.patch
-Patch132: bash-ulimit-m.patch
-Patch133: bash-3.2-rng.patch
 
 Obsoletes:    bash <= 1.14.7
 Obsoletes:    bash2
@@ -118,7 +78,7 @@ Again shell.
 
 
 %prep
-%setup -q -a 2
+%setup -q
 # Official upstream patches
 %patch1 -p0 -b .001
 %patch2 -p0 -b .002
@@ -127,72 +87,31 @@ Again shell.
 %patch5 -p0 -b .005
 %patch6 -p0 -b .006
 %patch7 -p0 -b .007
-%patch8 -p0 -b .008
-%patch9 -p0 -b .009
-%patch10 -p0 -b .010
-%patch11 -p0 -b .011
-%patch12 -p0 -b .012
-%patch13 -p0 -b .013
-%patch14 -p0 -b .014
-%patch15 -p0 -b .015
-%patch16 -p0 -b .016
-%patch17 -p0 -b .017
-%patch18 -p0 -b .018
-%patch19 -p0 -b .019
-%patch20 -p0 -b .020
-%patch21 -p0 -b .021
-%patch22 -p0 -b .022
-%patch23 -p0 -b .023
-%patch24 -p0 -b .024
-%patch25 -p0 -b .025
-%patch26 -p0 -b .026
-%patch27 -p0 -b .027
-%patch28 -p0 -b .028
-%patch29 -p0 -b .029
-%patch30 -p0 -b .030
-%patch31 -p0 -b .031
-%patch32 -p0 -b .032
-%patch33 -p0 -b .033
-%patch34 -p0 -b .034
-%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
-%patch46 -p0 -b .046
-%patch47 -p0 -b .047
-%patch48 -p0 -b .048
 
 # Other patches
-%patch100 -p1 -b .paths
 %patch101 -p1 -b .security
-%patch102 -p1 -b .profile
+%patch102 -p1 -b .paths
-%patch107 -p1 -b .interpreter
+%patch103 -p1 -b .profile
-%patch108 -p1 -b .readline-oom
+%patch104 -p1 -b .interpreter
-%patch114 -p1 -b .xcc
+%patch105 -p1 -b .debuginfo
-%patch115 -p1 -b .pgrp_sync
+%patch106 -p1 -b .manso
-%patch116 -p1 -b .manso
+%patch107 -p1 -b .pgrp_sync
-%patch117 -p1 -b .debuginfo
+%patch108 -p1 -b .readline_oom
-%patch118 -p1 -b .tty-tests
+%patch109 -p1 -b .xcc
-%patch126 -p1 -b .setlocale
+%patch110 -p1 -b .audit
-%patch130 -p1 -b .infotags
+%patch112 -p1 -b .ssh_source_bash
-#patch131 -p1 -b .cond-rmatch
+%patch113 -p1 -b .bashbug
-%patch132 -p1 -b .ulimit-m
+%patch115 -p1 -b .infotags
-%patch133 -p1 -b .rng.patch
+%patch116 -p1 -b .requires
+%patch117 -p1 -b .setlocale
 
 echo %{version} > _distribution
-echo %{release} |sed 's/.*vl//' > _patchlevel
+echo %{release} |sed 's/vl.*//' > _patchlevel
 
 
 %build
 %configure --with-bash-malloc=no
-make CPPFLAGS="-D_GNU_SOURCE `getconf LFS_CFLAGS`"
+make CPPFLAGS="-D_GNU_SOURCE -DRECYCLES_PIDS `getconf LFS_CFLAGS`"
 
 #%check
 #make check
@@ -242,8 +161,10 @@ done
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/bashrc
 
-# Not for printf (conflict with coreutils)
+# Not for printf, false and true (conflict with coreutils)
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/printf.1
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/true.1
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/false.1
 
 popd
 
@@ -322,6 +243,9 @@ fi
 
 
 %changelog
+* Fri Sep 03 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 4.1-1
+- update to 4.1 patch level 7
+
 * Fri Mar  5 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 3.2-9
 - check if /bin/grep exists on %%post script