pkg/59239: [patch] update net/scamper to 20250227

[mjl%luckie.org.nz@localhost]

>Number:         59239
>Category:       pkg
>Synopsis:       [patch] update net/scamper to 20250227
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 31 01:15:00 +0000 2025
>Originator:     mjl%luckie.org.nz@localhost
>Release:        NetBSD 10.1
>Organization:
	
>Environment:
	
	
System: NetBSD pi2 10.1 NetBSD 10.1 (GENERIC) #0: Mon Dec 16 13:08:11 UTC 2024 mkrepro%mkrepro.NetBSD.org@localhost:/usr/src/sys/arch/evbarm/compile/GENERIC evbarm
Architecture: earmv7hf
Machine: evbarm
>Description:
Update net/scamper to 20250227.  Note that it has been a long time
since this port received an update, and there are many changes over
the past 10 years.  I have tested scamper on NetBSD 10 and it works
correctly (parts of the current version in ports do not work on NetBSD
10 because of changes to the route socket).

The most recent changelog is:
https://mailman.caida.org/pipermail/scamper-announce/2025-February/000049.html

>How-To-Repeat:
	
>Fix:

diff -uNr scamper.orig/Makefile scamper/Makefile
--- scamper.orig/Makefile	2020-01-26 17:31:55.000000000 +0000
+++ scamper/Makefile	2025-03-31 00:32:33.025274422 +0000
@@ -1,19 +1,47 @@
 # $NetBSD: Makefile,v 1.19 2020/01/26 17:31:55 rillig Exp $
 #
 
