Attachment 247938 Details for Bug 276516 – upgrade patch

[patch] upgrade patch

0001-net-mgmt-fastnetmon-Update-to-1.2.6.patch (text/plain), 5.74 KB, created by Marek Zarychta on 2024-01-24 22:15:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Zarychta

Created: 2024-01-24 22:15:42 UTC

Size: 5.74 KB

patch

obsolete

>From 1ee44e8e2a71639810624f2b8f59a0b9f690cc1b Mon Sep 17 00:00:00 2001
>From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
>Date: Wed, 24 Jan 2024 22:32:31 +0100
>Subject: [PATCH] net-mgmt/fastnetmon: Update to 1.2.6
>
>- Update depency on gRPC
>- Fix build with updated Protobuf
>- Fix pid file
>---
> net-mgmt/fastnetmon/Makefile                  | 13 ++----
> net-mgmt/fastnetmon/distinfo                  |  6 +--
> .../fastnetmon/files/patch-src_CMakeLists.txt | 40 +++++++++++++++++++
> .../patch-src_files_fast__platform.h.template | 11 +++++
> 4 files changed, 58 insertions(+), 12 deletions(-)
> create mode 100644 net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt
> create mode 100644 net-mgmt/fastnetmon/files/patch-src_files_fast__platform.h.template
>
>diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile
>index 655c651ad..e5189d0a4 100644
>--- a/net-mgmt/fastnetmon/Makefile
>+++ b/net-mgmt/fastnetmon/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	fastnetmon
>-PORTVERSION=	1.2.5
>+PORTVERSION=	1.2.6
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	3
> CATEGORIES=	net-mgmt security
> 
> MAINTAINER=	farrokhi@FreeBSD.org
>@@ -20,13 +19,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 +51,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:
>diff --git a/net-mgmt/fastnetmon/distinfo b/net-mgmt/fastnetmon/distinfo
>index ef5b9939a..747d0869f 100644
>--- a/net-mgmt/fastnetmon/distinfo
>+++ b/net-mgmt/fastnetmon/distinfo
>@@ -1,3 +1,3 @@
>-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 = 1705911584
>+SHA256 (pavel-odintsov-fastnetmon-v1.2.6_GH0.tar.gz) = b6a7d1e9ba98c1c042d774bff82ea3e8bbf03085e0be43a2676e41d590f668cf
>+SIZE (pavel-odintsov-fastnetmon-v1.2.6_GH0.tar.gz) = 1421719
>diff --git a/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt b/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt
>new file mode 100644
>index 000000000..3813af2c6
>--- /dev/null
>+++ b/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt
>@@ -0,0 +1,40 @@
>+--- src/CMakeLists.txt.orig
>++++ src/CMakeLists.txt
>+@@ -594,26 +594,26 @@ if (ENABLE_GOBGP_SUPPORT)
>+         target_link_libraries(gobgp_action absl::base absl::synchronization)
>+     endif()
>+ 
>+-    # By default use module supplied by cmake to search for Protobuf 
>+-    set(FIND_PACKAGE_MODE_PROTOBUF "MODULE")
>+-
>+     if (DO_NOT_USE_SYSTEM_LIBRARIES_FOR_BUILD)
>+       # We add our custom path to Protobuf to top of search_list used by find_package: https://cmake.org/cmake/help/latest/variable/CMAKE_PREFIX_PATH.html
>+       # This approach has advantage over Protobuf_DIR which requires us to set direct path to cmake folder of custom built dependency
>+       # which resides in vendor specific folder with name lib which may be lib64 on CentOS platforms:
>+       # protobuf_21_12/lib/cmake/protobuf or  protobuf_21_12/lib64/cmake/protobuf on CentOS 
>+       list(APPEND CMAKE_PREFIX_PATH ${PROTOCOL_BUFFERS_CUSTOM_INSTALL_PATH}) 
>++    endif()
>+ 
>+-      # Switch to use to configuration supplied by custom Protobuf installation as it may be better
>+-      set(FIND_PACKAGE_MODE_PROTOBUF "CONFIG")
>++    # Apparently it's required to set this flag because without this flag set it cannot find protoc when custom library path is in use
>++    # https://github.com/protocolbuffers/protobuf/issues/1931
>++    set(protobuf_MODULE_COMPATIBLE true)
>+ 
>+-      # Apparently it's required to set this flag because without this flag set it cannot find protoc when custom library path is in use
>+-      # https://github.com/protocolbuffers/protobuf/issues/1931
>+-      set(protobuf_MODULE_COMPATIBLE true)
>+-    endif()
>++    # Switch to use to configuration supplied by custom Protobuf installation as it may be better
>++    find_package(Protobuf CONFIG)
>+ 
>+-    # https://cmake.org/cmake/help/latest/module/FindProtobuf.html
>+-    find_package(Protobuf ${FIND_PACKAGE_MODE_PROTOBUF} REQUIRED)
>++    if (NOT Protobuf_FOUND)
>++      # Fall back to module supplied by cmake to search for Protobuf
>++      # https://cmake.org/cmake/help/latest/module/FindProtobuf.html
>++      find_package(Protobuf MODULE REQUIRED)
>++    endif()
>+ 
>+     if (Protobuf_FOUND)
>+       message(STATUS "Found Protobuf ${Protobuf_VERSION}")
>diff --git a/net-mgmt/fastnetmon/files/patch-src_files_fast__platform.h.template b/net-mgmt/fastnetmon/files/patch-src_files_fast__platform.h.template
>new file mode 100644
>index 000000000..0b0e12106
>--- /dev/null
>+++ b/net-mgmt/fastnetmon/files/patch-src_files_fast__platform.h.template
>@@ -0,0 +1,11 @@
>+--- src/fast_platform.h.template	2024-01-24 21:39:02.291401000 +0100
>++++ src/fast_platform.h.template.orig	2024-01-24 21:38:41.560580000 +0100
>+@@ -8,7 +8,7 @@
>+     /* Platform specific paths */
>+     std::string fastnetmon_version = "${FASTNETMON_APPLICATION_VERSION}";
>+ 
>+-    std::string pid_path = "/var/run/fastnetmon.pid";
>++    std::string pid_path = "/var/run/fastnetmon/fastnetmon.pid";
>+     std::string global_config_path = "/etc/fastnetmon.conf";
>+ 
>+     std::string log_file_path = "/var/log/fastnetmon.log";
>-- 
>2.43.0
>

Actions: View | Diff

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