[Ipcop-svn] SF.net SVN: ipcop:[7651] ipcop/trunk

owes Fri, 26 Sep 2014 04:27:59 -0700

Revision: 7651
          http://sourceforge.net/p/ipcop/svn/7651
Author:   owes
Date:     2014-09-26 11:27:01 +0000 (Fri, 26 Sep 2014)
Log Message:
-----------
Update bash to 4.3.25


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

Modified: ipcop/trunk/lfs/bash
===================================================================
--- ipcop/trunk/lfs/bash        2014-08-28 10:43:30 UTC (rev 7650)
+++ ipcop/trunk/lfs/bash        2014-09-26 11:27:01 UTC (rev 7651)
@@ -43,22 +43,25 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-# patches 1 to 7 are together
-PATCH1    := $(THISAPP)-fixes-1.patch
-PATCH08   := $(PKG_NAME)42-008
+# patches 1 to 24 are together
+PATCH1    := $(THISAPP)-upstream_fixes-3.patch
+PATCH25   := $(PKG_NAME)43-025
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+       $(PATCH1) \
+       $(PATCH25).patch
 
+
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 $(PATCH1)  = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
-$(PATCH08).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH08)
+$(PATCH25).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH25)
 
 $(DL_FILE)_MD5 = 81348932d5da294953e15d4814c74dd1
-$(PATCH1)_MD5  = abae789c2807cb7c7c4c452fa3986f85
-$(PATCH08).patch_MD5 = 24c574bf6d6a581e300823d9c1276af6
+$(PATCH1)_MD5  = 3266ce3d2f0aa647d4ef068e46899246
+$(PATCH25).patch_MD5 = 193c06f578d38ffdbaebae9c51a7551f
 
 install : $(TARGET)
 
@@ -89,10 +92,10 @@
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-       # No patches yet, leave mechanism for future
-       #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
+       # Combined patch from LFS
+       cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
+       # For patches directly from GNU bash
+       cd $(DIR_APP) && patch -p0 -i $(DIR_DL)/$(PATCH25).patch
        # Same bash version doesn't like the variable evaluation, use a 
separate patch var
        #cd $(DIR_APP) && for nb in `seq 10 45`; do 
patch="$(DIR_DL)/$(PKG_NAME)42-0$$nb.patch";echo "using $$patch"; patch -p0 -i 
$$patch; done
 

Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6      2014-08-28 10:43:30 UTC 
(rev 7650)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6      2014-09-26 11:27:01 UTC 
(rev 7651)
@@ -57,6 +57,9 @@
 /usr/share/locale/zh_CN/LC_MESSAGES/ipcop.mo
 /usr/share/locale/zh_TW/LC_MESSAGES/ipcop.mo
 ##
+## bash-4.3.25
+/bin/bash
+##
 ## bind-9.9.5-P1
 /usr/bin/dig
 /usr/bin/host

Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml   2014-08-28 10:43:30 UTC (rev 
7650)
+++ ipcop/trunk/updates/2.1.6/information.xml   2014-09-26 11:27:01 UTC (rev 
7651)
@@ -7,7 +7,7 @@
         <description>Language updates.&lt;br /&gt;
         Patch openssl for CVE-2010-5298.&lt;br /&gt;
         Upgrade linux kernel to 3.4-3 (3.4.103).&lt;br /&gt;
-        Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 2.71, e2fsprogs 
to 1.42.11, fcron to 3.2.0,
+        Upgrade bash to 4.3.25, bind to 9.9.5-P1, dhcpcd to 6.4.3, dnsmasq to 
2.71, e2fsprogs to 1.42.11, fcron to 3.2.0,
         gnupg to 1.4.18, grep to 2.20, iproute2 to 3.16.0, libgcrypt to 1.6.2, 
libnl to 3.2.25, mdadm to 3.3.2,
         openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
         squid to 3.4.7, squid-langpack to 20140506, syslinux to 6.02,

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


------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

[Ipcop-svn] SF.net SVN: ipcop:[7651] ipcop/trunk

Reply via email to