From 5abae1a255052beadb1da8d3aa0941b0f11f4706 Mon Sep 17 00:00:00 2001
From: Daniele <jmc@chakra-project.org>
Date: Wed, 25 Jan 2012 02:54:54 +0000
Subject: [PATCH] Rebuilding iputils to fix the permissions of SUID binaries.

Conflicts:

	iputils/PKGBUILD
---
 iputils/PKGBUILD | 60 +++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/iputils/PKGBUILD b/iputils/PKGBUILD
index c4e12885e..11a474467 100644
--- a/iputils/PKGBUILD
+++ b/iputils/PKGBUILD
@@ -7,19 +7,19 @@
 pkgname=iputils
 pkgver=20100214
 _traceroutever=1.4a12
-pkgrel=3
-pkgdesc="IP Configuration Utilities (and Ping)"
-arch=(i686 x86_64)
+pkgrel=5
+pkgdesc="IP Configuration Utilities (and Ping)."
+arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.linuxfoundation.org/en/Net:Iputils"
 groups=('base')
 depends=('glibc')
-makedepends=('libxslt') #  'opensp'  'docbook-xsl'
+makedepends=('libxslt')
 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)
+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'
@@ -28,37 +28,29 @@ md5sums=('37596c8b3eed537294e77464b9804726'
 build()
 {
   #build iptuils
-  cd $startdir/src/$pkgname-s$pkgver
+  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 $startdir/pkg/usr/sbin/$i
-  done
-  for i in ping ping6 traceroute6; do
-    install -D -m4755 $i $startdir/pkg/bin/$i
-  done
-
-  #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
-  #    sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
-  #    xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.75.2/manpages/docbook.xsl $xf
-  #done
-
-  mkdir -p $startdir/pkg/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 \
-  #                  $startdir/pkg/usr/share/man/man8/
 
   # build traceroute
   # this is combined in this package because it's awkward as a separate package
-  cd ${startdir}/src/traceroute-$_traceroutever
-  patch -Np1 -i ../permission-fix.patch || return 1
+  cd "${srcdir}/traceroute-${_traceroutever}"
+  patch -Np1 -i "${srcdir}/permission-fix.patch" || return 1
   ./configure --prefix=/usr --sbindir=/bin --mandir=/usr/share/man
   make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1
-  make DESTDIR=${startdir}/pkg install install-man
 }
+
+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
+
+  cd "${srcdir}/traceroute-${_traceroutever}"
+  install -d -m755 "${pkgdir}/usr/share/man/man8"
+  make DESTDIR="${pkgdir}" install install-man
+}
+
+# vim:set ts=2 sw=2 et: