upgrade to Bash 2.05a and use new versioning

openpkg/README

@@ -17,9 +17,7 @@
   gzip-1.3.tar ............ untouched distribution tarball of the GNU gzip tool
   make-3.79.1.tar.gz ...... untouched distribution tarball of the GNU make tool
   patch-2.5.4.tar.gz ...... untouched distribution tarball of the GNU patch tool
-  bash-2.05.tar.gz ........ untouched distribution tarball of the GNU bash tool
-  bash-2.05.patch.1 ....... patch for GNU bash
-  bash-2.05.patch.2 ....... patch for GNU bash
+  bash-2.05a.tar.gz ....... untouched distribution tarball of the GNU bash tool
 
   rpm-4.0.2.tar.gz ........ distribution tarball of the RPM tool
   rpm-4.0.2.patch.bugfix .. patch for RPM (bugfixing parts) 
@@ -30,7 +28,7 @@
   db-3.2.9.patch .......... patch for Berkeley-DB library
   bzip2-1.0.1.tar.gz ...... untouched distribution tarball of the BZIP2 library
   zlib-1.1.3.tar.gz ....... untouched distribution tarball of the ZLIB library
-  curl-7.9.tar.gz ......... untouched distribution tarball of the cURL tool
+  curl-7.9.1.tar.gz ....... untouched distribution tarball of the cURL tool
 
   rpmpopt ................. extensions for RPM's popt configuration
   rpmrc ................... replacements for RPM's run-commands

openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 0.9
-%define       R_openpkg 20011121.0
+%define       V_openpkg 20011126.0
+%define       R_openpkg 20011126.0
 
 #   the used software versions
 %define       V_rpm     4.0.2
@@ -52,7 +52,7 @@
 %define       V_gzip    1.3
 %define       V_patch   2.5.4
 %define       V_tar     1.13.19
-%define       V_bash    2.05
+%define       V_bash    2.05a
 
 #   package information
 Name:         openpkg
@@ -104,13 +104,11 @@ Source33:     ftp://ftp.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
 Source34:     rc.openpkg
 Source35:     ftp://ftp.gnu.org/gnu/tar/tar-%{V_tar}.tar.gz
 Source36:     ftp://ftp.gnu.org/gnu/bash/bash-%{V_bash}.tar.gz
-Source37:     bash-%{V_bash}.patch.1
-Source38:     bash-%{V_bash}.patch.2
-Source39:     dot.bashrc
-Source40:     dot.bash_login
-Source41:     dot.lsyncrc
-Source42:     db-%{V_db}.patch
-Source43:     rc.conf
+Source37:     dot.bashrc
+Source38:     dot.bash_login
+Source39:     dot.lsyncrc
+Source40:     db-%{V_db}.patch
+Source41:     rc.conf
 
 #   build information
 Prefix:       %{l_prefix}
@@ -298,12 +296,6 @@ Provides:     OpenPKG
       touch aclocal.m4 configure
     )
 
-    #   apply OpenPKG patches to Bash distribution tree
-    ( cd bash-%{V_bash}
-      ${l_patch} -p0 <`SOURCE bash-%{V_bash}.patch.1`
-      ${l_patch} -p0 <`SOURCE bash-%{V_bash}.patch.2`
-    )
-
     #   apply OpenPKG patches to DB distribution tree
     ( cd db-%{V_db}
       ${l_patch} -p0 <`SOURCE db-%{V_db}.patch`