Revision: 6658
http://ipcop.svn.sourceforge.net/ipcop/?rev=6658&view=rev
Author: gespinasse
Date: 2012-06-18 18:10:39 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Upgrade net-tools to same snapshot from git tree as others distro
Snapshot date is mostly the last significant change.
Reorder the options to sed following config.in file order and set the new ones.
Upstream changed path for ifconfig/route to /bin for some reasons.
Restore previous /sbin is simplier for us.
Remove saving old binaries under .old name on rebuild, this is useless in our
context and produce a dummy rootfile
So remove savebin rule.
--Cette ligne, et les suivantes ci-dessous, seront ignor?\195?\169es--
M lfs/net-tools
M updates/2.1.0/information.xml
M updates/2.1.0/ROOTFILES.i486-2.1.0
D src/patches/net-tools-1.60_mii-tool.patch
Modified Paths:
--------------
ipcop/trunk/lfs/net-tools
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/net-tools-1.60_mii-tool.patch
Modified: ipcop/trunk/lfs/net-tools
===================================================================
--- ipcop/trunk/lfs/net-tools 2012-06-17 12:30:08 UTC (rev 6657)
+++ ipcop/trunk/lfs/net-tools 2012-06-18 18:10:39 UTC (rev 6658)
@@ -33,29 +33,26 @@
include Config
PKG_NAME = net-tools
-VER = 1.60
+VER = 1.60_p20120127084908
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = http://www.tazenda.demon.co.uk/phil/net-tools
+DL_FILE = $(THISAPP).tar.xz
+# Should be available on sourceforge in the futur but no new package yet
released, so using same snapshoot as others
+#DL_FROM = $(URL_SFNET)/$(PKG_NAME)
+DL_FROM = http://gentoo.osuosl.org/distfiles
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-PATCH1 = $(PKG_NAME)_$(VER)-23.diff.gz
-
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) \
- $(PATCH1)
+objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(PATCH1) = $(URL_DEBIAN)/n/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = 888774accab40217dde927e21979c165
-$(PATCH1)_MD5 = 2412e55c20308d5fbd28bfadd18c075f
+$(DL_FILE)_MD5 = 72a2e4715834c459282c9b63e8d81f56
install : $(TARGET)
@@ -84,34 +81,47 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -Np1
- cd $(DIR_APP) && for patch in `grep -v ^# debian/patches/series` ; do \
- patch -Np1 -i debian/patches/$$patch; \
- done
+ # Change Makefile before running configure, avoiding configure to
update config.h on first make
+ # Move ifconfig and route back to our usual /sbin to save us that
trouble
+ # Remove the install warning on ifconfig/route move, configure.sh
warning remain
+ # Remove saving previous installed binaries under .old name
+ cd $(DIR_APP) && sed -i -e '/install.*ifconfig/s/bin/sbin/' \
+ -e '/install.*route/s/bin/sbin/' \
+ -e '/^\t@echo*$$/d' \
+ -e 's/ savebin / /' Makefile
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_mii-tool.patch
cd $(DIR_APP) && sed -i \
-e 's/HAVE_AFIPX y/HAVE_AFIPX n/' \
-e 's/HAVE_AFATALK y/HAVE_AFATALK n/' \
-e 's/HAVE_AFAX25 y/HAVE_AFAX25 n/' \
-e 's/HAVE_AFNETROM y/HAVE_AFNETROM n/' \
+ -e 's/HAVE_AFROSE y/HAVE_AFROSE n/' \
-e 's/HAVE_AFX25 y/HAVE_AFX25 n/' \
+ -e 's/HAVE_AFECONET y/HAVE_AFECONET n/' \
+ -e 's/HAVE_AFASH y/HAVE_AFASH n/' \
+ -e 's/HAVE_AFX25 y/HAVE_AFX25 n/' \
+ -e 's/HAVE_HWARC y/HAVE_HWARC n/' \
-e 's/HAVE_HWSTRIP y/HAVE_HWSTRIP n/' \
- -e 's/HAVE_HWX25 y/HAVE_HWX25 n/' \
- -e 's/HAVE_HWNETROM y/HAVE_HWNETROM n/' \
- -e 's/HAVE_HWARC y/HAVE_HWARC n/' \
-e 's/HAVE_HWTR y/HAVE_HWTR n/' \
-e 's/HAVE_HWAX25 y/HAVE_HWAX25 n/' \
+ -e 's/HAVE_HWROSE y/HAVE_HWROSE n/' \
+ -e 's/HAVE_HWNETROM y/HAVE_HWNETROM n/' \
+ -e 's/HAVE_HWX25 y/HAVE_HWX25 n/' \
-e 's/HAVE_HWFR y/HAVE_HWFR n/' \
+ -e 's/HAVE_HWFDDI y/HAVE_HWFDDI n/' \
+ -e 's/HAVE_HWHIPPI y/HAVE_HWHIPPI n/' \
+ -e 's/HAVE_HWASH y/HAVE_HWASH n/' \
+ -e 's/HAVE_HWHDLCLAPB y/HAVE_HWHDLCLAPB n/' \
-e 's/HAVE_HWIRDA y/HAVE_HWIRDA n/' \
- -e 's/HAVE_MII n/HAVE_MII y/' config.in
- cd $(DIR_APP) && sed -i -e 's/DNLIB = -ldnet/DNLIB =/' Makefile
- cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' Makefile
- cd $(DIR_APP) && yes '' | make config
+ -e 's/HAVE_HWEC y/HAVE_HWEC n/' \
+ -e 's/HAVE_HWEUI64 y/HAVE_HWEUI64 n/' \
+ -e 's/HAVE_HWIB y/HAVE_HWIB n/' config.in
+
+ cd $(DIR_APP) && yes '' | ./configure.sh config.in
cd $(DIR_APP) && make
- cd $(DIR_APP) && make update
+ cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Deleted: ipcop/trunk/src/patches/net-tools-1.60_mii-tool.patch
===================================================================
--- ipcop/trunk/src/patches/net-tools-1.60_mii-tool.patch 2012-06-17
12:30:08 UTC (rev 6657)
+++ ipcop/trunk/src/patches/net-tools-1.60_mii-tool.patch 2012-06-18
18:10:39 UTC (rev 6658)
@@ -1,96 +0,0 @@
-mii-tool without any parameters only scans for eth%d devices.
-This misses (among other things) devices that are renamed by using udevs
-70-persistent-net.rules
-
-This patch makes mii-tool use the same for_all_interfaces method as used
-in ifconfig. Apply on top of Debian net-tools_1.60-23.diff.gz patchset.
-
---- net-tools-1.60/Makefile 2009-06-12 12:39:13.000000000 +0200
-+++ net-tools_mii-tool/Makefile 2009-06-12 12:38:32.000000000 +0200
-@@ -218,7 +218,7 @@
- $(CC) $(LDFLAGS) -o ipmaddr ipmaddr.o $(NLIB) $(RESLIB)
-
- mii-tool: mii-tool.o
-- $(CC) $(LDFLAGS) -o mii-tool mii-tool.o
-+ $(CC) $(LDFLAGS) -o mii-tool mii-tool.o $(NLIB)
-
- installbin:
- install -m 0755 -d ${BASEDIR}/sbin
---- net-tools-1.60/mii-tool.c 2009-06-12 13:34:32.000000000 +0200
-+++ net-tools_mii-tool/mii-tool.c 2009-06-12 13:37:34.000000000 +0200
-@@ -31,6 +31,8 @@
-
- static char Version[] = "$Id: mii-tool.c,v 1.9 2006/09/27 20:59:18 ecki Exp
$\n(Author: David Hinds based on Donald Becker's mii-diag)";
-
-+#include "config.h"
-+
- #include <unistd.h>
- #include <stdlib.h>
- #include <stdio.h>
-@@ -45,6 +47,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <net/if_arp.h>
- #include <linux/sockios.h>
-
- #ifndef __GLIBC__
-@@ -54,6 +57,9 @@
- #include "mii.h"
- #include "version.h"
-
-+#include "interface.h"
-+#include "sockets.h"
-+
- #define MAX_ETH 8 /* Maximum # of interfaces */
-
- /* Table of known MII's */
-@@ -109,8 +115,6 @@
- static int nway_advertise = 0;
- static int fixed_speed = 0;
- static int override_phy = -1;
--
--static int skfd = -1; /* AF_INET socket for ioctl() calls. */
- static struct ifreq ifr;
-
- /*--------------------------------------------------------------------*/
-@@ -409,6 +413,19 @@
-
- /*--------------------------------------------------------------------*/
-
-+int do_mii_print(struct interface *ife, void *cookie)
-+{
-+ int res;
-+
-+ res = do_if_fetch(ife);
-+ if ((res >= 0) && (ife->type == ARPHRD_ETHER)) {
-+ do_one_xcvr(skfd, ife->name, 1);
-+ }
-+ return res;
-+}
-+
-+/*--------------------------------------------------------------------*/
-+
- const char *usage =
- "usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
- " -V, --version display version information\n"
-@@ -477,11 +494,16 @@
-
- /* No remaining args means show all interfaces. */
- if (optind == argc) {
-+ int opt_a = 1;
- ret = 1;
-- for (i = 0; i < MAX_ETH; i++) {
-- sprintf(s, "eth%d", i);
-- ret &= do_one_xcvr(skfd, s, 1);
-+ /* Create a channel to the NET kernel. */
-+ if ((skfd = sockets_open(0)) < 0) {
-+ perror("socket");
-+ exit(1);
- }
-+ ret = for_all_interfaces(do_mii_print, &opt_a);
-+ (void) close(skfd);
-+
- if (ret)
- fprintf(stderr, "no MII interfaces found\n");
- } else {
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-17 12:30:08 UTC
(rev 6657)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-18 18:10:39 UTC
(rev 6658)
@@ -394,6 +394,16 @@
/sbin/mdadm
/sbin/mdmon
##
+## net-tools-1.60-p20120127084908
+/bin/dnsdomainname
+/bin/hostname
+/bin/netstat
+/sbin/arp
+/sbin/ifconfig
+/sbin/mii-tool
+/sbin/route
+/sbin/slattach
+##
## openldap-2.4.30
/usr/lib/liblber-2.4.so.2.8.3
/usr/lib/libldap-2.4.so.2.8.3
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-06-17 12:30:08 UTC (rev
6657)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-06-18 18:10:39 UTC (rev
6658)
@@ -14,7 +14,7 @@
iproute2 to 3.3.0, iptables to 1.4.14, hdparm to 9.39, kernel to
3.0.34, krb5 to 1.9.3,
libffi to 3.0.10, libgd to 2.0.36~rc1, libgcrypt to 1.5.0,
libnetfiltercontrack to 1.0.1, libpng to 1.5.10,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, lsof to 4.86,
- openldap to 2.4.30, openssh to 6.0, openssl to 1.0.1c, openswan to
2.6.38,
+ net-tools to 1.60-p20120127084908, openldap to 2.4.30, openssh to
6.0, openssl to 1.0.1c, openswan to 2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.3, psmisc to 22.17,
rsyslog to 5.8.9, shadow to 4.1.5.1, sqlite to 3.7.13, squid to
3.1.20, squid-langpack to 20120329,
traceroute to 2.0.18, tzdata to 2012c,
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
