From 8b2c05ff1b8365bbe0da8f68756f0dd30827a6db Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 28 Feb 2018 17:28:17 +0000
Subject: iputils: 20161105.1f2bb12
---
abs/core/iputils/PKGBUILD | 43 ++++++++++++++++------------------------
abs/core/iputils/iputils.install | 1 -
2 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/abs/core/iputils/PKGBUILD b/abs/core/iputils/PKGBUILD
index 9e017fa..3bc5bf8 100644
--- a/abs/core/iputils/PKGBUILD
+++ b/abs/core/iputils/PKGBUILD
@@ -1,59 +1,50 @@
-# $Id: PKGBUILD 192554 2013-08-14 06:31:20Z tpowa $
+# $Id$
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
-pkgver=20121221
-pkgrel=3
+# Commit date + git rev-parse --short origin/master
+_rev=1f2bb12
+pkgver=20161105.${_rev}
+pkgrel=2
pkgdesc="Network monitoring tools, including ping"
-arch=('i686' 'x86_64')
+arch=('x86_64')
license=('GPL')
url="http://www.skbuff.net/iputils/"
groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap')
+depends=('openssl' 'sysfsutils' 'libcap' 'libidn')
optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
+makedepends=('docbook-utils' 'perl-sgmls' 'git')
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
+source=("git+https://github.com/iputils/iputils.git#commit=${_rev}"
tftp.xinetd)
-sha1sums=('4d56d8c75d6a5d58f052e4056e975f01ebab9ba9'
+sha1sums=('SKIP'
'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
build() {
- cd "${srcdir}/${pkgname}-s${pkgver}"
+ cd "${srcdir}/${pkgname}"
- make USE_GNUTLS=no CCOPTOPT="$CFLAGS"
-
- 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
+ make USE_NETTLE=no USE_GNUTLS=no CCOPTOPT="$CFLAGS"
+ # fix perl-sgmls
+ sed -i -e 's#sgmlspl#sgmlspl.pl#g' "${srcdir}/${pkgname}/doc/Makefile"
+ make -C doc man
}
package() {
- cd "${srcdir}/${pkgname}-s${pkgver}"
+ cd "${srcdir}/${pkgname}"
install -dm755 "${pkgdir}"/usr/bin
- install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 "${pkgdir}"/usr/bin/
-
- install -m755 ping{,6} "${pkgdir}"/usr/bin/
+ install -m755 arping clockdiff ping rarpd rdisc tftpd tracepath "${pkgdir}"/usr/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
diff --git a/abs/core/iputils/iputils.install b/abs/core/iputils/iputils.install
index 8e5159e..1684c2e 100644
--- a/abs/core/iputils/iputils.install
+++ b/abs/core/iputils/iputils.install
@@ -1,6 +1,5 @@
post_install() {
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() {
--
cgit v0.12