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

2020-09-06 Thread Tobias Powalowski via arch-commits
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
===
--- PKGBUILD2020-09-06 15:13:30 UTC (rev 395521)
+++ PKGBUILD2020-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
 }


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

2020-08-17 Thread Tobias Powalowski via arch-commits
Date: Monday, August 17, 2020 @ 09:23:52
  Author: tpowa
Revision: 394332

upgpkg: iputils 20190709-3: fix #66727

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-17 08:23:29 UTC (rev 394331)
+++ PKGBUILD2020-08-17 09:23:52 UTC (rev 394332)
@@ -6,7 +6,7 @@
 # Commit date + git rev-parse --short origin/master
 _rev=13e0084
 pkgver=20190709
-pkgrel=2
+pkgrel=3
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')
@@ -20,14 +20,18 @@
 install=${pkgname}.install
 source=("git+https://github.com/iputils/iputils.git#commit=${_rev};
 tftp.xinetd
-fix-setuid-redeclared.patch)
+fix-setuid-redeclared.patch
+
https://github.com/iputils/iputils/commit/18f14be80466ddc8fb17a400be82764a779c8dcd.patch)
 sha1sums=('SKIP'
   'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-  'ea7c400d1c397d514de718957c28730d87cef656')
+  'ea7c400d1c397d514de718957c28730d87cef656'
+  'cf00aff837580a9a9fea069d98ab1a89b353c714')
 
 prepare() {
   cd $pkgname
   patch -Np1 -i $srcdir/fix-setuid-redeclared.patch
+  #fix #66727 arping duplicate ip adress
+  patch -Np1 -i $srcdir/18f14be80466ddc8fb17a400be82764a779c8dcd.patch
 }
 
 build() {


[arch-commits] Commit in iputils/trunk (PKGBUILD fix-setuid-redeclared.patch)

2020-01-14 Thread Jelle van der Waa via arch-commits
Date: Tuesday, January 14, 2020 @ 10:07:03
  Author: jelle
Revision: 373458

Add patch to fix build error

setuid() is already declared in system headers which makes the setuid
redeclared in iputils. Upstream fixed this in
https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83

Added:
  iputils/trunk/fix-setuid-redeclared.patch
Modified:
  iputils/trunk/PKGBUILD

-+
 PKGBUILD|   11 +++--
 fix-setuid-redeclared.patch |   48 ++
 2 files changed, 57 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-14 09:45:59 UTC (rev 373457)
+++ PKGBUILD2020-01-14 10:07:03 UTC (rev 373458)
@@ -19,10 +19,17 @@
 backup=(etc/xinetd.d/tftp)
 install=${pkgname}.install
 source=("git+https://github.com/iputils/iputils.git#commit=${_rev};
-tftp.xinetd)
+tftp.xinetd
+fix-setuid-redeclared.patch)
 sha1sums=('SKIP'
-  'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
+  'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
+  'ea7c400d1c397d514de718957c28730d87cef656')
 
