From nobody Wed Jul 05 17:43:43 2023 X-Original-To: dev-commits-ports-all@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 4Qx6TW6prxz4ltKT; Wed, 5 Jul 2023 17:43:43 +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 4Qx6TW6GtQz4YTp; Wed, 5 Jul 2023 17:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688579023; 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=FFj5YG+7pdmVa7TpBPsThGovULS6Jg2+kOuZyBwBlec=; b=fbGjCEuv84/8YUI5opuEAGXIKiWlGBUXqjChz7E23pNEZmDUfeoNKAjpMSQfnMeTKYk3+o C8jCKNDyCzJJZwIEBHzTFJ3r1JSa5Gr9rtggDQMaeAvXtXZYIN5eJc1VeINBv4CgDa6YTm 9neZHLDRO4GyJFcRTK3ZnuQyjVyYSMiI77nwflnl6yojb2b/5WS+CBGLCSYste5FaStYWS 6/o2DwSlmytsfx5tXpyNhXQI0Srp2xJ7EhlYYZoMOme+yS3ZhociajZ6gD0MuxBZcux3Hd F7ZgQmQyKII9iYQMIXntFVfyLgHcCdLb6WPMbfY7xkndCTR6OZRFLqivjtA94Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688579023; 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=FFj5YG+7pdmVa7TpBPsThGovULS6Jg2+kOuZyBwBlec=; b=qd0gbuvrjzyVffjd16Y7EMJntkqnUUVZc2YojF19mzJdxQJ0OSXhgHI5y+TD5cfDmcxAaf N3TM6mdXlER40vSaaxEIw47BXDGyUSwREgJIARan67iMbPD/N96uwZYCAZ49Vp/l5lKTmz zJo427kQW8q1l1Evd2W9XO7MRAt1LTW8bGav3lo5EkE4ACw+8UmlLqpOufDevjUAAkiS4E +qBo/HW5A6Fznah9YCPFRQAvm1Atqx6LCoVZJzXB4iB+uLkw6TSs8rvGn8KD5q/rSYcO9B /eaqjgH7WQ2PzNy3ARzze8NKR1IohydREcnOlLIcZHEgMINyyG1gSm2ON18Shg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688579023; a=rsa-sha256; cv=none; b=U6/c6RN3VKKKXpSOxCGcjWBwDdloYZe4bR7YQsPaWw6yZWSj1YFhrcteJGt+5XGTCPx3gD FDPHT2Q9nJfw0Ov94A/jB/O9Icy0KxAa0D7rGi9nz6ykKrHeKachnpNGl9rOaEMZTl3SLQ ZWJkMzXYKQJzWmNInmVKdlE2Gud0pNz37TqXRxiwful7kJ5hH0LTTXQKeWYWHl9ubnlXk2 LiVZVhiFwXx+gqr4S5Kkq1UWSft6xkl7OLMgkgHoiJsvMQK+rp7DF8GbdBJsTQmsB/QBR/ hUiVxih9T0ywFY009zI+/KzzcqOB3/Xh7zwwPNjd76blhV+0LY6PYUMsa26TSg== 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 4Qx6TW5N8MzPJT; Wed, 5 Jul 2023 17:43:43 +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 365HhhXB032436; Wed, 5 Jul 2023 17:43:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365Hhh0e032435; Wed, 5 Jul 2023 17:43:43 GMT (envelope-from git) Date: Wed, 5 Jul 2023 17:43:43 GMT Message-Id: <202307051743.365Hhh0e032435@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: 1d8bd44f535d - main - =?utf-8?Q?net/zmap:=20Update=202.1.1=20=E2=86=92=203.0.0?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 1d8bd44f535d40fed827d5dfdb470346f487409b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d8bd44f535d40fed827d5dfdb470346f487409b commit 1d8bd44f535d40fed827d5dfdb470346f487409b Author: Yuri Victorovich AuthorDate: 2023-07-05 17:43:18 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-05 17:43:41 +0000 net/zmap: Update 2.1.1 → 3.0.0 Reported by: portscout --- net/zmap/Makefile | 13 +++++-------- net/zmap/distinfo | 5 +++-- net/zmap/files/patch-CMakeLists.txt | 23 ----------------------- net/zmap/pkg-plist | 8 +++++--- 4 files changed, 13 insertions(+), 36 deletions(-) diff --git a/net/zmap/Makefile b/net/zmap/Makefile index 7a44359a8099..402d92a81287 100644 --- a/net/zmap/Makefile +++ b/net/zmap/Makefile @@ -1,7 +1,6 @@ PORTNAME= zmap -PORTVERSION= 2.1.1 +DISTVERSION= 3.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= net MAINTAINER= yuri@FreeBSD.org @@ -13,12 +12,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= gengetopt>0:devel/gengetopt LIB_DEPENDS= libdnet.so:net/libdnet \ - libgmp.so:math/gmp + libgmp.so:math/gmp \ + libunistring.so:devel/libunistring USE_GITHUB= yes USES= cmake:insource pkgconfig +CFLAGS+= -D_SYSTYPE_BSD + MANPAGE= zblacklist.1 zmap.1 ztee.1 OPTIONS_DEFINE= REDIS MONGO JSON @@ -46,9 +48,4 @@ post-patch: ${WRKSRC}/conf/zmap.conf \ ${WRKSRC}/src/zmap.c -post-install: -.for m in ${MANPAGE} - ${GZIP_CMD} ${STAGEDIR}${MANPREFIX}/man/man1/$m -.endfor - .include diff --git a/net/zmap/distinfo b/net/zmap/distinfo index d00622c974fd..30757c5fff27 100644 --- a/net/zmap/distinfo +++ b/net/zmap/distinfo @@ -1,2 +1,3 @@ -SHA256 (zmap-zmap-v2.1.1_GH0.tar.gz) = 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399 -SIZE (zmap-zmap-v2.1.1_GH0.tar.gz) = 131689 +TIMESTAMP = 1688578357 +SHA256 (zmap-zmap-v3.0.0_GH0.tar.gz) = e3151cdcdf695ab7581e01a7c6ee78678717d6a62ef09849b34db39682535454 +SIZE (zmap-zmap-v3.0.0_GH0.tar.gz) = 156278 diff --git a/net/zmap/files/patch-CMakeLists.txt b/net/zmap/files/patch-CMakeLists.txt deleted file mode 100644 index 868b2bf4d5db..000000000000 --- a/net/zmap/files/patch-CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2015-09-11 15:30:41 UTC -+++ CMakeLists.txt -@@ -72,6 +72,7 @@ if(WITH_JSON) - endif() - - add_definitions("-DJSON") -+ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}") - endif() - -@@ -135,11 +136,7 @@ message(STATUS "Default ZMap configuration file locati - foreach(EACH_CONF ${CONF_FILES}) - get_filename_component(CONF_BASENAME ${EACH_CONF} NAME) - message(STATUS "Checking if ${CONF_BASENAME} exists there...") -- if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}") -- install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION}) -- else() -- message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!") -- endif() -+ install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION}) - endforeach() - - # Allow Debian Packaging diff --git a/net/zmap/pkg-plist b/net/zmap/pkg-plist index 8df0187dc389..e68a9f2b8ac7 100644 --- a/net/zmap/pkg-plist +++ b/net/zmap/pkg-plist @@ -1,8 +1,10 @@ -%%ETCDIR%%/blacklist.conf +%%ETCDIR%%/blocklist.conf %%ETCDIR%%/zmap.conf -man/man1/zblacklist.1.gz +man/man1/zblocklist.1.gz +man/man1/ziterate.1.gz man/man1/zmap.1.gz man/man1/ztee.1.gz -sbin/zblacklist +sbin/zblocklist +sbin/ziterate sbin/zmap sbin/ztee