iputils 20101006

1 files changed, 59 insertions, 49 deletions

diff --git a/abs/core/iputils/PKGBUILD b/abs/core/iputils/PKGBUILD
index 1b62cda..e72795d 100644
--- a/abs/core/iputils/PKGBUILD
+++ b/abs/core/iputils/PKGBUILD
@@ -1,61 +1,71 @@
-# $Id: PKGBUILD 82625 2010-06-15 04:22:56Z allan $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
-pkgver=20100214
-_traceroutever=1.4a12
-pkgrel=2
+pkgver=20101006
+pkgrel=4
 pkgdesc="IP Configuration Utilities (and Ping)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.linuxfoundation.org/en/Net:Iputils"
 groups=('base')
-depends=('glibc')
-makedepends=('opensp' 'libxslt' 'docbook-xsl')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute')
-replaces=('netkit-base' 'traceroute')
-source=(http://www.skbuff.net/iputils/$pkgname-s$pkgver.tar.bz2
-        ftp://ftp.ee.lbl.gov/traceroute-$_traceroutever.tar.gz
-	permission-fix.patch)
-options=(!makeflags)
-md5sums=('37596c8b3eed537294e77464b9804726'
-         '964d599ef696efccdeebe7721cd4828d'
-         '66109966cad06e425bb12a78bab85b70')
-
-build()
-{
-  #build iptuils
-  cd $srcdir/$pkgname-s$pkgver
-  make KERNEL_INCLUDE=/usr/include || return 1   # for i686
-  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
+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
+        iputils-20101006-ping-integer-overflow.patch)
+sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+          'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+
+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
 
-  msg ":: building docs"
-  # good god, these docs are a pain
-  # special thanks to  Michael(tm) Smith <mike@w3.org> - http://people.w3.org/mike/
-  # from #docbook on freenode.org for figuring this out
   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
-      xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.76.0/manpages/docbook.xsl $xf
+    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
+}
 
-  mkdir -p $pkgdir/usr/share/man/man8
-  install -m644 arping.8 clockdiff.8 ping.8 ping6.8 rarpd.8 rdisc.8 \
-                    tftpd.8 tracepath.8 tracepath6.8 traceroute6.8 \
-                    $pkgdir/usr/share/man/man8/
-
-  # 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 || return 1
-  ./configure --prefix=/usr --sbindir=/bin --mandir=/usr/share/man
-  make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1
-  make DESTDIR=${pkgdir} install install-man
+package() {
+  cd "${srcdir}/${pkgname}-s${pkgver}"
+
+  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
+
+  # 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: