Revision: 6839
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6839&view=rev
Author:   gespinasse
Date:     2012-11-07 19:07:12 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Upgrade bash-4.2 to patchlevel 39

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-11-07 18:38:32 UTC (rev 6838)
+++ ipcop/trunk/lfs/bash        2012-11-07 19:07:12 UTC (rev 6839)
@@ -75,6 +75,8 @@
 PATCH35   := $(PKG_NAME)42-035
 PATCH36   := $(PKG_NAME)42-036
 PATCH37   := $(PKG_NAME)42-037
+PATCH38   := $(PKG_NAME)42-038
+PATCH39   := $(PKG_NAME)42-039
 
 ###############################################################################
 # Top-level Rules
@@ -110,7 +112,9 @@
        $(PATCH34).patch \
        $(PATCH35).patch \
        $(PATCH36).patch \
-       $(PATCH37).patch
+       $(PATCH37).patch \
+       $(PATCH38).patch \
+       $(PATCH39).patch \
 
 $(DL_FILE)                     = $(DL_FROM)/$(DL_FILE)
 $(PATCH1)                      = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
@@ -144,6 +148,8 @@
 $(PATCH35).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH35)
 $(PATCH36).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH36)
 $(PATCH37).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH37)
+$(PATCH38).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH38)
+$(PATCH39).patch               = $(DL_FROM)/$(THISAPP)-patches/$(PATCH39)
 
 $(DL_FILE)_MD5                 = 3fb927c7c33022f1c327f14a81c0d4b0
 $(PATCH1)_MD5                  = abae789c2807cb7c7c4c452fa3986f85
@@ -177,6 +183,8 @@
 $(PATCH35).patch_MD5           = 7cd9bfdf7cbfd45274d07620ee94c8d9
 $(PATCH36).patch_MD5           = 9c3142956064d175a880bcb186e51ef9
 $(PATCH37).patch_MD5           = c10692f447d4966c879f8fb8d7c8ebc9
+$(PATCH38).patch_MD5           = 9ef3c308cde413e95866c1266cfb4e98
+$(PATCH39).patch_MD5           = cd48f57a404498d4e5c73a3501c4b1a5
 
 install : $(TARGET)
 
@@ -207,11 +215,12 @@
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
+       # For patch numbers with leading 00
        cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH08).patch
        cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH09).patch
        # Ubuntu lucid bash version 4.1.5(1) do nothing with $(seq 10 36), use 
instead ``.
        # Same bash version doesn't like the variable evaluation, use a 
separate patch var
-       cd $(DIR_APP) && for nb in `seq 10 37`; do 
patch="$(DIR_DL)/$(PKG_NAME)42-0$$nb.patch";echo "using $$patch"; patch -p0 -i 
$$patch; done
+       cd $(DIR_APP) && for nb in `seq 10 39`; do 
patch="$(DIR_DL)/$(PKG_NAME)42-0$$nb.patch";echo "using $$patch"; patch -p0 -i 
$$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-11-07 18:38:32 UTC 
(rev 6838)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-11-07 19:07:12 UTC 
(rev 6839)
@@ -91,7 +91,7 @@
 ## arping-2.12
 /usr/sbin/arping
 ##
-## bash-4.2.37 + format-string patch
+## bash-4.2.39 + 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-11-07 18:38:32 UTC (rev 
6838)
+++ ipcop/trunk/updates/2.1.0/information.xml   2012-11-07 19:07:12 UTC (rev 
6839)
@@ -7,7 +7,7 @@
             cairo recompiled with -O3, isdn4k-utils with -Os 
-fno-strict-aliasing<br />
             Add xz-5.0.4<br />
             Language updates.<br />
-            Upgrade acpid to 2.0.17, arping to 2.12, bash to 4.2.37, bind to 
9.8.4, CnxADSL to ..PIM-2.6-2.7
+            Upgrade acpid to 2.0.17, arping to 2.12, bash to 4.2.39, bind to 
9.8.4, CnxADSL to ..PIM-2.6-2.7
             conntrack-tools to 1.2.2, coreutils to 8.19, dhcpcd to 5.6.2, 
dnsmasq to 2.63,
             e2fsprogs to 1.42.5, ethtool to 3.2, expat to 2.1.0, freetype to 
2.4.10, fontconfig to 2.9, gawk to 4.0.1, glib to 2.30.3,
             gmp to 5.0.5, gnupg to 1.4.12, grep to 2.14, gzip to 1.5,

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


------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to