Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4ee964f32400c2025bf5a51d70bb20d631ef7020)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4ee964f32400c2025bf5a51d70bb20d631ef7020)
  • Date: Fri, 22 Sep 2017 14:35:58 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

net/net-tools/BUILD | 3 -
net/net-tools/CONFIGURE | 26 ++++++++++
net/net-tools/DETAILS | 16 +++---
net/net-tools/FINAL | 2
net/net-tools/HISTORY | 10 ++++
net/net-tools/INSTALL | 9 +++
net/net-tools/PRE_BUILD | 4 -
net/net-tools/double-free-nameif.patch | 76
--------------------------------
net/net-tools/gcc-3.4.patch | 38 ----------------
net/net-tools/kernel-headers.patch | 10 ----
net/net-tools/net-tool-NULL-error.patch | 25 ----------
net/net-tools/x25_address-fix.patch | 23 ---------
12 files changed, 53 insertions(+), 189 deletions(-)

New commits:
commit 4ee964f32400c2025bf5a51d70bb20d631ef7020
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

net-tools: update to 1.60-git479bb4 to make it build again

Build of old net-tools is broken with newer kernels. Instead of
trying to backport patches, I decided to switch to a git snapshot
from the (again) active development. There are changes in the
output of the commands. That could break things. But SMGL does
not parse ifconfig output, for example. Generally, we rely on
iproute2 anyway, but there are instances of net-tools use that
hopefully are still happy with this updated version.

diff --git a/net/net-tools/BUILD b/net/net-tools/BUILD
index 65e023e..6d203b7 100755
--- a/net/net-tools/BUILD
+++ b/net/net-tools/BUILD
@@ -9,9 +9,6 @@ $CONFIG_OPTS"
fi &&

echo -e\n $CONFIG_OPTS > smgl_config_opts &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc-3.4.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/x25_address-fix.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/double-free-nameif.patch &&
sedit '382,391s/$/\\n\\/' mii-tool.c &&
./configure.sh config.in < smgl_config_opts &&
make_single &&
diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE
index 772bee8..411929c 100755
--- a/net/net-tools/CONFIGURE
+++ b/net/net-tools/CONFIGURE
@@ -40,13 +40,26 @@ config_query HWASH "Ash hardware support?"
y &&
config_query CISCO "(Cisco)-HDLC/LAPB hardware support?" y &&
config_query IRDA "IrDA hardware support?" y &&
config_query HWECONET "Econet hardware support?" y &&
+config_query HWUI64 "Generic EUI-64 hardware support?" y &&
+config_query HWIB "InfiniBand hardware support?" y &&
config_query IPMASQ "IP Masquerading support?" y &&
config_query IPTOOLS "Build iptunnel and ipmaddr?" y &&
+config_query PLIPTOOLS "Build plipconfig?" y &&
+config_query SERIALTOOLS "Build slattach?" y &&
# Turn off MII by default as it fails to build on some machines
-config_query MII "Build mii-tool?" n
+config_query MII "Build mii-tool?" n &&

persistent_add CONFIG_OPTS &&

