Revision: 6700
http://ipcop.svn.sourceforge.net/ipcop/?rev=6700&view=rev
Author: gespinasse
Date: 2012-07-09 19:46:07 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Upgrade bash to 4.2.36
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-07-09 14:58:02 UTC (rev 6699)
+++ ipcop/trunk/lfs/bash 2012-07-09 19:46:07 UTC (rev 6700)
@@ -67,6 +67,13 @@
PATCH27 := $(PKG_NAME)42-027
PATCH28 := $(PKG_NAME)42-028
PATCH29 := $(PKG_NAME)42-029
+PATCH30 := $(PKG_NAME)42-030
+PATCH31 := $(PKG_NAME)42-031
+PATCH32 := $(PKG_NAME)42-032
+PATCH33 := $(PKG_NAME)42-033
+PATCH34 := $(PKG_NAME)42-034
+PATCH35 := $(PKG_NAME)42-035
+PATCH36 := $(PKG_NAME)42-036
###############################################################################
# Top-level Rules
@@ -94,7 +101,14 @@
$(PATCH26).patch \
$(PATCH27).patch \
$(PATCH28).patch \
- $(PATCH29).patch
+ $(PATCH29).patch \
+ $(PATCH30).patch \
+ $(PATCH31).patch \
+ $(PATCH32).patch \
+ $(PATCH33).patch \
+ $(PATCH34).patch \
+ $(PATCH35).patch \
+ $(PATCH36).patch
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
@@ -120,6 +134,13 @@
$(PATCH27).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH27)
$(PATCH28).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH28)
$(PATCH29).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH29)
+$(PATCH30).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH30)
+$(PATCH31).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH31)
+$(PATCH32).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH32)
+$(PATCH33).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH33)
+$(PATCH34).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH34)
+$(PATCH35).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH35)
+$(PATCH36).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH36)
$(DL_FILE)_MD5 = 3fb927c7c33022f1c327f14a81c0d4b0
$(PATCH1)_MD5 = abae789c2807cb7c7c4c452fa3986f85
@@ -145,6 +166,13 @@
$(PATCH27).patch_MD5 = a6ed82daf034587aee2f2581ba5fe829
$(PATCH28).patch_MD5 = da9265aa2527fd4a7481baa3e0550287
$(PATCH29).patch_MD5 = ec444d229e8899fbaaf6fc7de2d82ae6
+$(PATCH30).patch_MD5 = b4bc1c4dc1b508ff9cdfc44f1a5039b5
+$(PATCH31).patch_MD5 = 89390ff6a3c2ef7e09dd4b8b097a8e56
+$(PATCH32).patch_MD5 = eee08003395c417f677d1a4bf8c548ee
+$(PATCH33).patch_MD5 = 2fe070dd6d75d8ff16f269184a16e9c4
+$(PATCH34).patch_MD5 = 4e610506c1711bf3483b965800ac3d5d
+$(PATCH35).patch_MD5 = 7cd9bfdf7cbfd45274d07620ee94c8d9
+$(PATCH36).patch_MD5 = 9c3142956064d175a880bcb186e51ef9
install : $(TARGET)
@@ -177,8 +205,9 @@
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
- # Ubuntu lucid bash version 4.1.5(1) do nothing with $(seq 10 29)
(instead use ``) and doesn't like the variable evaluation
- cd $(DIR_APP) && for nb in `seq 10 29`; do
patch="$(DIR_DL)/$(PKG_NAME)42-0$$nb.patch";echo "using $$patch"; patch -p0 -i
$$patch; done
+ # 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 36`; 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-07-09 14:58:02 UTC
(rev 6699)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-09 19:46:07 UTC
(rev 6700)
@@ -88,7 +88,7 @@
## arping-2.12
/usr/sbin/arping
##
-## bash-4.2.29 + format-string patch
+## bash-4.2.36 + 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-07-09 14:58:02 UTC (rev
6699)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-07-09 19:46:07 UTC (rev
6700)
@@ -7,7 +7,7 @@
cairo recompiled with -O3<br />
Add URL filter, xz-5.0.4<br />
Language updates.<br />
- Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.29, bind to
9.8.3-P1, conntrack-tools to 1.2.1, coreutils to 8.17,
+ Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.36, bind to
9.8.3-P1, conntrack-tools to 1.2.1, coreutils to 8.17,
dhcpcd to 5.5.6, dnsmasq to 2.62,
e2fsprogs to 1.42.4, 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.13, gzip to 1.5,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
