Revision: 6628
http://ipcop.svn.sourceforge.net/ipcop/?rev=6628&view=rev
Author: gespinasse
Date: 2012-05-31 07:01:07 +0000 (Thu, 31 May 2012)
Log Message:
-----------
While adding 24 to 28 patches, I miss to update the loop.
Fix that and add 29 patch
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-05-28 15:23:05 UTC (rev 6627)
+++ ipcop/trunk/lfs/bash 2012-05-31 07:01:07 UTC (rev 6628)
@@ -66,6 +66,7 @@
PATCH26 := $(PKG_NAME)42-026
PATCH27 := $(PKG_NAME)42-027
PATCH28 := $(PKG_NAME)42-028
+PATCH29 := $(PKG_NAME)42-029
###############################################################################
# Top-level Rules
@@ -92,7 +93,8 @@
$(PATCH25).patch \
$(PATCH26).patch \
$(PATCH27).patch \
- $(PATCH28).patch
+ $(PATCH28).patch \
+ $(PATCH29).patch
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(PATCH1) = $(URL_LFS)/$(PKG_NAME)/$(PATCH1)
@@ -117,6 +119,7 @@
$(PATCH26).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH26)
$(PATCH27).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH27)
$(PATCH28).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH28)
+$(PATCH29).patch = $(DL_FROM)/$(THISAPP)-patches/$(PATCH29)
$(DL_FILE)_MD5 = 3fb927c7c33022f1c327f14a81c0d4b0
$(PATCH1)_MD5 = abae789c2807cb7c7c4c452fa3986f85
@@ -141,6 +144,7 @@
$(PATCH26).patch_MD5 = 9f19c199dd8d1fa9254eebe738759272
$(PATCH27).patch_MD5 = a6ed82daf034587aee2f2581ba5fe829
$(PATCH28).patch_MD5 = da9265aa2527fd4a7481baa3e0550287
+$(PATCH29).patch_MD5 = ec444d229e8899fbaaf6fc7de2d82ae6
install : $(TARGET)
@@ -173,8 +177,8 @@
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 24)' and
doesn't like the variable evaluation
- cd $(DIR_APP) && for nb in `seq 10 24`; 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 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
# 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-05-28 15:23:05 UTC
(rev 6627)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-31 07:01:07 UTC
(rev 6628)
@@ -82,7 +82,7 @@
## arping-2.11
/usr/sbin/arping
##
-## bash-4.2.28 + format-string patch
+## bash-4.2.29 + 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-05-28 15:23:05 UTC (rev
6627)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-05-31 07:01:07 UTC (rev
6628)
@@ -7,7 +7,7 @@
cairo and conntrack-tools recompiled with -O3<br />
Add URL filter, xz-5.0.3<br />
Language updates.<br />
- Upgrade acpid to 2.0.16, arping to 2.11, bash to 4.2.28, bind to
9.8.3, coreutils to 8.17,
+ Upgrade acpid to 2.0.16, arping to 2.11, bash to 4.2.29, bind to
9.8.3, coreutils to 8.17,
dhcpcd to 5.5.6, dnsmasq to 2.61,
e2fsprogs to 1.42.3, ethtool to 3.2, 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.12,
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
