cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update Net-SNMP to 5.6 and switch to kvm_getproc2, thanks landry for testing

Browse Source 
"commit it!" landry@
This commit is contained in:
sthen 2010-10-25 22:59:12 +00:00
parent e8f51df300
commit 6777cb023e
28 changed files with 559 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
net/net-snmp/Makefile
View File

@ -1,19 +1,22 @@
# $OpenBSD: Makefile,v 1.47 2010/10/18 18:36:50 espie Exp $
# $OpenBSD: Makefile,v 1.48 2010/10/25 22:59:12 sthen Exp $
# XXX note there are various "openbsd[234]" ifdefs which will need adjusting when
# OpenBSD goes to 5.x
COMMENT-main= extendable SNMP implementation
COMMENT-perl= SNMP modules for Perl
COMMENT-tkmib= graphical SNMP MIB browser
V= 5.4.3
DISTNAME= net-snmp-${V}
V= 5.6
DISTNAME= net-snmp-$V
PKGNAME-main= ${DISTNAME}
PKGNAME-perl= p5-SNMP-${V}
PKGNAME-tkmib= net-snmp-tkmib-${V}
SHARED_LIBS= netsnmp 8.0 \
netsnmpagent 8.1 \
netsnmphelpers 8.0 \
netsnmpmibs 8.0 \
netsnmptrapd 8.0
PKGNAME-perl= p5-SNMP-$V
PKGNAME-tkmib= net-snmp-tkmib-$V
SHARED_LIBS= netsnmp 9.0 \
netsnmpagent 9.0 \
netsnmphelpers 9.0 \
netsnmpmibs 9.0 \
netsnmptrapd 9.0
CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
@ -25,13 +28,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main= c crypto kvm m perl util wrap
WANTLIB-main= c crypto kvm m perl pthread util wrap
MULTI_PACKAGES= -main -perl -tkmib
WANTLIB-perl= netsnmp netsnmpagent netsnmphelpers netsnmptrapd
WANTLIB-perl+= netsnmpmibs
WANTLIB-perl= crypto netsnmp netsnmpagent netsnmptrapd netsnmpmibs
LIB_DEPENDS-perl= ::net/net-snmp,-main
RUN_DEPENDS-tkmib= ::net/net-snmp,-perl \
::x11/p5-Tk
@ -44,10 +47,12 @@ DEFAULT_MIBS= IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:SNMPv2-MIB:RFC1213-MIB
# - base OpenBSD mibs (/usr/share/snmp/mibs)
OPENBSD_MIBS= OPENBSD-BASE-MIB:OPENBSD-MEM-MIB:OPENBSD-SENSORS-MIB:OPENBSD-SNMPD-CONF
USE_GROFF= Yes
USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.63
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-ipv6 \
--enable-mfd-rewrites \
--with-libwrap \

10
net/net-snmp/distinfo
View File

@ -1,5 +1,5 @@
MD5 (net-snmp-5.4.3.tar.gz) = NRPjnuGp1sdYHFCIELgY+Q==
RMD160 (net-snmp-5.4.3.tar.gz) = QX9HwwHDIhpk83FitWtGYcn22Ms=
SHA1 (net-snmp-5.4.3.tar.gz) = hJog3eqpCxsAEOSHh2kn5hW1xrw=
SHA256 (net-snmp-5.4.3.tar.gz) = Rhp6cqy+WtE+OfC64Sm0nfVBuOqPkXjSck3nZU1PHEA=
SIZE (net-snmp-5.4.3.tar.gz) = 5199202
MD5 (net-snmp-5.6.tar.gz) = ibOnp35o2u+SWr7kOj9wGA==
RMD160 (net-snmp-5.6.tar.gz) = pOVO+MT20/xcaImQjFOh9mRb1PM=
SHA1 (net-snmp-5.6.tar.gz) = 8GzieU0+g1d1IcO6ZIRLIGi+RGM=
SHA256 (net-snmp-5.6.tar.gz) = KoVs+1VN0tVR99mCnvI27PzUA8yTOpva9mVxhNBvvys=
SIZE (net-snmp-5.6.tar.gz) = 5908251

14
net/net-snmp/patches/patch-Makefile_top
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_top,v 1.7 2008/11/07 09:48:40 sthen Exp $
--- Makefile.top.orig Fri Oct 31 15:20:48 2008
+++ Makefile.top Thu Nov 6 22:48:36 2008
@@ -35,7 +35,9 @@ INSTALL_PREFIX = $(DESTDIR)
$OpenBSD: patch-Makefile_top,v 1.8 2010/10/25 22:59:12 sthen Exp $
--- Makefile.top.orig Thu Jun 17 19:54:51 2010
+++ Makefile.top Wed Oct 6 23:25:16 2010
@@ -36,7 +36,9 @@ INSTALL_PREFIX = $(DESTDIR)
INSTALL = $(LIBTOOL) --mode=install @INSTALL@
UNINSTALL = $(LIBTOOL) --mode=uninstall rm -f
LIBTOOLCLEAN = $(LIBTOOL) --mode=clean rm -f
@ -12,9 +12,9 @@ $OpenBSD: patch-Makefile_top,v 1.7 2008/11/07 09:48:40 sthen Exp $
SED = @SED@
LN_S = @LN_S@
AUTOCONF = @AUTOCONF@
@@ -80,10 +82,10 @@ LIBCURRENT = 16
LIBAGE = 1
LIBREVISION = 2
@@ -81,10 +83,10 @@ LIBCURRENT = 25
LIBAGE = 0
LIBREVISION = 0
-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
+LIB_LD_CMD = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -rpath $(libdir) -o

26
net/net-snmp/patches/patch-agent_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-agent_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
--- agent/Makefile.in.orig Thu Jul 5 00:26:56 2007
+++ agent/Makefile.in Sat Sep 15 23:12:28 2007
$OpenBSD: patch-agent_Makefile_in,v 1.5 2010/10/25 22:59:12 sthen Exp $
--- agent/Makefile.in.orig Tue Jun 8 22:05:11 2010
+++ agent/Makefile.in Wed Oct 6 23:29:46 2010
@@ -18,8 +18,8 @@ top_builddir = ..
SUBDIRS=helpers mibgroup
@ -11,33 +11,31 @@ $OpenBSD: patch-agent_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
+INSTALLPOSTLIBS = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
INCLUDESUBDIR=agent
INCLUDESUBDIRHEADERS=agent_read_config.h \
@@ -74,10 +74,10 @@ INSTALLUCDHEADERS= \
HEADERS=\
@@ -108,9 +108,9 @@ INSTALLUCDHEADERS= \
#
# how to build it info
#
-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
-AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION)
+HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION)
+AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION)
+MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmib_VERSION)
+MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
LOCAL_LIBS = -L../snmplib/.libs -L../snmplib -L./.libs -L./helpers/.libs -L./helpers
LOCAL_LIBS = -L../snmplib/.libs -L../snmplib -L./.libs
LAGENTLIBS = @LAGENTLIBS@
@@ -142,11 +142,11 @@ snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $
@@ -248,11 +248,11 @@ snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $
$(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
-libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
+libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
$(RANLIB) $(AGENTLIB)
-libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
+libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS)
-libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
+libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
$(RANLIB) $(MIBLIB)

22
net/net-snmp/patches/patch-agent_helpers_Makefile_in
View File

