diff options
Diffstat (limited to 'net-mgmt/net-snmp')
| -rw-r--r-- | net-mgmt/net-snmp/Makefile | 9 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-Makefile.in | 2 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c | 22 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h | 6 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/pkg-plist | 3 |
5 files changed, 36 insertions, 6 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index e7558608e1b8..4a15477cc3c4 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -1,7 +1,7 @@ PORTNAME= snmp PORTVERSION= 5.9.4 -PORTEPOCH= 1 PORTREVISION= 6 +PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \ ZI @@ -20,7 +20,7 @@ NOT_FOR_ARCHS_REASON= SSP is currently broken on MIPS OPTIONS_DEFINE= MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \ MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS AX_DISABLE_TRAP \ - TLS NEWSYSLOG NOLIBPKG SCTP + TLS NEWSYSLOG NOLIBPKG SCTP AES OPTIONS_DEFAULT=PERL PERL_EMBEDDED DUMMY SMUX NEWSYSLOG OPTIONS_SUB= yes @@ -35,6 +35,7 @@ SMUX_DESC= Build with SNMP multiplexing (SMUX) support NEWSYSLOG_DESC= Automatically rotate snmpd.log via newsyslog NOLIBPKG_DESC= Build without libpkg SCTP_DESC= Build with SCTP MIB support +AES_DESC= Build with Blumenthal AES support USERS= snmpd GROUPS= snmpd @@ -95,6 +96,10 @@ CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}" CONFIGURE_ARGS+=--with-dummy-values .endif +.if ${PORT_OPTIONS:MAES} +CONFIGURE_ARGS+=--enable-blumenthal-aes +.endif + .if ! ${PORT_OPTIONS:MTKMIB} PLIST_SUB+= WITH_TKMIB="@comment " .else diff --git a/net-mgmt/net-snmp/files/patch-Makefile.in b/net-mgmt/net-snmp/files/patch-Makefile.in index 34001fe318a6..ab24d0ccf525 100644 --- a/net-mgmt/net-snmp/files/patch-Makefile.in +++ b/net-mgmt/net-snmp/files/patch-Makefile.in @@ -5,7 +5,7 @@ freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \ freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd11.h \ - freebsd12.h freebsd13.h freebsd14.h freebsd.h \ -+ freebsd12.h freebsd13.h freebsd14.h freebsd15.h freebsd.h \ ++ freebsd12.h freebsd13.h freebsd14.h freebsd15.h freebsd16.h freebsd.h \ generic.h \ hpux.h irix.h kfreebsd.h linux.h mingw32.h mingw32msvc.h mips.h \ netbsd.h nto-qnx6.h osf5.h \ diff --git a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c index af46e3d86d43..83470a30dedf 100644 --- a/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c +++ b/net-mgmt/net-snmp/files/patch-agent_mibgroup_mibII_tcp.c @@ -1,5 +1,5 @@ ---- agent/mibgroup/mibII/tcp.c.orig 2023-08-15 20:32:01 UTC -+++ agent/mibgroup/mibII/tcp.c +--- agent/mibgroup/mibII/tcp.c.orig 2023-08-15 13:32:01.000000000 -0700 ++++ agent/mibgroup/mibII/tcp.c 2025-07-10 17:17:00.309421000 -0700 @@ -8,6 +8,14 @@ #include <net-snmp/net-snmp-features.h> #include "mibII_common.h" @@ -15,3 +15,21 @@ #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif +@@ -38,8 +46,17 @@ + #include <netinet/tcpip.h> + #endif + #ifdef HAVE_NETINET_TCP_TIMER_H ++#if __FreeBSD_version >= 1500048 ++#define _KERNEL ++#define max(x, y) (((x) > (y)) ? (x) : (y)) ++#define MSEC_2_TICKS(m) max(1, (uint32_t)((hz == 1000) ? \ ++ (m) : ((uint64_t)(m) * (uint64_t)hz)/(uint64_t)1000)) ++#endif + #include <netinet/tcp_timer.h> ++#if __FreeBSD_version >= 1500048 ++#undef _KERNEL + #endif ++#endif + #ifdef HAVE_NETINET_TCP_VAR_H + #ifdef openbsd7 + #define _KERNEL /* OpenBSD 7.3 */ diff --git a/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h new file mode 100644 index 000000000000..fff6187daf87 --- /dev/null +++ b/net-mgmt/net-snmp/files/patch-include_net-snmp_system_freebsd16.h @@ -0,0 +1,6 @@ +--- /dev/null 2025-09-10 01:07:21.909920000 +0200 ++++ include/net-snmp/system/freebsd16.h 2025-09-10 01:07:12.250409000 +0200 +@@ -0,0 +1,3 @@ ++/* freebsd16 is a superset of freebsd15 for now */ ++#include "freebsd15.h" ++#define freebsd15 freebsd15 diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 8db0b5d8e62a..9102b2376cbb 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -188,6 +188,7 @@ include/net-snmp/system/freebsd12.h include/net-snmp/system/freebsd13.h include/net-snmp/system/freebsd14.h include/net-snmp/system/freebsd15.h +include/net-snmp/system/freebsd16.h include/net-snmp/system/freebsd2.h include/net-snmp/system/freebsd3.h include/net-snmp/system/freebsd4.h @@ -610,7 +611,7 @@ share/man/man8/snmptrapd.8.gz %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client_intf%%PYTHON_EXT_SUFFIX%%.so +%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/client_intf%%PYTHON_TAG%%.so %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__init__.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/netsnmp/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc |