Date: Mon, 12 Jun 2017 20:30:31 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r443468 - in branches/2017Q2/net-mgmt: cacti-spine net-snmp net-snmp/files Message-ID: <201706122030.v5CKUVRq075927@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Jun 12 20:30:31 2017 New Revision: 443468 URL: https://svnweb.freebsd.org/changeset/ports/443468 Log: Fix LIB_DEPENDS of ports which link to libpkg.so spine and snmpd link to libpkg.so, but it is not properly declared in the port. Added: branches/2017Q2/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c - copied unchanged from r438995, head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c branches/2017Q2/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c - copied unchanged from r438192, head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c Modified: branches/2017Q2/net-mgmt/cacti-spine/Makefile branches/2017Q2/net-mgmt/net-snmp/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net-mgmt/cacti-spine/Makefile ============================================================================== --- branches/2017Q2/net-mgmt/cacti-spine/Makefile Mon Jun 12 20:27:42 2017 (r443467) +++ branches/2017Q2/net-mgmt/cacti-spine/Makefile Mon Jun 12 20:30:31 2017 (r443468) @@ -3,6 +3,7 @@ PORTNAME= spine PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.cacti.net/downloads/${PORTNAME}/ DISTNAME= cacti-${PORTNAME}-${PORTVERSION} @@ -14,7 +15,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= help2man:misc/help2man -LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ + libpkg.so:ports-mgmt/pkg GNU_CONFIGURE= YES CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE} Modified: branches/2017Q2/net-mgmt/net-snmp/Makefile ============================================================================== --- branches/2017Q2/net-mgmt/net-snmp/Makefile Mon Jun 12 20:27:42 2017 (r443467) +++ branches/2017Q2/net-mgmt/net-snmp/Makefile Mon Jun 12 20:30:31 2017 (r443468) @@ -3,7 +3,7 @@ PORTNAME= snmp PORTVERSION= 5.7.3 -PORTREVISION= 14 +PORTREVISION= 17 CATEGORIES= net-mgmt ipv6 MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= net- @@ -14,6 +14,8 @@ COMMENT= Extendable SNMP implementation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libpkg.so:ports-mgmt/pkg OPTIONS_DEFINE= IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \ MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS JAIL AX_DISABLE_TRAP \ Copied: branches/2017Q2/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c (from r438995, head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c Mon Jun 12 20:30:31 2017 (r443468, copy of r438995, head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_cpu_cpu_sysctl.c) @@ -0,0 +1,49 @@ +--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig 2014-12-08 12:23:22.000000000 -0800 ++++ agent/mibgroup/hardware/cpu/cpu_sysctl.c 2017-04-20 15:05:11.607496000 -0700 +@@ -130,8 +130,21 @@ + #endif /* VM_UVMEXP2 || VM_UVMEXP */ + + #elif defined(__FreeBSD__) /* FreeBSD */ ++#if __FreeBSD_version >= 1200028 ++#define VMMETER_TYPE uint64_t ++#else ++#define VMMETER_TYPE u_int ++#endif ++struct __vmmeter { ++ VMMETER_TYPE v_intr; ++ VMMETER_TYPE v_swtch; ++ VMMETER_TYPE v_swappgsin; ++ VMMETER_TYPE v_swappgsout; ++ VMMETER_TYPE v_swapin; ++ VMMETER_TYPE v_swapout; ++}; + #define NETSNMP_VM_STATS VM_METER +-#define NETSNMP_VM_STATS_TYPE struct vmmeter ++#define NETSNMP_VM_STATS_TYPE struct __vmmeter + #define NS_VM_INTR v_intr + #define NS_VM_SWTCH v_swtch + #define NS_VM_PAGEIN v_swappgsin +@@ -206,7 +219,23 @@ + * Interrupt/Context Switch statistics + * XXX - Do these really belong here ? + */ ++#ifdef __FreeBSD__ ++#define GET_VM_STATS(space, name) sysctlbyname("vm.stats." #space "." #name, &mem_stats.name, &len, NULL, 0) ++ { ++ size_t len; ++ ++ len = sizeof(VMMETER_TYPE); ++ GET_VM_STATS(sys, v_intr); ++ GET_VM_STATS(sys, v_swtch); ++ GET_VM_STATS(vm, v_swappgsin); ++ GET_VM_STATS(vm, v_swappgsout); ++ GET_VM_STATS(vm, v_swapin); ++ GET_VM_STATS(vm, v_swapout); ++ } ++#undef GET_VM_STATS ++#else + sysctl(mem_mib, 2, &mem_stats, &mem_size, NULL, 0); ++#endif + cpu->nInterrupts = mem_stats.NS_VM_INTR; + cpu->nCtxSwitches = mem_stats.NS_VM_SWTCH; + cpu->swapIn = mem_stats.NS_VM_SWAPIN; Copied: branches/2017Q2/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c (from r438192, head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c Mon Jun 12 20:30:31 2017 (r443468, copy of r438192, head/net-mgmt/net-snmp/files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c) @@ -0,0 +1,11 @@ +--- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2017-03-22 16:28:29 UTC ++++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c +@@ -116,7 +116,7 @@ netsnmp_fsys_arch_load( void ) + /* + * Retrieve information about the currently mounted filesystems... + */ +- n = NSFS_GETFSSTAT( NULL, 0, 0 ); ++ n = NSFS_GETFSSTAT( NULL, 0, MNT_NOWAIT ); + if ( n==0 ) + return; + stats = (struct NSFS_STATFS *)malloc( n * sizeof( struct NSFS_STATFS ));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706122030.v5CKUVRq075927>