@ -1,35 +1,27 @@
$OpenBSD: patch-agent_helpers_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
--- agent/helpers/Makefile.in.orig Tue Jun 26 22:45:20 2007
+++ agent/helpers/Makefile.in Sat Sep 15 23:12:28 2007
@@ -12,7 +12,7 @@ top_builddir=../..
$OpenBSD: patch-agent_helpers_Makefile_in,v 1.5 2010/10/25 22:59:12 sthen Exp $
--- agent/helpers/Makefile.in.orig Sun May 30 21:19:04 2010
+++ agent/helpers/Makefile.in Wed Oct 6 23:28:43 2010
@@ -16,13 +16,13 @@ top_builddir=../..
# What to install
#
-INSTALLLIBS=libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
+INSTALLLIBS=libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION)
INCLUDESUBDIR=agent
HEADERS=all_helpers.h \
baby_steps.h \
@@ -48,10 +48,10 @@ INCLUDESUBDIRHEADERS=$(HEADERS) $(HEADERSONLY)
#
# Build info
#
-NETSNMPLIB = ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-HELPERLIB = libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
-AGENTLIB = ../libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-MIBLIB = ../libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+NETSNMPLIB = ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION)
+HELPERLIB = libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION)
+AGENTLIB = ../libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION)
+MIBLIB = ../libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
# -I. -I.. -I../..
CPPFLAGS= $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
$(SNMPLIB_INCLUDES) @CPPFLAGS@
@@ -139,6 +139,6 @@ LOBJS = all_helpers.lo \
@@ -33,6 +33,6 @@ LOBJS = dummy.lo
all: standardall
-libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS)
+libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION): $(LOBJS)
$(LIB_LD_CMD) $@ $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS)
$(LIB_LD_CMD) $@ $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS)
$(RANLIB) $@