-DISTNAME=	scamper-cvs-20141211d
+DISTNAME=	scamper-cvs-20250227
 PKGNAME=	${DISTNAME:S/-cvs//}
 CATEGORIES=	net
-MASTER_SITES=	http://www.caida.org/tools/measurement/scamper/code/
+MASTER_SITES=	http://www.caida.org/catalog/software/scamper/code/
 
 MAINTAINER=	mjl%luckie.org.nz@localhost
-HOMEPAGE=	https://www.caida.org/tools/measurement/scamper/
+HOMEPAGE=	https://www.caida.org/catalog/software/scamper/
 COMMENT=	Tool for parallelised IPv4 and IPv6 measurement
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
 USE_FEATURES+=	inet6
 
+BUILD_DEFS+=	VARBASE
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-privsep-dir=${VARBASE}/chroot/scamper
+CONFIGURE_ARGS+=	--with-privsep-user=_scamper
+CONFIGURE_ARGS+=	--with-bz2
+CONFIGURE_ARGS+=	--with-zlib
+CONFIGURE_ARGS+=	--with-lzma
+CONFIGURE_ARGS+=	--with-pcre2
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--enable-sc_hoiho
+CONFIGURE_ARGS+=	--enable-sc_minrtt
+CONFIGURE_ARGS+=	--enable-sc_uptime
+USE_LIBTOOL=		yes
+
+PKG_GROUPS=		_scamper
+PKG_USERS=		_scamper:_scamper
+PKG_HOME._scamper=	${VARBASE}/chroot/scamper
+
+OWN_DIRS=		${VARBASE}/chroot/scamper
+AUTO_MKDIRS=		yes
+
+SPECIAL_PERMS=		bin/scamper ${SETUID_ROOT_PERMS}
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../archivers/xz/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -uNr scamper.orig/PLIST scamper/PLIST
--- scamper.orig/PLIST	2016-01-16 16:13:15.000000000 +0000
+++ scamper/PLIST	2025-03-31 00:14:17.093213063 +0000
@@ -2,22 +2,38 @@
 bin/sc_ally
 bin/sc_analysis_dump
 bin/sc_attach
+bin/sc_bdrmap
+bin/sc_erosprober
 bin/sc_filterpolicy
+bin/sc_hoiho
 bin/sc_ipiddump
+bin/sc_minrtt
+bin/sc_pinger
+bin/sc_prefixprober
+bin/sc_prefixscan
+bin/sc_radargun
+bin/sc_remoted
 bin/sc_speedtrap
 bin/sc_tbitblind
+bin/sc_tbitpmtud
 bin/sc_tracediff
+bin/sc_ttlexp
+bin/sc_uptime
 bin/sc_warts2csv
 bin/sc_warts2json
 bin/sc_warts2pcap
 bin/sc_warts2text
 bin/sc_wartscat
 bin/sc_wartsdump
+bin/sc_wartsfilter
 bin/sc_wartsfix
 bin/scamper
+include/libscamperctrl.h
 include/scamper_addr.h
 include/scamper_dealias.h
 include/scamper_file.h
+include/scamper_host.h
+include/scamper_http.h
 include/scamper_icmpext.h
 include/scamper_list.h
 include/scamper_neighbourdisc.h
@@ -27,20 +43,38 @@
 include/scamper_tbit.h
 include/scamper_trace.h
 include/scamper_tracelb.h
+include/scamper_udpprobe.h
+lib/libscamperctrl.la
 lib/libscamperfile.la
 man/man1/sc_ally.1
 man/man1/sc_analysis_dump.1
 man/man1/sc_attach.1
+man/man1/sc_bdrmap.1
+man/man1/sc_erosprober.1
 man/man1/sc_filterpolicy.1
+man/man1/sc_hoiho.1
 man/man1/sc_ipiddump.1
+man/man1/sc_minrtt.1
+man/man1/sc_pinger.1
+man/man1/sc_prefixprober.1
+man/man1/sc_prefixscan.1
+man/man1/sc_radargun.1
+man/man1/sc_remoted.1
 man/man1/sc_speedtrap.1
 man/man1/sc_tbitblind.1
+man/man1/sc_tbitpmtud.1
 man/man1/sc_tracediff.1
+man/man1/sc_ttlexp.1
+man/man1/sc_uptime.1
+man/man1/sc_warts2csv.1
 man/man1/sc_warts2json.1
 man/man1/sc_warts2pcap.1
 man/man1/sc_warts2text.1
 man/man1/sc_wartscat.1
 man/man1/sc_wartsdump.1
+man/man1/sc_wartsfilter.1
+man/man1/sc_wartsfix.1
 man/man1/scamper.1
+man/man3/libscamperctrl.3
 man/man3/libscamperfile.3
 man/man5/warts.5
diff -uNr scamper.orig/distinfo scamper/distinfo
--- scamper.orig/distinfo	2024-10-10 20:33:39.000000000 +0000
+++ scamper/distinfo	2025-03-30 19:43:29.807483499 +0000
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.17 2024/10/10 20:33:39 nia Exp $
 
-BLAKE2s (scamper-cvs-20141211d.tar.gz) = 1a789a37bafd250cfa7ccac558efc569887f563e22de6c8d4f7e67d2dc2b1477
-SHA512 (scamper-cvs-20141211d.tar.gz) = b032868470039691c45d90dd99025fd569c1cb63b8d337d4be04fe2ddac3b9c334cd7075a0b2533d093d65d8bb18414db1e74f4fc9719072679021aa7df99b7c
-Size (scamper-cvs-20141211d.tar.gz) = 1465618 bytes
-SHA1 (patch-internal.h) = 3d6e81b0d7da0f8092b51f79ead6eae1345081cc
+BLAKE2s (scamper-cvs-20250227.tar.gz) = a33761dab04c2270f5a6f635996af1890ef8c5853d957ee39f3662fac6bc33c3
+SHA512 (scamper-cvs-20250227.tar.gz) = 019b6be511fae874747e899a65f7cd520002b2b6ad48074d76229229601b96c4dc6c46a3f16dabdbe3eaa49e808bee7eb18c338c3f01936fb7ec65319c0af6c0
+Size (scamper-cvs-20250227.tar.gz) = 3216225 bytes
diff -uNr scamper.orig/patches/patch-internal.h scamper/patches/patch-internal.h
--- scamper.orig/patches/patch-internal.h	2024-10-10 20:33:39.000000000 +0000
+++ scamper/patches/patch-internal.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-internal.h,v 1.1 2024/10/10 20:33:39 nia Exp $
-
-Include <limits.h> for LONG_MIN/LONG_MAX.
-
---- internal.h.orig	2024-10-10 20:30:50.817453129 +0000
-+++ internal.h
-@@ -203,6 +203,7 @@ typedef unsigned short sa_family_t;
- #include <signal.h>
- #include <fcntl.h>
- #include <ctype.h>
-+#include <limits.h>
- #include <time.h>
- #include <math.h>
- 

>Unformatted: