autu: Update to 0.93-2

3 files changed, 38 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5ac7461f421..d439e896426a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = paris-traceroute
 	pkgdesc = Paris traceroute is a new version of the well-known network diagnosis and measurement tool
 	pkgver = 0.93
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.paris-traceroute.net
 	arch = i686
 	arch = x86_64
@@ -9,10 +9,12 @@ pkgbase = paris-traceroute
 	depends = glibc
 	source = libparistraceroute-0.93.tar.gz::https://github.com/libparistraceroute/libparistraceroute//archive/v0.93.tar.gz
 	source = 0000-whois.c-BUFFER_SIZE-overflow.patch
+	source = 0001-mda_link_dump_mda_interface_t_array.patch
 	md5sums = ac7c0583ed97c55481ef126a56d4eb87
 	md5sums = 89edd8047c18b4ee88d7853400baf059
+	md5sums = 8a23e259e5a9452572a20879d2c78fd4
 	sha512sums = 505de465454c349adea936637a097bb3f812f010665825badfc97751e9219325d04d8af78ac6d107e66ff6ef02a8cda1559b8073906d36a745115cd54104a8b4
 	sha512sums = 7c36c814f8b8c219ddc7be6bf22210e5565b0e6b504256de41ba14a084cf9a380bf9d70f440badb48429a3d4843f7b9e75fab44aa3984d0e16a19bfa32e97df9
+	sha512sums = e86ca3261d8e88e74263fd861e80ef238cc085c2cbc37f73e178593e250b50fce4dac7a3dc8695b743ccff7e3227772620130a6fc6c4bab56c4787126acb472a
 
 pkgname = paris-traceroute
-
diff --git a/0001-mda_link_dump_mda_interface_t_array.patch b/0001-mda_link_dump_mda_interface_t_array.patch
new file mode 100644
index 000000000000..86cf5123c824
--- /dev/null
+++ b/0001-mda_link_dump_mda_interface_t_array.patch
@@ -0,0 +1,16 @@
+diff -pNaru5 a/libparistraceroute/algorithms/mda/interface.c b/libparistraceroute/algorithms/mda/interface.c
+--- a/libparistraceroute/algorithms/mda/interface.c	2016-07-11 06:22:56.000000000 -0400
++++ b/libparistraceroute/algorithms/mda/interface.c	2023-12-31 21:18:16.562870584 -0500
+@@ -180,11 +180,11 @@ static inline void mda_hop_dump_with_res
+     address_resolv(hop->address, &hostname, CACHE_ENABLED);
+     mda_hop_dump(hop, hostname);
+     if (hostname) free(hostname);
+ }
+ 
+-void mda_link_dump(const mda_interface_t * link[2], bool do_resolv)
++void mda_link_dump(const mda_interface_t ** link, bool do_resolv)
+ {
+     char *  hostname = NULL;
+     uint8_t ttl;
+     size_t  i;
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 62b9305c016f..b9ca711bed67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,12 @@
 # Contributor: danyf90 <daniele.formichelli@gmail.com>
 # Contributor: Julien <paci79@free.fr>
 
+# 0.93 has serious bugs in whois.c
+
 set -u
 pkgname='paris-traceroute'
 pkgver='0.93'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='Paris traceroute is a new version of the well-known network diagnosis and measurement tool'
 arch=('i686' 'x86_64')
 url='http://www.paris-traceroute.net'
@@ -18,17 +20,29 @@ 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'
+  '0001-mda_link_dump_mda_interface_t_array.patch'
 )
 md5sums=('ac7c0583ed97c55481ef126a56d4eb87'
-         '89edd8047c18b4ee88d7853400baf059')
+         '89edd8047c18b4ee88d7853400baf059'
+         '8a23e259e5a9452572a20879d2c78fd4')
 sha512sums=('505de465454c349adea936637a097bb3f812f010665825badfc97751e9219325d04d8af78ac6d107e66ff6ef02a8cda1559b8073906d36a745115cd54104a8b4'
-            '7c36c814f8b8c219ddc7be6bf22210e5565b0e6b504256de41ba14a084cf9a380bf9d70f440badb48429a3d4843f7b9e75fab44aa3984d0e16a19bfa32e97df9')
+            '7c36c814f8b8c219ddc7be6bf22210e5565b0e6b504256de41ba14a084cf9a380bf9d70f440badb48429a3d4843f7b9e75fab44aa3984d0e16a19bfa32e97df9'
+            'e86ca3261d8e88e74263fd861e80ef238cc085c2cbc37f73e178593e250b50fce4dac7a3dc8695b743ccff7e3227772620130a6fc6c4bab56c4787126acb472a')
 
 prepare() {
   set -u
   cd "${_srcdir}"
 
-  patch -Nup1 -i "${srcdir}/0000-whois.c-BUFFER_SIZE-overflow.patch"
+  local _f
+  for _f in "${source[@]}"; do
+    if [[ "${_f}" = *.patch ]]; then
+      set +u; msg2 "Patch ${_f}"; set -u
+      patch -Nup1 -i "${srcdir}/${_f}"
+    fi
+  done
+  #cd '..'; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; cd "${_srcdir}"; false
+  # diff -pNaru5 'a' 'b' > '0000-new.patch'
+
   rm -f 'Makefile'
   set +u
 }