CVS commit: pkgsrc/net/traceroute-as

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jun 25 16:24:32 UTC 2024

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

Log Message:
net/traceroute-as: Fix build with recent /etc/protocols

* Standard pkgsrc way.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/traceroute-as/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/traceroute-as/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/traceroute-as/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/traceroute-as/patches/patch-ab

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-as/Makefile
diff -u pkgsrc/net/traceroute-as/Makefile:1.14 pkgsrc/net/traceroute-as/Makefile:1.15
--- pkgsrc/net/traceroute-as/Makefile:1.14      Sat Apr 24 20:08:28 2021
+++ pkgsrc/net/traceroute-as/Makefile   Tue Jun 25 16:24:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/04/24 20:08:28 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2024/06/25 16:24:31 ryoon Exp $
 
 DISTNAME=      traceroute_991603.tar
 PKGNAME=       traceroute-as-991603
@@ -19,7 +19,10 @@ PKG_SYSDEFS.*=               #empty
 
 MAKE_FLAGS+=           CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q}
 MAKE_FLAGS+=           PKG_LIBRARIES=${PKG_LIBRARIES:Q} DESTMAN=${DESTDIR}${PREFIX}/${PKGMANDIR}
-INSTALL_PROGRAM_SUID=  ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555
-MAKE_ENV+=             BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q}
+MAKE_FLAGS+=           BINOWN=${BINOWN} BINGRP=${BINGRP}
+
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man8 sbin
+
+SPECIAL_PERMS+=                sbin/traceroute-as ${SETUID_ROOT_PERMS}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/traceroute-as/distinfo
diff -u pkgsrc/net/traceroute-as/distinfo:1.6 pkgsrc/net/traceroute-as/distinfo:1.7
--- pkgsrc/net/traceroute-as/distinfo:1.6       Tue Oct 26 11:07:04 2021
+++ pkgsrc/net/traceroute-as/distinfo   Tue Jun 25 16:24:31 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:07:04 nia Exp $
+$NetBSD: distinfo,v 1.7 2024/06/25 16:24:31 ryoon Exp $
 
 BLAKE2s (traceroute_991603.tar.Z) = fb28b67500d8a7ee02adc73e297ac815b33c225feb884c8d78a61c4831dfe28b
 SHA512 (traceroute_991603.tar.Z) = 61457a57adcbd3b869715d0d1b2ad70fb973dfb4501f691c03bdb350fb29d6c593fe900e261f5175bb3f22c612238dd14ea5dcddb0517178cb89d3be138f424f
 Size (traceroute_991603.tar.Z) = 75111 bytes
-SHA1 (patch-aa) = 3370d57975369c049773e8fa1b31bbb5403c0dd9
-SHA1 (patch-ab) = ec3d5a3c76c7cad44fcc24e7855f8e607635aa63
+SHA1 (patch-aa) = 143ebe04b8e82af8bcb243f29bb4653276758137
+SHA1 (patch-ab) = 437fe83201f769506688956c27c7621092b21f38
 SHA1 (patch-ac) = 5e7ad798aaacc4198a84e0cf66c200150de12ba9

Index: pkgsrc/net/traceroute-as/patches/patch-aa
diff -u pkgsrc/net/traceroute-as/patches/patch-aa:1.1.1.1 pkgsrc/net/traceroute-as/patches/patch-aa:1.2
--- pkgsrc/net/traceroute-as/patches/patch-aa:1.1.1.1   Tue Oct 16 22:40:11 2001
+++ pkgsrc/net/traceroute-as/patches/patch-aa   Tue Jun 25 16:24:31 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 22:40:11 seb Exp $
+$NetBSD: patch-aa,v 1.2 2024/06/25 16:24:31 ryoon Exp $
 
---- Makefile.orig      Fri Aug 28 10:40:36 1998
+--- Makefile.orig      1998-08-28 08:40:36.000000000 +0000
 +++ Makefile
 @@ -5,10 +5,10 @@
  # ----------------------------------------------------------------------
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
  
  BINDIR = $(DESTBIN)
  MANDIR = $(DESTMAN)/man8
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ SYSDEFS = -DLINUX_IPSUM
  SYSDEFS = -D_BSD_SOURCE
  #endif
  
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
  
  # ----------------------------------------------------------------------
  # Configuration definitions.
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ SYSDEFS =
  CONFIGDEFS = -DOLD_RES_STATE
  #endif
  
