CVS commit: pkgsrc/net/traceroute-nanog

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jun 25 16:23:38 UTC 2024

Modified Files:
        pkgsrc/net/traceroute-nanog: Makefile distinfo
        pkgsrc/net/traceroute-nanog/patches: patch-aa

Log Message:
net/traceroute-nanog: Fix runtime segfault by ambiguous inet_addr()

* Install as setuid.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/traceroute-nanog/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/traceroute-nanog/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/traceroute-nanog/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/traceroute-nanog/Makefile
diff -u pkgsrc/net/traceroute-nanog/Makefile:1.12 pkgsrc/net/traceroute-nanog/Makefile:1.13
--- pkgsrc/net/traceroute-nanog/Makefile:1.12   Wed Apr  1 19:23:21 2020
+++ pkgsrc/net/traceroute-nanog/Makefile        Tue Jun 25 16:23:38 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2020/04/01 19:23:21 schwarz Exp $
+# $NetBSD: Makefile,v 1.13 2024/06/25 16:23:38 ryoon Exp $
 
 DISTNAME=      traceroute-nanog_6.4.2.orig
 PKGNAME=       ${DISTNAME:S/.orig//:S/_/-/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://archive.debian.org/debian//pool/main/t/traceroute-nanog/
 
@@ -42,6 +43,8 @@ CPPFLAGS+=    -Dsocklen_t=int
 
 INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
 
+SPECIAL_PERMS+=                sbin/traceroute-nanog ${SETUID_ROOT_PERMS}
+
 do-build:
        cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS}
 

Index: pkgsrc/net/traceroute-nanog/distinfo
diff -u pkgsrc/net/traceroute-nanog/distinfo:1.6 pkgsrc/net/traceroute-nanog/distinfo:1.7
--- pkgsrc/net/traceroute-nanog/distinfo:1.6    Tue Oct 26 11:07:04 2021
+++ pkgsrc/net/traceroute-nanog/distinfo        Tue Jun 25 16:23:38 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:07:04 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/06/25 16:23:38 ryoon Exp $
 
 BLAKE2s (traceroute-nanog_6.4.2-1.diff.gz) = dad05b77916aaac5c1b58988be4f4684cd894441bcd8e772fa6dbd12f119da17
 SHA512 (traceroute-nanog_6.4.2-1.diff.gz) = 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
@@ -6,4 +6,4 @@ Size (traceroute-nanog_6.4.2-1.diff.gz) 
 BLAKE2s (traceroute-nanog_6.4.2.orig.tar.gz) = f9b5f643acd212ab03b7cef67e1ca302be9ae6240456565d51e1a9b227b72d39
 SHA512 (traceroute-nanog_6.4.2.orig.tar.gz) = 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
 Size (traceroute-nanog_6.4.2.orig.tar.gz) = 34429 bytes
-SHA1 (patch-aa) = 84c3d8e806609b705310006fd9a1447da143a173
+SHA1 (patch-aa) = bff1f4f9c528c5953e5775f512fb4f1d9f3bf587

Index: pkgsrc/net/traceroute-nanog/patches/patch-aa
diff -u pkgsrc/net/traceroute-nanog/patches/patch-aa:1.2 pkgsrc/net/traceroute-nanog/patches/patch-aa:1.3
--- pkgsrc/net/traceroute-nanog/patches/patch-aa:1.2    Sat May  5 22:44:19 2012
+++ pkgsrc/net/traceroute-nanog/patches/patch-aa        Tue Jun 25 16:23:38 2024
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2012/05/05 22:44:19 schwarz Exp $
+$NetBSD: patch-aa,v 1.3 2024/06/25 16:23:38 ryoon Exp $
 
---- traceroute.c.orig  2012-05-06 00:38:52.000000000 +0200
-+++ traceroute.c       2012-05-06 00:39:12.000000000 +0200
-@@ -758,17 +758,6 @@
+* Fix segfault.
+
+--- traceroute.c.orig  2007-10-10 21:50:07.000000000 +0000
++++ traceroute.c
+@@ -638,6 +638,7 @@ int fixargs(int *, char **, char **);
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#include <arpa/inet.h> /* for inet_addr(3) */
+ #include <sys/time.h>
+ 
+ #ifndef vms                     /* Not VMS */
+@@ -758,17 +759,6 @@ void cksum(u_int16_t *, int, volatile u_
  #undef IP_HDRINCL
  #endif