git: 4ac620100103 - main - net/scamper: update to 20230614b

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ac620100103cd2bdacc246e6c086208d2b87462

commit 4ac620100103cd2bdacc246e6c086208d2b87462
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2023-08-16 07:58:04 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-08-17 08:27:58 +0000

    net/scamper: update to 20230614b
    
    ChangeLog:
    https://mailman.caida.org/pipermail/scamper-announce/2023-August/000034.html
    
    Merged ChangeLog
    
    configure:
     * better tests for zlib, libbz2, and liblzma that check for both
       libraries and headers.
     * change --with-sc_uptime, --with-sc_hoiho, and --with-tests to be
       --enable-sc_uptime, --enable-sc_hoiho, and --enable-tests
     * disable maintainer mode, pass foreign to AM_INIT_AUTOMAKE
    
    scamper:
     * fix regression in multicall binary introduced in 20230605, so that
       scamper-ping, scamper-trace, etc, work again.
     * for scamper -v (have scamper report its version), return 0 on
       exit from scamper process, rather than -1 (255).
     * remove reading regular files from poll/select/epoll/kqueue path,
       which fixes reading regular input files (-f option to scamper) using
       epoll or kqueue
     * fix reading stdin as input (-f option to scamper) when using
       epoll (catch EPOLLHUP)
     * add DNS server to host signature, add host path for scamper_task_find
     * rework scamper_osinfo to work with malformed release names (uname -r)
     * dealias: do not crash on malformed prefixscan and bump commands
     * dealias: fix memory leak of probedefs on malformed commands
     * sting: fix memory leak of recorded packets
     * remove tsps input method (-O tsps option to scamper)
     * fix handling of EPOLLHUP on client disconnection -- Linux-specific
       (scamper -U /path/to/socket)
     * update manual page
    
    libscamperctrl:
     * link against list.o and splaytree.o so that the library is self-contained
     * fix memory leak when task is not accepted
     * fix handling of disconnected instances
     * API improvements
    
    libscamperfile:
     * fix memory leak when reading SOA/MX from warts file
     * fix memory leak when reading PMTUD traceroute structures from warts file
     * sting: fix memory leak of recorded packets
    
    sc_analysis_dump, sc_warts2pcap, sc_wartscat, sc_wartsfilter:
     * link against list.o/utils.o so that these utilities are not reliant on
       those symbols being exported from libscamperfile
    
    sc_prefixprober:
     * in sc_prefixprober, shuffle IPv6 addresses within a prefix, unless
       told not to.
     * allow compression type to be specified using -O
     * free scamper_addr_t as each are removed from the list to probe
    
    sc_remoted:
     * catch EPOLLHUP with epoll
    
    sc_warts2text:
     * fix memory leaks
    
    sc_wartsdump:
     * fix memory leaks
     * link against utils.o so that sc_wartsdump is not reliant on those
       symbols being exported from libscamperfile
     * have sc_wartsdump print firsthop for trace records.
    
    misc:
     * build libcmdtest.a in tests to reduce duplication in Makefile.
    
    PR:             273126
    Reported by:    mjl@luckie.org.nz (maintainer)
---
 net/scamper/Makefile  | 7 ++++---
 net/scamper/distinfo  | 6 +++---
 net/scamper/pkg-plist | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index 38c267226376..704ed8526f9b 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	scamper
-DISTVERSION=	20230605
+PORTVERSION=	20230614b
 CATEGORIES=	net
 MASTER_SITES=	https://www.caida.org/catalog/software/scamper/code/
 DISTNAME=	${PORTNAME}-cvs-${PORTVERSION}
@@ -24,9 +24,10 @@ UPTIME_DESC=	Install sc_uptime
 
 HOIHO_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 HOIHO_USES=		localbase:ldflags
-HOIHO_CONFIGURE_WITH=	pcre2 sc_hoiho
+HOIHO_CONFIGURE_ENABLE=	sc_hoiho
+HOIHO_CONFIGURE_WITH=	pcre2
 
 UPTIME_USES=		localbase:ldflags sqlite:3
-UPTIME_CONFIGURE_WITH=	sc_uptime
+UPTIME_CONFIGURE_ENABLE=	sc_uptime
 
 .include <bsd.port.mk>
diff --git a/net/scamper/distinfo b/net/scamper/distinfo
index 2caf96e882a0..f521450dfb8a 100644
--- a/net/scamper/distinfo
+++ b/net/scamper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685930544
-SHA256 (scamper-cvs-20230605.tar.gz) = 63bb36e33cc22649c88cdfab1041b461ee8b3f29ab48714943ee4a17c1d0766b
-SIZE (scamper-cvs-20230605.tar.gz) = 2208130
+TIMESTAMP = 1691906233
+SHA256 (scamper-cvs-20230614b.tar.gz) = d02af6902ffdeb718349b84113df3dc415ce8e40c6e42bb739756274d9ac4cfa
+SIZE (scamper-cvs-20230614b.tar.gz) = 2201320
diff --git a/net/scamper/pkg-plist b/net/scamper/pkg-plist
index a88958bc8266..54ea05f719a2 100644
--- a/net/scamper/pkg-plist
+++ b/net/scamper/pkg-plist
@@ -28,11 +28,11 @@ bin/sc_wartsfilter
 bin/sc_wartsfix
 lib/libscamperctrl.a
 lib/libscamperctrl.so.2
-lib/libscamperctrl.so.2.0.0
+lib/libscamperctrl.so.2.1.1
 lib/libscamperctrl.so
 lib/libscamperfile.a
 lib/libscamperfile.so.6
-lib/libscamperfile.so.6.0.0
+lib/libscamperfile.so.6.1.0
 lib/libscamperfile.so
 man/man1/sc_ally.1.gz
 man/man1/sc_analysis_dump.1.gz