+prepare() {
+  cd $pkgname
+  patch -Np1 -i $srcdir/fix-setuid-redeclared.patch
+}
+
 build() {
   mkdir -p build
   cd build

Added: fix-setuid-redeclared.patch
===
--- fix-setuid-redeclared.patch (rev 0)
+++ fix-setuid-redeclared.patch 2020-01-14 10:07:03 UTC (rev 373458)
@@ -0,0 +1,48 @@
+From 18f9a84e0e702841d6cc4d5f593de4fbd1348e83 Mon Sep 17 00:00:00 2001
+From: Sami Kerola 
+Date: Sat, 28 Dec 2019 17:16:27 +
+Subject: [PATCH] ninfod: change variable name to avoid colliding with function
+ name
+
+The sys/capability.h header has 'extern int cap_setuid(uid_t uid);'
+function prototype.
+
+Addresses: https://github.com/iputils/iputils/issues/246
+Signed-off-by: Sami Kerola 
+---
+ ninfod/ninfod.c | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c
+index 26112d0..95583de 100644
+--- a/ninfod/ninfod.c
 b/ninfod/ninfod.c
+@@ -455,7 +455,7 @@ static void do_daemonize(void)
+ /* - */
+ #ifdef HAVE_LIBCAP
+ static const cap_value_t cap_net_raw = CAP_NET_RAW;
+-static const cap_value_t cap_setuid =  CAP_SETUID; 
++static const cap_value_t cap_setuserid = CAP_SETUID;
+ static cap_flag_value_t cap_ok;
+ #else
+ static uid_t euid;
+@@ -487,7 +487,7 @@ static void limit_capabilities(void)
+ 
+   cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, _ok);
+   if (cap_ok != CAP_CLEAR)
+-  cap_set_flag(cap_p, CAP_PERMITTED, 1, _setuid, CAP_SET);
++  cap_set_flag(cap_p, CAP_PERMITTED, 1, _setuserid, CAP_SET);
+ 
+   if (cap_set_proc(cap_p) < 0) {
+   DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
+@@ -520,8 +520,8 @@ static void drop_capabilities(void)
+ 
+   /* setuid / setuid */
+   if (cap_ok != CAP_CLEAR) {
+-  cap_set_flag(cap_p, CAP_PERMITTED, 1, _setuid, CAP_SET);
+-  cap_set_flag(cap_p, CAP_EFFECTIVE, 1, _setuid, CAP_SET);
++  cap_set_flag(cap_p, CAP_PERMITTED, 1, _setuserid, CAP_SET);
++  cap_set_flag(cap_p, CAP_EFFECTIVE, 1, _setuserid, CAP_SET);
+ 
+   if (cap_set_proc(cap_p) < 0) {
+   DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));


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

2019-11-13 Thread Evangelos Foutras via arch-commits
Date: Wednesday, November 13, 2019 @ 16:15:19
  Author: foutrelis
Revision: 368181

[core] mass rebuild

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 16:14:36 UTC (rev 368180)
+++ PKGBUILD2019-11-13 16:15:19 UTC (rev 368181)
@@ -6,7 +6,7 @@
 # Commit date + git rev-parse --short origin/master
 _rev=13e0084
 pkgver=20190709
-pkgrel=1
+pkgrel=2
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')


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

2019-11-13 Thread Christian Hesse via arch-commits
Date: Wednesday, November 13, 2019 @ 12:16:39
  Author: eworm
Revision: 368096

base group removal

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 12:16:07 UTC (rev 368095)
+++ PKGBUILD2019-11-13 12:16:39 UTC (rev 368096)
@@ -11,7 +11,6 @@
 arch=('x86_64')
 license=('GPL')
 url="http://www.skbuff.net/iputils/;
-groups=('base')
 depends=('openssl' 'libcap' 'libidn2')
 optdepends=('xinetd: for tftpd')
 makedepends=('perl-sgmls' 'git' 'docbook-xsl' 'meson')


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

2019-09-13 Thread Antonio Rojas via arch-commits
Date: Friday, September 13, 2019 @ 19:50:05
  Author: arojas
Revision: 362600

Update to 20190709

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   27 ++-
 1 file changed, 10 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 19:30:40 UTC (rev 362599)
+++ PKGBUILD2019-09-13 19:50:05 UTC (rev 362600)
@@ -4,9 +4,9 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=f6aac8d
-pkgver=20180629.${_rev}
-pkgrel=4
+_rev=13e0084
+pkgver=20190709
+pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')
@@ -14,7 +14,7 @@
 groups=('base')
 depends=('openssl' 'libcap' 'libidn2')
 optdepends=('xinetd: for tftpd')
-makedepends=('perl-sgmls' 'git' 'docbook-xsl')
+makedepends=('perl-sgmls' 'git' 'docbook-xsl' 'meson')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
@@ -25,25 +25,18 @@
   'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  mkdir -p build
+  cd build
 
-  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
+  arch-meson ../$pkgname -DBUILD_RARPD=true
+  ninja
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd build
 
-  install -dm755 "${pkgdir}"/usr/bin
+  DESTDIR="$pkgdir" ninja install
 
-  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/
-
   # FS#24768
   install -dm755 "${pkgdir}"/etc/xinetd.d/
   install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp


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

2019-02-09 Thread Felix Yan via arch-commits
Date: Sunday, February 10, 2019 @ 02:57:46
  Author: felixonmars
Revision: 345815

libidn2 2.1.1 rebuild

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-10 02:56:48 UTC (rev 345814)
+++ PKGBUILD2019-02-10 02:57:46 UTC (rev 345815)
@@ -6,7 +6,7 @@
 # Commit date + git rev-parse --short origin/master
 _rev=f6aac8d
 pkgver=20180629.${_rev}
-pkgrel=3
+pkgrel=4
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')


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

2019-01-13 Thread Evangelos Foutras via arch-commits
Date: Sunday, January 13, 2019 @ 21:11:46
  Author: foutrelis
Revision: 344007

libidn2 2.1.0 rebuild

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-13 21:11:34 UTC (rev 344006)
+++ PKGBUILD2019-01-13 21:11:46 UTC (rev 344007)
@@ -6,7 +6,7 @@
 # Commit date + git rev-parse --short origin/master
 _rev=f6aac8d
 pkgver=20180629.${_rev}
-pkgrel=2
+pkgrel=3
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')


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

2018-07-11 Thread Tobias Powalowski via arch-commits
Date: Thursday, July 12, 2018 @ 04:52:53
  Author: tpowa
Revision: 328298

upgpkg: iputils 20180629.f6aac8d-2

fix #58633

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-12 04:32:22 UTC (rev 328297)
+++ PKGBUILD2018-07-12 04:52:53 UTC (rev 328298)
@@ -7,15 +7,15 @@
 # Commit date + git rev-parse --short origin/master
 _rev=f6aac8d
 pkgver=20180629.${_rev}
-pkgrel=1
+pkgrel=2
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')
 url="http://www.skbuff.net/iputils/;
 groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap' 'libidn2')
+depends=('openssl' 'libcap' 'libidn2')
 optdepends=('xinetd: for tftpd')
-makedepends=('docbook-utils' 'perl-sgmls' 'git' 'docbook-xsl')
+makedepends=('perl-sgmls' 'git' 'docbook-xsl')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)


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

