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

update to Net-SNMP 5.7.2; lots of fixes and improvements

Browse Source 
- many of our local patches are now committed upstream
This commit is contained in:
sthen 2012-10-18 14:01:45 +00:00
parent 32a9d93edb
commit c7f5986d4b
17 changed files with 49 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/net-snmp/Makefile
View File

@ -1,21 +1,18 @@
# $OpenBSD: Makefile,v 1.67 2012/08/23 15:50:05 sthen Exp $
# $OpenBSD: Makefile,v 1.68 2012/10/18 14:01:45 sthen Exp $
COMMENT-main= extendable SNMP implementation
COMMENT-perl= SNMP modules for Perl
COMMENT-tkmib= graphical SNMP MIB browser
V= 5.7.1
V= 5.7.2
DISTNAME= net-snmp-$V
DISTNAME= net-snmp-${V:S/pre/.pre/:S/rc/.rc/}
MULTI_PACKAGES= -main -perl -tkmib
REVISION-main= 5
REVISION-perl= 2
REVISION-tkmib= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-main= net-snmp-$V
PKGNAME-perl= p5-SNMP-$V
PKGNAME-tkmib= net-snmp-tkmib-$V
LIBV= 12.1
LIBV= 13.0
.for i in netsnmp netsnmpagent netsnmphelpers netsnmpmibs netsnmptrapd
SHARED_LIBS += $i ${LIBV}
.endfor
@ -34,7 +31,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main= c crypto kvm m perl util wrap
WANTLIB-perl= c crypto m netsnmp netsnmpagent netsnmptrapd netsnmpmibs
WANTLIB-perl= crypto m netsnmp netsnmpagent netsnmptrapd netsnmpmibs
LIB_DEPENDS-perl= net/net-snmp,-main
RUN_DEPENDS-tkmib= net/net-snmp,-perl \
@ -64,6 +61,7 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-default-snmp-version="3" \
--with-sys-contact="nobody@nowhere.invalid" \
--with-sys-location="somewhere" \
--with-temp-file-pattern=/tmp/snmpdXXXXXXXXXXXX \
--with-logfile="/var/log/snmpd" \
--with-persistent-directory="/var/net-snmp"
REGRESS_TARGET= test

7
net/net-snmp/distinfo
View File

@ -1,5 +1,2 @@
MD5 (net-snmp-5.7.1.tar.gz) = yV0I/V2T3wwRouG98OAeCw==
RMD160 (net-snmp-5.7.1.tar.gz) = PkOXQX8ct//Roy+1DgSClp2ZXwc=
SHA1 (net-snmp-5.7.1.tar.gz) = 3bgs4REu8GQoadPI18flhfFRhJo=
SHA256 (net-snmp-5.7.1.tar.gz) = fHHJZQxltxU1ZUfiDKLb5jE5RCeK+MwZwypTN/RrGB8=
SIZE (net-snmp-5.7.1.tar.gz) = 6110619
SHA256 (net-snmp-5.7.2.tar.gz) = Ce0xtMwfPAQR75oW7/ee87MNicMspG1aAaQYJsTOuBY=
SIZE (net-snmp-5.7.2.tar.gz) = 6281352

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_top,v 1.14 2011/11/18 12:39:06 sthen Exp $
--- Makefile.top.orig Wed Aug 31 03:21:51 2011
+++ Makefile.top Thu Sep 1 23:24:44 2011
$OpenBSD: patch-Makefile_top,v 1.15 2012/10/18 14:01:45 sthen Exp $
--- Makefile.top.orig Wed Sep 26 03:36:45 2012
+++ Makefile.top Wed Sep 26 22:00:33 2012
@@ -39,6 +39,8 @@ LIBTOOLCLEAN = $(LIBTOOL) --mode=clean rm -f
FEATURECHECK = $(top_srcdir)/local/minimalist/feature-check
FEATUREPROCESS = $(top_srcdir)/local/minimalist/feature-remove
@ -12,10 +12,10 @@ $OpenBSD: patch-Makefile_top,v 1.14 2011/11/18 12:39:06 sthen Exp $
AUTOCONF = @AUTOCONF@
@@ -83,7 +85,7 @@ LIBCURRENT = 30
LIBAGE = 0
LIBREVISION = 1
LIBREVISION = 2
-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
LIB_EXTENSION = la
LIB_VERSION =
LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)

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

@ -1,41 +0,0 @@
$OpenBSD: patch-agent_Makefile_in,v 1.6 2011/07/07 20:02:02 sthen Exp $
--- agent/Makefile.in.orig Fri Jul 1 23:35:46 2011
+++ agent/Makefile.in Wed Jul 6 23:15:52 2011
@@ -20,8 +20,8 @@ SUBDIRS=helpers mibgroup
FTSUBDIRS=mibgroup helpers
INSTALLSBINPROGS= @SNMPD@
-INSTALLLIBS = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-INSTALLPOSTLIBS = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+INSTALLLIBS = libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION)
+INSTALLPOSTLIBS = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
INCLUDESUBDIR=agent
HEADERS=\
@@ -110,9 +110,9 @@ INSTALLUCDHEADERS= \
#
# how to build it info
#
-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION)
+AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION)
+MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
LOCAL_LIBS = -L../snmplib/.libs -L../snmplib -L./.libs
LAGENTLIBS = @LAGENTLIBS@
@@ -297,11 +297,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} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
$(RANLIB) $(AGENTLIB)
-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)

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

@ -1,27 +0,0 @@
$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
#
# Build info
#
-HELPERLIB = libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
+HELPERLIB = libnetsnmphelpers.$(LIB_EXTENSION)$(LIBnetsnmphelpers_VERSION)
# -I. -I.. -I../..
CPPFLAGS= $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
$(SNMPLIB_INCLUDES) @CPPFLAGS@
@@ -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) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS)
$(RANLIB) $@

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

@ -1,20 +0,0 @@
$OpenBSD: patch-agent_mibgroup_agent_extend_c,v 1.1 2012/05/03 20:06:51 jasper Exp $
Security fix for CVE-2012-2141 net-snmp: Array index error, leading to
out-of heap-based buffer read (snmpd crash)
Fix from https://bugzilla.redhat.com/show_bug.cgi?id=815813
--- agent/mibgroup/agent/extend.c.orig Thu May 3 21:46:19 2012
+++ agent/mibgroup/agent/extend.c Thu May 3 21:46:45 2012
@@ -1380,6 +1380,10 @@ handle_nsExtendOutput2Table(netsnmp_mib_handler
* Determine which line we've been asked for....
*/
line_idx = *table_info->indexes->next_variable->val.integer;
+ if (line_idx < 1 || line_idx > extension->numlines) {
+ netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHINSTANCE);
+ continue;
+ }
cp = extension->lines[line_idx-1];
/*

29
net/net-snmp/patches/patch-agent_mibgroup_hardware_fsys_fsys_getfsstats_c
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-agent_mibgroup_hardware_fsys_fsys_getfsstats_c,v 1.1 2011/11/28 22:40:25 sthen Exp $
hunk 0 - stats[i].f_mnt{on,from}name is much smaller than sizeof(entry->path)
so memcpy was reading past the allowed memory space; these are nul-terminated
strings so just use strncpy instead
hunk 1 - bug #3408398: Fix a memory leak
--- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig Mon Nov 28 13:49:38 2011
+++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c Mon Nov 28 14:10:15 2011
@@ -150,9 +150,9 @@ netsnmp_fsys_arch_load( void )
if (!entry)
continue;
- memcpy( entry->path, stats[i].f_mntonname, sizeof(entry->path) );
+ strncpy( entry->path, stats[i].f_mntonname, sizeof(entry->path) );
entry->path[sizeof(entry->path)-1] = '\0';
- memcpy( entry->device, stats[i].f_mntfromname, sizeof(entry->device));
+ strncpy( entry->device, stats[i].f_mntfromname, sizeof(entry->device));
entry->device[sizeof(entry->device)-1] = '\0';
entry->units = stats[i].f_bsize; /* or f_frsize */
entry->size = stats[i].f_blocks;
@@ -175,4 +175,6 @@ netsnmp_fsys_arch_load( void )
}
netsnmp_fsys_calculate32(entry);
}
+
+ free(stats);
}

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

