iproute2, iptables, iputils:

update binary path to /usr/bin
refs #961

3 files changed, 16 insertions, 39 deletions

diff --git a/abs/core/iputils/PKGBUILD b/abs/core/iputils/PKGBUILD
index e72795d..9e017fa 100644
--- a/abs/core/iputils/PKGBUILD
+++ b/abs/core/iputils/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
+# $Id: PKGBUILD 192554 2013-08-14 06:31:20Z tpowa $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
-pkgver=20101006
-pkgrel=4
-pkgdesc="IP Configuration Utilities (and Ping)"
+pkgver=20121221
+pkgrel=3
+pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
+url="http://www.skbuff.net/iputils/"
 groups=('base')
 depends=('openssl' 'sysfsutils' 'libcap')
 optdepends=('xinetd: for tftpd')
@@ -18,22 +18,15 @@ conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
-        iputils-20101006-ping-integer-overflow.patch)
-sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
+        tftp.xinetd)
+sha1sums=('4d56d8c75d6a5d58f052e4056e975f01ebab9ba9'
+          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
 
 build() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
 
-  # Use our CFLAGS
-  sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
-  # FS#28897
-  patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
-
-  make
+  make USE_GNUTLS=no CCOPTOPT="$CFLAGS"
 
   cd doc
   for file in *.sgml; do
@@ -47,16 +40,14 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
 
-  install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
+  install -dm755 "${pkgdir}"/usr/bin
 
-  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
-    "${pkgdir}"/usr/sbin/
+  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 "${pkgdir}"/usr/bin/
 
   install -m755 ping{,6} "${pkgdir}"/usr/bin/
-   ln -sf /usr/bin/ping{,6}  "${pkgdir}"/bin/
 
-   install -dm755 "${pkgdir}"/usr/share/man/man8
-   install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
+  install -dm755 "${pkgdir}"/usr/share/man/man8
+  install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
      "${pkgdir}"/usr/share/man/man8/
 
   cd "${pkgdir}"/usr/share/man/man8
@@ -67,5 +58,3 @@ package() {
   install -dm755 "${pkgdir}"/etc/xinetd.d/
   install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch b/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch
deleted file mode 100644
index 720e5e8..0000000
--- a/abs/core/iputils/iputils-20101006-ping-integer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20101006/ping_common.c	2010-10-06 13:59:20.000000000 +0200
-+++ iputils-s20101006-patched/ping_common.c	2012-03-09 16:42:46.878151032 +0100
-@@ -590,7 +590,7 @@
- 
- 			/* If we are here, recvmsg() is unable to wait for
- 			 * required timeout. */
--			if (1000*next <= 1000000/(int)HZ) {
-+			if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) {
- 				/* Very short timeout... So, if we wait for
- 				 * something, we sleep for MININTERVAL.
- 				 * Otherwise, spin! */
diff --git a/abs/core/iputils/iputils.install b/abs/core/iputils/iputils.install
index 2481fb3..8e5159e 100644
--- a/abs/core/iputils/iputils.install
+++ b/abs/core/iputils/iputils.install
@@ -1,7 +1,6 @@
 post_install() {
-  setcap cap_net_raw=ep usr/bin/ping 
-  setcap cap_net_raw=ep usr/bin/ping6 
-  echo " >> Traceroute is now provided by core/traceroute"
+  setcap cap_net_raw=ep usr/bin/ping  2>/dev/null || chmod +s usr/bin/ping 
+  setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6
 }
 
 post_upgrade() {