Attachment 247945 Details for Bug 276516 – upgrade patch

[patch] upgrade patch

0001-net-mgmt-fastnetmon-Update-to-1.2.6v2.patch (text/plain), 4.88 KB, created by Marek Zarychta on 2024-01-25 11:11:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Zarychta

Created: 2024-01-25 11:11:50 UTC

Size: 4.88 KB

patch

obsolete

>From 177bda6525d19adb2a1302b4889a0fc065e42539 Mon Sep 17 00:00:00 2001
>From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
>Date: Thu, 25 Jan 2024 11:54:16 +0100
>Subject: [PATCH] net-mgmt/fastnetmon: Update to 1.2.6
>
>	- Updated dependency on gRPC
>	- Fixed build with updated Protobuf
>	- Fixed pid file logic
>	- Customized configuration files and script are now preserved during upgrades
>---
> net-mgmt/fastnetmon/Makefile            | 23 +++++++++++------------
> net-mgmt/fastnetmon/distinfo            |  8 +++++---
> net-mgmt/fastnetmon/files/fastnetmon.in |  2 +-
> net-mgmt/fastnetmon/pkg-plist           |  6 +++---
> 4 files changed, 20 insertions(+), 19 deletions(-)
>
>diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile
>index 655c651ad..56bd7f801 100644
>--- a/net-mgmt/fastnetmon/Makefile
>+++ b/net-mgmt/fastnetmon/Makefile
>@@ -1,9 +1,11 @@
> PORTNAME=	fastnetmon
>-PORTVERSION=	1.2.5
>+PORTVERSION=	1.2.6
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	3
> CATEGORIES=	net-mgmt security
> 
>+PATCH_SITES=	https://github.com/pavel-odintsov/${PORTNAME}/commit/
>+PATCHFILES=	fad8757b8986226024d549a6dfb40abbab01643e.patch:-p1
>+
> MAINTAINER=	farrokhi@FreeBSD.org
> COMMENT=	Very fast DDoS analyzer with sflow/netflow/mirror support
> WWW=		https://fastnetmon.com
>@@ -20,13 +22,13 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
> 		libjson-c.so:devel/json-c \
> 		libbson-1.0.so:devel/libbson \
> 		libcapnp.so:devel/capnproto \
>-		libgrpc.so:devel/grpc142 \
>+		libgrpc.so:devel/grpc \
> 		libprotobuf.so:devel/protobuf \
> 		libabsl_base.so:devel/abseil \
> 		libhiredis.so:databases/hiredis
> 
>-USES=	cmake compiler:c++17-lang pkgconfig localbase:ldflags ssl
>-USE_CXXSTD=	c++17
>+USES=	cmake compiler:c++20-lang llvm:max=15 pkgconfig localbase:ldflags ssl
>+USE_CXXSTD=	c++20
> USE_GITHUB=	yes
> GH_ACCOUNT=	pavel-odintsov
> USE_RC_SUBR=	${PORTNAME}
>@@ -52,10 +54,6 @@ OPTIONS_DEFINE=	DOCS
> 
> .include <bsd.port.options.mk>
> 
>-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
>-USES+=	llvm:max=15
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> post-patch:
>@@ -67,10 +65,11 @@ post-patch:
> 		${WRKSRC}/src/man/fastnetmon.8
> 
> post-install:
>-	${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \
>-		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>+	${INSTALL_DATA} ${WRKSRC}/src/fastnetmon.conf ${STAGEDIR}${PREFIX}/etc/fastnetmon.conf.sample
>+	${INSTALL_DATA} ${WRKSRC}/src/networks_list ${STAGEDIR}${PREFIX}/etc/networks_list.sample
>+	${INSTALL_DATA} ${WRKSRC}/src/networks_whitelist ${STAGEDIR}${PREFIX}/etc/networks_whitelist.sample
> 	${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon_attacks
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/notify_about_attack.sh ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_SCRIPT} ${WRKSRC}/src/notify_about_attack.sh ${STAGEDIR}${PREFIX}/bin/notify_about_attack.sh.sample
> 
> post-install-DOCS-on:
> 	cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md docs" ${STAGEDIR}${DOCSDIR}
>diff --git a/net-mgmt/fastnetmon/distinfo b/net-mgmt/fastnetmon/distinfo
>index ef5b9939a..f8d70d4ff 100644
>--- a/net-mgmt/fastnetmon/distinfo
>+++ b/net-mgmt/fastnetmon/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1686746794
>-SHA256 (pavel-odintsov-fastnetmon-v1.2.5_GH0.tar.gz) = d92a1f16e60b6ab6f5c5e023a215570e9352ce9d0c9a9d7209416f8cd0227ae6
>-SIZE (pavel-odintsov-fastnetmon-v1.2.5_GH0.tar.gz) = 1383370
>+TIMESTAMP = 1706176431
>+SHA256 (pavel-odintsov-fastnetmon-v1.2.6_GH0.tar.gz) = b6a7d1e9ba98c1c042d774bff82ea3e8bbf03085e0be43a2676e41d590f668cf
>+SIZE (pavel-odintsov-fastnetmon-v1.2.6_GH0.tar.gz) = 1421719
>+SHA256 (fad8757b8986226024d549a6dfb40abbab01643e.patch) = 22e739071959c4e2b88cca4ad8278c07be998505c152952d6f18b69227cc8844
>+SIZE (fad8757b8986226024d549a6dfb40abbab01643e.patch) = 2694
>diff --git a/net-mgmt/fastnetmon/files/fastnetmon.in b/net-mgmt/fastnetmon/files/fastnetmon.in
>index c6ee5b2aa..598dbc038 100644
>--- a/net-mgmt/fastnetmon/files/fastnetmon.in
>+++ b/net-mgmt/fastnetmon/files/fastnetmon.in
>@@ -24,7 +24,7 @@ load_rc_config "$name"
> : ${fastnetmon_user:=fastnetmon}
> 
> command=%%PREFIX%%/bin/fastnetmon
>-command_args="--daemonize --configuration_file ${fastnetmon_conf} ${fastnetmon_flags}"
>+command_args="--daemonize --configuration_file ${fastnetmon_conf} --pid_logic ${fastnetmon_flags}"
> pidfile=/var/run/fastnetmon/$name.pid
> 
> run_rc_command "$1"
>diff --git a/net-mgmt/fastnetmon/pkg-plist b/net-mgmt/fastnetmon/pkg-plist
>index 6c244f25b..bf4f5e1e0 100644
>--- a/net-mgmt/fastnetmon/pkg-plist
>+++ b/net-mgmt/fastnetmon/pkg-plist
>@@ -1,11 +1,11 @@
> bin/fastnetmon
> bin/fastnetmon_api_client
> bin/fastnetmon_client
>-bin/notify_about_attack.sh
>-etc/networks_list
>-etc/networks_whitelist
> man/man8/fastnetmon.8.gz
> man/man1/fastnetmon_client.1.gz
>+@sample bin/notify_about_attack.sh.sample
>+@sample etc/networks_list.sample
>+@sample etc/networks_whitelist.sample
> @sample etc/fastnetmon.conf.sample
> @dir(fastnetmon,fastnetmon) /var/run/fastnetmon
> @dir(fastnetmon,fastnetmon) /var/log/fastnetmon_attacks
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 276516: 247837 | 247907 | 247913 | 247931 | 247932 | 247938 | 247945 | 247958