FreeBSD Bugzilla – Attachment 240759 Details for
Bug 245751
net-mgmt/fastnetmon: Enable Netmap support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
This is complete patch
0001-net-mgmt-fastnetmon-fix-startup-script-try-to-unbrea.patch (text/plain), 2.78 KB, created by
Marek Zarychta
on 2023-03-11 22:40:27 UTC
(
hide
)
Description:
This is complete patch
Filename:
MIME Type:
Creator:
Marek Zarychta
Created:
2023-03-11 22:40:27 UTC
Size:
2.78 KB
patch
obsolete
>From f48a128cd7776e0c360b0e609b20a366c09ed3d5 Mon Sep 17 00:00:00 2001 >From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> >Date: Sat, 11 Mar 2023 23:01:55 +0100 >Subject: [PATCH] net-mgmt/fastnetmon: fix startup script, try to unbreak > Netmap > > PR: 245751 > >diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile >index f1269937c2..a4a2340d81 100644 >--- a/net-mgmt/fastnetmon/Makefile >+++ b/net-mgmt/fastnetmon/Makefile >@@ -1,5 +1,6 @@ > PORTNAME= fastnetmon > PORTVERSION= 1.2.4 >+PORTREVISION= 1 > DISTVERSIONPREFIX= v > CATEGORIES= net-mgmt security > >@@ -24,7 +25,7 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ > libabsl_base.so:devel/abseil \ > libhiredis.so:databases/hiredis > >-USES= cmake compiler:c++11-lang pkgconfig localbase:ldflags ssl >+USES= cmake compiler:c++2b-lang pkgconfig localbase:ldflags ssl > > USE_GITHUB= yes > GH_ACCOUNT= pavel-odintsov >@@ -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 > 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 \ >+ -DENABLE_GOBGP_SUPPORT=ON \ > -DLINK_WITH_ABSL=ON \ > -DSET_ABSOLUTE_INSTALL_PATH=OFF \ > -DCMAKE_INSTALL_MANDIR=${PREFIX}/man >diff --git a/net-mgmt/fastnetmon/files/fastnetmon.in b/net-mgmt/fastnetmon/files/fastnetmon.in >index 431a347934..c6ee5b2aa5 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.hpp b/net-mgmt/fastnetmon/files/patch-src_netmap_plugin_netmap_collector.hpp >new file mode 100644 >index 0000000000..1e49209dc1 >--- /dev/null >+++ b/net-mgmt/fastnetmon/files/patch-src_netmap_plugin_netmap_collector.hpp >@@ -0,0 +1,8 @@ >+--- src/netmap_plugin/netmap_collector.hpp.orig 2023-03-11 17:05:13.761571000 +0100 >++++ src/netmap_plugin/netmap_collector.hpp 2023-03-11 16:59:34.769459000 +0100 >+@@ -1,4 +1,5 @@ >+ #ifndef NETMAP_PLUGIN_H >+ #define NETMAP_PLUGIN_H >++#define NETMAP_API 14 >+ >+ #include "../fastnetmon_types.hpp" >-- >2.39.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 245751
:
240757
| 240759