zmap: update to 4.4.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: zmap: update to 4.4.0
From: Bartosz Kuzma (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 5 Jul 2026 17:30:26 +0000
Module Name:	pkgsrc-wip
Committed By:	Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Pushed By:	bartosz.kuzma
Date:		Sun Jul 5 19:30:16 2026 +0200
Changeset:	b8314400ba2ee417921443d3292667288334919f

Modified Files:
	zmap/Makefile
	zmap/PLIST
	zmap/TODO
	zmap/distinfo
	zmap/patches/patch-src_CMakeLists.txt
Added Files:
	zmap/patches/patch-lib_logger.h
	zmap/patches/patch-src_get__gateway-bsd.h

Log Message:
zmap: update to 4.4.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b8314400ba2ee417921443d3292667288334919f

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

diffstat:
 zmap/Makefile                             | 11 +++++++---
 zmap/PLIST                                | 12 +++++++++--
 zmap/TODO                                 |  7 +++++++
 zmap/distinfo                             | 10 +++++----
 zmap/patches/patch-lib_logger.h           | 17 +++++++++++++++
 zmap/patches/patch-src_CMakeLists.txt     | 35 +++++++++++++++++++++++--------
 zmap/patches/patch-src_get__gateway-bsd.h | 18 ++++++++++++++++
 7 files changed, 92 insertions(+), 18 deletions(-)

diffs:
diff --git a/zmap/Makefile b/zmap/Makefile
index 582dd116a2..2f3af97c8f 100644
--- a/zmap/Makefile
+++ b/zmap/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2015/01/20 12:02:10 ahp-nils Exp $
 
-DISTNAME=	zmap-1.2.1
+DISTNAME=	zmap-4.4.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=zmap/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,10 +12,15 @@ LICENSE=	apache-2.0
 
 TOOL_DEPENDS+=	gengetopt-[0-9]*:../../devel/gengetopt
 
-USE_CMAKE=	yes
-USE_TOOLS+=	yacc
+USE_TOOLS+=	byacc pkg-config
 
+CMAKE_CONFIGURE_ARGS=	-DRESPECT_INSTALL_PREFIX_CONFIG=ON
+
+.include "../../devel/cmake/build.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../textproc/libunistring/buildlink3.mk"
+.include "../../wip/judy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/zmap/PLIST b/zmap/PLIST
index 040fd3d4fd..b0c99050c5 100644
--- a/zmap/PLIST
+++ b/zmap/PLIST
@@ -1,3 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2014/04/25 13:12:48 ahp-nils Exp $
+@comment $NetBSD$
+etc/zmap/blocklist.conf
+etc/zmap/zmap.conf
+man/man1/zblocklist.1
+man/man1/ziterate.1
+man/man1/zmap.1
+man/man1/ztee.1
+sbin/zblocklist
+sbin/ziterate
 sbin/zmap
-share/man/man1/zmap.1
+sbin/ztee
diff --git a/zmap/TODO b/zmap/TODO
index 49fced0221..1f2b25efc6 100644
--- a/zmap/TODO
+++ b/zmap/TODO
@@ -1 +1,8 @@
 Started packaging on NetBSD, but too Linux-specific.
+
+Jul 05 19:24:41.208 [INFO] zmap: By default, ZMap will output the unique IP addresses of hosts that respond successfully (e.g., SYN-ACK packet). This is equivalent to running ZMap with the following flags: --output-module=csv --output-fields=saddr --output-filter='success=1 && repeat=0' --no-header-row. If you want all responses, explicitly set an output module or set --output-filter="".
+Jul 05 19:24:41.208 [INFO] dedup: Response deduplication method is full
+assertion "zconf.iface" failed: file "/usr/pkgsrc/wip/zmap/work/zmap-4.4.0/src/zmap.c", line 142, function "network_config_init"
+Abort (core dumped)
+
+Configuration files must not be registered in the PLIST.
diff --git a/zmap/distinfo b/zmap/distinfo
index 3505962377..b7bda32eab 100644
--- a/zmap/distinfo
+++ b/zmap/distinfo
@@ -1,6 +1,8 @@
 $NetBSD: distinfo,v 1.6 2015/01/20 12:02:10 ahp-nils Exp $
 
-RMD160 (zmap-1.2.1.tar.gz) = 1b15b7ce0702ef25129d6566dd44521dfc1e8fb3
-SHA512 (zmap-1.2.1.tar.gz) = 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2
-Size (zmap-1.2.1.tar.gz) = 99840 bytes
-SHA1 (patch-src_CMakeLists.txt) = 482ba413114f4928a721b2a372015ff02c5daa40
+BLAKE2s (zmap-4.4.0.tar.gz) = 31ddce18f6a25870e3c1fe5b500c5e06318f6ea365ea6485add5683b556282e3
+SHA512 (zmap-4.4.0.tar.gz) = daff8819cd64ee591d8301c8945083a072f4f781ac4f692c44c870860b60cacd2b47360ad536ca80afb5ac5053a72f19f84084aaa8e3fbee9d6d1110a45236b3
+Size (zmap-4.4.0.tar.gz) = 219020 bytes
+SHA1 (patch-lib_logger.h) = c336ce00b3409d50329ab7247cfbf620a2655736
+SHA1 (patch-src_CMakeLists.txt) = b0de1ba301d5bea7e88d22b43b7899302ac22e45
+SHA1 (patch-src_get__gateway-bsd.h) = 4154fbb188d30b99b02f900605c219047a709cab
diff --git a/zmap/patches/patch-lib_logger.h b/zmap/patches/patch-lib_logger.h
new file mode 100644
index 0000000000..1f7aa7e75d
--- /dev/null
+++ b/zmap/patches/patch-lib_logger.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Add missing LOG_MAKEPRI
+
+--- lib/logger.h.orig	2026-07-05 07:22:13.630983546 +0000
++++ lib/logger.h
+@@ -21,6 +21,10 @@
+ #ifndef LOGGER_H
+ #define LOGGER_H
+ 
++#if !defined(LOG_MAKEPRI)
++#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/zmap/patches/patch-src_CMakeLists.txt b/zmap/patches/patch-src_CMakeLists.txt
index 293d03d789..a01e3c1099 100644
--- a/zmap/patches/patch-src_CMakeLists.txt
+++ b/zmap/patches/patch-src_CMakeLists.txt
@@ -1,15 +1,32 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2014/04/25 13:37:48 ahp-nils Exp $
+$NetBSD$
 
-byacc in pkgsrc is just yacc.
+Use pkgsrc byacc
+Fix man pages dir
 
---- src/CMakeLists.txt.orig	2014-03-10 17:37:37.000000000 +0000
+--- src/CMakeLists.txt.orig	2026-05-29 06:33:05.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -96,7 +96,7 @@ add_custom_command(OUTPUT lexer.c
- 	)
+@@ -198,17 +198,10 @@ add_custom_command(OUTPUT lexer.c
+     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/lexer.l"
+ )
  
+-if(NetBSD)
+-add_custom_command(OUTPUT parser.c
+-    COMMAND yacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
+-    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
+-)
+-else()
  add_custom_command(OUTPUT parser.c
--	COMMAND byacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
-+	COMMAND yacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
- 	DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
- 	)
+     COMMAND byacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
+     DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
+ )
+-endif()
  
