[arch-commits] Commit in iputils/trunk (PKGBUILD)

[Tobias Powalowski]

    Date: Sunday, September 6, 2020 @ 15:33:42
  Author: tpowa
Revision: 395522

upgpkg: iputils 20200821-1: bump to latest version, fix #63710 and #67643

Modified:
  iputils/trunk/PKGBUILD

----------+
 PKGBUILD |   36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-06 15:13:30 UTC (rev 395521)
+++ PKGBUILD	2020-09-06 15:33:42 UTC (rev 395522)
@@ -4,41 +4,25 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=13e0084
-pkgver=20190709
-pkgrel=3
+_rev=23c3782a
+pkgver=20200821
+pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')
 url="http://www.skbuff.net/iputils/"
-depends=('openssl' 'libcap' 'libidn2')
-optdepends=('xinetd: for tftpd')
-makedepends=('perl-sgmls' 'git' 'docbook-xsl' 'meson')
+depends=('libcap' 'libidn2')
+makedepends=('perl-sgmls' 'git' 'docbook-xsl' 'meson' 'systemd')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
-backup=(etc/xinetd.d/tftp)
-install=${pkgname}.install
-source=("git+https://github.com/iputils/iputils.git#commit=${_rev}"
-        tftp.xinetd
-        fix-setuid-redeclared.patch
-        https://github.com/iputils/iputils/commit/18f14be80466ddc8fb17a400be82764a779c8dcd.patch)
-sha1sums=('SKIP'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          'ea7c400d1c397d514de718957c28730d87cef656'
-          'cf00aff837580a9a9fea069d98ab1a89b353c714')
+source=("git+https://github.com/iputils/iputils.git#commit=${_rev}")
+sha1sums=('SKIP')
 
-prepare() {
-  cd $pkgname
-  patch -Np1 -i $srcdir/fix-setuid-redeclared.patch
-  #fix #66727 arping duplicate ip adress
-  patch -Np1 -i $srcdir/18f14be80466ddc8fb17a400be82764a779c8dcd.patch
-}
-
 build() {
   mkdir -p build
   cd build
 
-  arch-meson ../$pkgname -DBUILD_RARPD=true
+  arch-meson ../$pkgname -DBUILD_RARPD=true -DBUILD_TFTPD=true
   ninja
 }
 
@@ -46,8 +30,4 @@
   cd build
 
   DESTDIR="$pkgdir" ninja install
-
-  # FS#24768
-  install -dm755 "${pkgdir}"/etc/xinetd.d/
-  install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
 }