2018-07-11 Thread Tobias Powalowski via arch-commits
Date: Wednesday, July 11, 2018 @ 19:47:45
  Author: tpowa
Revision: 328270

upgpkg: iputils 20180629.f6aac8d-1

bump to latest version

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-11 19:45:11 UTC (rev 328269)
+++ PKGBUILD2018-07-11 19:47:45 UTC (rev 328270)
@@ -5,17 +5,17 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=1f2bb12
-pkgver=20161105.${_rev}
-pkgrel=2
+_rev=f6aac8d
+pkgver=20180629.${_rev}
+pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('x86_64')
 license=('GPL')
 url="http://www.skbuff.net/iputils/;
 groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap' 'libidn')
+depends=('openssl' 'sysfsutils' 'libcap' 'libidn2')
 optdepends=('xinetd: for tftpd')
-makedepends=('docbook-utils' 'perl-sgmls' 'git')
+makedepends=('docbook-utils' 'perl-sgmls' 'git' 'docbook-xsl')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)


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

2017-02-11 Thread Pierre Schmitz
Date: Saturday, February 11, 2017 @ 12:07:08
  Author: pierre
Revision: 288663

upgpkg: iputils 20161105.1f2bb12-2

OpenSSL 1,1 rebuild

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-11 12:01:33 UTC (rev 288662)
+++ PKGBUILD2017-02-11 12:07:08 UTC (rev 288663)
@@ -7,7 +7,7 @@
 # Commit date + git rev-parse --short origin/master
 _rev=1f2bb12
 pkgver=20161105.${_rev}
-pkgrel=1
+pkgrel=2
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
 license=('GPL')


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

2016-11-16 Thread Tobias Powalowski
Date: Wednesday, November 16, 2016 @ 08:00:19
  Author: tpowa
Revision: 280874

upgpkg: iputils 20161105.1f2bb12-1

bump to latest version

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-16 02:10:33 UTC (rev 280873)
+++ PKGBUILD2016-11-16 08:00:19 UTC (rev 280874)
@@ -5,8 +5,8 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=0db72a4
-pkgver=20160308.${_rev}
+_rev=1f2bb12
+pkgver=20161105.${_rev}
 pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