+# Untested for now, keeping upstream default.
+AFBLUETOOTH=n &&
+SELINUX=n &&
+
+# Also keeping default for sanity.
+HOSTNAMETOOLS=y &&
+HOSTNAMELINK=y &&
+ARPTOOLS=y &&
+
CONFIG_OPTS="$UNIX\n\
$INET\n\
$INET6\n\
@@ -59,6 +72,7 @@ $AFX25\n\
$AFECONET\n\
$DECNET\n\
$AFASH\n\
+$AFBLUETOOTH\n\
$ETHERNET\n\
$ARCNET\n\
$SLIP\n\
@@ -78,6 +92,14 @@ $HWASH\n\
$CISCO\n\
$IRDA\n\
$HWECONET\n\
+$HWEUI64\n\
+$HWIB\n\
$IPMASQ\n\
+$ARPTOOLS\n\
+$HOSTNAMETOOLS\n\
+$HOSTNAMELINK\n\
$IPTOOLS\n\
-$MII\n"
+$MII\n\
+$PLIPTOOLS\n\
+$SERIALTOOLS\n\
+$SELINUX\n"
diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index f2da6f9..7890b6c 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -1,12 +1,14 @@
SPELL=net-tools
- VERSION=1.60
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
- PATCHLEVEL=11
+ VERSION_COMMIT=479bb4a7e11a4084e2935c0a576388f92469225b
+ VERSION=1.60-git$(cut -c 1-6 <<<"$VERSION_COMMIT")
+ SOURCE=${SPELL}-${VERSION}.zip
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-code-${VERSION_COMMIT}
+# SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
+
SOURCE_URL[0]=https://sourceforge.net/code-snapshots/git/n/ne/net-tools/code.git/net-tools-code-479bb4a7e11a4084e2935c0a576388f92469225b.zip
+
SOURCE_HASH=sha512:85229ac654161cead1c82d896a746c9eff98760c6431288b469ab75892201530393ebd3546484a1eb5b68c4a7a555b5712242e8647f0e9ed75e97222f84bffa7
+ PATCHLEVEL=12
LICENSE[0]=GPL
- WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
+ WEB_SITE=https://sourceforge.net/projects/net-tools/
ENTERED=20010922
KEYWORDS="tools net"
SHORT="Essential tools for networking."
diff --git a/net/net-tools/FINAL b/net/net-tools/FINAL
new file mode 100755
index 0000000..d241398
--- /dev/null
+++ b/net/net-tools/FINAL
@@ -0,0 +1,2 @@
+message "The net-tools output has changed since version 1.60." \
+ "You might have to adapt scripts that parse e.g. for IP addresses."
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index 75c968d..662ac88 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,13 @@
+2017-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 1.60-git-479bb4, switch to git snapshot
+ that has maintenance patches
+ * PRE_BUILD, *.patch: removed
+ * BUILD: no patches
+ * CONFIGURE: new options
+ * INSTALL: ensure that /sbin/ifconfig and /sbin/route exist
+ * FINAL: a rather persistent note about changed output, been
+ a long time!
+
2017-01-13 David C. Haley <khoralin AT gmail.com>
* DETAILS: updated SOURCE_URL
${...} syntax added where needed
diff --git a/net/net-tools/INSTALL b/net/net-tools/INSTALL
index 830a350..b4ac45e 100755
--- a/net/net-tools/INSTALL
+++ b/net/net-tools/INSTALL
@@ -1,2 +1,9 @@
make_normal &&
-make BASEDIR=${INSTALL_ROOT}/ install
+make BASEDIR=${INSTALL_ROOT}/ install &&
+# Ifconfig and route now installed into /bin/. Scripts might expect them in
/sbin/.
+if ! test -e "$INSTALL_ROOT/sbin/ifconfig"; then
+ ln -s ../bin/ifconfig "$INSTALL_ROOT/sbin/ifconfig"
+fi
+if ! test -e "$INSTALL_ROOT/sbin/route"; then
+ ln -s ../bin/route "$INSTALL_ROOT/sbin/route"
+fi
diff --git a/net/net-tools/PRE_BUILD b/net/net-tools/PRE_BUILD
deleted file mode 100755
index 25fa4ee..0000000
--- a/net/net-tools/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/kernel-headers.patch &&
-patch -p0 < $SPELL_DIRECTORY/net-tool-NULL-error.patch
diff --git a/net/net-tools/double-free-nameif.patch
b/net/net-tools/double-free-nameif.patch
deleted file mode 100644
index 70304f5..0000000
--- a/net/net-tools/double-free-nameif.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- net-tools-1.60.orig/nameif.c
-+++ net-tools-1.60/nameif.c
-@@ -3,7 +3,7 @@
- * Writen 2000 by Andi Kleen.
- * Subject to the Gnu Public License, version 2.
- * TODO: make it support token ring etc.
-- * $Id: nameif.c,v 1.1 2000/10/18 17:26:29 ak Exp $
-+ * $Id: nameif.c,v 1.4 2003/09/11 03:46:49 ak Exp $
- */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
-@@ -117,7 +117,8 @@
- }
-
- struct change {
-- struct change *next,**pprev;
-+ struct change *next;
-+ int found;
- char ifname[IFNAMSIZ+1];
- unsigned char mac[6];
- };
-@@ -139,10 +140,7 @@
- ch->ifname, pos);
- if (parsemac(p,ch->mac) < 0)
- complain(_("cannot parse MAC `%s' at %s"), p, pos);
-- if (clist)
-- clist->pprev = &ch->next;
- ch->next = clist;
-- ch->pprev = &clist;
- clist = ch;
- return 0;
- }
-@@ -177,7 +175,7 @@
- if (*p == '\0')
- continue;
- n = strcspn(p, " \t");
-- if (n > IFNAMSIZ)
-+ if (n > IFNAMSIZ-1)
- complain(_("interface name too long at line %d"),
line);
- memcpy(ch->ifname, p, n);
- ch->ifname[n] = 0;
-@@ -200,7 +198,7 @@
-
- void usage(void)
- {
-- fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname
macaddress}"));
-+ fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname
macaddress}\n"));
- exit(1);
- }
-
-@@ -277,21 +275,21 @@
- ch = lookupmac(mac);
- if (!ch)
- continue;
--
-- *ch->pprev = ch->next;
-+
-+ ch->found = 1;
- if (strcmp(p, ch->ifname)) {
- if (setname(p, ch->ifname) < 0)
- complain(_("cannot change name of %s to %s:
%s"),
- p, ch->ifname,
strerror(errno));
- }
-- free(ch);
- }
- fclose(ifh);
-
- while (clist) {
- struct change *ch = clist;
- clist = clist->next;
-- warning(_("interface '%s' not found"), ch->ifname);
-+ if (!ch->found)
-+ warning(_("interface '%s' not found"), ch->ifname);
- free(ch);
- }
-
diff --git a/net/net-tools/gcc-3.4.patch b/net/net-tools/gcc-3.4.patch
deleted file mode 100644
index 41ea442..0000000
--- a/net/net-tools/gcc-3.4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Nur net-tools-1.60/hostname.c net-tools-1.60-fixed/hostname.c
---- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200
-+++ net-tools-1.60-fixed/hostname.c 2004-05-29 20:29:50.526423387 +0200
-@@ -98,6 +98,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ ;
- }
- exit(1);
- };
-@@ -117,6 +118,7 @@
- fprintf(stderr, _("%s: name too long\n"), program_name);
- break;
- default:
-+ ;
- }
- exit(1);
- };
-@@ -174,6 +176,7 @@
- printf("%s\n", hp->h_name);
- break;
- default:
-+ ;
- }
- }
-
-diff -Nur net-tools-1.60/lib/inet_sr.c net-tools-1.60-fixed/lib/inet_sr.c
---- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100
-+++ net-tools-1.60-fixed/lib/inet_sr.c 2004-05-29 20:29:42.490447616 +0200
-@@ -105,6 +105,7 @@
- case 2:
- isnet = 0; break;
- default:
-+ ;
- }
-
- /* Fill in the other fields. */
diff --git a/net/net-tools/kernel-headers.patch
b/net/net-tools/kernel-headers.patch
deleted file mode 100644
index 2cd83bb..0000000
--- a/net/net-tools/kernel-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/fddi.c.orig 2007-04-01 10:41:24.000000000 +0200
-+++ lib/fddi.c 2007-04-01 10:41:33.000000000 +0200
-@@ -27,6 +27,7 @@
- #error "Disable HW Type FDDI"
- #endif
- #if __GLIBC__ >= 2
-+#define __be16 __u16
- #include <netinet/if_fddi.h>
- #else
- #include <linux/if_fddi.h>
diff --git a/net/net-tools/net-tool-NULL-error.patch
b/net/net-tools/net-tool-NULL-error.patch
deleted file mode 100644
index 998c5dc..0000000
--- a/net/net-tools/net-tool-NULL-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0ee63912133943e0837b90e46bec274761d46598 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier AT gentoo.org>
-Date: Mon, 9 Jun 2008 01:23:59 -0400
-Subject: [PATCH] Pull in stdlib.h for NULL definition to fix #225425
-
-Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
----
- lib/ec_hw.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/lib/ec_hw.c b/lib/ec_hw.c
-index 825e501..558f26f 100644
---- lib/ec_hw.c
-+++ lib/ec_hw.c
-@@ -16,6 +16,7 @@
-
- #if HAVE_HWEC
-
-+#include <stdlib.h>
- #include <net/if_arp.h>
- #include "net-support.h"
-
---
-1.5.5.3
-
diff --git a/net/net-tools/x25_address-fix.patch
b/net/net-tools/x25_address-fix.patch
deleted file mode 100644
index 92ce901..0000000
--- a/net/net-tools/x25_address-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
---- net-tools-1.60.orig/lib/x25_sr.c 2000-05-20 15:38:10.000000000 +0200
-+++ net-tools-1.60/lib/x25_sr.c 2003-10-18 20:33:31.927574928 +0200
-@@ -22,6 +22,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/x25.h>
-+#include <linux/version.h>
- #include <ctype.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -77,7 +78,11 @@
- rt.sigdigits=sigdigits;
-
- /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
- memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+#else
-+ memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
-+#endif
-
- while (*args) {
- if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (4ee964f32400c2025bf5a51d70bb20d631ef7020), Thomas Orgis, 09/22/2017

Archive powered by MHonArc 2.6.24.

Top of Page