iputils: updated to s20121221 and aligned with upstream

diff --git a/iputils/.md5sum b/iputils/.md5sum
index 576a790bfc524eb8adb94c9e76fcdb54c5127d05..e873d4a2bdce1817b5fe46591f23f7155cfc1f29 100644 (file)
--- a/iputils/.md5sum
+++ b/iputils/.md5sum
@@ -1,3 +1,2 @@
-5ec60e7637bac0a060766fe193c75bf7  iputils-man-s20101006.tar.xz
-ff0061ec890ec0bcaf84372484cc0b62  iputils-s20101006-fixes-1.patch
-a36c25e9ec17e48be514dc0485e7376c  iputils-s20101006.tar.bz2
+c5808ed90bbf3cf40031c7d4aa0ada67  iputils-man-s20121221.tar.xz
+6072aef64205720dd1893b375e184171  iputils-s20121221.tar.bz2

diff --git a/iputils/Pkgfile b/iputils/Pkgfile
index 39323415002ef4015d92436e8f519d7dfa9314dd..9d4f1ca795073e4c7d037116729f3c26d5151e2a 100644 (file)
--- a/iputils/Pkgfile
+++ b/iputils/Pkgfile
@@ -3,22 +3,20 @@
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Packager: Juergen Daubert, juergen dot daubert at t-online dot de
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: sysfsutils
+# Depends on: sysfsutils libcap
 
 name=iputils
-version=s20101006
+version=s20121221
 release=1
 source=(http://www.skbuff.net/iputils/$name-$version.tar.bz2
-        http://crux.nu/files/distfiles/$name-man-$version.tar.xz
-        iputils-s20101006-fixes-1.patch)
+        http://crux.nu/files/distfiles/$name-man-$version.tar.xz)
 
 build() {
   cd $name-$version
   sed -e "s|arping.o -lsysfs|arping.o $CLFS/usr/lib/libsysfs.so|" \
       -e 's/IPV6_TARGETS=*/IPV6_TARGETS=/' -i Makefile
 
-  patch -p1 -i $SRC/iputils-s20101006-fixes-1.patch
-  make CC="$CC" CFLAGS="$CFLAGS $CCOPT -I$CLFS/usr/include"
+  make CC="$CC" CFLAGS="$CFLAGS $CCOPT -I$CLFS/usr/include" USE_GNUTLS=no
   
   install -d $PKG/{{s,}bin,usr/{man/man8,sbin}}
   install ping $PKG/bin