From nobody Thu May 23 03:04:49 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VlChK6HvBz5Lbp0; Thu, 23 May 2024 03:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VlChK5h5jz49xM; Thu, 23 May 2024 03:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716433489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2qFWntBRuGwEDcxR08D3XZdc//qa4joKNj4R/CfZjY=; b=bjLBzXqvKgFa8jLA/IMMnKnKbPSVuer6F9BjH5UTlni2W3Rw7UwuP7Khy1M3MDAGJwKMxZ 10P2Gyye0Cx3A/F+ocVSgR5Tg9MC84fv/l4liWuqHeFJh9qx5gvSH+kOoK4m6FstI63tw3 AnmQG8g09C8oCtDytCF+YMLYDeEFdrdENZzR1RazaR0GzohUH3IIwqB7gvwvpxWfMWoTpE mBoe+OOHWVwldPpONxRSaC8W1Td56OSWRigRvQGzC25Jp+MfxrCGxGJOBgK4VZo40EA5uT 9wLohPQo1wPJjeMvjpUUXq7WYPnuolF5xQuugbGtIlvamrMhFzZkc5NzIXgiJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716433489; a=rsa-sha256; cv=none; b=bKy6YuNBlEAVpnuWbZyDvr4kFghf4WXBeQYUdYAr2t/MmtedwiZygf1X3AaT8xBqLtjXoS MxsDEnz63WncxEEqbVtXI5pXfgn4bfDH/P+wQdtDJlKRS5zF2js/CwT4NiuqBUIRkRoOc0 x/sBCfJ/dLCTgUv/sa/yzH4zE0cTHtUHVoJ9Gy/4JU9ZpBbdouylK26InbZFrMuDueFw+7 TCIMegbxyYdGE7FX6KtIC7pU8eB9g5NUCzT8MqHhk8dV0OcrrjsAntC9vF1S8AGv4ukMUv u2BBWqCbUvRPKcOCujJ0WD1kSV893xqpBNTMz+4dCzubQGi9ZskV5s9WYK+5Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716433489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O2qFWntBRuGwEDcxR08D3XZdc//qa4joKNj4R/CfZjY=; b=J2PwzsqsxbNy3zMPsY3CCPIObFi5qfXuLMOHrPJ7WB08m93TmoEyLZw2yoN9QtDNk8N52G jfC2TsfcIUvB7TIuGfMyToA1GGM/n4onsjUBNQsQ4gGD3ZK0893N1DOMB8rL7wMh7o4G2b pG4K9UBSoHy+0NWzrOUZCe3hsFmwU+As/8JMhqIH3yP3cgS7fYbMYMo8QPuqEKt9jSmU0K A3u8ynCPV3yba6kwecZIrq30TJVLSsTGK0JgA9S2h9k/nNGXsXFifdzG8aPaTPYZsGCzE7 lTt4BeTeVTRPa2LpzsZ9D1I+DN7XBAt3DFM2PS3O23pCKyZ7cFmtmsPari/UWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VlChK5FR3zYDl; Thu, 23 May 2024 03:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44N34nC8094162; Thu, 23 May 2024 03:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N34neH094159; Thu, 23 May 2024 03:04:49 GMT (envelope-from git) Date: Thu, 23 May 2024 03:04:49 GMT Message-Id: <202405230304.44N34neH094159@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 8753f725fd74 - main - net/zmap: update 3.0.0 =?utf-8?Q?=E2=86=92?= 4.1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8753f725fd741506707b31385f4373a773da299a Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=8753f725fd741506707b31385f4373a773da299a commit 8753f725fd741506707b31385f4373a773da299a Author: Yuri Victorovich AuthorDate: 2024-05-23 02:14:04 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-23 03:04:46 +0000 net/zmap: update 3.0.0 → 4.1.1 Reported by: portscout --- net/zmap/Makefile | 29 +++++++++++++++++++++++------ net/zmap/distinfo | 8 +++++--- net/zmap/pkg-plist | 4 ++-- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/net/zmap/Makefile b/net/zmap/Makefile index 57db586c0b7f..ad084e1aea06 100644 --- a/net/zmap/Makefile +++ b/net/zmap/Makefile @@ -1,8 +1,9 @@ PORTNAME= zmap DISTVERSIONPREFIX= v -DISTVERSION= 3.0.0 -PORTREVISION= 1 +DISTVERSION= 4.1.1 CATEGORIES= net +MASTER_SITES= SF/judy/judy/Judy-1.0.5/:judy +DISTFILES= Judy-1.0.5.tar.gz:judy MAINTAINER= yuri@FreeBSD.org COMMENT= Internet scanner @@ -11,16 +12,22 @@ WWW= https://zmap.io/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= gengetopt>0:devel/gengetopt +BUILD_DEPENDS= gengetopt>0:devel/gengetopt \ + gmake:devel/gmake LIB_DEPENDS= libdnet.so:net/libdnet \ libgmp.so:math/gmp \ libunistring.so:devel/libunistring +USES= cmake:insource pkgconfig USE_GITHUB= yes -USES= cmake:insource pkgconfig +JUDY_WRKSRC= ${WRKDIR}/judy-1.0.5 + +CFLAGS+= -D_SYSTYPE_BSD \ + -I${JUDY_WRKSRC}/src +LDFLAGS+= -L${JUDY_WRKSRC}/src/obj/.libs -CFLAGS+= -D_SYSTYPE_BSD +CMAKE_ON= FORCE_CONF_INSTALL MANPAGE= zblacklist.1 zmap.1 ztee.1 @@ -37,14 +44,24 @@ MONGO_CMAKE_BOOL= WITH_MONGO JSON_LIB_DEPENDS= libjson-c.so:devel/json-c JSON_CMAKE_BOOL= WITH_JSON +pre-build: # build the Judy library + @cd ${JUDY_WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ./configure --disable-shared && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} + post-patch: @${REINPLACE_CMD} -i '' -e 's|/etc/zmap|${LOCALBASE}/etc/zmap|g' -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -i '' -e 's|/etc/zmap/zmap.conf|${LOCALBASE}/etc/zmap/zmap.conf|g' \ ${WRKSRC}/src/zopt.ggo.in \ ${WRKSRC}/src/zmap.c - @${REINPLACE_CMD} -i '' -e 's|/etc/zmap/blacklist.conf|${LOCALBASE}/etc/zmap/blacklist.conf|g' \ + @${REINPLACE_CMD} -i '' -e 's|/etc/zmap/blocklist.conf|${LOCALBASE}/etc/zmap/blocklist.conf|g' \ ${WRKSRC}/conf/zmap.conf \ ${WRKSRC}/src/zmap.c +post-install: +.for cnf in blocklist.conf zmap.conf + @${MV} ${STAGEDIR}${ETCDIR}/${cnf} ${STAGEDIR}${ETCDIR}/${cnf}.sample +.endfor + .include diff --git a/net/zmap/distinfo b/net/zmap/distinfo index 30757c5fff27..e914132ddcd2 100644 --- a/net/zmap/distinfo +++ b/net/zmap/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1688578357 -SHA256 (zmap-zmap-v3.0.0_GH0.tar.gz) = e3151cdcdf695ab7581e01a7c6ee78678717d6a62ef09849b34db39682535454 -SIZE (zmap-zmap-v3.0.0_GH0.tar.gz) = 156278 +TIMESTAMP = 1716410286 +SHA256 (Judy-1.0.5.tar.gz) = d2704089f85fdb6f2cd7e77be21170ced4b4375c03ef1ad4cf1075bd414a63eb +SIZE (Judy-1.0.5.tar.gz) = 1147847 +SHA256 (zmap-zmap-v4.1.1_GH0.tar.gz) = b37c4e70e4f9c12091ee10dc7f6f3518cbb7bc291b5b81a451a37632c9440047 +SIZE (zmap-zmap-v4.1.1_GH0.tar.gz) = 202697 diff --git a/net/zmap/pkg-plist b/net/zmap/pkg-plist index ffe1c97709c1..479300dbed8b 100644 --- a/net/zmap/pkg-plist +++ b/net/zmap/pkg-plist @@ -1,5 +1,5 @@ -%%ETCDIR%%/blocklist.conf -%%ETCDIR%%/zmap.conf +@sample %%ETCDIR%%/blocklist.conf.sample +@sample %%ETCDIR%%/zmap.conf.sample sbin/zblocklist sbin/ziterate sbin/zmap