3 files changed, 63 insertions, 41 deletions
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index 0d585e312..efc4eda5c 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,65 +1,66 @@
-# $Id: PKGBUILD 142315 2011-11-08 10:57:52Z tpowa $
+# $Id: PKGBUILD 162361 2012-06-25 20:10:09Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
 pkgver=20101006
-_traceroutever=1.4a12
-pkgrel=2
+pkgrel=3
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.linuxfoundation.org/en/Net:Iputils"
 groups=('base')
-depends=('glibc' 'openssl' 'sysfsutils')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute')
-replaces=('netkit-base' 'traceroute')
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
-        ftp://ftp.ee.lbl.gov/traceroute-${_traceroutever}.tar.gz
-        'permission-fix.patch'
-        'iputils-s20101006-manpages.patch')
-options=('!makeflags')
-md5sums=('a36c25e9ec17e48be514dc0485e7376c'
-         '964d599ef696efccdeebe7721cd4828d'
-         '66109966cad06e425bb12a78bab85b70'
-         'd02dffac6f16e841921a9fc73bd2d3bd')
+depends=('openssl' 'sysfsutils' 'libcap')
+optdepends=('xinetd: for tftpd')
+makedepends=('docbook2x' 'opensp')
+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)
+sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
 
 build() {
-  #build iptuils
   cd "${srcdir}/${pkgname}-s${pkgver}"
-  
-  # Doc fails to build (see FS#20251)
-  # As a temporary workaround, we use these man pages from Fedora & LFS
-  patch -Np1 -i ../iputils-s20101006-manpages.patch
+
+  # Use our CFLAGS
+  sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
+
   make
 
-  # build traceroute
-  # this is combined in this package because it's awkward as a separate package
-  cd "${srcdir}/traceroute-${_traceroutever}"
-  patch -Np1 -i ../permission-fix.patch
-  ./configure --prefix=/usr \
-              --sbindir=/bin \
-              --mandir=/usr/share/man
-  make CFLAGS="${CFLAGS} -Ilinux-include/"
+  cd doc
+  for file in *.sgml; do
+    xf=${file/.sgml/.xml}
+    osx -xlower -xno-nl-in-tag $file > $xf || true
+    sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
+    docbook2man $xf
+  done
 }
 
 package() {
   cd "${srcdir}/${pkgname}-s${pkgver}"
-  for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
-    install -D -m755 $i "${pkgdir}/usr/sbin/$i"
-  done
-  for i in ping ping6 traceroute6; do
-    install -D -m4755 $i "${pkgdir}/bin/$i"
-  done
- 
-  install -dm755 "${pkgdir}/usr/share/man/man8"
-  install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath,traceroute6}.8 \
-    "${pkgdir}/usr/share/man/man8/"
 
-  cd "${pkgdir}/usr/share/man/man8"
+  install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
+
+  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
+    "${pkgdir}"/usr/sbin/
+
+  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 \
+     "${pkgdir}"/usr/share/man/man8/
+
+  cd "${pkgdir}"/usr/share/man/man8
   ln -sf ping.8.gz  ping6.8.gz
   ln -sf tracepath.8.gz tracepath6.8.gz
 
-  cd "${srcdir}/traceroute-${_traceroutever}"
-  make DESTDIR="${pkgdir}" install install-man
+  # FS#24768
+  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/core/iputils/iputils.install b/core/iputils/iputils.install
new file mode 100644
index 000000000..2481fb396
--- /dev/null
+++ b/core/iputils/iputils.install
@@ -0,0 +1,11 @@
+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"
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/iputils/tftp.xinetd b/core/iputils/tftp.xinetd
new file mode 100644
index 000000000..26041a3f9
--- /dev/null
+++ b/core/iputils/tftp.xinetd
@@ -0,0 +1,10 @@
+service tftp
+{
+	socket_type	= dgram
+	protocol	= udp
+	wait		= yes
+	user		= nobody
+	server		= /usr/sbin/tftpd
+	server_args	= /var/tftpboot
+	disable		= yes
+}