Revision: 5566
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5566&view=rev
Author:   owes
Date:     2011-03-27 10:58:11 +0000 (Sun, 27 Mar 2011)

Log Message:
-----------
Upgrade bash to 4.2.8. Move bash to .19 upgrade to avoid potential trouble 
caused by readline upgrade.

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/bash
    ipcop/trunk/lfs/bash
    ipcop/trunk/updates/1.9.18/information.xml
    ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19
    ipcop/trunk/updates/1.9.19/information.xml

Modified: ipcop/trunk/config/rootfiles/common/bash
===================================================================
--- ipcop/trunk/config/rootfiles/common/bash    2011-03-26 07:00:12 UTC (rev 
5565)
+++ ipcop/trunk/config/rootfiles/common/bash    2011-03-27 10:58:11 UTC (rev 
5566)
@@ -1,49 +1,8 @@
-## bash-4.1 (we cheat for sh and bash here)
+## bash-4.2 (we cheat for sh and bash here)
 ##
 bin/sh
 bin/bash
 #bin/bashbug
 #usr/share/info/bash.info
-#usr/share/locale/af
-#usr/share/locale/af/LC_MESSAGES
-#usr/share/locale/af/LC_MESSAGES/bash.mo
-#usr/share/locale/bg/LC_MESSAGES/bash.mo
-#usr/share/locale/ca/LC_MESSAGES/bash.mo
-#usr/share/locale/cs/LC_MESSAGES/bash.mo
-#usr/share/locale/de/LC_MESSAGES/bash.mo
-#usr/share/locale/en@boldquot
-#usr/share/locale/en@boldquot/LC_MESSAGES
-#usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
-#usr/share/locale/en@quot
-#usr/share/locale/en@quot/LC_MESSAGES
-#usr/share/locale/en@quot/LC_MESSAGES/bash.mo
-#usr/share/locale/eo
-#usr/share/locale/eo/LC_MESSAGES
-#usr/share/locale/eo/LC_MESSAGES/bash.mo
-#usr/share/locale/es/LC_MESSAGES/bash.mo
-#usr/share/locale/et
-#usr/share/locale/et/LC_MESSAGES
-#usr/share/locale/et/LC_MESSAGES/bash.mo
-#usr/share/locale/fi/LC_MESSAGES/bash.mo
-#usr/share/locale/fr/LC_MESSAGES/bash.mo
-#usr/share/locale/ga
-#usr/share/locale/ga/LC_MESSAGES
-#usr/share/locale/ga/LC_MESSAGES/bash.mo
-#usr/share/locale/hu/LC_MESSAGES/bash.mo
-#usr/share/locale/id/LC_MESSAGES/bash.mo
-#usr/share/locale/ja/LC_MESSAGES/bash.mo
-#usr/share/locale/lt/LC_MESSAGES/bash.mo
-#usr/share/locale/nl/LC_MESSAGES/bash.mo
-#usr/share/locale/pl/LC_MESSAGES/bash.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/bash.mo
-#usr/share/locale/ro
-#usr/share/locale/ro/LC_MESSAGES
-#usr/share/locale/ro/LC_MESSAGES/bash.mo
-#usr/share/locale/ru/LC_MESSAGES/bash.mo
-#usr/share/locale/sk/LC_MESSAGES/bash.mo
-#usr/share/locale/sv/LC_MESSAGES/bash.mo
-#usr/share/locale/tr/LC_MESSAGES/bash.mo
-#usr/share/locale/vi/LC_MESSAGES/bash.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
 #usr/share/man/man1/bash.1
 #usr/share/man/man1/bashbug.1

Modified: ipcop/trunk/lfs/bash
===================================================================
--- ipcop/trunk/lfs/bash        2011-03-26 07:00:12 UTC (rev 5565)
+++ ipcop/trunk/lfs/bash        2011-03-27 10:58:11 UTC (rev 5566)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = bash
-VER        = 4.1
+VER        = 4.2
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -43,24 +43,24 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-# patches 1 to 9 are together
-PATCH1     = $(THISAPP)-fixes-3.patch
-PATCH10    = $(PKG_NAME)41-010
+# patches 1 to 7 are together
+PATCH1     = $(THISAPP)-fixes-1.patch
+PATCH08    = $(PKG_NAME)42-008
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects = $(DL_FILE) \
        $(PATCH1) \
-       $(PATCH10).patch
+       $(PATCH08).patch
 
 $(DL_FILE)                     = $(DL_FROM)/$(DL_FILE)
 $(PATCH1)                      = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(PATCH10).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH10)
+$(PATCH08).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH08)
 
-$(DL_FILE)_MD5                 = 9800d8724815fd84994d9be65ab5e7b8
-$(PATCH1)_MD5                  = 500043db34cfb2c857335cb090ffd43d
-$(PATCH10).patch_MD5           = 3bfe98c6896ada8a447d3f6c5c22eaed
+$(DL_FILE)_MD5                 = 3fb927c7c33022f1c327f14a81c0d4b0
+$(PATCH1)_MD5                  = abae789c2807cb7c7c4c452fa3986f85
+$(PATCH08).patch_MD5           = 24c574bf6d6a581e300823d9c1276af6
 
 install : $(TARGET)
 