16
net/net-snmp/patches/patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c,v 1.1 2008/09/22 18:46:36 sthen Exp $
$OpenBSD: patch-agent_mibgroup_hardware_cpu_cpu_sysctl_c,v 1.2 2010/10/25 22:59:12 sthen Exp $
the last chunk is probably not used yet, but what they have now
is plain wrong, so it may as well go in here so it's not lost.
--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig Mon Sep 22 00:58:02 2008
+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c Mon Sep 22 01:06:11 2008
--- agent/mibgroup/hardware/cpu/cpu_sysctl.c.orig Sat Jun 12 22:33:30 2010
+++ agent/mibgroup/hardware/cpu/cpu_sysctl.c Wed Oct 6 23:34:18 2010
@@ -37,19 +37,20 @@ void _cpu_copy_stats( netsnmp_cpu_info *cpu );
* (including descriptions)
*/
@ -29,14 +29,14 @@ is plain wrong, so it may as well go in here so it's not lost.
for ( i = 0; i < n; i++ ) {
cpu = netsnmp_cpu_get_byIdx( i, 1 );
cpu->status = 2; /* running */
@@ -190,8 +191,8 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void
@@ -190,8 +191,9 @@ int netsnmp_cpu_arch_load( netsnmp_cache *cache, void
#ifdef NETSNMP_KERN_MCPU
mcpu_stats = malloc(cpu_num*sizeof(NETSNMP_KERN_MCPU_TYPE));
- sysctl(mcpu_mib, 2, mcpu_stats,
- cpu_num*sizeof(NETSNMP_KERN_MCPU_TYPE), NULL, 0);
mcpu_stats = (NETSNMP_KERN_MCPU_TYPE *)malloc(cpu_num*sizeof(NETSNMP_KERN_MCPU_TYPE));
+ mcpu_size = sizeof(mcpu_stats);
+ sysctl(mcpu_mib, 2, mcpu_stats, &mcpu_size, NULL, 0);
sysctl(mcpu_mib, 2, mcpu_stats,
- cpu_num*sizeof(NETSNMP_KERN_MCPU_TYPE), NULL, 0);
+ &mcpu_size, NULL, 0);
for ( i = 0; i < cpu_num; i++ ) {
cpu = netsnmp_cpu_get_byIdx( i, 0 );
/* XXX - per-CPU statistics - mcpu_mib[i].??? */

12
net/net-snmp/patches/patch-agent_mibgroup_host_data_access_swrun_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-agent_mibgroup_host_data_access_swrun_h,v 1.1 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/host/data_access/swrun.h.orig Mon Oct 25 13:09:45 2010
+++ agent/mibgroup/host/data_access/swrun.h Mon Oct 25 13:16:56 2010
@@ -35,7 +35,7 @@ config_exclude(host/hr_swrun)
#elif defined( aix4 ) || defined( aix5 ) || defined( aix6 ) || defined( aix7 )
config_require(host/data_access/swrun_procinfo)
/* Should really be #elif HAVE_KVM_GETPROCS */
-#elif defined(freebsd) || defined(openbsd) || defined(netbsd)
+#elif defined(freebsd) || defined(openbsd4) || defined(netbsd)
config_require(host/data_access/swrun_kinfo)
#elif defined( linux )
config_require(host/data_access/swrun_procfs_status)

84
net/net-snmp/patches/patch-agent_mibgroup_host_data_access_swrun_kinfo_c Normal file
View File

@ -0,0 +1,84 @@
$OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kinfo_c,v 1.1 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig Mon Jun 1 17:37:18 2009
+++ agent/mibgroup/host/data_access/swrun_kinfo.c Mon Oct 25 14:54:36 2010
@@ -51,16 +51,28 @@
/*
* later FreeBSD kinfo_proc field names
*/
+#define SWRUN_TABLE kinfo_proc
#define SWRUN_K_STAT ki_stat
#define SWRUN_K_PID ki_pid
#define SWRUN_K_COMM ki_comm
#define SWRUN_K_FLAG ki_flag
#define SWRUN_K_CLASS ki_pri.pri_class
+#elif defined(HAVE_KVM_GETPROC2)
+ /*
+ * newer OpenBSD, NetBSD kinfo_proc2 field names
+ */
+#define SWRUN_TABLE kinfo_proc2
+#define SWRUN_K_STAT p_stat
+#define SWRUN_K_PID p_pid
+#define SWRUN_K_COMM p_comm
+#define SWRUN_K_FLAG p_flag
+/* SWRUN_K_CLASS not defined */
#else
/*
* early FreeBSD, NetBSD, OpenBSD kinfo_proc field names
*/
+#define SWRUN_TABLE kinfo_proc
#define SWRUN_K_STAT kp_proc.p_stat
#define SWRUN_K_PID kp_proc.p_pid
#define SWRUN_K_COMM kp_proc.p_comm
@@ -123,7 +135,7 @@ netsnmp_arch_swrun_init(void)
int
netsnmp_arch_swrun_container_load( netsnmp_container *container, u_int flags)
{
- struct kinfo_proc *proc_table;
+ struct SWRUN_TABLE *proc_table;
int nprocs, i, rc;
char buf[BUFSIZ], **argv, *cp;
char *name, *path;
@@ -133,7 +145,11 @@ netsnmp_arch_swrun_container_load( netsnmp_container *
DEBUGMSGTL(("swrun:load:arch"," Can't query kvm info\n"));
return 1; /* No handle for retrieving process table */
}
- proc_table = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nprocs );
+#ifdef HAVE_KVM_GETPROC2
+ proc_table = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(*proc_table), &nprocs );
+#else
+ proc_table = kvm_getproc(kd, KERN_PROC_ALL, 0, &nprocs );
+#endif
for ( i=0 ; i<nprocs; i++ ) {
if ( 0 == proc_table[i].SWRUN_K_STAT )
continue;
@@ -153,7 +169,11 @@ netsnmp_arch_swrun_container_load( netsnmp_container *
* We'll use SWRUN_K_COMM for hrSWRunName,
* and as an alternative for hrSWRunPath
*/
+#ifdef HAVE_KVM_GETPROC2
+ argv = kvm_getargv2( kd, &(proc_table[i]), 0);
+#else
argv = kvm_getargv( kd, &(proc_table[i]), 0);
+#endif
entry->hrSWRunName_len = snprintf(entry->hrSWRunName,
sizeof(entry->hrSWRunName)-1,
@@ -234,6 +254,17 @@ netsnmp_arch_swrun_container_load( netsnmp_container *
# endif
entry->hrSWRunPerfCPU = proc_table[i].ki_runtime / 100000;
entry->hrSWRunPerfMem = proc_table[i].ki_size / 1024;;
+#elif defined(HAVE_KVM_GETPROC2)
+ /*
+ * new OpenBSD, NetBSD
+ */
+ entry->hrSWRunPerfCPU = proc_table[i].p_uticks;
+ entry->hrSWRunPerfCPU += proc_table[i].p_sticks;
+ entry->hrSWRunPerfCPU += proc_table[i].p_iticks;
+ entry->hrSWRunPerfMem = proc_table[i].p_vm_tsize;
+ entry->hrSWRunPerfMem += proc_table[i].p_vm_ssize;
+ entry->hrSWRunPerfMem += proc_table[i].p_vm_dsize;
+ entry->hrSWRunPerfMem *= (getpagesize() / 1024);
#else
/*
* early FreeBSD, NetBSD, OpenBSD

12
net/net-snmp/patches/patch-agent_mibgroup_host_data_access_swrun_kvm_proc_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kvm_proc_c,v 1.1 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/host/data_access/swrun_kvm_proc.c.orig Mon Oct 25 00:15:53 2010
+++ agent/mibgroup/host/data_access/swrun_kvm_proc.c Mon Oct 25 00:16:43 2010
@@ -103,7 +103,7 @@ netsnmp_arch_swrun_container_load( netsnmp_container *
entry = netsnmp_swrun_entry_create(pid);
if (NULL == entry)
continue; /* error already logged by function */
- if (NULL == (proc_buf = kvm_getproc( kd, pid))) {
+ if (NULL == (proc_buf = kvm_getproc( kd, pid))) { /* XXX */
/* release entry */
continue;
}

8
net/net-snmp/patches/patch-agent_mibgroup_host_hr_storage_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_host_hr_storage_c,v 1.5 2007/09/26 20:03:42 rui Exp $
--- agent/mibgroup/host/hr_storage.c.orig Fri Jun 8 11:33:58 2007
+++ agent/mibgroup/host/hr_storage.c Sat Sep 15 23:12:28 2007
@@ -175,6 +175,7 @@
$OpenBSD: patch-agent_mibgroup_host_hr_storage_c,v 1.6 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/host/hr_storage.c.orig Fri Aug 13 16:04:33 2010
+++ agent/mibgroup/host/hr_storage.c Wed Oct 6 23:25:16 2010
@@ -176,6 +176,7 @@ BPERFSTAT_H
#include <net-snmp/library/read_config.h>
#define HRSTORE_MONOTONICALLY_INCREASING

178
net/net-snmp/patches/patch-agent_mibgroup_host_hr_swrun_c Normal file
View File

@ -0,0 +1,178 @@
$OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.1 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/host/hr_swrun.c.orig Mon Oct 25 00:15:26 2010
+++ agent/mibgroup/host/hr_swrun.c Mon Oct 25 02:26:50 2010
@@ -122,6 +122,8 @@ static int LowProcIndex;
#if defined(hpux10) || defined(hpux11)
struct pst_status *proc_table;
struct pst_dynamic pst_dyn;
+#elif HAVE_KVM_GETPROC2
+struct kinfo_proc2 *proc_table;
#elif HAVE_KVM_GETPROCS
struct kinfo_proc *proc_table;
#elif defined(solaris2)
@@ -504,7 +506,7 @@ var_hrswrun(struct variable * vp,
time_t now;
static int oldpid = -1;
#endif
-#if HAVE_KVM_GETPROCS
+#ifdef (HAVE_KVM_GETPROCS || HAVE_KVM_GETPROC2)
char **argv;
#endif
#ifdef linux
@@ -550,7 +552,7 @@ var_hrswrun(struct variable * vp,
#else
if (kd == NULL)
return NULL;
- if ((proc_buf = kvm_getproc(kd, pid)) == NULL)
+ if ((proc_buf = kvm_getproc(kd, pid)) == NULL) /* XXX */
return NULL;
#endif
oldpid = pid;
@@ -611,6 +613,12 @@ var_hrswrun(struct variable * vp,
cp = strchr(string, ' ');
if (cp != NULL)
*cp = '\0';
+#elif HAVE_KVM_GETPROC2
+ strlcpy(string, proc_table[LowProcIndex].p_comm, sizeof(string));
+ /* process name: truncate the string at the first space */
+ cp = strchr(string, ' ');
+ if (cp != NULL)
+ *cp = '\0';
#elif HAVE_KVM_GETPROCS
#if defined(freebsd5) && __FreeBSD_version >= 500014
strcpy(string, proc_table[LowProcIndex].ki_comm);
@@ -734,6 +742,12 @@ var_hrswrun(struct variable * vp,
cp = strchr(string, ' ');
if (cp != NULL)
*cp = '\0';
+#elif HAVE_KVM_GETPROC2
+ /* Should be path, but this is not available, just use argv[0] again */
+ strlcpy(string, proc_table[LowProcIndex].p_comm, sizeof(string));
+ cp = strchr(string, ' ');
+ if (cp != NULL)
+ *cp = '\0';
#elif HAVE_KVM_GETPROCS
#if defined(freebsd5) && __FreeBSD_version >= 500014
strcpy(string, proc_table[LowProcIndex].ki_comm);
@@ -851,6 +865,17 @@ var_hrswrun(struct variable * vp,
sprintf(string, "%s", cp);
} else
string[0] = '\0';
+#elif HAVE_KVM_GETPROC2
+ string[0] = 0;
+ argv = kvm_getargv2(kd, proc_table + LowProcIndex, sizeof(string));
+ if (argv)
+ argv++;
+ while (argv && *argv) {
+ if (string[0] != 0)
+ strcat(string, " ");
+ strcat(string, *argv);
+ argv++;
+ }
#elif HAVE_KVM_GETPROCS
string[0] = 0;
argv = kvm_getargv(kd, proc_table + LowProcIndex, sizeof(string));
@@ -933,6 +958,11 @@ var_hrswrun(struct variable * vp,
long_return = 2; /* kernel process */
} else
long_return = 4; /* application */
+#elif HAVE_KVM_GETPROC2
+ if (proc_table[LowProcIndex].p_flag & P_SYSTEM)
+ long_return = 2; /* operatingSystem */
+ else
+ long_return = 4; /* application */
#elif HAVE_KVM_GETPROCS
#if defined(freebsd5) && __FreeBSD_version >= 500014
if (proc_table[LowProcIndex].ki_flag & P_SYSTEM) {
@@ -981,7 +1011,9 @@ var_hrswrun(struct variable * vp,
break;
}
#else
-#if HAVE_KVM_GETPROCS
+#if HAVE_KVM_GETPROC2
+ switch (proc_table[LowProcIndex].p_stat) {
+#elif HAVE_KVM_GETPROCS
#if defined(freebsd5) && __FreeBSD_version >= 500014
switch (proc_table[LowProcIndex].ki_stat) {
#else
@@ -1082,6 +1114,10 @@ var_hrswrun(struct variable * vp,
#else
long_return = proc_buf->p_utime * 100 + proc_buf->p_stime * 100;
#endif
+#elif HAVE_KVM_GETPROC2
+ long_return = proc_table[LowProcIndex].p_uticks +
+ proc_table[LowProcIndex].p_sticks +
+ proc_table[LowProcIndex].p_iticks;
#elif HAVE_KVM_GETPROCS
#if defined(NOT_DEFINED) && defined(freebsd5) && __FreeBSD_version >= 500014
/* XXX: Accessing ki_paddr causes sig10 ...
@@ -1196,6 +1232,11 @@ var_hrswrun(struct variable * vp,
#endif
#elif defined(aix4) || defined(aix5) || defined(aix6) || defined(aix7)
long_return = proc_table[LowProcIndex].pi_size * getpagesize() / 1024;
+#elif HAVE_KVM_GETPROC2
+ long_return = proc_table[LowProcIndex].p_vm_tsize +
+ proc_table[LowProcIndex].p_vm_ssize +
+ proc_table[LowProcIndex].p_vm_dsize;
+ long_return = long_return * (getpagesize() / 1024);
#elif HAVE_KVM_GETPROCS && !defined(darwin8)
#if defined(NOT_DEFINED) && defined(freebsd5) && __FreeBSD_version >= 500014
/* XXX
@@ -1468,13 +1509,21 @@ Init_HR_SWRun(void)
proc_table = realloc(proc_table, avail * sizeof(proc_table[0]));
}
}
+#elif HAVE_KVM_GETPROC2
+ {
+ if (kd == NULL) {
+ nproc = 0;
+ return;
+ }
+ proc_table = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof (*proc_table), &nproc);
+ }
#elif HAVE_KVM_GETPROCS
{
if (kd == NULL) {
nproc = 0;
return;
}
- proc_table = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc);
+ proc_table = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc); /* XXX */
}
#else
@@ -1524,6 +1573,9 @@ Get_Next_HR_SWRun(void)
return proc_table[current_proc_entry++].pst_pid;
#elif defined(solaris2)
return proc_table[current_proc_entry++];
+#elif HAVE_KVM_GETPROC2
+ if (proc_table[current_proc_entry].p_stat != 0)
+ return proc_table[current_proc_entry++].p_pid;
#elif HAVE_KVM_GETPROCS
#if defined(freebsd5) && __FreeBSD_version >= 500014
if (proc_table[current_proc_entry].ki_stat != 0)
@@ -1558,13 +1610,13 @@ End_HR_SWRun(void)
int
count_processes(void)
{
-#if !(defined(linux) || defined(cygwin) || defined(hpux10) || defined(hpux11) || defined(solaris2) || HAVE_KVM_GETPROCS || defined(dynix))
+#if !(defined(linux) || defined(cygwin) || defined(hpux10) || defined(hpux11) || defined(solaris2) || HAVE_KVM_GETPROCS || HAVE_KVM_GETPROC2 || defined(dynix))
int i;
#endif
int total = 0;
Init_HR_SWRun();
-#if defined(hpux10) || defined(hpux11) || HAVE_KVM_GETPROCS || defined(solaris2)
+#if defined(hpux10) || defined(hpux11) || HAVE_KVM_GETPROCS || HAVE_KVM_GETPROC2 || defined(solaris2)
total = nproc;
#else
#if defined(aix4) || defined(aix5) || defined(aix6) || defined(aix7)
@@ -1578,7 +1630,7 @@ count_processes(void)
#endif
++total;
}
-#endif /* !hpux10 && !hpux11 && !HAVE_KVM_GETPROCS && !solaris2 */
+#endif /* !hpux10 && !hpux11 && !HAVE_KVM_GETPROCS && !HAVE_KVM_GETPROC2 && !solaris2 */
End_HR_SWRun();
return total;
}

8
net/net-snmp/patches/patch-agent_mibgroup_mibII_interfaces_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_mibII_interfaces_c,v 1.5 2010/09/21 10:43:04 sthen Exp $
--- agent/mibgroup/mibII/interfaces.c.orig Wed Apr 14 09:11:44 2010
+++ agent/mibgroup/mibII/interfaces.c Mon Sep 20 09:48:18 2010
@@ -2117,11 +2117,10 @@ Interface_Scan_Get_Count(void)
$OpenBSD: patch-agent_mibgroup_mibII_interfaces_c,v 1.6 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/mibII/interfaces.c.orig Thu Jul 29 15:58:47 2010
+++ agent/mibgroup/mibII/interfaces.c Wed Oct 6 23:25:16 2010
@@ -2137,11 +2137,10 @@ Interface_Scan_Get_Count(void)
#else /* hpux11 */

10
net/net-snmp/patches/patch-agent_mibgroup_mibII_ipAddr_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_mibII_ipAddr_c,v 1.1 2008/12/22 10:43:59 sthen Exp $
--- agent/mibgroup/mibII/ipAddr.c.orig Tue Dec 9 09:43:13 2008
+++ agent/mibgroup/mibII/ipAddr.c Tue Dec 9 09:43:15 2008
@@ -758,10 +758,10 @@ static int nifs;
$OpenBSD: patch-agent_mibgroup_mibII_ipAddr_c,v 1.2 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/mibII/ipAddr.c.orig Sat Jan 23 15:07:35 2010
+++ agent/mibgroup/mibII/ipAddr.c Wed Oct 6 23:25:16 2010
@@ -754,10 +754,10 @@ static int nifs;
static void
get_iflist(void)
{
@ -14,7 +14,7 @@ $OpenBSD: patch-agent_mibgroup_mibII_ipAddr_c,v 1.1 2008/12/22 10:43:59 sthen Ex
size_t len;
struct rt_msghdr *rtm;
struct if_msghdr *ifm;
@@ -787,65 +787,60 @@ get_iflist(void)
@@ -783,65 +783,60 @@ get_iflist(void)
return;
}

8
net/net-snmp/patches/patch-agent_mibgroup_mibII_mta_sendmail_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_mibII_mta_sendmail_c,v 1.2 2007/09/26 20:03:42 rui Exp $
--- agent/mibgroup/mibII/mta_sendmail.c.orig Fri Sep 15 01:48:50 2006
+++ agent/mibgroup/mibII/mta_sendmail.c Sat Sep 15 23:12:28 2007
@@ -520,7 +520,7 @@ open_sendmailst(BOOL config)
$OpenBSD: patch-agent_mibgroup_mibII_mta_sendmail_c,v 1.3 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/mibII/mta_sendmail.c.orig Mon Aug 16 17:03:44 2010
+++ agent/mibgroup/mibII/mta_sendmail.c Wed Oct 6 23:25:16 2010
@@ -499,7 +499,7 @@ open_sendmailst(BOOL config)
count_queuegroup(struct QGrp *qg)
{
struct QDir *d;

14
net/net-snmp/patches/patch-agent_mibgroup_mibII_route_write_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_mibII_route_write_c,v 1.3 2007/09/26 20:03:42 rui Exp $
--- agent/mibgroup/mibII/route_write.c.orig Sun Mar 25 20:03:40 2007
+++ agent/mibgroup/mibII/route_write.c Sat Sep 15 23:12:28 2007
@@ -97,7 +97,7 @@
$OpenBSD: patch-agent_mibgroup_mibII_route_write_c,v 1.4 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/mibII/route_write.c.orig Sat Mar 20 19:36:28 2010
+++ agent/mibgroup/mibII/route_write.c Wed Oct 6 23:25:16 2010
@@ -93,7 +93,7 @@
int
addRoute(u_long dstip, u_long gwip, u_long iff, u_short flags)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-agent_mibgroup_mibII_route_write_c,v 1.3 2007/09/26 20:03:42 rui
struct sockaddr_in dst;
struct sockaddr_in gateway;
int s, rc;
@@ -133,6 +133,50 @@ addRoute(u_long dstip, u_long gwip, u_long iff, u_shor
@@ -129,6 +129,50 @@ addRoute(u_long dstip, u_long gwip, u_long iff, u_shor
snmp_log_perror("ioctl");
return rc;
@ -61,7 +61,7 @@ $OpenBSD: patch-agent_mibgroup_mibII_route_write_c,v 1.3 2007/09/26 20:03:42 rui
#else /* SIOCADDRT */
return -1;
#endif
@@ -143,7 +187,7 @@ addRoute(u_long dstip, u_long gwip, u_long iff, u_shor
@@ -139,7 +183,7 @@ addRoute(u_long dstip, u_long gwip, u_long iff, u_shor
int
delRoute(u_long dstip, u_long gwip, u_long iff, u_short flags)
{
@ -70,7 +70,7 @@ $OpenBSD: patch-agent_mibgroup_mibII_route_write_c,v 1.3 2007/09/26 20:03:42 rui
struct sockaddr_in dst;
struct sockaddr_in gateway;
@@ -177,7 +221,49 @@ delRoute(u_long dstip, u_long gwip, u_long iff, u_shor
@@ -173,7 +217,49 @@ delRoute(u_long dstip, u_long gwip, u_long iff, u_shor
rc = ioctl(s, SIOCDELRT, (caddr_t) & route);
close(s);
return rc;

30
net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-agent_mibgroup_mibII_tcpTable_c,v 1.6 2008/09/20 22:15:51 rui Exp $
--- agent/mibgroup/mibII/tcpTable.c.orig Sun Oct 14 13:12:58 2007
+++ agent/mibgroup/mibII/tcpTable.c Fri Sep 19 18:04:38 2008
@@ -456,7 +456,7 @@ tcpTable_next_entry( void **loop_context,
* and update the loop context ready for the next one.
*/
*data_context = (void*)entry;
- *loop_context = (void*)entry->INP_NEXT_SYMBOL;
+ *loop_context = (void*)entry->inp_next;
return index;
}
@@ -466,7 +466,7 @@ tcpTable_free(netsnmp_cache *cache, void *magic)
TCPTABLE_ENTRY_TYPE *p;
while (tcp_head) {
p = tcp_head;
- tcp_head = tcp_head->INP_NEXT_SYMBOL;
+ tcp_head = tcp_head->inp_next;
free(p);
}
@@ -811,7 +811,7 @@ tcpTable_load(netsnmp_cache *cache, void *vmagic)
nnew->state == 8 /* closeWait */ )
tcp_estab++;
- entry = nnew->INP_NEXT_SYMBOL; /* Next kernel entry */
+ entry = nnew->inp_next; /* Next kernel entry */
nnew->inp_next = tcp_head;
tcp_head = nnew;

15
net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-agent_mibgroup_mibII_udpTable_c,v 1.1 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/mibII/udpTable.c.orig Sun Oct 24 19:33:28 2010
+++ agent/mibgroup/mibII/udpTable.c Sun Oct 24 19:34:04 2010
@@ -64,6 +64,11 @@ struct netsnmp_udpEntry_s {
#ifdef linux
#define INP_NEXT_SYMBOL inp_next
#endif
+#ifdef openbsd4
+/* XXX smelly hack */
+#undef INP_NEXT_SYMBOL
+#define INP_NEXT_SYMBOL inp_queue.cqe_next
+#endif
#if defined(freebsd4) || defined(darwin) || defined(osf5)
typedef struct netsnmp_inpcb_s netsnmp_inpcb;

8
net/net-snmp/patches/patch-agent_mibgroup_mibII_var_route_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_mibII_var_route_c,v 1.6 2008/09/20 22:15:52 rui Exp $
--- agent/mibgroup/mibII/var_route.c.orig Mon Jul 28 15:39:55 2008
+++ agent/mibgroup/mibII/var_route.c Fri Sep 19 18:04:38 2008
@@ -1715,22 +1715,21 @@ TAILQ_HEAD(, snmprt)
$OpenBSD: patch-agent_mibgroup_mibII_var_route_c,v 1.7 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/mibII/var_route.c.orig Tue Jun 22 09:37:26 2010
+++ agent/mibgroup/mibII/var_route.c Wed Oct 6 23:25:17 2010
@@ -1716,22 +1716,21 @@ TAILQ_HEAD(, snmprt)
continue;
switch (bit) {
case RTA_DST:

14
net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_dlmod_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.3 2007/09/26 20:03:42 rui Exp $
--- agent/mibgroup/ucd-snmp/dlmod.c.orig Thu Mar 9 16:19:40 2006
+++ agent/mibgroup/ucd-snmp/dlmod.c Sat Sep 15 23:12:28 2007
@@ -180,7 +180,12 @@ dlmod_load_module(struct dlmod *dlm)
$OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.4 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/ucd-snmp/dlmod.c.orig Wed Jun 16 22:34:42 2010
+++ agent/mibgroup/ucd-snmp/dlmod.c Wed Oct 6 23:25:17 2010
@@ -181,7 +181,12 @@ dlmod_load_module(struct dlmod *dlm)
if (dlm->status == DLMOD_ERROR)
return;
}
@ -14,7 +14,7 @@ $OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.3 2007/09/26 20:03:42 rui Ex
dl_init = dlsym(dlm->handle, sym_init);
if (dl_init == NULL) {
dlclose(dlm->handle);
@@ -204,7 +209,11 @@ dlmod_unload_module(struct dlmod *dlm)
@@ -205,7 +210,11 @@ dlmod_unload_module(struct dlmod *dlm)
if (!dlm || dlm->status != DLMOD_LOADED)
return;
@ -24,5 +24,5 @@ $OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.3 2007/09/26 20:03:42 rui Ex
+ snprintf(sym_deinit, sizeof(sym_deinit), "_deinit_%s", dlm->name);
+#endif
dl_deinit = dlsym(dlm->handle, sym_deinit);
if (dl_deinit == NULL) {
snprintf(dlm->error, sizeof(dlm->error),
if (dl_deinit) {
DEBUGMSGTL(("dlmod", "Calling deinit_%s()\n", dlm->name));

8
net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_versioninfo_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_ucd-snmp_versioninfo_c,v 1.3 2007/09/26 20:03:42 rui Exp $
--- agent/mibgroup/ucd-snmp/versioninfo.c.orig Fri Sep 15 01:48:50 2006
+++ agent/mibgroup/ucd-snmp/versioninfo.c Sat Sep 15 23:12:28 2007
@@ -94,7 +94,13 @@ var_extensible_version(struct variable *vp,
$OpenBSD: patch-agent_mibgroup_ucd-snmp_versioninfo_c,v 1.4 2010/10/25 22:59:12 sthen Exp $
--- agent/mibgroup/ucd-snmp/versioninfo.c.orig Sun Jan 24 11:41:03 2010
+++ agent/mibgroup/ucd-snmp/versioninfo.c Wed Oct 6 23:25:17 2010
@@ -87,7 +87,13 @@ var_extensible_version(struct variable *vp,
char *cptr;
time_t curtime;
#ifdef NETSNMP_CONFIGURE_OPTIONS

20
net/net-snmp/patches/patch-apps_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-apps_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
--- apps/Makefile.in.orig Thu Jul 5 00:26:56 2007
+++ apps/Makefile.in Sat Sep 15 23:12:28 2007
@@ -36,7 +36,7 @@ INSTALLBINPROGS = snmpget$(EXEEXT) \
$OpenBSD: patch-apps_Makefile_in,v 1.5 2010/10/25 22:59:12 sthen Exp $
--- apps/Makefile.in.orig Fri Jul 2 17:27:52 2010
+++ apps/Makefile.in Wed Oct 6 23:27:10 2010
@@ -46,7 +46,7 @@ INSTALLBINPROGS = snmpget$(EXEEXT) \
INSTALLSBINPROGS = snmptrapd$(EXEEXT)
@ -10,22 +10,20 @@ $OpenBSD: patch-apps_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
SUBDIRS = snmpnetstat
@@ -45,10 +45,10 @@ SUBDIRS = snmpnetstat
@@ -55,9 +55,9 @@ SUBDIRS = snmpnetstat
#
# USELIBS/USEAGENTLIBS are for dependencies
-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-HELPERLIB = ../agent/helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
-AGENTLIB = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION)
+HELPERLIB = ../agent/helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION)
+AGENTLIB = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION)
+MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(HELPERLIB) $(USELIBS)
#
@@ -142,7 +142,7 @@ encode_keychange$(EXEEXT): encode_keychange.$(OSUFF
USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(USELIBS)
MYSQL_LIBS = @MYSQL_LIBS@
MYSQL_INCLUDES = @MYSQL_INCLUDES@
@@ -160,7 +160,7 @@ encode_keychange$(EXEEXT): encode_keychange.$(OSUFF
snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}

71
net/net-snmp/patches/patch-configure
View File

@ -1,71 +0,0 @@
$OpenBSD: patch-configure,v 1.10 2010/09/21 10:43:04 sthen Exp $
--- configure.orig Sun May 23 22:10:00 2010
+++ configure Mon Sep 20 09:48:18 2010
@@ -21655,34 +21655,6 @@ fi
echo "$as_me:$LINENO: result: $EXTRACPPFLAGS" >&5
echo "${ECHO_T}$EXTRACPPFLAGS" >&6
-# Prefixes must begin with "/" or [A-Z] followed by colon.
-
-if test "x$prefix" = "xNONE"; then
- prefix=/usr/local
-fi
-
-fch=`echo $prefix | sed 's/\(.\).*/\1/'`
-if test "x$fch" != "x/" ; then
- sch=`echo $prefix | sed 's/.\(.\).*/\1/'`
- if test "x$sch" != "x:" ; then
- prefix=`pwd`/$prefix
- echo "adjusting prefix to $prefix"
- fi
-fi
-
-if test "x$exec_prefix" = "xNONE"; then
- exec_prefix=$prefix
-fi
-
-fch=`echo $exec_prefix | sed 's/\(.\).*/\1/'`
-if test "x$fch" != "x/" ; then
- sch=`echo $exec_prefix | sed 's/.\(.\).*/\1/'`
- if test "x$sch" != "x:" ; then
- exec_prefix=`pwd`/$exec_prefix
- echo "adjusting exec_prefix to $exec_prefix"
- fi
-fi
-
# Set SNMPLIBPATH & SNMPSHAREPATH
SNMPLIBPATH=""
@@ -28344,6 +28316,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+#include <sys/types.h>
#include <tcpd.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -28388,6 +28361,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#include <tcpd.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
@@ -34009,7 +33983,7 @@ done
-for ac_header in malloc.h net/if_dl.h sys/sysctl.h stdlib.h net/if_types.h sys/queue.h osreldate.h machine/types.h sys/user.h sys/proc.h sys/mbuf.h sys/mount.h sys/dkstat.h sys/conf.h
+for ac_header in sys/param.h net/if_dl.h sys/sysctl.h stdlib.h net/if_types.h sys/queue.h osreldate.h machine/types.h sys/socketvar.h sys/user.h sys/proc.h sys/mbuf.h sys/mount.h sys/dkstat.h sys/conf.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -37485,7 +37459,6 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <machine/types.h>
#include <sys/disklabel.h>
_ACEOF

37
net/net-snmp/patches/patch-configure_d_config_os_headers Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-configure_d_config_os_headers,v 1.1 2010/10/25 22:59:12 sthen Exp $
On OpenBSD headers must be included in this order:
kernel
network
others
Also in_pcb.h requires ip.h
--- configure.d/config_os_headers.orig Fri Aug 13 16:04:07 2010
+++ configure.d/config_os_headers Thu Oct 14 19:38:58 2010
@@ -392,17 +392,20 @@ AC_CHECK_HEADERS(netinet/in_pcb.h,,,
#if HAVE_SYS_SOCKETVAR_H
#include <sys/socketvar.h>
#endif
-#if HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
#endif
#if HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
+#if HAVE_NETINET_IP_H
+#include <netinet/ip.h>
#endif
#if HAVE_NET_ROUTE_H
#include <net/route.h>
+#endif
+#if HAVE_ARPA_INET_H
+#include <arpa/inet.h>
#endif
]])

26
net/net-snmp/patches/patch-configure_d_config_os_libs Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-configure_d_config_os_libs,v 1.1 2010/10/25 22:59:12 sthen Exp $
--- configure.d/config_os_libs.orig Fri Aug 13 17:04:07 2010
+++ configure.d/config_os_libs Mon Oct 25 00:13:48 2010
@@ -163,17 +163,20 @@ NETSNMP_SEARCH_LIBS(kstat_lookup, kstat,
if test "x$PARTIALTARGETOS" = "xlinux"; then
NETSNMP_SEARCH_LIBS(pthread_create, pthread,,,, LMIBLIBS)
fi
+if test "x$PARTIALTARGETOS" = "xopenbsd4"; then
+ LMIBLIBS="$LMIBLIBS -pthread"
+fi
# libkvm
#
NETSNMP_SEARCH_LIBS(kvm_read, kvm,,,, LAGENTLIBS)
NETSNMP_SEARCH_LIBS(kvm_openfiles, kvm,,,, LAGENTLIBS)
-NETSNMP_SEARCH_LIBS(kvm_getprocs, kvm,,,, LMIBLIBS)
+NETSNMP_SEARCH_LIBS(kvm_getproc2, kvm,,,, LMIBLIBS)
NETSNMP_SEARCH_LIBS(kvm_getswapinfo, kvm,,,, LMIBLIBS)
netsnmp_save_LIBS="$LIBS"
LIBS="$LAGENTLIBS $LMIBLIBS $LIBS"
-AC_CHECK_FUNCS([kvm_openfiles kvm_getprocs kvm_getswapinfo])
+AC_CHECK_FUNCS([kvm_openfiles kvm_getproc2 kvm_getswapinfo])
LIBS="$netsnmp_save_LIBS"

16
net/net-snmp/patches/patch-include_net-snmp_system_openbsd_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-include_net-snmp_system_openbsd_h,v 1.3 2007/09/26 20:03:42 rui Exp $
--- include/net-snmp/system/openbsd.h.orig Thu Mar 8 15:52:34 2007
+++ include/net-snmp/system/openbsd.h Sat Sep 15 23:12:29 2007
$OpenBSD: patch-include_net-snmp_system_openbsd_h,v 1.4 2010/10/25 22:59:12 sthen Exp $
--- include/net-snmp/system/openbsd.h.orig Thu Jun 21 15:01:08 2007
+++ include/net-snmp/system/openbsd.h Thu Oct 14 19:12:35 2010
@@ -3,8 +3,6 @@
#define netbsd1 netbsd1 /* we're really close to this */
#define UVM
@ -10,3 +10,13 @@ $OpenBSD: patch-include_net-snmp_system_openbsd_h,v 1.3 2007/09/26 20:03:42 rui
#undef TOTAL_MEMORY_SYMBOL
/* at least OpenBSD/SPARC 3.7 doesn't define this */
@@ -15,3 +13,9 @@
/* define the extra mib modules that are supported */
#define NETSNMP_INCLUDE_HOST_RESOURCES
#define NETSNMP_INCLUDE_IFTABLE_REWRITES
+
+#undef INP_NEXT_SYMBOL
+#define INP_NEXT_SYMBOL inp_next
+#undef INP_PREV_SYMBOL
+#define INP_PREV_SYMBOL inp_prev
+

12
net/net-snmp/patches/patch-net-snmp-config_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-net-snmp-config_in,v 1.4 2010/10/25 22:59:12 sthen Exp $
--- net-snmp-config.in.orig Tue Oct 19 02:21:02 2010
+++ net-snmp-config.in Tue Oct 19 02:22:10 2010
@@ -57,7 +57,7 @@ NSC_EXEC_PREFIX=$exec_prefix
NSC_SRCDIR=@srcdir@
NSC_INCDIR=${NSC_PREFIX}/include
NSC_BASE_SUBAGENT_LIBS="-lnetsnmpagent -lnetsnmp"
-NSC_BASE_AGENT_LIBS="-lnetsnmpagent -lnetsnmpmibs -lnetsnmp"
+NSC_BASE_AGENT_LIBS="-pthread -lnetsnmpagent -lnetsnmpmibs -lnetsnmp"
NSC_SRC_LIBDIRS="agent/.libs snmplib/.libs"
NSC_SRC_LIBDEPS="agent/.libs/libnetsnmpmibs.a agent/.libs/libnetsnmpagent.a snmplib/.libs/libnetsnmp.a"

12
net/net-snmp/patches/patch-snmplib_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-snmplib_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
--- snmplib/Makefile.in.orig Mon Jun 18 22:34:43 2007
+++ snmplib/Makefile.in Sat Sep 15 23:12:29 2007
@@ -127,7 +127,7 @@ INSTALLUCDHEADERS= asn1.h \
$OpenBSD: patch-snmplib_Makefile_in,v 1.5 2010/10/25 22:59:12 sthen Exp $
--- snmplib/Makefile.in.orig Thu May 27 05:06:32 2010
+++ snmplib/Makefile.in Wed Oct 6 23:28:02 2010
@@ -133,7 +133,7 @@ INSTALLUCDHEADERS= asn1.h \
transform_oids.h
# libraries
@ -10,12 +10,12 @@ $OpenBSD: patch-snmplib_Makefile_in,v 1.4 2007/09/26 20:03:42 rui Exp $
INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
#
@@ -187,7 +187,7 @@ CPPFLAGS = $(TOP_INCLUDES) -I. $(SNMPLIB_INCLUDES) @C
@@ -199,7 +199,7 @@ CPPFLAGS = $(TOP_INCLUDES) -I. $(SNMPLIB_INCLUDES) @C
all: standardall
# how to build the libraries.
-libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
+libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION): $(TOBJS)
$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
$(RANLIB) $@

111
net/net-snmp/pkg/PLIST-main
View File

@ -1,12 +1,16 @@
@comment $OpenBSD: PLIST-main,v 1.8 2010/09/21 10:43:04 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2010/10/25 22:59:12 sthen Exp $
@pkgpath net/net-snmp
%%SHARED%%
@bin bin/agentxtrap
@bin bin/encode_keychange
bin/fixproc
@comment bin/ipf-mod.pl
bin/mib2c
bin/mib2c-update
bin/net-snmp-cert
bin/net-snmp-config
bin/net-snmp-create-v3-user
bin/snmp-bridge-mib
@bin bin/snmpbulkget
@bin bin/snmpbulkwalk
bin/snmpcheck
@ -35,6 +39,7 @@ include/net-snmp/agent/agent_index.h
include/net-snmp/agent/agent_module_config.h
include/net-snmp/agent/agent_read_config.h
include/net-snmp/agent/agent_registry.h
include/net-snmp/agent/agent_sysORTable.h
include/net-snmp/agent/agent_trap.h
include/net-snmp/agent/all_helpers.h
include/net-snmp/agent/auto_nlist.h
@ -60,9 +65,11 @@ include/net-snmp/agent/scalar_group.h
include/net-snmp/agent/serialize.h
include/net-snmp/agent/set_helper.h
include/net-snmp/agent/snmp_agent.h
include/net-snmp/agent/snmp_get_statistic.h
include/net-snmp/agent/snmp_vars.h
include/net-snmp/agent/stash_cache.h
include/net-snmp/agent/stash_to_next.h
include/net-snmp/agent/sysORTable.h
include/net-snmp/agent/table.h
include/net-snmp/agent/table_array.h
include/net-snmp/agent/table_container.h
@ -79,6 +86,7 @@ include/net-snmp/library/
include/net-snmp/library/README
include/net-snmp/library/asn1.h
include/net-snmp/library/callback.h
include/net-snmp/library/cert_util.h
include/net-snmp/library/check_varbind.h
include/net-snmp/library/cmu_compat.h
include/net-snmp/library/container.h
@ -88,26 +96,36 @@ include/net-snmp/library/container_list_ssll.h
include/net-snmp/library/container_null.h
include/net-snmp/library/data_list.h
include/net-snmp/library/default_store.h
include/net-snmp/library/dir_utils.h
include/net-snmp/library/factory.h
include/net-snmp/library/fd_event_manager.h
include/net-snmp/library/file_utils.h
include/net-snmp/library/getopt.h
include/net-snmp/library/int64.h
include/net-snmp/library/keytools.h
include/net-snmp/library/large_fd_set.h
include/net-snmp/library/lcd_time.h
include/net-snmp/library/md5.h
include/net-snmp/library/mib.h
include/net-snmp/library/mt_support.h
include/net-snmp/library/oid.h
include/net-snmp/library/oid_stash.h
include/net-snmp/library/parse.h
include/net-snmp/library/read_config.h
include/net-snmp/library/scapi.h
include/net-snmp/library/snmp-tc.h
include/net-snmp/library/snmp.h
include/net-snmp/library/snmpAliasDomain.h
include/net-snmp/library/snmpCallbackDomain.h
include/net-snmp/library/snmpIPv4BaseDomain.h
include/net-snmp/library/snmpIPv6BaseDomain.h
include/net-snmp/library/snmpSocketBaseDomain.h
include/net-snmp/library/snmpTCPBaseDomain.h
include/net-snmp/library/snmpTCPDomain.h
include/net-snmp/library/snmpTCPIPv6Domain.h
include/net-snmp/library/snmpUDPBaseDomain.h
include/net-snmp/library/snmpUDPDomain.h
include/net-snmp/library/snmpUDPIPv4BaseDomain.h
include/net-snmp/library/snmpUDPIPv6Domain.h
include/net-snmp/library/snmpUnixDomain.h
include/net-snmp/library/snmp_alarm.h
@ -129,6 +147,7 @@ include/net-snmp/library/system.h
include/net-snmp/library/text_utils.h
include/net-snmp/library/tools.h
include/net-snmp/library/transform_oids.h
include/net-snmp/library/types.h
include/net-snmp/library/ucd_compat.h
include/net-snmp/library/vacm.h
include/net-snmp/library/winpipe.h
@ -150,6 +169,7 @@ include/net-snmp/system/bsdi3.h
include/net-snmp/system/bsdi4.h
include/net-snmp/system/cygwin.h
include/net-snmp/system/darwin.h
include/net-snmp/system/darwin10.h
include/net-snmp/system/darwin7.h
include/net-snmp/system/darwin8.h
include/net-snmp/system/darwin9.h
@ -193,11 +213,14 @@ lib/libnetsnmpmibs.a
lib/libnetsnmpmibs.la
lib/libnetsnmptrapd.a
lib/libnetsnmptrapd.la
@man man/man1/agentxtrap.1
@man man/man1/encode_keychange.1
@man man/man1/fixproc.1
@man man/man1/mib2c-update.1
@man man/man1/mib2c.1
@man man/man1/net-snmp-config.1
@man man/man1/net-snmp-create-v3-user.1
@man man/man1/snmp-bridge-mib.1
@man man/man1/snmpbulkget.1
@man man/man1/snmpbulkwalk.1
@man man/man1/snmpcmd.1
@ -228,87 +251,59 @@ lib/libnetsnmptrapd.la
@man man/man3/fprint_value.3
@man man/man3/fprint_variable.3
@man man/man3/get_module_node.3
@man man/man3/init_mib.3
@man man/man3/init_mib_internals.3
@man man/man3/mib_api.3
@man man/man3/netsnmp_agent.3
@man man/man3/netsnmp_baby_steps.3
@man man/man3/netsnmp_bulk_to_next.3
@man man/man3/netsnmp_cache_handler.3
@man man/man3/netsnmp_container.3
@man man/man3/netsnmp_debug.3
@man man/man3/netsnmp_ds_get_boolean.3
@man man/man3/netsnmp_ds_get_int.3
@man man/man3/netsnmp_ds_get_string.3
@man man/man3/netsnmp_ds_register_config.3
@man man/man3/netsnmp_ds_register_premib.3
@man man/man3/netsnmp_ds_set_boolean.3
@man man/man3/netsnmp_ds_set_int.3
@man man/man3/netsnmp_ds_set_string.3
@man man/man3/netsnmp_ds_shutdown.3
@man man/man3/netsnmp_example_scalar_int.3
@man man/man3/netsnmp_handler.3
@man man/man3/netsnmp_instance.3
@man man/man3/netsnmp_iterator_info_s.3
@man man/man3/netsnmp_leaf.3
@man man/man3/netsnmp_library.3
@man man/man3/netsnmp_mib_handler_methods.3
@man man/man3/netsnmp_mib_utilities.3
@man man/man3/netsnmp_mode_end_call.3
@man man/man3/netsnmp_multiplexer.3
@man man/man3/netsnmp_old_api.3
@man man/man3/netsnmp_read_only.3
@man man/man3/netsnmp_row_merge.3
@man man/man3/netsnmp_scalar.3
@man man/man3/netsnmp_scalar_group_group.3
@man man/man3/netsnmp_serialize.3
@man man/man3/netsnmp_stash_cache.3
@man man/man3/netsnmp_table.3
@man man/man3/netsnmp_table_array.3
@man man/man3/netsnmp_table_data.3
@man man/man3/netsnmp_table_dataset.3
@man man/man3/netsnmp_table_iterator.3
@man man/man3/netsnmp_utilities.3
@man man/man3/netsnmp_watcher.3
@man man/man3/netsnmp_agent_api.3
@man man/man3/netsnmp_config_api.3
@man man/man3/netsnmp_init_mib.3
@man man/man3/netsnmp_mib_api.3
@man man/man3/netsnmp_pdu_api.3
@man man/man3/netsnmp_read_module.3
@man man/man3/netsnmp_sess_api.3
@man man/man3/netsnmp_session_api.3
@man man/man3/netsnmp_trap_api.3
@man man/man3/netsnmp_varbind_api.3
@man man/man3/print_description.3
@man man/man3/print_mib.3
@man man/man3/print_objid.3
@man man/man3/print_value.3
@man man/man3/print_variable.3
@man man/man3/read_all_mibs.3
@man man/man3/read_config.3
@man man/man3/read_config_print_usage.3
@man man/man3/read_configs.3
@man man/man3/read_mib.3
@man man/man3/read_module.3
@man man/man3/read_module_node.3
@man man/man3/read_objid.3
@man man/man3/read_premib_configs.3
@man man/man3/register_app_config_handler.3
@man man/man3/register_app_premib_handler.3
@man man/man3/register_app_prenetsnmp_mib_handler.3
@man man/man3/register_config_handler.3
@man man/man3/register_const_config_handler.3
@man man/man3/register_mib_handlers.3
@man man/man3/register_premib_handler.3
@man man/man3/register_prenetsnmp_mib_handler.3
@man man/man3/send_easy_trap.3
@man man/man3/send_trap_vars.3
@man man/man3/send_v2trap.3
@man man/man3/shutdown_mib.3
@man man/man3/snmp_agent_api.3
@man man/man3/snmp_add_null_var.3
@man man/man3/snmp_alarm.3
@man man/man3/snmp_alarm_register.3
@man man/man3/snmp_alarm_register_hr.3
@man man/man3/snmp_alarm_unregister.3
@man man/man3/snmp_api.3
@man man/man3/snmp_api_errstring.3
@man man/man3/snmp_clone_pdu.3
@man man/man3/snmp_clone_varbind.3
@man man/man3/snmp_close.3
@man man/man3/snmp_error.3
@man man/man3/snmp_fix_pdu.3
@man man/man3/snmp_free_pdu.3
@man man/man3/snmp_free_var.3
@man man/man3/snmp_free_varbind.3
@man man/man3/snmp_open.3
@man man/man3/snmp_parse_oid.3
@man man/man3/snmp_pdu_add_variable.3
@man man/man3/snmp_pdu_create.3
@man man/man3/snmp_perror.3
@man man/man3/snmp_read.3
@man man/man3/snmp_select_info.3
@man man/man3/snmp_send.3
@man man/man3/snmp_sess_api.3
@man man/man3/snmp_sess_async_send.3
@man man/man3/snmp_sess_close.3
@man man/man3/snmp_sess_error.3
@ -320,16 +315,20 @@ lib/libnetsnmptrapd.la
@man man/man3/snmp_sess_send.3
@man man/man3/snmp_sess_session.3
@man man/man3/snmp_sess_timeout.3
@man man/man3/snmp_set_mib_errors.3
@man man/man3/snmp_set_mib_warnings.3
@man man/man3/snmp_set_save_descriptions.3
@man man/man3/snmp_set_var_objid.3
@man man/man3/snmp_set_var_typed_integer.3
@man man/man3/snmp_set_var_typed_value.3
@man man/man3/snmp_set_var_value.3
@man man/man3/snmp_timeout.3
@man man/man3/snmp_trap_api.3
@man man/man3/snmp_varlist_add_variable.3
@man man/man3/snprint_description.3
@man man/man3/snprint_objid.3
@man man/man3/snprint_value.3
@man man/man3/snprint_variable.3
@man man/man3/sprint_realloc_objid.3
@man man/man3/sprint_realloc_value.3
@man man/man3/sprint_realloc_variable.3
@man man/man3/unregister_all_config_handlers.3
@man man/man3/unregister_app_config_handler.3
@man man/man3/unregister_config_handler.3
@man man/man3p/NetSNMP::TrapReceiver.3p
@ -440,12 +439,14 @@ share/snmp/mib2c.mfd.conf
share/snmp/mib2c.notify.conf
share/snmp/mib2c.old-api.conf
share/snmp/mib2c.perl.conf
share/snmp/mib2c.raw-table.conf
share/snmp/mib2c.scalar.conf
share/snmp/mib2c.table_data.conf
share/snmp/mibs/
@comment no checksum
share/snmp/mibs/.index
share/snmp/mibs/AGENTX-MIB.txt
share/snmp/mibs/BRIDGE-MIB.txt
share/snmp/mibs/DISMAN-EVENT-MIB.txt
share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
share/snmp/mibs/DISMAN-SCRIPT-MIB.txt