Revision: 6484
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6484&view=rev
Author:   gespinasse
Date:     2012-03-16 09:05:51 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
Upgrade bash to 4.2.24

Modified Paths:
--------------
    ipcop/trunk/lfs/bash
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml

Modified: ipcop/trunk/lfs/bash
===================================================================
--- ipcop/trunk/lfs/bash        2012-03-16 06:43:19 UTC (rev 6483)
+++ ipcop/trunk/lfs/bash        2012-03-16 09:05:51 UTC (rev 6484)
@@ -58,6 +58,10 @@
 PATCH18   := $(PKG_NAME)42-018
 PATCH19   := $(PKG_NAME)42-019
 PATCH20   := $(PKG_NAME)42-020
+PATCH21   := $(PKG_NAME)42-021
+PATCH22   := $(PKG_NAME)42-022
+PATCH23   := $(PKG_NAME)42-023
+PATCH24   := $(PKG_NAME)42-024
 
 ###############################################################################
 # Top-level Rules
@@ -76,7 +80,11 @@
        $(PATCH17).patch \
        $(PATCH18).patch \
        $(PATCH19).patch \
-       $(PATCH20).patch
+       $(PATCH20).patch \
+       $(PATCH21).patch \
+       $(PATCH22).patch \
+       $(PATCH23).patch \
+       $(PATCH24).patch
 
 $(DL_FILE)                     = $(DL_FROM)/$(DL_FILE)
 $(PATCH1)                      = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
@@ -93,6 +101,10 @@
 $(PATCH18).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH18)
 $(PATCH19).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH19)
 $(PATCH20).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH20)
+$(PATCH21).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH21)
+$(PATCH22).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH22)
+$(PATCH23).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH23)
+$(PATCH24).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH24)
 
 $(DL_FILE)_MD5                 = 3fb927c7c33022f1c327f14a81c0d4b0
 $(PATCH1)_MD5                  = abae789c2807cb7c7c4c452fa3986f85
@@ -109,6 +121,10 @@
 $(PATCH18).patch_MD5           = 6921a0b4228fe89b6537a5c29f027c89
 $(PATCH19).patch_MD5           = 1195d85447f3d048d2c9bcd075fa765c
 $(PATCH20).patch_MD5           = b09000bba08da6ac753124593850cdf7
+$(PATCH21).patch_MD5           = 09d3f96a16b881334cfaee0cf320b47e
+$(PATCH22).patch_MD5           = 597bf71a2aac6feb510b7505cdd3d4f7
+$(PATCH23).patch_MD5           = 3fab459b4e09daea529cacad025b13b3
+$(PATCH24).patch_MD5           = 4ad8d11e72afc6090e701073ff034cf4
 
 install : $(TARGET)
 
@@ -141,17 +157,7 @@
        cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
        cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH08).patch
        cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH09).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH10).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH11).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH12).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH13).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH14).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH15).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH16).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH17).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH18).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH19).patch
-       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH20).patch
+       cd $(DIR_APP) && for patch in $(seq 10 24); do patch -p0 -i 
$(DIR_DL)/$(PATCH$$patch).patch; done
 
        # Fix not a string literal and no format arguments, debian borrowed
        cd $(DIR_APP) && patch -p2 -i 
$(DIR_PATCHES)/$(PKG_NAME)-4.1_hardening-formatstring.patch

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-03-16 06:43:19 UTC 
(rev 6483)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-03-16 09:05:51 UTC 
(rev 6484)
@@ -64,7 +64,7 @@
 ## arping-2.11
 /usr/sbin/arping
 ##
-## bash-4.2.20 +format-string patch
+## bash-4.2.24 + format-string patch
 /bin/sh
 /bin/bash
 ##

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml   2012-03-16 06:43:19 UTC (rev 
6483)
+++ ipcop/trunk/updates/2.1.0/information.xml   2012-03-16 09:05:51 UTC (rev 
6484)
@@ -6,7 +6,7 @@
         <description>bash and gettext patch&lt;br /&gt;
             Add URL filter.&lt;br /&gt;
             Language updates.&lt;br /&gt;
-            Upgrade arping to 2.11, dhcpcd to 5.5.4, e2fsprogs to 1.42.1, 
ethtool to 3.2,
+            Upgrade arping to 2.11, bash to 4.2.24, dhcpcd to 5.5.4, e2fsprogs 
to 1.42.1, ethtool to 3.2,
             gmp to 5.0.4, grep to 2.11,
             gnupg to 1.4.12, hdparm to 9.39, kernel to 3.0.24, krb5 to 1.9.3,
             libgcrypt to 1.5.0, libtool to 2.4.2, lsof to 4.85,

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


------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to