+ add_custom_target(manpages ronn "${CMAKE_CURRENT_SOURCE_DIR}/zmap.1.ronn" --organization="ZMap" --manual="zmap"
+     COMMAND ronn "${CMAKE_CURRENT_SOURCE_DIR}/zblocklist.1.ronn" --organization="ZMap" --manual="zblocklist"
+@@ -284,5 +277,5 @@ install(
+     zblocklist.1
+     ziterate.1
+     ztee.1
+-    DESTINATION share/man/man1
++    DESTINATION man/man1
+ )
diff --git a/zmap/patches/patch-src_get__gateway-bsd.h b/zmap/patches/patch-src_get__gateway-bsd.h
new file mode 100644
index 0000000000..5d52b2e388
--- /dev/null
+++ b/zmap/patches/patch-src_get__gateway-bsd.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+No RTF_LLINFO on NetBSD
+
+--- src/get_gateway-bsd.h.orig	2026-07-05 07:29:45.985076874 +0000
++++ src/get_gateway-bsd.h
+@@ -38,7 +38,11 @@ int get_hw_addr(struct in_addr *gw_ip, U
+ 	mib[2] = 0;
+ 	mib[3] = AF_INET;
+ 	mib[4] = NET_RT_FLAGS;
++#ifdef RTF_LLINFO
+ 	mib[5] = RTF_LLINFO;
++#else
++	mib[5] = 0;
++#endif
+ 	size_t bufsz = 0;
+ 	if (sysctl(mib, 6, NULL, &bufsz, NULL, 0) == -1) {
+ 		log_debug("get_hw_addr", "sysctl getting buffer size: %d %s", errno, strerror(errno));
Prev by Date: sftpgo: update to 2.7.4
Next by Date: py-keras: Add reference to CVE-2026-12481
Previous by Thread: sftpgo: update to 2.7.4
Next by Thread: py-keras: Add reference to CVE-2026-12481
Indexes:
Home | Main Index | Thread Index | Old Index