@@ -33,7 +33,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
  
  # ----------------------------------------------------------------------
  # Include file directories.
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ DEFS = $(CONFIGDEFS) $(SYSDEFS) $(INCLUD
  COPTS =
  COPTS = -O
  
@@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
  
  # Select your favorite compiler.
  CC = /usr/ucb/cc                      #if defined(solaris) && BSD
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ COMPLIB =
  LIBS = -lsocket -lnsl                 #if defined(solaris) && not BSD
  LIBS =
  
@@ -51,23 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
  
  LDFLAGS =
  
-@@ -121,10 +121,11 @@
- # Miscellaneous definitions.
- # ----------------------------------------------------------------------
- 
--MAKE = make $(MFLAGS)
--
--# This assumes the BSD install.
--INSTALL = install -c
-+INSTALL_PROGRAM = $(BSD_INSTALL_PROGRAM)
-+INSTALL_PROGRAM_SUID = $(BSD_INSTALL_PROGRAM_SUID)
-+INSTALL_PROGRAM_DIR = $(BSD_INSTALL_PROGRAM_DIR)
-+INSTALL_MAN = $(BSD_INSTALL_MAN)
-+INSTALL_MAN_DIR = $(BSD_INSTALL_MAN_DIR)
- 
- # Grrr
- SHELL = /bin/sh
-@@ -144,13 +145,13 @@
+@@ -144,42 +144,44 @@ FILES = Makefile $(DOCS) $(HDRS) $(SRCS)
  
  UHDR = aslookup.h port.h exit.h
  USRC = aslookup.c vers.c
@@ -83,7 +67,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
  
  # ----------------------------------------------------------------------
  # Rules for installation.
-@@ -161,25 +162,29 @@
+ # ----------------------------------------------------------------------
+ 
+-OWNER = root
+-GROUP = network
++OWNER = ${BINOWN}
++GROUP = ${BINGRP}
  MODE  = 4755
  STRIP = -s
  
@@ -98,14 +87,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/10/16 2
 -install: $(PROG)
 -      $(INSTALL) -m $(MODE) -o $(OWNER) -g $(GROUP) $(STRIP) $(PROG) $(BINDIR)
 +install: $(PROG) $(UTIL) man
-+      $(INSTALL_PROGRAM_DIR) $(BINDIR)
-+      $(INSTALL_PROGRAM_SUID) traceroute $(BINDIR)/traceroute-as
-+      $(INSTALL_PROGRAM) aslookup $(BINDIR)/aslookup
++      $(INSTALL) -m $(MODE) -o $(OWNER) -g $(GROUP) $(STRIP) $(PROG) $(BINDIR)/traceroute-as
++      $(INSTALL) -m $(MODE) -o $(OWNER) -g $(GROUP) $(STRIP) $(UTIL) $(BINDIR)/aslookup
  
  man: $(MANS)
 -      $(INSTALL) -m 444 traceroute.8 $(MANDIR)
-+      $(INSTALL_MAN_DIR) $(MANDIR)
-+      $(INSTALL_MAN) traceroute.8 $(MANDIR)/traceroute-as.8
++      $(INSTALL) -m 444 traceroute.8 $(MANDIR)/traceroute-as.8
  
  clean:
        rm -f $(CLEANUP) *.o a.out core

Index: pkgsrc/net/traceroute-as/patches/patch-ab
diff -u pkgsrc/net/traceroute-as/patches/patch-ab:1.1 pkgsrc/net/traceroute-as/patches/patch-ab:1.2
--- pkgsrc/net/traceroute-as/patches/patch-ab:1.1       Sun Dec 18 18:58:29 2005
+++ pkgsrc/net/traceroute-as/patches/patch-ab   Tue Jun 25 16:24:31 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2005/12/18 18:58:29 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2024/06/25 16:24:31 ryoon Exp $
 
---- traceroute.c.orig  2005-12-18 18:53:05.000000000 +0000
+--- traceroute.c.orig  2000-04-03 14:06:53.000000000 +0000
 +++ traceroute.c
 @@ -297,7 +297,6 @@ static char Version[] = "@(#)traceroute.
  #define EXTERN extern
@@ -10,3 +10,24 @@ $NetBSD: patch-ab,v 1.1 2005/12/18 18:58
  EXTERN res_state_t _res;      /* defined in res_init.c */
  extern char *version;         /* program version number */
  
+@@ -982,16 +981,16 @@ check_proto()
+ {
+       struct protoent *proto;
+ 
+-      proto = getprotobyname("ip");
++      proto = getprotobyname("ipv4");
+       if (proto == NULL)
+       {
+-              (void) fprintf(stderr, "ip: unknown protocol\n");
++              (void) fprintf(stderr, "ipv4: unknown protocol\n");
+               exit(EX_OSFILE);
+       }
+-      if (proto->p_proto != IPPROTO_IP)
++      if (proto->p_proto != IPPROTO_IPV4)
+       {
+               (void) fprintf(stderr, "ip protocol %d should be %d\n",
+-                      proto->p_proto, IPPROTO_IP);
++                      proto->p_proto, IPPROTO_IPV4);
+               exit(EX_CONFIG);
+       }
+