From: Victor Martinez <pitillo@ono.com>
Date: Wed, 1 Oct 2014 07:18:12 +0000 (+0000)
Subject: inetutils: updated to 1.9.1
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=c2eed42aa7c2e6566452d7aef9b612e738ade12a;p=crossrootfs.git

inetutils: updated to 1.9.1
---

diff --git a/inetutils/.footprint b/inetutils/.footprint
index 7dc3c01..75a22d4 100644
--- a/inetutils/.footprint
+++ b/inetutils/.footprint
@@ -1,14 +1,20 @@
+-rwxr-xr-x	root/root	bin
 drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/inetd.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/inetd
+-rwxr-xr-x	root/root	sbin
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/telnet
+-rwsrwxr-x	root/root	usr/bin/traceroute
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/ftp.1.gz
+-rw-r--r--	root/root	usr/man/man1/hostname.1.gz
+-rw-r--r--	root/root	usr/man/man1/ifconfig.1.gz
 -rw-r--r--	root/root	usr/man/man1/telnet.1.gz
+-rw-r--r--	root/root	usr/man/man1/traceroute.1.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/inetd.8.gz
 drwxr-xr-x	root/root	usr/sbin/
diff --git a/inetutils/.md5sum b/inetutils/.md5sum
index 0ba398b..f511115 100644
--- a/inetutils/.md5sum
+++ b/inetutils/.md5sum
@@ -1,3 +1,4 @@
 87fdb9f85d8fc140b2f873e8e4e18440  inetd
 dd0d71e008809420edada02dda7a3149  inetd.conf
+c4d6af326062d6ea848cccb038c817c8  inetutils-1.9.1-pathprocnet.patch
 944f7196a2b3dba2d400e9088576000c  inetutils-1.9.1.tar.gz
diff --git a/inetutils/Pkgfile b/inetutils/Pkgfile
index 280bb00..1410f8d 100644
--- a/inetutils/Pkgfile
+++ b/inetutils/Pkgfile
@@ -6,9 +6,9 @@
 
 name=inetutils
 version=1.9.1
-release=2
+release=4
 source=(http://ftp.gnu.org/gnu/inetutils/inetutils-$version.tar.gz \
-        inetd.conf inetd)
+        inetd.conf inetd $name-$version-pathprocnet.patch)
 
 build() {
   cd inetutils-$version
@@ -16,6 +16,9 @@ build() {
   # fix for glibc 'gets' removal
   sed -i -e '/gets is a/d' lib/stdio.in.h
 
+  # Fix for PATH_PROC_NET undefined error
+  patch -p1 -i $SRC/$name-$version-pathprocnet.patch
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
@@ -24,12 +27,16 @@ build() {
               --localstatedir=/var \
               --sysconfdir=/etc \
               --disable-{servers,clients} \
-              --enable-{inetd,ftp,telnet}
+              --enable-{hostname,ifconfig,inetd,ftp,telnet,traceroute}
 
   make
   make DESTDIR=$PKG install
 
   install -d $PKG/etc/rc.d
+
+  mv $PKG/usr/bin/hostname $PKG/bin
+  mv $PKG/usr/bin/ifconfig $PKG/sbin
+
   install -m 644 $SRC/inetd.conf $PKG/etc
   install -m 755 $SRC/inetd $PKG/etc/rc.d
 
diff --git a/inetutils/inetutils-1.9.1-pathprocnet.patch b/inetutils/inetutils-1.9.1-pathprocnet.patch
new file mode 100644
index 0000000..3753533
--- /dev/null
+++ b/inetutils/inetutils-1.9.1-pathprocnet.patch
@@ -0,0 +1,26 @@
+inetutils: define PATH_PROCNET_DEV if not already defined
+
+this prevents the following compilation error :
+system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function)
+
+this patch comes from :
+ http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/
+
+Upstream-Status: Inappropriate [not author]
+
+Signed-of-by: Eric Bénard <eric at eukrea.com>
+---
+diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c
+--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500
++++ inetutils-1.9/ifconfig/system/linux.c  2012-01-04 16:40:53.000000000 -0500
+@@ -49,6 +49,10 @@
+ #include "../ifconfig.h"
+ 
+
++#ifndef PATH_PROCNET_DEV
++  #define PATH_PROCNET_DEV "/proc/net/dev"
++#endif
++
+ /* ARPHRD stuff.  */
+ 
+ static void