@ -1,22 +0,0 @@
$OpenBSD: patch-agent_mibgroup_hardware_fsys_hw_fsys_c,v 1.1 2011/11/28 22:40:25 sthen Exp $
ensure sp->path and sp->device are null terminated
--- agent/mibgroup/hardware/fsys/hw_fsys.c.orig Mon Nov 28 14:06:25 2011
+++ agent/mibgroup/hardware/fsys/hw_fsys.c Mon Nov 28 14:09:10 2011
@@ -176,6 +176,7 @@ netsnmp_fsys_by_path( char *path, int create_type )
sp = _fsys_create_entry();
if ( sp ) {
strncpy( sp->path, path, sizeof(sp->path) );
+ sp->path[sizeof(sp->path) - 1] = '\0';
}
return sp;
}
@@ -219,6 +220,7 @@ netsnmp_fsys_by_device( char *device, int create_type
sp = _fsys_create_entry();
if ( sp ) {
strncpy( sp->device, device, sizeof(sp->device) );
+ sp->device[sizeof(sp->device) - 1] = '\0';
}
return sp;
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kinfo_c,v 1.6 2011/11/18 12:39:06 sthen Exp $
--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig Wed Aug 31 03:21:51 2011
+++ agent/mibgroup/host/data_access/swrun_kinfo.c Thu Sep 1 23:53:44 2011
$OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kinfo_c,v 1.7 2012/10/18 14:01:45 sthen Exp $
--- agent/mibgroup/host/data_access/swrun_kinfo.c.orig Wed Aug 29 22:10:31 2012
+++ agent/mibgroup/host/data_access/swrun_kinfo.c Wed Aug 29 23:04:40 2012
@@ -3,7 +3,7 @@
* hrSWRunTable data access:
* kvm_getprocs() interface - FreeBSD, NetBSD, OpenBSD
@ -10,7 +10,7 @@ $OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kinfo_c,v 1.6 2011/11/18 1
*/
#include <net-snmp/net-snmp-config.h>
@@ -58,11 +58,15 @@
@@ -59,11 +59,15 @@ extern kvm_t *kd;
#define SWRUN_K_FLAG ki_flag
#define SWRUN_K_CLASS ki_pri.pri_class
@ -27,7 +27,7 @@ $OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kinfo_c,v 1.6 2011/11/18 1
#define SWRUN_K_STAT p_stat
#define SWRUN_K_PID p_pid
#define SWRUN_K_COMM p_comm
@@ -156,7 +160,9 @@ netsnmp_arch_swrun_container_load( netsnmp_container *
@@ -157,7 +161,9 @@ 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 */
}
@ -36,12 +36,12 @@ $OpenBSD: patch-agent_mibgroup_host_data_access_swrun_kinfo_c,v 1.6 2011/11/18 1
+ proc_table = kvm_getprocs(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &nprocs );
+#elif defined(HAVE_KVM_GETPROC2)
proc_table = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &nprocs );
#else
proc_table = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nprocs );
@@ -287,7 +293,7 @@ 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(KERN_PROC_PROC)
proc_table = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nprocs );
@@ -288,7 +294,7 @@ netsnmp_arch_swrun_container_load( netsnmp_container *
entry->hrSWRunPerfCPU += (proc_table[i].ki_rusage_ch.ru_utime.tv_sec*1000000 + proc_table[i].ki_rusage_ch.ru_utime.tv_usec) / 10000;
entry->hrSWRunPerfCPU += (proc_table[i].ki_rusage_ch.ru_stime.tv_sec*1000000 + proc_table[i].ki_rusage_ch.ru_stime.tv_usec) / 10000;
entry->hrSWRunPerfMem = proc_table[i].ki_rssize * (getpagesize()/1024); /* in kB */
-#elif defined(HAVE_KVM_GETPROC2)
+#elif defined(HAVE_KVM_GETPROC2) || defined(openbsd5)
/*

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

@ -1,7 +1,7 @@
$OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen Exp $
--- agent/mibgroup/host/hr_swrun.c.orig Fri Jul 1 23:35:46 2011
+++ agent/mibgroup/host/hr_swrun.c Wed Jul 6 23:45:48 2011
@@ -700,6 +700,8 @@ var_hrswrun(struct variable * vp,
$OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.5 2012/10/18 14:01:45 sthen Exp $
--- agent/mibgroup/host/hr_swrun.c.orig Sat Jun 2 17:27:10 2012
+++ agent/mibgroup/host/hr_swrun.c Thu Jun 7 23:39:39 2012
@@ -695,6 +695,8 @@ var_hrswrun(struct variable * vp,
strcpy(string, proc_table[LowProcIndex].ki_comm);
#elif defined(dragonfly) && __DragonFly_version >= 190000
strcpy(string, proc_table[LowProcIndex].kp_comm);
@ -10,7 +10,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
#else
strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
#endif
@@ -822,6 +824,8 @@ var_hrswrun(struct variable * vp,
@@ -816,6 +818,8 @@ var_hrswrun(struct variable * vp,
strcpy(string, proc_table[LowProcIndex].ki_comm);
#elif defined(dragonfly) && __DragonFly_version >= 190000
strcpy(string, proc_table[LowProcIndex].kp_comm);
@ -19,7 +19,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
#else
strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
#endif
@@ -1008,6 +1012,11 @@ var_hrswrun(struct variable * vp,
@@ -1002,6 +1006,11 @@ var_hrswrun(struct variable * vp,
long_return = 2;/* operatingSystem */
} else
long_return = 4; /* application */
@ -31,7 +31,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
#else
#if defined(dragonfly) && __DragonFly_version >= 190000
if (proc_table[LowProcIndex].kp_flags & P_SYSTEM)
@@ -1058,6 +1067,8 @@ var_hrswrun(struct variable * vp,
@@ -1052,6 +1061,8 @@ var_hrswrun(struct variable * vp,
switch (proc_table[LowProcIndex].ki_stat) {
#elif defined(dragonfly) && __DragonFly_version >= 190000
switch (proc_table[LowProcIndex].kp_stat) {
@ -40,7 +40,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
#else
switch (proc_table[LowProcIndex].kp_proc.p_stat) {
#endif
@@ -1163,6 +1174,10 @@ var_hrswrun(struct variable * vp,
@@ -1157,6 +1168,10 @@ var_hrswrun(struct variable * vp,
long_return = proc_table[LowProcIndex].kp_lwp.kl_uticks +
proc_table[LowProcIndex].kp_lwp.kl_sticks +
proc_table[LowProcIndex].kp_lwp.kl_iticks;
@ -51,7 +51,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
#elif defined(dragonfly)
long_return = proc_table[LowProcIndex].kp_eproc.e_uticks +
proc_table[LowProcIndex].kp_eproc.e_sticks +
@@ -1284,6 +1299,11 @@ var_hrswrun(struct variable * vp,
@@ -1278,6 +1293,11 @@ var_hrswrun(struct variable * vp,
#else
proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size / 1024;
#endif
@ -63,7 +63,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
#else
long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize +
proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize +
@@ -1546,7 +1566,11 @@ Init_HR_SWRun(void)
@@ -1540,7 +1560,11 @@ Init_HR_SWRun(void)
nproc = 0;
return;
}
@ -75,7 +75,7 @@ $OpenBSD: patch-agent_mibgroup_host_hr_swrun_c,v 1.4 2011/07/07 20:02:02 sthen E
}
#else
@@ -1606,6 +1630,9 @@ Get_Next_HR_SWRun(void)
@@ -1600,6 +1624,9 @@ Get_Next_HR_SWRun(void)
#elif defined(dragonfly) && __DragonFly_version >= 190000
if (proc_table[current_proc_entry].kp_stat != 0)
return proc_table[current_proc_entry++].kp_pid;

24
net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_disk_hw_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-agent_mibgroup_ucd-snmp_disk_hw_c,v 1.1 2011/11/28 22:40:25 sthen Exp $
chunk 0 - bug #3434824: SIGSEGV when reading disk directive after SIGHUP
chunk 1 - 9aa1e70: off-by-one in dskIndex
--- agent/mibgroup/ucd-snmp/disk_hw.c.orig Mon Nov 28 13:38:09 2011
+++ agent/mibgroup/ucd-snmp/disk_hw.c Mon Nov 28 13:50:43 2011
@@ -137,6 +137,7 @@ disk_free_config(void)
if (disks) {
free( disks );
disks = NULL;
+ maxdisks = numdisks = 0;
}
allDisksIncluded = 0;
}
@@ -321,7 +322,7 @@ tryAgain:
switch (vp->magic) {
case MIBINDEX:
- long_ret = disknum;
+ long_ret = disknum + 1;
return ((u_char *) (&long_ret));
case ERRORNAME: /* DISKPATH */
*var_len = strlen(entry->path);

10
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.5 2011/07/07 20:02:02 sthen Exp $
--- agent/mibgroup/ucd-snmp/dlmod.c.orig Fri Jul 1 23:35:46 2011
+++ agent/mibgroup/ucd-snmp/dlmod.c Wed Jul 6 23:18:52 2011
@@ -129,7 +129,11 @@ dlmod_load_module(struct dlmod *dlm)
$OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.6 2012/10/18 14:01:45 sthen Exp $
--- agent/mibgroup/ucd-snmp/dlmod.c.orig Sat Jun 2 17:27:10 2012
+++ agent/mibgroup/ucd-snmp/dlmod.c Thu Jun 7 23:39:39 2012
@@ -127,7 +127,11 @@ dlmod_load_module(struct dlmod *dlm)
return;
}
{
@ -13,7 +13,7 @@ $OpenBSD: patch-agent_mibgroup_ucd-snmp_dlmod_c,v 1.5 2011/07/07 20:02:02 sthen
int (*dl_init) (void);
snprintf(sym_init, sizeof(sym_init), "init_%s", dlm->name);
@@ -157,7 +161,11 @@ dlmod_unload_module(struct dlmod *dlm)
@@ -155,7 +159,11 @@ dlmod_unload_module(struct dlmod *dlm)
if (!dlm || dlm->status != DLMOD_LOADED)
return;

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

@ -1,34 +0,0 @@
$OpenBSD: patch-apps_Makefile_in,v 1.6 2011/07/07 20:02:02 sthen Exp $
--- apps/Makefile.in.orig Fri Jul 1 23:35:46 2011
+++ apps/Makefile.in Wed Jul 6 23:15:53 2011
@@ -66,7 +66,7 @@ INSTALLBINPROGS = snmpget$(EXEEXT) \
INSTALLSBINPROGS = snmptrapd$(EXEEXT)
-INSTALLLIBS = libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION)
+INSTALLLIBS = libnetsnmptrapd.$(LIB_EXTENSION)$(LIBnetsnmptrapd_VERSION)
SUBDIRS = snmpnetstat
@@ -77,9 +77,9 @@ FEATUREFILE=../include/net-snmp/features-apps.h
#
# USELIBS/USEAGENTLIBS are for dependencies
-USELIBS = ../snmplib/libnetsnmp.$(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)
+AGENTLIB = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIBnetsnmpagent_VERSION)
+MIBLIB = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIBnetsnmpmibs_VERSION)
USEAGENTLIBS = $(MIBLIB) $(AGENTLIB) $(USELIBS)
MYSQL_LIBS = @MYSQL_LIBS@
MYSQL_INCLUDES = @MYSQL_INCLUDES@
@@ -206,7 +206,7 @@ encode_keychange$(EXEEXT): encode_keychange.$(OSUFF
snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
-libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS)
+libnetsnmptrapd.$(LIB_EXTENSION)$(LIBnetsnmptrapd_VERSION): $(LLIBTRAPD_OBJS)
$(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
$(RANLIB) $@

15
net/net-snmp/patches/patch-include_net-snmp_library_large_fd_set_h
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-include_net-snmp_library_large_fd_set_h,v 1.1 2011/11/28 22:40:25 sthen Exp $
e24c34f - Use correct select() FD mask size.
--- include/net-snmp/library/large_fd_set.h.orig Mon Nov 28 13:52:44 2011
+++ include/net-snmp/library/large_fd_set.h Mon Nov 28 13:53:09 2011
@@ -74,7 +74,7 @@ int netsnmp_large_fd_is_set(SOCKET fd, netsnmp_larg
* According to SUSv2, this array must have the name fds_bits. See also
* <a href="http://www.opengroup.org/onlinepubs/007908775/xsh/systime.h.html">The Single UNIX Specification, Version 2, &lt;sys/time.h&gt;</a>.
*/
-#define NETSNMP_FD_MASK_SIZE sizeof(((fd_set*)0)->fds_bits)
+#define NETSNMP_FD_MASK_SIZE sizeof(((fd_set*)0)->fds_bits[0])
/** Number of bits in one element of the fd_set::fds_bits array. */
#define NETSNMP_BITS_PER_FD_MASK (8 * NETSNMP_FD_MASK_SIZE)

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

@ -1,21 +0,0 @@
$OpenBSD: patch-snmplib_Makefile_in,v 1.6 2011/07/07 20:02:02 sthen Exp $
--- snmplib/Makefile.in.orig Fri Jul 1 23:35:46 2011
+++ snmplib/Makefile.in Wed Jul 6 23:15:53 2011
@@ -133,7 +133,7 @@ INSTALLUCDHEADERS= asn1.h \
transform_oids.h
# libraries
-INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIBnetsnmp_VERSION)
INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
#
@@ -229,7 +229,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) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
$(RANLIB) $@

15
net/net-snmp/patches/patch-snmplib_snmp_api_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-snmplib_snmp_api_c,v 1.1 2011/11/28 22:40:25 sthen Exp $
bug #3423915: Change default number of retries back from 0 to 5
--- snmplib/snmp_api.c.orig Mon Nov 28 13:46:27 2011
+++ snmplib/snmp_api.c Mon Nov 28 13:47:08 2011
@@ -704,6 +704,8 @@ _init_snmp(void)
netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_HEX_OUTPUT_LENGTH, 16);
+ netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_RETRIES,
+ DEFAULT_RETRIES);
#ifdef NETSNMP_USE_REVERSE_ASNENCODING
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.15 2012/05/11 13:14:43 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2012/10/18 14:01:45 sthen Exp $
@pkgpath net/net-snmp
@extraunexec rm -rf /var/net-snmp/*
%%SHARED%%
@ -70,6 +70,7 @@ 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/struct.h
include/net-snmp/agent/sysORTable.h
include/net-snmp/agent/table.h
include/net-snmp/agent/table_array.h
@ -78,7 +79,11 @@ include/net-snmp/agent/table_data.h
include/net-snmp/agent/table_dataset.h
include/net-snmp/agent/table_iterator.h
include/net-snmp/agent/table_tdata.h
include/net-snmp/agent/util_funcs/
include/net-snmp/agent/util_funcs.h
include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h
include/net-snmp/agent/util_funcs/header_generic.h
include/net-snmp/agent/util_funcs/header_simple_table.h
include/net-snmp/agent/var_struct.h
include/net-snmp/agent/watcher.h
include/net-snmp/config_api.h
@ -177,6 +182,7 @@ include/net-snmp/system/darwin9.h
include/net-snmp/system/dragonfly.h
include/net-snmp/system/dynix.h
include/net-snmp/system/freebsd.h
include/net-snmp/system/freebsd10.h
include/net-snmp/system/freebsd2.h
include/net-snmp/system/freebsd3.h
include/net-snmp/system/freebsd4.h
@ -338,9 +344,9 @@ lib/libnetsnmptrapd.la
@man man/man3/unregister_app_config_handler.3
@man man/man3/unregister_config_handler.3
@man man/man5/mib2c.conf.5
@man man/man5/netsnmp-snmpd.conf.5
@man man/man5/snmp.conf.5
@man man/man5/snmp_config.5
@man man/man5/netsnmp-snmpd.conf.5
@man man/man5/snmpd.examples.5
@man man/man5/snmpd.internal.5
@man man/man5/snmptrapd.conf.5