Revision: 6921
http://ipcop.svn.sourceforge.net/ipcop/?rev=6921&view=rev
Author: gespinasse
Date: 2013-02-10 17:22:16 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Upgrade iputils to 20121221
Remove the debian patching lines as not needed
Remove CFLAGS += -fno-strict-aliasing as makefile do that now by default.
Use the new way to pass our options (CCOPTOPT) and let compile with -O3 as this
is the new default
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 2013-02-10 17:14:04 UTC (rev 6920)
+++ ipcop/trunk/lfs/iputils 2013-02-10 17:22:16 UTC (rev 6921)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = iputils
-VER = s20121011
+VER = s20121221
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,22 +43,15 @@
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) $(PATCH1)
+objects = $(DL_FILE)
$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
-$(PATCH1) := $(URL_DEBIAN)/i/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = 67056dae90c1ec02e753e0e17d3774ac
-$(PATCH1)_MD5 := e153e7c7ab1ec5f9acf49ae215f784a7
+$(DL_FILE)_MD5 = 6072aef64205720dd1893b375e184171
install : $(TARGET)
@@ -88,11 +81,9 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # There is currently no Debian patchset for s20121011, keep the code to
easily add later
- #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 ping6 CCOPT="-D_GNU_SOURCE $(CFLAGS) -Wall"
+ # Set CCOPTOPT with CFLAGS and original -O3 value
+ cd $(DIR_APP) && make ping ping6 CCOPTOPT="${CFLAGS} -O3" USE_GNUTLS=no
cd $(DIR_APP) && install -m 0755 ping ping6 /bin
@rm -rf $(DIR_APP)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-02-10 17:14:04 UTC
(rev 6920)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-02-10 17:22:16 UTC
(rev 6921)
@@ -383,7 +383,7 @@
## iptstate-2.2.5
/usr/sbin/iptstate
##
-## iputils-s20121011
+## iputils-s20121221
/bin/ping
/bin/ping6
##
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-02-10 17:14:04 UTC (rev
6920)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-02-10 17:22:16 UTC (rev
6921)
@@ -11,7 +11,7 @@
conntrack-tools to 1.2.2, coreutils to 8.20, dhcpcd to 5.6.7,
dnsmasq to 2.65,
e2fsprogs to 1.42.6, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.11, fontconfig to 2.9,
gawk to 4.0.2, gettext to 0.18.2, glib to 2.30.3, gmp to 5.0.5,
gnupg to 1.4.13, grep to 2.14, gzip to 1.5,
- iproute2 to 3.7.0, iptables to 1.4.17, iptstate to 2.2.5, iputils
to s20121011, iw to 3.8,
+ iproute2 to 3.7.0, iptables to 1.4.17, iptstate to 2.2.5, iputils
to s20121221, iw to 3.8,
hdparm to 9.39, httpd to 2.2.23, krb5 to 1.10.3,
less to 451, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to
1.5.0, libnet to 1.1.6,
libnetfiltercontrack to 1.0.2, libnl to 3.2.16, libpcap to 1.3.0,
libpng to 1.5.12,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