@@ -91,7 +91,7 @@
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/$(PATCH10).patch
+       cd $(DIR_APP) && patch -Np0 -i $(DIR_DL)/$(PATCH08).patch
        # In bash-3.2, configure and configure.in are patched in that order
        # if they are not in the same second, autoconf is called.
        # Toolchain compilation fail if autoconf is not available on the 
building machine
@@ -114,6 +114,7 @@
        cd $(DIR_APP) && ./configure    --prefix=/usr \
                                        --bindir=/bin \
                                        --without-bash-malloc \
+                                       --disable-nls \
                                        --with-installed-readline
        cd $(DIR_APP) && make
 ifeq "$(RUNNING_TEST)" "yes"

Modified: ipcop/trunk/updates/1.9.18/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.18/information.xml  2011-03-26 07:00:12 UTC (rev 
5565)
+++ ipcop/trunk/updates/1.9.18/information.xml  2011-03-27 10:58:11 UTC (rev 
5566)
@@ -4,7 +4,7 @@
         <releasedate>2011-03-dd</releasedate>
         <size>0</size>
         <description>Language updates.&lt;br /&gt;
-        Upgrade acpid to 2.0.7, apache to 2.2.17, bash to 4.1.10, cairo to 
1.10.2,
+        Upgrade acpid to 2.0.7, apache to 2.2.17, cairo to 1.10.2,
         conntrack-tools to 1.0.0, coreutils to 8.10, dejavu-fonts to 2.32,
         dhcpcd to 5.2.11, dnsmqsq to 2.57, e2fsprogs to 1.41.14, ethtool to 
2.6.36, freetype to 2.4.4,
         glib to 2.26.1, glibc to 2.11.3, gnupg to 1.4.11, grep to 2.7, hdparm 
to 9.36,
@@ -12,7 +12,7 @@
         libnetfilter_conntrack to 0.9.1, libnl to 2.0, libpng to 1.5.0,
         libxml2 to 2.7.8, linux-atm to 2.5.2, lzo to 2.04, openssh to 5.8, 
openssl to 0.9.8r,
         openswan to 2.6.33, openvpn to 2.1.4, pango to 1.28.3, pixman to 
0.20.2, psmisc to 22.13,
-        rrdtool to 1.4.5, smartmontools to 5.40, sqlite to 3.7.4, squid to 
3.1.11, tar to 1.26, traceroute to 2.0.16,
+        rrdtool to 1.4.5, smartmontools to 5.40, sqlite to 3.7.4, tar to 1.26, 
traceroute to 2.0.16,
         tzdata to 2011d, usb-modeswitch to 1.1.7, usbutils to 001, vim to 
7.3&lt;br /&gt;
         Fixed pcre-8.11 with --enable-unicode-properties,
         pptp recompiled with hardening flags. Added sendEmail 1.56. Remove 
libmpfr</description>

Modified: ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19
===================================================================
--- ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19    2011-03-26 07:00:12 UTC 
(rev 5565)
+++ ipcop/trunk/updates/1.9.19/ROOTFILES.i486-1.9.19    2011-03-27 10:58:11 UTC 
(rev 5566)
@@ -4,6 +4,10 @@
 /etc/rc.d/rc.wanpipe
 /usr/local/bin/disk-partition.sh
 ##
+## bash-4.2.8
+/bin/bash
+/bin/sh
+##
 ## expat-2.0.1 patched
 /usr/lib/libexpat.so
 /usr/lib/libexpat.so.1

Modified: ipcop/trunk/updates/1.9.19/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.19/information.xml  2011-03-26 07:00:12 UTC (rev 
5565)
+++ ipcop/trunk/updates/1.9.19/information.xml  2011-03-27 10:58:11 UTC (rev 
5566)
@@ -4,7 +4,7 @@
         <releasedate>2011-03-dd</releasedate>
         <size>0</size>
         <description>Patch expat for CVE-2009-3560 and CVE-2009-3720&lt;br 
/&gt;
-        Upgrade iproute2 to 2.6.38, kernel to 2.6.32.35, logwatch to 7.4.0, 
memtest to 4.20, nano to 2.2.6, ntpd to 4.2.6p3,
+        Upgrade bash to 4.2.8, iproute2 to 2.6.38, kernel to 2.6.32.35, 
logwatch to 7.4.0, memtest to 4.20, nano to 2.2.6, ntpd to 4.2.6p3,
         pcre to 8.11, readline to 6.2, rsyslog to 5.6.2, shadow to 4.1.4.3, 
udev to 166, util-linux to 2.19, wanpipe to 3.5.18.&lt;br /&gt;
         &lt;b&gt;Mandatory reboot after upgrade.&lt;/b&gt;</description>
         <previousversion>1.9.18</previousversion>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software 
be a part of the solution? Download the Intel(R) Manageability Checker 
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to