@@ -13,9 +13,9 @@
 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' 'git')
+makedepends=('docbook-utils' 'perl-sgmls' 'git')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
@@ -28,15 +28,10 @@
 build() {
   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|\(.*\), \(.*\)|\1, 
\2|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() {
@@ -44,15 +39,12 @@
 
   install -dm755 "${pkgdir}"/usr/bin
 
-  install -m755 arping clockdiff ping rarpd rdisc tftpd tracepath tracepath6 
"${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 tracepath.8.gz tracepath6.8.gz
-
   # FS#24768
   install -dm755 "${pkgdir}"/etc/xinetd.d/
   install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp


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

2016-03-10 Thread Tobias Powalowski
Date: Thursday, March 10, 2016 @ 16:50:15
  Author: tpowa
Revision: 261284

upgpkg: iputils 20160308.0db72a4-1

bump to latest version

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-10 15:38:25 UTC (rev 261283)
+++ PKGBUILD2016-03-10 15:50:15 UTC (rev 261284)
@@ -5,9 +5,9 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=1c59920
-pkgver=20150815.${_rev}
-pkgrel=3
+_rev=0db72a4
+pkgver=20160308.${_rev}
+pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
 license=('GPL')


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

2015-10-19 Thread Tobias Powalowski
Date: Monday, October 19, 2015 @ 16:26:43
  Author: tpowa
Revision: 249508

upgpkg: iputils 20150815.1c59920-3

remove ping6 manpage, updated docs from upstream

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-19 12:44:21 UTC (rev 249507)
+++ PKGBUILD2015-10-19 14:26:43 UTC (rev 249508)
@@ -5,9 +5,9 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=1b5d03a
+_rev=1c59920
 pkgver=20150815.${_rev}
-pkgrel=2
+pkgrel=3
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -51,7 +51,6 @@
  "${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


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

2015-09-04 Thread Tobias Powalowski
Date: Friday, September 4, 2015 @ 20:49:21
  Author: tpowa
Revision: 245303

upgpkg: iputils 20150815.1b5d03a-1

bump to latest version

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-04 18:15:16 UTC (rev 245302)
+++ PKGBUILD2015-09-04 18:49:21 UTC (rev 245303)
@@ -5,8 +5,8 @@
 
 pkgname=iputils
 # Commit date + git rev-parse --short origin/master
-_rev=fad11dc
-pkgver=20140519.${_rev}
+_rev=1b5d03a
+pkgver=20150815.${_rev}
 pkgrel=1
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
@@ -44,10 +44,8 @@
 
   install -dm755 "${pkgdir}"/usr/bin
 
-  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 
"${pkgdir}"/usr/bin/
+  install -m755 arping clockdiff ping rarpd rdisc tftpd tracepath tracepath6 
"${pkgdir}"/usr/bin/
 
-  install -m755 ping{,6} "${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/


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

2015-09-04 Thread Tobias Powalowski
Date: Friday, September 4, 2015 @ 21:32:08
  Author: tpowa
Revision: 245311

upgpkg: iputils 20150815.1b5d03a-2

cleaned up .install from removed ping6 command

Modified:
  iputils/trunk/PKGBUILD
  iputils/trunk/iputils.install

-+
 PKGBUILD|2 +-
 iputils.install |1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-04 19:06:30 UTC (rev 245310)
+++ PKGBUILD2015-09-04 19:32:08 UTC (rev 245311)
@@ -7,7 +7,7 @@
 # Commit date + git rev-parse --short origin/master
 _rev=1b5d03a
 pkgver=20150815.${_rev}
-pkgrel=1
+pkgrel=2
 pkgdesc="Network monitoring tools, including ping"
 arch=('i686' 'x86_64')
 license=('GPL')

Modified: iputils.install
===
--- iputils.install 2015-09-04 19:06:30 UTC (rev 245310)
+++ iputils.install 2015-09-04 19:32:08 UTC (rev 245311)
@@ -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() {


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

2015-05-08 Thread Tobias Powalowski
Date: Friday, May 8, 2015 @ 15:50:20
  Author: tpowa
Revision: 238698

upgpkg: iputils 20140519.fad11dc-1

bump to latest version #44670

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 12:59:48 UTC (rev 238697)
+++ PKGBUILD2015-05-08 13:50:20 UTC (rev 238698)
@@ -4,8 +4,10 @@
 # Contributor: Aaron Griffin aa...@archlinux.org
 
 pkgname=iputils
-pkgver=20121221
-pkgrel=3
+# Commit date + git rev-parse --short origin/master
+_rev=fad11dc
+pkgver=20140519.${_rev}
+pkgrel=1
 pkgdesc=Network monitoring tools, including ping
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,18 +15,18 @@
 groups=('base')
 depends=('openssl' 'sysfsutils' 'libcap')
 optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
+makedepends=('docbook2x' 'opensp' '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
 
@@ -38,7 +40,7 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-s${pkgver}
+  cd ${srcdir}/${pkgname}
 
   install -dm755 ${pkgdir}/usr/bin
 


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

2013-08-13 Thread Tobias Powalowski
Date: Tuesday, August 13, 2013 @ 17:08:13
  Author: tpowa
Revision: 192531

upgpkg: iputils 20121221-3

fix #36508 remove BSD license

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-13 14:24:49 UTC (rev 192530)
+++ PKGBUILD2013-08-13 15:08:13 UTC (rev 192531)
@@ -5,10 +5,10 @@
 
 pkgname=iputils
 pkgver=20121221
-pkgrel=2
+pkgrel=3
 pkgdesc=Network monitoring tools, including ping
 arch=('i686' 'x86_64')
-license=('GPL' 'BSD')
+license=('GPL')
 url=http://www.skbuff.net/iputils/;
 groups=('base')
 depends=('openssl' 'sysfsutils' 'libcap')



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

2013-05-14 Thread Stéphane Gaudreault
Date: Tuesday, May 14, 2013 @ 12:52:15
  Author: stephane
Revision: 185468

upgpkg: iputils 20121221-2

Move files to /usr/bin

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-14 10:47:43 UTC (rev 185467)
+++ PKGBUILD2013-05-14 10:52:15 UTC (rev 185468)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20121221
-pkgrel=1
+pkgrel=2
 pkgdesc=Network monitoring tools, including ping
 arch=('i686' 'x86_64')
 license=('GPL' 'BSD')
@@ -40,16 +40,14 @@
 package() {
   cd ${srcdir}/${pkgname}-s${pkgver}
 
-  install -dm755 ${pkgdir}/usr/{bin,sbin} ${pkgdir}/bin
+  install -dm755 ${pkgdir}/usr/bin
 
-  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
-${pkgdir}/usr/sbin/
+  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 
${pkgdir}/usr/bin/
 
   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 \
+  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



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

2013-01-08 Thread Stéphane Gaudreault
Date: Tuesday, January 8, 2013 @ 11:17:39
  Author: stephane
Revision: 174907

upgpkg: iputils 20121221-1

upstream update; use our CFLAGS

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-08 16:14:44 UTC (rev 174906)
+++ PKGBUILD2013-01-08 16:17:39 UTC (rev 174907)
@@ -4,7 +4,7 @@
 # Contributor: Aaron Griffin aa...@archlinux.org
 
 pkgname=iputils
-pkgver=20121126
+pkgver=20121221
 pkgrel=1
 pkgdesc=Network monitoring tools, including ping
 arch=('i686' 'x86_64')
@@ -20,17 +20,14 @@
 install=${pkgname}.install
 source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
 tftp.xinetd)
-sha1sums=('3e46391f53381080d5e1961f1b2b0ccd9a158ab2'
+sha1sums=('4d56d8c75d6a5d58f052e4056e975f01ebab9ba9'
   'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
 
 build() {
   cd ${srcdir}/${pkgname}-s${pkgver}
 
-  # Use our CFLAGS
-  sed -i -e /^CCOPT=/s|-O2|${CFLAGS}| Makefile
+  make USE_GNUTLS=no CCOPTOPT=$CFLAGS
 
-  make
-
   cd doc
   for file in *.sgml; do
 xf=${file/.sgml/.xml}



[arch-commits] Commit in iputils/trunk (PKGBUILD iputils-20121011-flood.patch)

2012-11-05 Thread Stéphane Gaudreault
Date: Monday, November 5, 2012 @ 10:35:18
  Author: stephane
Revision: 170232

upgpkg: iputils 20121011-2

patch for ping -f (fix FS#32306)

Added:
  iputils/trunk/iputils-20121011-flood.patch
Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 iputils-20121011-flood.patch |   22 ++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-05 15:19:18 UTC (rev 170231)
+++ PKGBUILD2012-11-05 15:35:18 UTC (rev 170232)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20121011
-pkgrel=1
+pkgrel=2
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,10 +19,12 @@
 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)
+iputils-20101006-ping-integer-overflow.patch
+iputils-20121011-flood.patch)
 sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
   'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-  'ec78574d798b53e4f8bdd37e42514fc17ed71667')
+  'ec78574d798b53e4f8bdd37e42514fc17ed71667'
+  '2343edf0dce28030e43305cefedd60806bb58eae')
 
 build() {
   cd ${srcdir}/${pkgname}-s${pkgver}
@@ -33,6 +35,9 @@
   # FS#28897
   patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
 
+  # FS#32306
+  patch -Np1 -i ../iputils-20121011-flood.patch
+
   make
 
   cd doc

Added: iputils-20121011-flood.patch
===
--- iputils-20121011-flood.patch(rev 0)
+++ iputils-20121011-flood.patch2012-11-05 15:35:18 UTC (rev 170232)
@@ -0,0 +1,22 @@
+--- iputils-s20121011/ping_common.h2012-11-05 10:07:40.065281888 +0100
 iputils-s20121011-new/ping_common.h2012-11-05 10:07:22.001268362 
+0100
+@@ -141,7 +141,7 @@ static inline void write_stdout(const ch
+   do {
+   cc = write(STDOUT_FILENO, str + o, len - o);
+   o += cc;
+-  } while (len = o || cc  0);
++  } while (len  o || cc  0);
+ }
+ 
+ /*
+--- iputils-s20121011/ping_common.c2012-11-05 10:07:40.066281889 +0100
 iputils-s20121011-new/ping_common.c2012-11-05 10:07:22.007268368 
+0100
+@@ -776,7 +776,7 @@ restamp:
+   if (!csfailed)
+   write_stdout(\b \b, 3);
+   else
+-  write_stdout(\bC, 1);
++  write_stdout(\bC, 2);
+   } else {
+   int i;
+   __u8 *cp, *dp;



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

2012-10-17 Thread Stéphane Gaudreault
Date: Wednesday, October 17, 2012 @ 10:09:21
  Author: stephane
Revision: 169050

upgpkg: iputils 20121011-1

upstream update

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-17 12:04:25 UTC (rev 169049)
+++ PKGBUILD2012-10-17 14:09:21 UTC (rev 169050)
@@ -4,8 +4,8 @@
 # Contributor: Aaron Griffin aa...@archlinux.org
 
 pkgname=iputils
-pkgver=20101006
-pkgrel=7
+pkgver=20121011
+pkgrel=1
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -20,7 +20,7 @@
 install=${pkgname}.install
 source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 
tftp.xinetd
 iputils-20101006-ping-integer-overflow.patch)
-sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
   'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
   'ec78574d798b53e4f8bdd37e42514fc17ed71667')
 



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

2012-10-04 Thread Stéphane Gaudreault
Date: Thursday, October 4, 2012 @ 08:11:36
  Author: stephane
Revision: 167960

upgpkg: iputils 20101006-7

vercmp was used in a completely wrong way here ... drop the message as it is old

Modified:
  iputils/trunk/PKGBUILD
  iputils/trunk/iputils.install

-+
 PKGBUILD|2 +-
 iputils.install |4 
 2 files changed, 1 insertion(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-04 08:06:12 UTC (rev 167959)
+++ PKGBUILD2012-10-04 12:11:36 UTC (rev 167960)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20101006
-pkgrel=6
+pkgrel=7
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=('i686' 'x86_64')
 license=('GPL')

Modified: iputils.install
===
--- iputils.install 2012-10-04 08:06:12 UTC (rev 167959)
+++ iputils.install 2012-10-04 12:11:36 UTC (rev 167960)
@@ -1,10 +1,6 @@
 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
-  
-  if [ $(vercmp $2  20101006-3) -le 0 ]; then
-echo   Traceroute is now provided by core/traceroute
-  fi
 }
 
 post_upgrade() {



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

2012-10-01 Thread Stéphane Gaudreault
Date: Monday, October 1, 2012 @ 15:26:19
  Author: stephane
Revision: 167381

upgpkg: iputils 20101006-5

Workaround to install on NFS (fix FS#31748)

Modified:
  iputils/trunk/PKGBUILD
  iputils/trunk/iputils.install

-+
 PKGBUILD|2 +-
 iputils.install |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-01 19:24:15 UTC (rev 167380)
+++ PKGBUILD2012-10-01 19:26:19 UTC (rev 167381)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20101006
-pkgrel=4
+pkgrel=5
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=('i686' 'x86_64')
 license=('GPL')

Modified: iputils.install
===
--- iputils.install 2012-10-01 19:24:15 UTC (rev 167380)
+++ iputils.install 2012-10-01 19:26:19 UTC (rev 167381)
@@ -1,6 +1,6 @@
 post_install() {
-  setcap cap_net_raw=ep usr/bin/ping 
-  setcap cap_net_raw=ep usr/bin/ping6 
+  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
   echo   Traceroute is now provided by core/traceroute
 }
 



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

2012-10-01 Thread Stéphane Gaudreault
Date: Monday, October 1, 2012 @ 19:45:44
  Author: stephane
Revision: 167411

upgpkg: iputils 20101006-6

only print install message once (fix FS#31757)

Modified:
  iputils/trunk/PKGBUILD
  iputils/trunk/iputils.install

-+
 PKGBUILD|2 +-
 iputils.install |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-01 23:41:01 UTC (rev 167410)
+++ PKGBUILD2012-10-01 23:45:44 UTC (rev 167411)
@@ -5,7 +5,7 @@
 
 pkgname=iputils
 pkgver=20101006
-pkgrel=5
+pkgrel=6
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=('i686' 'x86_64')
 license=('GPL')

Modified: iputils.install
===
--- iputils.install 2012-10-01 23:41:01 UTC (rev 167410)
+++ iputils.install 2012-10-01 23:45:44 UTC (rev 167411)
@@ -1,7 +1,10 @@
 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
-  echo   Traceroute is now provided by core/traceroute
+  
+  if [ $(vercmp $2  20101006-3) -le 0 ]; then
+echo   Traceroute is now provided by core/traceroute
+  fi
 }
 
 post_upgrade() {



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

2011-11-03 Thread Tobias Powalowski
Date: Thursday, November 3, 2011 @ 16:08:11
  Author: tpowa
Revision: 141975

signed rebuild

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-03 19:53:55 UTC (rev 141974)
+++ PKGBUILD2011-11-03 20:08:11 UTC (rev 141975)
@@ -5,7 +5,7 @@
 pkgname=iputils
 pkgver=20101006
 _traceroutever=1.4a12
-pkgrel=1
+pkgrel=2
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=('i686' 'x86_64')
 license=('GPL')



[arch-commits] Commit in iputils/trunk (PKGBUILD iputils-s20101006-manpages.patch)

2011-01-26 Thread Stéphane Gaudreault
Date: Wednesday, January 26, 2011 @ 12:38:04
  Author: stephane
Revision: 107536

upgpkg: iputils 20101006-1
Rebuild of old package, Tidy up PKGBUILD, upgrade to 20101006, workaround for 
FS#20251

Added:
  iputils/trunk/iputils-s20101006-manpages.patch
Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   61 --
 iputils-s20101006-manpages.patch | 1044 +
 2 files changed, 1072 insertions(+), 33 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 107535:107536 to see the changes.


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

2010-12-21 Thread Andrea Scarpino
Date: Tuesday, December 21, 2010 @ 04:31:31
  Author: andrea
Revision: 103537

path is changed again (FS#21647)

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-21 07:09:36 UTC (rev 103536)
+++ PKGBUILD2010-12-21 09:31:31 UTC (rev 103537)
@@ -37,7 +37,7 @@
   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.76.0/manpages/docbook.xsl $xf
+  xsltproc 
/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl $xf
   done
 
   # build traceroute



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

2010-06-14 Thread Allan McRae
Date: Tuesday, June 15, 2010 @ 00:22:56
  Author: allan
Revision: 82625

fix $startdir usage

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-15 04:20:07 UTC (rev 82624)
+++ PKGBUILD2010-06-15 04:22:56 UTC (rev 82625)
@@ -25,13 +25,13 @@
 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
+install -D -m755 $i $pkgdir/usr/sbin/$i
   done
   for i in ping ping6 traceroute6; do
-install -D -m4755 $i $startdir/pkg/bin/$i
+install -D -m4755 $i $pkgdir/bin/$i
   done
 
   msg :: building docs
@@ -46,16 +46,16 @@
   xsltproc 
/usr/share/xml/docbook/xsl-stylesheets-1.75.2/manpages/docbook.xsl $xf
   done
 
-  mkdir -p $startdir/pkg/usr/share/man/man8
+  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 \
-$startdir/pkg/usr/share/man/man8/
+$pkgdir/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
+  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=${startdir}/pkg install install-man
+  make DESTDIR=${pkgdir} install install-man
 }



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

2010-02-23 Thread Tobias Powalowski
Date: Tuesday, February 23, 2010 @ 13:39:27
  Author: tpowa
Revision: 69940

upgpkg: iputils 20100214-2
fixed manpages #18425

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-23 18:37:59 UTC (rev 69939)
+++ PKGBUILD2010-02-23 18:39:27 UTC (rev 69940)
@@ -4,7 +4,7 @@
 pkgname=iputils
 pkgver=20100214
 _traceroutever=1.4a12
-pkgrel=1
+pkgrel=2
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=(i686 x86_64)
 license=('GPL')
@@ -43,7 +43,7 @@
   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.73.2/manpages/docbook.xsl $xf
+  xsltproc 
/usr/share/xml/docbook/xsl-stylesheets-1.75.2/manpages/docbook.xsl $xf
   done
 
   mkdir -p $startdir/pkg/usr/share/man/man8



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

2010-02-20 Thread Tobias Powalowski
Date: Saturday, February 20, 2010 @ 05:48:04
  Author: tpowa
Revision: 69336

upgpkg: iputils 20100214-1
bump to latest version

Modified:
  iputils/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-20 10:36:52 UTC (rev 69335)
+++ PKGBUILD2010-02-20 10:48:04 UTC (rev 69336)
@@ -2,9 +2,9 @@
 # Maintainer: Aaron Griffin aa...@archlinux.org
 
 pkgname=iputils
-pkgver=20071127
+pkgver=20100214
 _traceroutever=1.4a12
-pkgrel=2
+pkgrel=1
 pkgdesc=IP Configuration Utilities (and Ping)
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,19 +16,16 @@
 replaces=('netkit-base' 'traceroute')
 source=(http://www.skbuff.net/iputils/$pkgname-s$pkgver.tar.bz2
 ftp://ftp.ee.lbl.gov/traceroute-$_traceroutever.tar.gz
-   iputils-20070202-no-open-max.patch
permission-fix.patch)
 options=(!makeflags)
-md5sums=('12245e9927d60ff5cf4a99d265bcb7d3'
+md5sums=('37596c8b3eed537294e77464b9804726'
  '964d599ef696efccdeebe7721cd4828d'
-'a2cbc0174dd883f68297aa7f3e7c4f5c'
-'66109966cad06e425bb12a78bab85b70')
+ '66109966cad06e425bb12a78bab85b70')
 
 build()
 {
   #build iptuils
   cd $startdir/src/$pkgname-s$pkgver
-  patch -Np1 -i ../iputils-20070202-no-open-max.patch || return 1
   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