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

[gespinasse]

Revision: 6675
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6675&view=rev
Author:   gespinasse
Date:     2012-06-29 06:13:13 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Update iputils with debian patches as anyway binaries would have been changed 
by an not yet commited glibc-2.11 patch
Debian patches should fix a few minor issues.

Silent stric-aliasing warnings

Build ping and ping 6 in one make line

Use our CFLAGS

Change hdparms in update to be in the right order

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

Modified: ipcop/trunk/lfs/iputils
===================================================================
--- ipcop/trunk/lfs/iputils     2012-06-27 06:41:18 UTC (rev 6674)
+++ ipcop/trunk/lfs/iputils     2012-06-29 06:13:13 UTC (rev 6675)
@@ -43,15 +43,22 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+# no s in number for debian
+PATCH1    := $(PKG_NAME)_20101006-1.debian.tar.gz
+
+CFLAGS += -fno-strict-aliasing
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(PATCH1)
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
+$(PATCH1)  := $(URL_DEBIAN)/i/$(PKG_NAME)/$(PATCH1)
 
 $(DL_FILE)_MD5 = a36c25e9ec17e48be514dc0485e7376c
+$(PATCH1)_MD5 := e153e7c7ab1ec5f9acf49ae215f784a7
 
 install : $(TARGET)
 
@@ -81,11 +88,14 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       # Apply patches on debian order
+       cd $(DIR_APP) && tar zxf $(DIR_DL)/$(PATCH1)
+       cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch 
-p1 -i debian/patches/$$patch; done
 
-       cd $(DIR_APP) && make ping
-       cd $(DIR_APP) && install -m 0755 ping /bin/ping
-       cd $(DIR_APP) && make ping6
-       cd $(DIR_APP) && install -m 0755 ping6 /bin/ping6
+       cd $(DIR_APP) && sed -i "s/\-O2/$(CFLAGS)/" Makefile
 
+       cd $(DIR_APP) && make ping ping6
+       cd $(DIR_APP) && install -m 0755 ping ping6 /bin
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-06-27 06:41:18 UTC 
(rev 6674)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-06-29 06:13:13 UTC 
(rev 6675)
@@ -247,6 +247,9 @@
 /usr/bin/uncompress
 /usr/bin/zcat
 ##
+## hdparm-9.39
+/usr/sbin/hdparm
+##
 ## iproute2-3.4.0
 /sbin/ip
 /sbin/rtmon
@@ -338,8 +341,9 @@
 /lib/libxtables.so.7.0.0
 /sbin/xtables-multi
 ##
-## hdparm-9.39
-/usr/sbin/hdparm
+## iputils-s20101006 with debian patches
+/bin/ping
+/bin/ping6
 ##
 ## iw-3.4
 /usr/sbin/iw

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml   2012-06-27 06:41:18 UTC (rev 
6674)
+++ ipcop/trunk/updates/2.1.0/information.xml   2012-06-29 06:13:13 UTC (rev 
6675)
@@ -3,7 +3,7 @@
         <version>2.1.0</version>
         <releasedate>2012-04-dd</releasedate>
         <size>0</size>
-        <description>httpd, gettext, setserial, pcmciautils patched&lt;br /&gt;
+        <description>httpd, iputils, gettext, setserial, pcmciautils 
patched&lt;br /&gt;
             cairo recompiled with -O3&lt;br /&gt;
             Add URL filter, xz-5.0.4&lt;br /&gt;
             Language updates.&lt;br /&gt;

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
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn