From nobody Fri Mar 24 14:57:41 2023 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 4PjlgT2xRNz41gBP; Fri, 24 Mar 2023 14:57:41 +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 4PjlgT2PcWz4F9G; Fri, 24 Mar 2023 14:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679669861; 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=2uSLRI7PUHYOE3JMm19+IcNTvuP7i5lCfPTtIY4GPLQ=; b=o2UIq+v3q0IoFw3++D4yMF/P4Rr1qCYmzHNFOit93PPkktXRLmah20oIPMap9yEDmYYa/2 NKmdG9jDhdLC+9C7LPrY2TtPG9Xxf0CGqt2zwc9jDJBDCQqW92sM/H9Py8Wrv76aiezlEC mAoZsPFYVe9DP+mzO7vnDGOT8UrRqiPlxAvQDrfnrch/GLLRMmU5H4AxSRF9MccSUb0Ofd 9XF4TmnGUP00yUBmpUd7DlygV0Cfhm09Iw+8CFsf9cM6ow6yh1A7Ey8shupslh8LIbvtFm tOsG2iJDwnh4P5xggEK37zP7l1d0fbslDGUHZHK/rn/qebChUrXz20boMu2FhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679669861; 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=2uSLRI7PUHYOE3JMm19+IcNTvuP7i5lCfPTtIY4GPLQ=; b=kFegLCErpjzhneifRgUtceSSk43A2HzFuj0p+ymfu1L5gi+xvwPqN4pKxLqkjtNMI4gF6A Qi88+ylrv9GvQoanpDxeVfhNUwOQXwNSxQjVs4ToaHNhMgZM2mR+hWSEnf0tKYfDVonhtL VapEE0xB7xD2nn+pC8yP8oZDGdlMP/e2Xy4tBWFAljFDME3EerbwQYG4nU8fW6NOCUxIxu GEApyX5v23cOaGAVlgdFwHflK9I7PfuM53ta7jwPiCmmMwKlZxMSXJOhmLUc0coOzrIiax RW0kPMnhFusJJdmw5OfXQqPLpTPlnQPAHtXsRtk2RSCbJ7smxc2WxCkLRDuvNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679669861; a=rsa-sha256; cv=none; b=RsdRtSXMV50OsPFsV5vRPy1+GnNdlel4rSU3p3U0rk/EyqYtxfZQuUDTIUURDSNO9rietV sQqy+20VzLIcDA2VEGqKH+M364cAiSqKtvPPW7Ugx7tzSVjLXMQCM5S98QxtUiPqZ6BCtz tLPbN8ntK1b93hdrlmIN6PQXzSRtCr1hfZX++PSnZAxHmCqbmzNDw5eU8LxNszk4FE1JKx YXnNHGdLwnANZS2w6BcSZ96cT4Gd0ALaq/hAaT0Kk0l8lUbJWNr2Ujh9nSs8P+vjTRPPuQ pxttFlkst3jGdNQliEqK6XN2z45EgDNPuYUqkMm/ifpz0RTJgnlYO8KgmQmXRw== 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 4PjlgT1L6dzMpJ; Fri, 24 Mar 2023 14:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32OEvfhu096144; Fri, 24 Mar 2023 14:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OEvfjc096143; Fri, 24 Mar 2023 14:57:41 GMT (envelope-from git) Date: Fri, 24 Mar 2023 14:57:41 GMT Message-Id: <202303241457.32OEvfjc096143@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Babak Farrokhi Subject: git: 3002262c9396 - main - net-mgmt/fastnetmon: Unreak build on 12.x 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: farrokhi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3002262c9396ba38da42839a1a8c48ef444f80f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by farrokhi: URL: https://cgit.FreeBSD.org/ports/commit/?id=3002262c9396ba38da42839a1a8c48ef444f80f0 commit 3002262c9396ba38da42839a1a8c48ef444f80f0 Author: Babak Farrokhi AuthorDate: 2023-03-24 14:56:36 +0000 Commit: Babak Farrokhi CommitDate: 2023-03-24 14:56:36 +0000 net-mgmt/fastnetmon: Unreak build on 12.x - Unbreak build on 12.x - Enable netmap support - Cleanup unused options - Fix startup script PR: 270126 --- net-mgmt/fastnetmon/Makefile | 13 ++++++------- net-mgmt/fastnetmon/files/fastnetmon.in | 6 +++--- .../files/patch-src_netmap__plugin_netmap__collector.cpp | 10 ++++++++++ net-mgmt/fastnetmon/pkg-plist | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile index f1269937c2ad..128d059d46ec 100644 --- a/net-mgmt/fastnetmon/Makefile +++ b/net-mgmt/fastnetmon/Makefile @@ -1,6 +1,7 @@ PORTNAME= fastnetmon PORTVERSION= 1.2.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org @@ -34,17 +35,15 @@ GROUPS= ${PORTNAME} USE_RC_SUBR= ${PORTNAME} -OPTIONS_DEFINE= DOCS REDIS - -REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +OPTIONS_DEFINE= DOCS PORTDOCS= * -CXXFLAGS += -DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED +CXXFLAGS += -DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED \ + -D_GNU_SOURCE CFLAGS_i386= -march=i586 CMAKE_SOURCE_PATH= ${WRKSRC}/src -CMAKE_ARGS+= -DDISABLE_PF_RING_SUPPORT=ON \ - -DENABLE_NETMAP_SUPPORT=OFF \ +CMAKE_ARGS+= -DENABLE_NETMAP_SUPPORT=ON \ -DLINK_WITH_ABSL=ON \ -DSET_ABSOLUTE_INSTALL_PATH=OFF \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/man @@ -64,7 +63,7 @@ post-patch: post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample - ${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon + ${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon_attacks ${INSTALL_SCRIPT} ${WRKSRC}/src/notify_about_attack.sh ${STAGEDIR}${PREFIX}/bin post-install-DOCS-on: diff --git a/net-mgmt/fastnetmon/files/fastnetmon.in b/net-mgmt/fastnetmon/files/fastnetmon.in index 431a34793412..c6ee5b2aa52e 100644 --- a/net-mgmt/fastnetmon/files/fastnetmon.in +++ b/net-mgmt/fastnetmon/files/fastnetmon.in @@ -19,12 +19,12 @@ rcvar=fastnetmon_enable load_rc_config "$name" : ${fastnetmon_enable:=NO} -: ${fastnetmon_conf:=%%ETCDIR%%/$name.conf} -: ${fastnetmon_flags:=--daemonize} +: ${fastnetmon_conf:=%%PREFIX%%/etc/$name.conf} +: ${fastnetmon_flags:=} : ${fastnetmon_user:=fastnetmon} command=%%PREFIX%%/bin/fastnetmon -command_args="--configuration_file ${fastnetmon_conf} ${fastnetmon_flags}" +command_args="--daemonize --configuration_file ${fastnetmon_conf} ${fastnetmon_flags}" pidfile=/var/run/fastnetmon/$name.pid run_rc_command "$1" diff --git a/net-mgmt/fastnetmon/files/patch-src_netmap__plugin_netmap__collector.cpp b/net-mgmt/fastnetmon/files/patch-src_netmap__plugin_netmap__collector.cpp new file mode 100644 index 000000000000..19a3f3d8b17d --- /dev/null +++ b/net-mgmt/fastnetmon/files/patch-src_netmap__plugin_netmap__collector.cpp @@ -0,0 +1,10 @@ +--- src/netmap_plugin/netmap_collector.cpp.orig 2023-03-01 14:23:34 UTC ++++ src/netmap_plugin/netmap_collector.cpp +@@ -19,6 +19,7 @@ + + // Disable debug messages from Netmap + #define NETMAP_NO_DEBUG ++typedef bool _Bool; + #include + #include + diff --git a/net-mgmt/fastnetmon/pkg-plist b/net-mgmt/fastnetmon/pkg-plist index 01e28de42b0d..6c244f25be27 100644 --- a/net-mgmt/fastnetmon/pkg-plist +++ b/net-mgmt/fastnetmon/pkg-plist @@ -8,4 +8,4 @@ man/man8/fastnetmon.8.gz man/man1/fastnetmon_client.1.gz @sample etc/fastnetmon.conf.sample @dir(fastnetmon,fastnetmon) /var/run/fastnetmon -@dir(fastnetmon,fastnetmon) /var/log/fastnetmon +@dir(fastnetmon,fastnetmon) /var/log/fastnetmon_attacks