autu: Update to 0.93-1

3 files changed, 86 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5a5dc77059c..a5ac7461f421 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = paris-traceroute
 	pkgdesc = Paris traceroute is a new version of the well-known network diagnosis and measurement tool
-	pkgver = 0.92
-	pkgrel = 2
+	pkgver = 0.93
+	pkgrel = 1
 	url = http://www.paris-traceroute.net
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = glibc
-	source = http://www.paris-traceroute.net/downloads/paris-traceroute-0.92-dev.tar.gz
-	sha512sums = ecae447bb3f811f5668d2beb24fb0146e9267189e14c10b09fe930daad552e97dbcde7208be6020c83b3560b41395a866a87d4076e6ce6c5d574490a9e0d9128
+	source = libparistraceroute-0.93.tar.gz::https://github.com/libparistraceroute/libparistraceroute//archive/v0.93.tar.gz
+	source = 0000-whois.c-BUFFER_SIZE-overflow.patch
+	md5sums = ac7c0583ed97c55481ef126a56d4eb87
+	md5sums = 89edd8047c18b4ee88d7853400baf059
+	sha512sums = 505de465454c349adea936637a097bb3f812f010665825badfc97751e9219325d04d8af78ac6d107e66ff6ef02a8cda1559b8073906d36a745115cd54104a8b4
+	sha512sums = 7c36c814f8b8c219ddc7be6bf22210e5565b0e6b504256de41ba14a084cf9a380bf9d70f440badb48429a3d4843f7b9e75fab44aa3984d0e16a19bfa32e97df9
 
 pkgname = paris-traceroute
 
diff --git a/0000-whois.c-BUFFER_SIZE-overflow.patch b/0000-whois.c-BUFFER_SIZE-overflow.patch
new file mode 100644
index 000000000000..f44058aee38f
--- /dev/null
+++ b/0000-whois.c-BUFFER_SIZE-overflow.patch
@@ -0,0 +1,29 @@
+diff -ru5 libparistraceroute-0.9x/libparistraceroute/whois.c libparistraceroute-0.93/libparistraceroute/whois.c
+--- libparistraceroute-0.9x/libparistraceroute/whois.c	2016-07-11 06:22:56.000000000 -0400
++++ libparistraceroute-0.93/libparistraceroute/whois.c	2020-06-16 23:31:20.207270352 -0400
+@@ -83,11 +83,11 @@
+     size_t socket_len;
+ 
+     int    family = server_address->family;
+     size_t len = 0;
+ 
+-    buffer[BUFFER_SIZE] = '\0';
++    buffer[BUFFER_SIZE-1] = '\0';
+ 
+     if (queried_address->family != AF_INET && queried_address->family != AF_INET6) {
+         fprintf(stderr, "whois_query: queried address family not supported (family = %d)\n", queried_address->family);
+         goto ERR_INVALID_FAMILY;
+     }
+@@ -148,11 +148,11 @@
+         goto ERR_SEND;
+     }
+ 
+     // Handle the response.
+     size_t offset = 0;
+-    while ((read_size = recv(sockfd, buffer + offset, BUFFER_SIZE, 0))) {
++    while ((read_size = recv(sockfd, buffer + offset, BUFFER_SIZE-1, 0))) {
+         // Find (line_begin, line_end) the pair of pointer delimiting the next full line.
+         char * line_begin = buffer,
+              * line_end   = buffer,
+              * buffer_end = buffer + read_size;
+         while (line_end < buffer_end) {
diff --git a/PKGBUILD b/PKGBUILD
index cbd82c15a8d2..62b9305c016f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,61 @@
-# Maintainer:  danyf90 <daniele.formichelli@gmail.com>
+# Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
+# Contributor: danyf90 <daniele.formichelli@gmail.com>
 # Contributor: Julien <paci79@free.fr>
 
-pkgname=paris-traceroute
-pkgver=0.92
-pkgrel=2
-pkgdesc="Paris traceroute is a new version of the well-known network diagnosis and measurement tool"
+set -u
+pkgname='paris-traceroute'
+pkgver='0.93'
+pkgrel='1'
+pkgdesc='Paris traceroute is a new version of the well-known network diagnosis and measurement tool'
 arch=('i686' 'x86_64')
-depends=('glibc')
+url='http://www.paris-traceroute.net'
+_giturl='https://github.com/libparistraceroute/libparistraceroute'
 license=('GPL')
-source=("http://www.paris-traceroute.net/downloads/paris-traceroute-$pkgver-dev.tar.gz")
-url="http://www.paris-traceroute.net"
-sha512sums=('ecae447bb3f811f5668d2beb24fb0146e9267189e14c10b09fe930daad552e97dbcde7208be6020c83b3560b41395a866a87d4076e6ce6c5d574490a9e0d9128')
+depends=('glibc')
+#_srcdir='paris-traceroute-current'
+_srcdir="libparistraceroute-${pkgver}"
+source=(
+  #"http://www.paris-traceroute.net/downloads/paris-traceroute-${pkgver}-dev.tar.gz"
+  "${_srcdir}.tar.gz::${_giturl}//archive/v${pkgver}.tar.gz"
+  '0000-whois.c-BUFFER_SIZE-overflow.patch'
+)
+md5sums=('ac7c0583ed97c55481ef126a56d4eb87'
+         '89edd8047c18b4ee88d7853400baf059')
+sha512sums=('505de465454c349adea936637a097bb3f812f010665825badfc97751e9219325d04d8af78ac6d107e66ff6ef02a8cda1559b8073906d36a745115cd54104a8b4'
+            '7c36c814f8b8c219ddc7be6bf22210e5565b0e6b504256de41ba14a084cf9a380bf9d70f440badb48429a3d4843f7b9e75fab44aa3984d0e16a19bfa32e97df9')
+
+prepare() {
+  set -u
+  cd "${_srcdir}"
+
+  patch -Nup1 -i "${srcdir}/0000-whois.c-BUFFER_SIZE-overflow.patch"
+  rm -f 'Makefile'
+  set +u
+}
 
 build() {
-  cd $srcdir/paris-traceroute-current
+  set -u
+  cd "${_srcdir}"
 
-  ./configure --prefix=/usr
+  if [ ! -s 'configure' ]; then
+    ./autogen.sh
+  fi
+  if [ ! -s 'Makefile' ]; then
+    ./configure --prefix='/usr'
+  fi
   make
+  set +u
 }
 
 package() {
-  cd $srcdir/paris-traceroute-current
+  set +u
+  cd "${_srcdir}"
 
-  make prefix=$pkgdir/usr install
-  install -Dm644 man/$pkgname.8 $pkgdir/usr/share/man/man8/$pkgname.8
-  install -Dm644 doc/tupleroute.dia $pkgdir/usr/share/$pkgname/tupleroute.dia
-}
\ No newline at end of file
+  make prefix="${pkgdir}/usr" install
+  mv "${pkgdir}/usr/bin/"{ping,pinglt}
+  chmod +s "${pkgdir}/usr/bin"/*
+  #install -Dpm644 "man/${pkgname}.8" -t "${pkgdir}/usr/share/man/man8/"
+  #install -Dpm644 'doc/tupleroute.dia' -t "${pkgdir}/usr/share/${pkgname}/"
+  set -u
+}
+set +u