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

2020-09-24 Thread Levente Polyak via arch-commits 
Date: Thursday, September 24, 2020 @ 21:26:28
  Author: anthraxx
Revision: 396493

upgpkg: mtr 0.94-1

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-09-24 20:55:31 UTC (rev 396492)
+++ PKGBUILD2020-09-24 21:26:28 UTC (rev 396493)
@@ -4,8 +4,8 @@
 
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
-pkgver=0.93
-pkgrel=3
+pkgver=0.94
+pkgrel=1
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
 url='https://www.bitwizard.nl/mtr/'
 arch=('x86_64')
@@ -13,7 +13,8 @@
 makedepends=('ncurses' 'gtk2' 'libcap')
 install=mtr.install
 
source=(https://github.com/traviscross/mtr/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('865c394d8dfa234c472832dc205ddc9ec3cf0552475f565782fd4f4e878251c03f1473e2d28d6799e59da4fcb33c5355049f1e6f02e8610c6bbf681ffb78f53e')
+sha512sums=('0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11')
+b2sums=('e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0')
 
 prepare() {
   (cd ${pkgbase}-${pkgver}

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

2020-05-16 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 16, 2020 @ 11:43:01
  Author: foutrelis
Revision: 384331

upgpkg: mtr 0.93-3: reproducibility rebuild

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 11:42:18 UTC (rev 384330)
+++ PKGBUILD2020-05-16 11:43:01 UTC (rev 384331)
@@ -5,7 +5,7 @@
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
 pkgver=0.93
-pkgrel=2
+pkgrel=3
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
 url='https://www.bitwizard.nl/mtr/'
 arch=('x86_64')

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

2019-08-06 Thread Levente Polyak via arch-commits 
Date: Tuesday, August 6, 2019 @ 20:14:07
  Author: anthraxx
Revision: 359263

upgpkg: mtr 0.93-2 (fix version information)

also prefere unprocessed source files

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-08-06 18:41:59 UTC (rev 359262)
+++ PKGBUILD2019-08-06 20:14:07 UTC (rev 359263)
@@ -5,7 +5,7 @@
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
 pkgver=0.93
-pkgrel=1
+pkgrel=2
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
 url='https://www.bitwizard.nl/mtr/'
 arch=('x86_64')
@@ -12,11 +12,12 @@
 license=('GPL2')
 makedepends=('ncurses' 'gtk2' 'libcap')
 install=mtr.install
-source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
-sha512sums=('046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021')
+source=(https://github.com/traviscross/mtr/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha512sums=('865c394d8dfa234c472832dc205ddc9ec3cf0552475f565782fd4f4e878251c03f1473e2d28d6799e59da4fcb33c5355049f1e6f02e8610c6bbf681ffb78f53e')
 
 prepare() {
   (cd ${pkgbase}-${pkgver}
+echo "${pkgver}" > .tarball-version
 autoreconf -fiv
   )
   cp -ra ${pkgbase}-${pkgver}{,-cli}

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

2019-08-05 Thread Levente Polyak via arch-commits 
Date: Monday, August 5, 2019 @ 22:08:42
  Author: anthraxx
Revision: 359202

upgpkg: mtr 0.93-1

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-08-05 21:22:55 UTC (rev 359201)
+++ PKGBUILD2019-08-05 22:08:42 UTC (rev 359202)
@@ -4,8 +4,8 @@
 
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
-pkgver=0.92
-pkgrel=2
+pkgver=0.93
+pkgrel=1
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
 url='https://www.bitwizard.nl/mtr/'
 arch=('x86_64')
@@ -12,8 +12,8 @@
 license=('GPL2')
 makedepends=('ncurses' 'gtk2' 'libcap')
 install=mtr.install
-source=(${pkgbase}-${pkgver}.tar.gz::ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
-sha512sums=('d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f')
+source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
+sha512sums=('046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021')
 
 prepare() {
   (cd ${pkgbase}-${pkgver}
@@ -24,11 +24,16 @@
 
 build() {
   (cd ${pkgbase}-${pkgver}-cli
-./configure --prefix=/usr --without-gtk --sbindir=/usr/bin
+./configure \
+  --prefix=/usr \
+  --without-gtk \
+  --sbindir=/usr/bin
 make
   )
   (cd ${pkgbase}-${pkgver}
-./configure --prefix=/usr --sbindir=/usr/bin
+./configure \
+  --prefix=/usr \
+  --sbindir=/usr/bin
 make
   )
 }

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

2019-05-07 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 7, 2019 @ 20:48:16
  Author: arojas
Revision: 352748

https

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-05-07 20:47:43 UTC (rev 352747)
+++ PKGBUILD2019-05-07 20:48:16 UTC (rev 352748)
@@ -7,7 +7,7 @@
 pkgver=0.92
 pkgrel=2
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
-url='http://www.bitwizard.nl/mtr/'
+url='https://www.bitwizard.nl/mtr/'
 arch=('x86_64')
 license=('GPL2')
 makedepends=('ncurses' 'gtk2' 'libcap')

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

2018-11-09 Thread Felix Yan via arch-commits 
Date: Friday, November 9, 2018 @ 22:15:18
  Author: felixonmars
Revision: 338666

PIE/BUILDINFO rebuild

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 22:14:54 UTC (rev 338665)
+++ PKGBUILD2018-11-09 22:15:18 UTC (rev 338666)
@@ -5,7 +5,7 @@
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
 pkgver=0.92
-pkgrel=1
+pkgrel=2
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
 url='http://www.bitwizard.nl/mtr/'
 arch=('x86_64')

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

2017-07-05 Thread Levente Polyak 
Date: Wednesday, July 5, 2017 @ 20:33:42
  Author: anthraxx
Revision: 299719

upgpkg: mtr 0.92-1

Modified:
  mtr/trunk/PKGBUILD
  mtr/trunk/mtr.install

-+
 PKGBUILD|6 --
 mtr.install |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-05 18:54:51 UTC (rev 299718)
+++ PKGBUILD2017-07-05 20:33:42 UTC (rev 299719)
@@ -4,7 +4,7 @@
 
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
-pkgver=0.87
+pkgver=0.92
 pkgrel=1
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
 url='http://www.bitwizard.nl/mtr/'
@@ -13,7 +13,7 @@
 makedepends=('ncurses' 'gtk2' 'libcap')
 install=mtr.install
 
source=(${pkgbase}-${pkgver}.tar.gz::ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
-sha512sums=('172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9')
+sha512sums=('d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f')
 
 prepare() {
   (cd ${pkgbase}-${pkgver}
@@ -36,6 +36,7 @@
 package_mtr() {
   pkgdesc='Combines the functionality of traceroute and ping into one tool 
(CLI version)'
   depends=('ncurses' 'libcap')
+  optdepends=('bash-completion: bash completion support')
   cd ${pkgbase}-${pkgver}-cli
   make DESTDIR="${pkgdir}" install
 }
@@ -43,6 +44,7 @@
 package_mtr-gtk() {
   pkgdesc='Combines the functionality of traceroute and ping into one tool 
(GTK version)'
   depends=('ncurses' 'libcap' 'gtk2')
+  optdepends=('bash-completion: bash completion support')
   conflicts=('mtr')
   provides=("mtr=${pkgver}")
   cd ${pkgbase}-${pkgver}

Modified: mtr.install
===
--- mtr.install 2017-07-05 18:54:51 UTC (rev 299718)
+++ mtr.install 2017-07-05 20:33:42 UTC (rev 299719)
@@ -1,5 +1,5 @@
 post_install() {
-  setcap cap_net_raw+ep usr/bin/mtr
+  setcap cap_net_bind_service,cap_net_raw+ep usr/bin/mtr-packet
 }
 
 post_upgrade() {

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

2016-08-03 Thread Levente Polyak 
Date: Wednesday, August 3, 2016 @ 16:18:18
  Author: anthraxx
Revision: 272972

upgpkg: mtr 0.87-1

- using cap_net_raw+ep instead of setuid

Added:
  mtr/trunk/mtr.install
Modified:
  mtr/trunk/PKGBUILD

-+
 PKGBUILD|   20 
 mtr.install |9 +
 2 files changed, 21 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-03 15:52:58 UTC (rev 272971)
+++ PKGBUILD2016-08-03 16:18:18 UTC (rev 272972)
@@ -4,18 +4,22 @@
 
 pkgbase=mtr
 pkgname=('mtr' 'mtr-gtk')
-pkgver=0.86
-pkgrel=3
+pkgver=0.87
+pkgrel=1
 pkgdesc='Combines the functionality of traceroute and ping into one tool'
-url="http://www.bitwizard.nl/mtr/;
+url='http://www.bitwizard.nl/mtr/'
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('ncurses' 'gtk2')
+makedepends=('ncurses' 'gtk2' 'libcap')
+install=mtr.install
 
source=(${pkgbase}-${pkgver}.tar.gz::ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
-sha512sums=('e649825ab77987e369e0cd353a502b31f4aafa54a934467db907cb171af45b11bd0a8725d567d923422f32b886ad272b42151514c71893f0ba947f8d18719583')
+sha512sums=('172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9')
 
 prepare() {
-cp -ra ${pkgbase}-${pkgver}{,-cli}
+  (cd ${pkgbase}-${pkgver}
+autoreconf -fiv
+  )
+  cp -ra ${pkgbase}-${pkgver}{,-cli}
 }
 
 build() {
@@ -31,7 +35,7 @@
 
 package_mtr() {
   pkgdesc='Combines the functionality of traceroute and ping into one tool 
(CLI version)'
-  depends=('ncurses')
+  depends=('ncurses' 'libcap')
   cd ${pkgbase}-${pkgver}-cli
   make DESTDIR="${pkgdir}" install
 }
@@ -38,7 +42,7 @@
 
 package_mtr-gtk() {
   pkgdesc='Combines the functionality of traceroute and ping into one tool 
(GTK version)'
-  depends=('ncurses' "gtk2")
+  depends=('ncurses' 'libcap' 'gtk2')
   conflicts=('mtr')
   provides=("mtr=${pkgver}")
   cd ${pkgbase}-${pkgver}

Added: mtr.install
===
--- mtr.install (rev 0)
+++ mtr.install 2016-08-03 16:18:18 UTC (rev 272972)
@@ -0,0 +1,9 @@
+post_install() {
+  setcap cap_net_raw+ep usr/bin/mtr
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:

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

2016-06-03 Thread Levente Polyak 
Date: Saturday, June 4, 2016 @ 00:27:39
  Author: anthraxx
Revision: 268884

upgpkg: mtr 0.86-3

Modified:
  mtr/trunk/PKGBUILD

--+
 PKGBUILD |   52 +---
 1 file changed, 29 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-03 21:19:09 UTC (rev 268883)
+++ PKGBUILD2016-06-03 22:27:39 UTC (rev 268884)
@@ -1,42 +1,48 @@
-# $Id$
-# Maintainer : Ionut Biru 
+# Maintainer: Levente Polyak 
+# Contributor: Ionut Biru 
 # Contributor: Douglas Soares de Andrade 
 
 pkgbase=mtr
-pkgname=(mtr mtr-gtk)
+pkgname=('mtr' 'mtr-gtk')
 pkgver=0.86
-pkgrel=2
+pkgrel=3
+pkgdesc='Combines the functionality of traceroute and ping into one tool'
+url="http://www.bitwizard.nl/mtr/;
 arch=('i686' 'x86_64')
-url="http://www.bitwizard.nl/mtr/;
-license=('GPL')
+license=('GPL2')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
-md5sums=('8d63592c9d4579ef20cf491b41843eb2')
+source=(${pkgbase}-${pkgver}.tar.gz::ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
+sha512sums=('e649825ab77987e369e0cd353a502b31f4aafa54a934467db907cb171af45b11bd0a8725d567d923422f32b886ad272b42151514c71893f0ba947f8d18719583')
 
+prepare() {
+cp -ra ${pkgbase}-${pkgver}{,-cli}
+}
+
 build() {
-cp -r  $pkgbase-$pkgver $pkgbase-cli
-cd mtr-cli
+  (cd ${pkgbase}-${pkgver}-cli
 ./configure --prefix=/usr --without-gtk --sbindir=/usr/bin
 make
-
-cd "$srcdir/$pkgbase-$pkgver"
+  )
+  (cd ${pkgbase}-${pkgver}
 ./configure --prefix=/usr --sbindir=/usr/bin
 make
+  )
 }
 
 package_mtr() {
-pkgdesc="Combines the functionality of traceroute and ping into one tool 
(CLI version)"
-depends=('ncurses')
-cd mtr-cli
-make DESTDIR="$pkgdir" install
+  pkgdesc='Combines the functionality of traceroute and ping into one tool 
(CLI version)'
+  depends=('ncurses')
+  cd ${pkgbase}-${pkgver}-cli
+  make DESTDIR="${pkgdir}" install
 }
 
 package_mtr-gtk() {
-pkgdesc="Combines the functionality of traceroute and ping into one tool 
(GTK version)"
-depends=('ncurses' "gtk2")
-conflicts=("mtr")
-provides=("mtr=$pkgver")
+  pkgdesc='Combines the functionality of traceroute and ping into one tool 
(GTK version)'
+  depends=('ncurses' "gtk2")
+  conflicts=('mtr')
+  provides=("mtr=${pkgver}")
+  cd ${pkgbase}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}
 
-cd $pkgbase-$pkgver
-make DESTDIR="$pkgdir" install
-}
+# vim: ts=2 sw=2 et:

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

2015-09-09 Thread Evangelos Foutras 
Date: Thursday, September 10, 2015 @ 04:15:16
  Author: foutrelis
Revision: 245641

ncurses 6.0 rebuild.

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-09-10 02:14:26 UTC (rev 245640)
+++ PKGBUILD2015-09-10 02:15:16 UTC (rev 245641)
@@ -5,7 +5,7 @@
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.86
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.bitwizard.nl/mtr/;
 license=('GPL')

[arch-commits] Commit in mtr/trunk (PKGBUILD mtr-0.85-grace-period.patch)

2014-10-01 Thread Evangelos Foutras 
Date: Wednesday, October 1, 2014 @ 14:31:50
  Author: foutrelis
Revision: 223719

upgpkg: mtr 0.85-2

- Fix FS#39132: checksum fails and website missing
- Fix FS#40793: mtr doesn't wait for last packets sent out in report mode

Added:
  mtr/trunk/mtr-0.85-grace-period.patch
Modified:
  mtr/trunk/PKGBUILD

-+
 PKGBUILD|   16 +++--
 mtr-0.85-grace-period.patch |   71 ++
 2 files changed, 83 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-01 09:40:52 UTC (rev 223718)
+++ PKGBUILD2014-10-01 12:31:50 UTC (rev 223719)
@@ -5,14 +5,22 @@
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.85
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
+url=http://www.bitwizard.nl/mtr/;
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
-url=ba1e111d270178eb1d65e51ebf6503f
-md5sums=('aba1e111d270178eb1d65e51ebf6503f')
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
+mtr-0.85-grace-period.patch)
+md5sums=('5e665c617e5659b6ec3e201ee7488eb1'
+ 'c5d16e124a4734adeaaf3e0b83ef40fb')
 
+prepare() {
+cd $srcdir/$pkgbase-$pkgver
+
+patch -Np1 -i ../mtr-0.85-grace-period.patch
+}
+
 build() {
 cp -r  $pkgbase-$pkgver $pkgbase-cli
 cd mtr-cli

Added: mtr-0.85-grace-period.patch
===
--- mtr-0.85-grace-period.patch (rev 0)
+++ mtr-0.85-grace-period.patch 2014-10-01 12:31:50 UTC (rev 223719)
@@ -0,0 +1,71 @@
+From 6ce1601b27fdd95b44ed65d7fd83604860276d63 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar sekleta...@gmail.com
+Date: Tue, 17 Sep 2013 16:11:20 +0200
+Subject: [PATCH] core: introduce grace period
+
+In report mode we break out from select loop immediately after we reach
+maximum count of iterations. But we should wait for packets which are still on
+the way.
+
+In order to fix the issue we introduce grace period during which we don't send
+out more packets but we just wait for responses which might be still on the 
way.
+
+resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1009051
+---
+ select.c | 26 +++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/select.c b/select.c
+index 29088fd..31bfd5f 100644
+--- a/select.c
 b/select.c
+@@ -45,6 +45,8 @@ static struct timeval intervaltime;
+ int display_offset = 0;
+ 
+ 
++#define GRACETIME (5 * 1000*1000)
++
+ void select_loop(void) {
+   fd_set readfd;
+   fd_set writefd;
+@@ -57,8 +59,12 @@ void select_loop(void) {
+   int NumPing = 0;
+   int paused = 0;
+   struct timeval lasttime, thistime, selecttime;
++  struct timeval startgrace;
+   int dt;
+   int rv; 
++  int graceperiod = 0;
++
++  memset(startgrace, 0, sizeof(startgrace));
+ 
+   gettimeofday(lasttime, NULL);
+ 
+@@ -124,10 +130,24 @@ void select_loop(void) {
+  (thistime.tv_sec == lasttime.tv_sec + intervaltime.tv_sec 
+   thistime.tv_usec = lasttime.tv_usec + intervaltime.tv_usec)) {
+ lasttime = thistime;
+-if(NumPing = MaxPing  (!Interactive || ForceMaxPing))
++
++if (!graceperiod) {
++  if (NumPing = MaxPing  (!Interactive || ForceMaxPing)) {
++graceperiod = 1;
++startgrace = thistime;
++  }
++
++  /* do not send out batch when we've already initiated grace period 
*/
++  if (!graceperiod  net_send_batch())
++NumPing++;
++}
++  }
++
++  if (graceperiod) {
++dt = (thistime.tv_usec - startgrace.tv_usec) +
++  100 * (thistime.tv_sec - startgrace.tv_sec);
++if (dt  GRACETIME)
+   return;
+-if (net_send_batch())
+-  NumPing++;
+   }
+ 
+   selecttime.tv_usec = (thistime.tv_usec - lasttime.tv_usec);

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

2013-07-11 Thread Ionuț Mircea Bîru 
Date: Thursday, July 11, 2013 @ 21:03:53
  Author: ioni
Revision: 189931

update to 0.85

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-07-11 18:55:47 UTC (rev 189930)
+++ PKGBUILD2013-07-11 19:03:53 UTC (rev 189931)
@@ -4,14 +4,14 @@
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.84
-pkgrel=2
+pkgver=0.85
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
 source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
-url=http://www.bitwizard.nl/mtr/;
-md5sums=('df61096ae1b18b27f915feeb907ae48c')
+url=ba1e111d270178eb1d65e51ebf6503f
+md5sums=('aba1e111d270178eb1d65e51ebf6503f')
 
 build() {
 cp -r  $pkgbase-$pkgver $pkgbase-cli

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

2013-05-30 Thread Evangelos Foutras 
Date: Friday, May 31, 2013 @ 06:02:53
  Author: foutrelis
Revision: 186755

upgpkg: mtr 0.84-2

Move the mtr binary to /usr/bin.

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-05-31 03:40:46 UTC (rev 186754)
+++ PKGBUILD2013-05-31 04:02:53 UTC (rev 186755)
@@ -5,7 +5,7 @@
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.84
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
@@ -16,11 +16,11 @@
 build() {
 cp -r  $pkgbase-$pkgver $pkgbase-cli
 cd mtr-cli
-./configure --prefix=/usr --without-gtk
+./configure --prefix=/usr --without-gtk --sbindir=/usr/bin
 make
 
 cd $srcdir/$pkgbase-$pkgver
-./configure --prefix=/usr
+./configure --prefix=/usr --sbindir=/usr/bin
 make
 }

[arch-commits] Commit in mtr/trunk (PKGBUILD mtr-glib2.patch)

2013-04-09 Thread Ionuț Mircea Bîru 
Date: Tuesday, April 9, 2013 @ 20:06:50
  Author: ioni
Revision: 182369

update to 0.84

Modified:
  mtr/trunk/PKGBUILD
Deleted:
  mtr/trunk/mtr-glib2.patch

-+
 PKGBUILD|   11 +++
 mtr-glib2.patch |   26 --
 2 files changed, 3 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-09 18:01:07 UTC (rev 182368)
+++ PKGBUILD2013-04-09 18:06:50 UTC (rev 182369)
@@ -4,27 +4,22 @@
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.83
+pkgver=0.84
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
-mtr-glib2.patch)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url=http://www.bitwizard.nl/mtr/;
-md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
- '6bce08e1de7c6835bdda893847981bc8')
+md5sums=('df61096ae1b18b27f915feeb907ae48c')
 
 build() {
-patch -Np0 -i mtr-glib2.patch
 cp -r  $pkgbase-$pkgver $pkgbase-cli
 cd mtr-cli
-./bootstrap.sh
 ./configure --prefix=/usr --without-gtk
 make
 
 cd $srcdir/$pkgbase-$pkgver
-./bootstrap.sh
 ./configure --prefix=/usr
 make
 }

Deleted: mtr-glib2.patch
===
--- mtr-glib2.patch 2013-04-09 18:01:07 UTC (rev 182368)
+++ mtr-glib2.patch 2013-04-09 18:06:50 UTC (rev 182369)
@@ -1,26 +0,0 @@
-diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
 mtr-0.83/configure.in.glib22013-02-18 20:10:00.767417356 +0100
-+++ mtr-0.83/configure.in  2013-02-18 20:10:53.549513018 +0100
-@@ -59,6 +59,8 @@ else
-   GTK_OBJ=
- fi
- 
-+PKG_CHECK_MODULES([GLIB2], [glib-2.0])
-+
- AC_CHECK_FUNC(socket, , 
-   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
- 
-diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
 mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100
-+++ mtr-0.83/Makefile.am   2013-02-18 20:16:17.877101679 +0100
-@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
-   mtr-gtk.h
- EXTRA_mtr_SOURCES = curses.c \
- gtk.c
-+AM_CFLAGS = $(GLIB2_CFLAGS)
- mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
--mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
-+mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
- 
- EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
- distclean-local:

[arch-commits] Commit in mtr/trunk (PKGBUILD mtr-glib2.patch)

2013-02-26 Thread Ionuț Mircea Bîru 
Date: Tuesday, February 26, 2013 @ 19:55:39
  Author: ioni
Revision: 178763

update to 0.83

Added:
  mtr/trunk/mtr-glib2.patch
Modified:
  mtr/trunk/PKGBUILD

-+
 PKGBUILD|   27 ---
 mtr-glib2.patch |   26 ++
 2 files changed, 42 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-26 18:22:51 UTC (rev 178762)
+++ PKGBUILD2013-02-26 18:55:39 UTC (rev 178763)
@@ -4,30 +4,35 @@
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.82
+pkgver=0.83
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
+mtr-glib2.patch)
 url=http://www.bitwizard.nl/mtr/;
-md5sums=('10601ea543fda3e51545c4bce195b64c')
+md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
+ '6bce08e1de7c6835bdda893847981bc8')
 
 build() {
-install -d  $srcdir/{mtr-cli,mtr-gtk}
-cd $srcdir/mtr-cli
-../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
+patch -Np0 -i mtr-glib2.patch
+cp -r  $pkgbase-$pkgver $pkgbase-cli
+cd mtr-cli
+./bootstrap.sh
+./configure --prefix=/usr --without-gtk
 make
 
-cd $srcdir/mtr-gtk
-../$pkgbase-$pkgver/configure --prefix=/usr
+cd $srcdir/$pkgbase-$pkgver
+./bootstrap.sh
+./configure --prefix=/usr
 make
 }
 
 package_mtr() {
 pkgdesc=Combines the functionality of traceroute and ping into one tool 
(CLI version)
-depends=('ncurses')
-cd $srcdir/mtr-cli
+depends=('ncurses' 'glib2')
+cd mtr-cli
 make DESTDIR=$pkgdir install
 }
 
@@ -37,6 +42,6 @@
 conflicts=(mtr)
 provides=(mtr=$pkgver)
 
-cd $srcdir/mtr-gtk
+cd $pkgbase-$pkgver
 make DESTDIR=$pkgdir install
 }

Added: mtr-glib2.patch
===
--- mtr-glib2.patch (rev 0)
+++ mtr-glib2.patch 2013-02-26 18:55:39 UTC (rev 178763)
@@ -0,0 +1,26 @@
+diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
+--- mtr-0.83/configure.in.glib22013-02-18 20:10:00.767417356 +0100
 mtr-0.83/configure.in  2013-02-18 20:10:53.549513018 +0100
+@@ -59,6 +59,8 @@ else
+   GTK_OBJ=
+ fi
+ 
++PKG_CHECK_MODULES([GLIB2], [glib-2.0])
++
+ AC_CHECK_FUNC(socket, , 
+   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
+ 
+diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
+--- mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100
 mtr-0.83/Makefile.am   2013-02-18 20:16:17.877101679 +0100
+@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
+   mtr-gtk.h
+ EXTRA_mtr_SOURCES = curses.c \
+ gtk.c
++AM_CFLAGS = $(GLIB2_CFLAGS)
+ mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
+-mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
++mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
+ 
+ EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
+ distclean-local:

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

2011-12-03 Thread Ionut Biru 
Date: Saturday, December 3, 2011 @ 07:20:36
  Author: ibiru
Revision: 144088

update to 0.82

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-12-03 09:31:31 UTC (rev 144087)
+++ PKGBUILD2011-12-03 12:20:36 UTC (rev 144088)
@@ -4,39 +4,39 @@
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.81
+pkgver=0.82
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url=http://www.bitwizard.nl/mtr/;
-md5sums=('b7a7914f1fc1b5a21ab10bdca44356e1')
+md5sums=('10601ea543fda3e51545c4bce195b64c')
 
 build() {
-install -d  ${srcdir}/{mtr-cli,mtr-gtk}
-cd ${srcdir}/mtr-cli
-../${pkgbase}-${pkgver}/configure --prefix=/usr --disable-gtktest 
--without-gtk
+install -d  $srcdir/{mtr-cli,mtr-gtk}
+cd $srcdir/mtr-cli
+../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
 make
 
-cd ${srcdir}/mtr-gtk
-../${pkgbase}-${pkgver}/configure --prefix=/usr
+cd $srcdir/mtr-gtk
+../$pkgbase-$pkgver/configure --prefix=/usr
 make
 }
 
 package_mtr() {
 pkgdesc=Combines the functionality of traceroute and ping into one tool 
(CLI version)
 depends=('ncurses')
-cd ${srcdir}/mtr-cli
-make DESTDIR=${pkgdir} install
+cd $srcdir/mtr-cli
+make DESTDIR=$pkgdir install
 }
 
 package_mtr-gtk() {
 pkgdesc=Combines the functionality of traceroute and ping into one tool 
(GTK version)
 depends=('ncurses' gtk2)
 conflicts=(mtr)
-provides=(mtr=${pkgver})
+provides=(mtr=$pkgver)
 
-cd ${srcdir}/mtr-gtk
-make DESTDIR=${pkgdir} install
+cd $srcdir/mtr-gtk
+make DESTDIR=$pkgdir install
 }

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

2011-01-17 Thread Ionut Biru 
Date: Monday, January 17, 2011 @ 15:34:58
  Author: ibiru
Revision: 106670

upgpkg: mtr 0.80-2
support ncurses and gtk interface in two separate packages. mtr now has only 
ncurses and for gtk interface install mtr-gtk

Modified:
  mtr/trunk/PKGBUILD

--+
 PKGBUILD |   39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-17 20:28:19 UTC (rev 106669)
+++ PKGBUILD2011-01-17 20:34:58 UTC (rev 106670)
@@ -2,20 +2,41 @@
 # Maintainer : Ionut Biru ib...@archlinux.org
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
-pkgname=mtr
+pkgbase=mtr
+pkgname=(mtr mtr-gtk)
 pkgver=0.80
-pkgrel=1
-pkgdesc=Combines the functionality of traceroute and ping into one tool
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gtk2=2.22.0' 'ncurses=5.7')
-source=(ftp://ftp.bitwizard.nl/mtr/${pkgname}-${pkgver}.tar.gz)
+makedepends=('ncurses' 'gtk2')
+source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
 url=http://www.bitwizard.nl/mtr/;
 md5sums=('fa68528eaec1757f52bacf9fea8c68a9')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-gtk2
-  make
-  make DESTDIR=${pkgdir} install
+install -d  ${srcdir}/{mtr-cli,mtr-gtk}
+cd ${srcdir}/mtr-cli
+../${pkgbase}-${pkgver}/configure --prefix=/usr --disable-gtktest 
--without-gtk
+make
+
+cd ${srcdir}/mtr-gtk
+../${pkgbase}-${pkgver}/configure --prefix=/usr --enable-gtk2
+make
 }
+
+package_mtr() {
+pkgdesc=Combines the functionality of traceroute and ping into one tool 
(CLI version)
+depends=('ncurses=5.7')
+cd ${srcdir}/mtr-cli
+make DESTDIR=${pkgdir} install
+}
+
+package_mtr-gtk() {
+pkgdesc=Combines the functionality of traceroute and ping into one tool 
(GTK version)
+depends=('ncurses=5.7' gtk2=2.22.0)
+conflicts=(mtr)
+provides=(mtr=${pkgver})
+
+cd ${srcdir}/mtr-gtk
+make DESTDIR=${pkgdir} install
+}

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

2010-10-22 Thread Ionut Biru 
Date: Friday, October 22, 2010 @ 09:24:39
  Author: ibiru
Revision: 96583

upgpkg: mtr 0.80-1
update to 0.80

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-10-22 13:20:51 UTC (rev 96582)
+++ PKGBUILD2010-10-22 13:24:39 UTC (rev 96583)
@@ -3,19 +3,19 @@
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=mtr
-pkgver=0.79
+pkgver=0.80
 pkgrel=1
 pkgdesc=Combines the functionality of traceroute and ping into one tool
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gtk2=2.20.1' 'ncurses=5.7')
+depends=('gtk2=2.22.0' 'ncurses=5.7')
 source=(ftp://ftp.bitwizard.nl/mtr/${pkgname}-${pkgver}.tar.gz)
 url=http://www.bitwizard.nl/mtr/;
-md5sums=('f7c1f873e68e7176f60ae9fbb2ca20f4')
+md5sums=('fa68528eaec1757f52bacf9fea8c68a9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-gtk2 || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr --enable-gtk2
+  make
+  make DESTDIR=${pkgdir} install
 }

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

2010-06-13 Thread Ionut Biru 
Date: Sunday, June 13, 2010 @ 14:57:50
  Author: ibiru
Revision: 82584

upgpkg: mtr 0.79-1
update to 0.79

Modified:
  mtr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2010-06-13 18:33:06 UTC (rev 82583)
+++ PKGBUILD2010-06-13 18:57:50 UTC (rev 82584)
@@ -1,16 +1,17 @@
 # $Id$
-# Maintainer: Douglas Soares de Andrade doug...@archlinux.org
+# Maintainer : Ionut Biru ib...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
 
 pkgname=mtr
-pkgver=0.75
-pkgrel=4
+pkgver=0.79
+pkgrel=1
 pkgdesc=Combines the functionality of traceroute and ping into one tool
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gtk2=2.14.7' 'ncurses=5.7')
+depends=('gtk2=2.20.1' 'ncurses=5.7')
 source=(ftp://ftp.bitwizard.nl/mtr/${pkgname}-${pkgver}.tar.gz)
 url=http://www.bitwizard.nl/mtr/;
-md5sums=('23baca52d0922c2ecba7eba05317868c')
+md5sums=('f7c1f873e68e7176f60ae9fbb2ca20f4')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}