FreeBSD Bugzilla – Attachment 197865 Details for
Bug 232025
net-mgmt/net-snmp: update 5.7.3 -> 5.8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
snmp.diff (text/plain), 25.96 KB, created by
Kurt Jaeger
on 2018-10-07 08:31:18 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Kurt Jaeger
Created:
2018-10-07 08:31:18 UTC
Size:
25.96 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 481410) >+++ Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= snmp >-PORTVERSION= 5.7.3 >-PORTREVISION= 18 >+PORTVERSION= 5.8 > CATEGORIES= net-mgmt ipv6 > MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \ > ZI >@@ -149,8 +148,8 @@ > CONFIGURE_ARGS+=--without-root-access > .endif > >-SHLIB_VERSION= 30 >-SHLIB_VERSION2= .0.3 >+SHLIB_VERSION= 35 >+SHLIB_VERSION2= .0.0 > PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION2=${SHLIB_VERSION2} > SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} > >Index: distinfo >=================================================================== >--- distinfo (revision 481410) >+++ distinfo (working copy) >@@ -1,2 +1,3 @@ >-SHA256 (net-snmp-5.7.3.tar.gz) = 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0 >-SIZE (net-snmp-5.7.3.tar.gz) = 6382428 >+TIMESTAMP = 1538855962 >+SHA256 (net-snmp-5.8.tar.gz) = b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf >+SIZE (net-snmp-5.8.tar.gz) = 6591680 >Index: files/patch-Makefile.in >=================================================================== >--- files/patch-Makefile.in (revision 481410) >+++ files/patch-Makefile.in (nonexistent) >@@ -1,11 +0,0 @@ >---- Makefile.in.orig 2015-01-19 14:39:40 UTC >-+++ Makefile.in >-@@ -230,7 +230,7 @@ pythonmodules: subdirs >- fi >- >- pythoninstall: >-- @(dir=`pwd`; cd python; $(PYMAKE) install --basedir=$$dir) ; \ >-+ @(dir=`pwd`; cd python; $(PYMAKE) install --root=${STAGEDIR} --basedir=$$dir ${PYDISTUTILS_INSTALLARGS}) ; \ >- if test $$? != 0 ; then \ >- exit 1 ; \ >- fi > >Property changes on: files/patch-Makefile.in >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c >=================================================================== >--- files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c (revision 481410) >+++ files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c (nonexistent) >@@ -1,11 +0,0 @@ >---- 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 )); > >Property changes on: files/patch-agent_mibgroup_hardware_fsys_fsys__getfsstats.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-agent_mibgroup_mibII_icmp.h >=================================================================== >--- files/patch-agent_mibgroup_mibII_icmp.h (revision 481410) >+++ files/patch-agent_mibgroup_mibII_icmp.h (nonexistent) >@@ -1,11 +0,0 @@ >---- agent/mibgroup/mibII/icmp.h.orig 2014-12-08 20:23:22 UTC >-+++ agent/mibgroup/mibII/icmp.h >-@@ -14,6 +14,8 @@ config_arch_require(freebsd7, mibII/ker >- config_arch_require(freebsd8, mibII/kernel_sysctl) >- config_arch_require(freebsd9, mibII/kernel_sysctl) >- config_arch_require(freebsd10, mibII/kernel_sysctl) >-+config_arch_require(freebsd11, mibII/kernel_sysctl) >-+config_arch_require(freebsd12, mibII/kernel_sysctl) >- config_arch_require(netbsd, mibII/kernel_netbsd) >- config_arch_require(netbsdelf, mibII/kernel_netbsd) >- config_arch_require(openbsd4, mibII/kernel_sysctl) > >Property changes on: files/patch-agent_mibgroup_mibII_icmp.h >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-agent_mibgroup_ucd-snmp_diskio.c >=================================================================== >--- files/patch-agent_mibgroup_ucd-snmp_diskio.c (revision 481410) >+++ files/patch-agent_mibgroup_ucd-snmp_diskio.c (nonexistent) >@@ -1,54 +0,0 @@ >---- agent/mibgroup/ucd-snmp/diskio.c.orig 2014-12-08 20:23:22 UTC >-+++ agent/mibgroup/ucd-snmp/diskio.c >-@@ -944,14 +944,14 @@ var_diskio(struct variable * vp, >- return (u_char *) stat->dinfo->devices[indx].device_name; >- case DISKIO_NREAD: >- #if HAVE_DEVSTAT_GETDEVS >-- long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; >-+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ] & 0xFFFFFFFF; >- #else >- long_ret = (signed long) stat->dinfo->devices[indx].bytes_read; >- #endif >- return (u_char *) & long_ret; >- case DISKIO_NWRITTEN: >- #if HAVE_DEVSTAT_GETDEVS >-- long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE]; >-+ long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE] & 0xFFFFFFFF; >- #else >- long_ret = (signed long) stat->dinfo->devices[indx].bytes_written; >- #endif >-@@ -959,7 +959,7 @@ var_diskio(struct variable * vp, >- case DISKIO_NREADX: >- *var_len = sizeof(struct counter64); >- #if HAVE_DEVSTAT_GETDEVS >-- longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; >-+ longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_READ] & 0xFFFFFFFF; >- #else >- longlong_ret = stat->dinfo->devices[indx].bytes_read; >- #endif >-@@ -969,7 +969,7 @@ var_diskio(struct variable * vp, >- case DISKIO_NWRITTENX: >- *var_len = sizeof(struct counter64); >- #if HAVE_DEVSTAT_GETDEVS >-- longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE]; >-+ longlong_ret = stat->dinfo->devices[indx].bytes[DEVSTAT_WRITE] & 0xFFFFFFFF; >- #else >- longlong_ret = stat->dinfo->devices[indx].bytes_written; >- #endif >-@@ -978,14 +978,14 @@ var_diskio(struct variable * vp, >- return (u_char *) & c64_ret; >- case DISKIO_READS: >- #if HAVE_DEVSTAT_GETDEVS >-- long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ]; >-+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_READ] & 0xFFFFFFFF; >- #else >- long_ret = (signed long) stat->dinfo->devices[indx].num_reads; >- #endif >- return (u_char *) & long_ret; >- case DISKIO_WRITES: >- #if HAVE_DEVSTAT_GETDEVS >-- long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE]; >-+ long_ret = (signed long) stat->dinfo->devices[indx].operations[DEVSTAT_WRITE] & 0xFFFFFFFF; >- #else >- long_ret = (signed long) stat->dinfo->devices[indx].num_writes; >- #endif > >Property changes on: files/patch-agent_mibgroup_ucd-snmp_diskio.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c >=================================================================== >--- files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c (revision 481410) >+++ files/patch-agent_mibgroup_udp-mib_data__access_udp__endpoint__freebsd4.c (working copy) >@@ -1,17 +1,5 @@ > --- agent/mibgroup/udp-mib/data_access/udp_endpoint_freebsd4.c.orig 2014-12-08 12:23:22.000000000 -0800 > +++ agent/mibgroup/udp-mib/data_access/udp_endpoint_freebsd4.c 2017-04-07 16:05:05.752849000 -0700 >-@@ -153,7 +153,11 @@ >- #endif >- >- #if !defined(NETSNMP_ENABLE_IPV6) >-+#if __FreeBSD_version >= 1200026 >-+ if (pcb.inp_vflag & INP_IPV6) >-+#else >- if (pcb.xi_inp.inp_vflag & INP_IPV6) >-+#endif >- continue; >- #endif >- > @@ -164,9 +168,24 @@ > } > >Index: files/patch-include__net-snmp__net-snmp-config.h.in >=================================================================== >--- files/patch-include__net-snmp__net-snmp-config.h.in (revision 481410) >+++ files/patch-include__net-snmp__net-snmp-config.h.in (nonexistent) >@@ -1,11 +0,0 @@ >---- ./include/net-snmp/net-snmp-config.h.in.orig 2012-10-09 18:28:58.000000000 -0400 >-+++ ./include/net-snmp/net-snmp-config.h.in 2012-10-14 11:37:35.000000000 -0400 >-@@ -2106,7 +2106,7 @@ >- #define UCD_SNMP_LIBRARY 1 >- >- /* final conclusion on nlist usage */ >--#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && defined(HAVE_KMEM) && !defined(NETSNMP_NO_KMEM_USAGE) >-+#if defined(HAVE_NLIST) && defined(HAVE_STRUCT_NLIST_N_VALUE) && !defined(NETSNMP_DONT_USE_NLIST) && !defined(NETSNMP_NO_KMEM_USAGE) >- #define NETSNMP_CAN_USE_NLIST >- #endif >- > >Property changes on: files/patch-include__net-snmp__net-snmp-config.h.in >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-kthreads >=================================================================== >--- files/patch-kthreads (revision 481410) >+++ files/patch-kthreads (nonexistent) >@@ -1,96 +0,0 @@ >-diff --git a/agent/mibgroup/host/data_access/swrun.c b/agent/mibgroup/host/data_access/swrun.c >-index d18ea5f..60ad5b4 100644 >---- agent/mibgroup/host/data_access/swrun.c >-+++ agent/mibgroup/host/data_access/swrun.c >-@@ -75,10 +75,27 @@ shutdown_swrun(void) >- } >- >- int >--swrun_count_processes( void ) >-+swrun_count_processes(int include_kthreads) >- { >-+ netsnmp_swrun_entry *entry; >-+ netsnmp_iterator *it; >-+ int i = 0; >-+ >- netsnmp_cache_check_and_reload(swrun_cache); >-- return ( swrun_container ? CONTAINER_SIZE(swrun_container) : 0 ); >-+ if ( !swrun_container ) >-+ return 0; /* or -1 */ >-+ >-+ if (include_kthreads) >-+ return ( swrun_container ? CONTAINER_SIZE(swrun_container) : 0 ); >-+ >-+ it = CONTAINER_ITERATOR( swrun_container ); >-+ while ((entry = (netsnmp_swrun_entry*)ITERATOR_NEXT( it )) != NULL) { >-+ if (4 == entry->hrSWRunType) >-+ i++; >-+ } >-+ ITERATOR_RELEASE( it ); >-+ >-+ return i; >- } >- >- #ifndef NETSNMP_FEATURE_REMOVE_SWRUN_MAX_PROCESSES >-diff --git a/agent/mibgroup/host/hr_system.c b/agent/mibgroup/host/hr_system.c >-index d99cc7d..e853779 100644 >---- agent/mibgroup/host/hr_system.c >-+++ agent/mibgroup/host/hr_system.c >-@@ -24,6 +24,7 @@ >- >- #include <net-snmp/net-snmp-includes.h> >- #include <net-snmp/agent/net-snmp-agent-includes.h> >-+#include <net-snmp/data_access/swrun.h> >- >- #include "host.h" >- #include "host_res.h" >-@@ -114,7 +115,14 @@ static long get_max_solaris_processes(void); >- static int get_load_dev(void); >- static int count_users(void); >- extern int count_processes(void); >--extern int swrun_count_processes(void); >-+#if USING_HOST_DATA_ACCESS_SWRUN_MODULE >-+static int count_kthreads = 0; >-+ >-+static void parse_count_kthreads(const char *token, const char *line) >-+{ >-+ count_kthreads = atoi(line); >-+} >-+#endif >- >- /********************* >- * >-@@ -194,6 +202,11 @@ init_hr_system(void) >- #ifdef NPROC_SYMBOL >- auto_nlist(NPROC_SYMBOL, 0, 0); >- #endif >-+#if USING_HOST_DATA_ACCESS_SWRUN_MODULE >-+ snmpd_register_const_config_handler("count_kthreads", >-+ parse_count_kthreads, NULL, >-+ "0|1 0 to exclude kernel threads from hrSystemProcesses.0"); >-+#endif >- >- REGISTER_MIB("host/hr_system", hrsystem_variables, variable2, >- hrsystem_variables_oid); >-@@ -317,7 +330,7 @@ var_hrsys(struct variable * vp, >- return (u_char *) & long_return; >- case HRSYS_PROCS: >- #if USING_HOST_DATA_ACCESS_SWRUN_MODULE >-- long_return = swrun_count_processes(); >-+ long_return = swrun_count_processes(count_kthreads); >- #elif USING_HOST_HR_SWRUN_MODULE >- long_return = count_processes(); >- #else >-diff --git a/include/net-snmp/data_access/swrun.h b/include/net-snmp/data_access/swrun.h >-index 3e15c41..4f768ac 100644 >---- include/net-snmp/data_access/swrun.h >-+++ include/net-snmp/data_access/swrun.h >-@@ -85,7 +85,7 @@ extern "C" { >- >- void netsnmp_swrun_entry_free(netsnmp_swrun_entry *entry); >- >-- int swrun_count_processes( void ); >-+ int swrun_count_processes( int include_kthreads ); >- int swrun_max_processes( void ); >- int swrun_count_processes_by_name( char *name ); >- > >Property changes on: files/patch-kthreads >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-perl5.23 >=================================================================== >--- files/patch-perl5.23 (revision 481410) >+++ files/patch-perl5.23 (nonexistent) >@@ -1,135 +0,0 @@ >---- agent/snmp_perl.c.orig 2015-08-11 13:07:06 UTC >-+++ agent/snmp_perl.c >-@@ -5,6 +5,10 @@ >- #include <EXTERN.h> >- #include "perl.h" >- >-+#ifdef U64TYPE >-+#define U64 U64pairU32 >-+#endif >-+ >- #include <net-snmp/net-snmp-config.h> >- #include <net-snmp/net-snmp-includes.h> >- #include <net-snmp/agent/net-snmp-agent-includes.h> >---- perl/OID/OID.xs.orig 2015-08-11 13:07:28 UTC >-+++ perl/OID/OID.xs >-@@ -7,6 +7,10 @@ >- #include "perl.h" >- #include "XSUB.h" >- >-+#ifdef U64TYPE >-+#define U64 U64pairU32 >-+#endif >-+ >- #include <net-snmp/net-snmp-config.h> >- #include <net-snmp/net-snmp-includes.h> >- >---- perl/SNMP/SNMP.xs.orig 2015-08-11 13:07:54 UTC >-+++ perl/SNMP/SNMP.xs >-@@ -16,6 +16,10 @@ >- #include "perl.h" >- #include "XSUB.h" >- >-+#ifdef U64TYPE >-+#define U64 U64pairU32 >-+#endif >-+ >- #include <net-snmp/net-snmp-config.h> >- #include <net-snmp/net-snmp-includes.h> >- #include <sys/types.h> >---- perl/TrapReceiver/TrapReceiver.xs.orig 2015-08-11 13:08:02 UTC >-+++ perl/TrapReceiver/TrapReceiver.xs >-@@ -9,6 +9,10 @@ >- >- #include "ppport.h" >- >-+#ifdef U64TYPE >-+#define U64 U64pairU32 >-+#endif >-+ >- #include <net-snmp/net-snmp-config.h> >- #include <net-snmp/net-snmp-includes.h> >- #include <net-snmp/agent/net-snmp-agent-includes.h> >---- perl/agent/agent.xs.orig 2015-08-11 13:07:48 UTC >-+++ perl/agent/agent.xs >-@@ -9,6 +9,10 @@ >- #include <netdb.h> >- #include <sys/socket.h> >- >-+#ifdef U64TYPE >-+#define U64 U64pairU32 >-+#endif >-+ >- #include <net-snmp/net-snmp-config.h> >- #include <net-snmp/net-snmp-includes.h> >- #include <net-snmp/agent/net-snmp-agent-includes.h> >---- perl/ASN/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/ASN/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package ASN; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/AnyData_SNMP/Makefile.PL.orig 2015-09-03 22:27:45 UTC >-+++ perl/AnyData_SNMP/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package AnyData_SNMP; >- use ExtUtils::MakeMaker; >- # See lib/ExtUtils/MakeMaker.pm for details of how to influence >- # the contents of the Makefile that is written. >---- perl/OID/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/OID/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package OID; >- # See lib/ExtUtils/MakeMaker.pm for details of how to influence >- # the contents of the Makefile that is written. >- >---- perl/SNMP/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/SNMP/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package SNMP; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/TrapReceiver/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/TrapReceiver/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package TrapReceiver; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/agent/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/agent/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package agent; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/agent/Support/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/agent/Support/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package agent_Support; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/agent/default_store/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/agent/default_store/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package agent_default_store; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/default_store/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/default_store/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package default_store; >- use ExtUtils::MakeMaker; >- require 5; >- use Config; >---- perl/manager/Makefile.PL.orig 2014-12-08 20:23:22 UTC >-+++ perl/manager/Makefile.PL >-@@ -1,3 +1,4 @@ >-+package manager; >- use ExtUtils::MakeMaker; >- # See lib/ExtUtils/MakeMaker.pm for details of how to influence >- # the contents of the Makefile that is written. > >Property changes on: files/patch-perl5.23 >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-snmplib_snmp__api.c >=================================================================== >--- files/patch-snmplib_snmp__api.c (revision 481410) >+++ files/patch-snmplib_snmp__api.c (nonexistent) >@@ -1,117 +0,0 @@ >---- snmplib/snmp_api.c.orig 2014-12-08 20:23:22 UTC >-+++ snmplib/snmp_api.c >-@@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char >- u_char type; >- u_char msg_type; >- u_char *var_val; >-- int badtype = 0; >- size_t len; >- size_t four; >-- netsnmp_variable_list *vp = NULL; >-+ netsnmp_variable_list *vp = NULL, *vplast = NULL; >- oid objid[MAX_OID_LEN]; >- u_char *p; >- >-@@ -4493,38 +4492,24 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char >- (ASN_SEQUENCE | ASN_CONSTRUCTOR), >- "varbinds"); >- if (data == NULL) >-- return -1; >-+ goto fail; >- >- /* >- * get each varBind sequence >- */ >- while ((int) *length > 0) { >-- netsnmp_variable_list *vptemp; >-- vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp)); >-- if (NULL == vptemp) { >-- return -1; >-- } >-- if (NULL == vp) { >-- pdu->variables = vptemp; >-- } else { >-- vp->next_variable = vptemp; >-- } >-- vp = vptemp; >-+ vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list); >-+ if (NULL == vp) >-+ goto fail; >- >-- vp->next_variable = NULL; >-- vp->val.string = NULL; >- vp->name_length = MAX_OID_LEN; >-- vp->name = NULL; >-- vp->index = 0; >-- vp->data = NULL; >-- vp->dataFreeHook = NULL; >- DEBUGDUMPSECTION("recv", "VarBind"); >- data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type, >- &vp->val_len, &var_val, length); >- if (data == NULL) >-- return -1; >-+ goto fail; >- if (snmp_set_var_objid(vp, objid, vp->name_length)) >-- return -1; >-+ goto fail; >- >- len = MAX_PACKET_LENGTH; >- DEBUGDUMPHEADER("recv", "Value"); >-@@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char >- vp->val.string = (u_char *) malloc(vp->val_len); >- } >- if (vp->val.string == NULL) { >-- return -1; >-+ goto fail; >- } >- p = asn_parse_string(var_val, &len, &vp->type, vp->val.string, >- &vp->val_len); >-@@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char >- vp->val_len *= sizeof(oid); >- vp->val.objid = (oid *) malloc(vp->val_len); >- if (vp->val.objid == NULL) { >-- return -1; >-+ goto fail; >- } >- memmove(vp->val.objid, objid, vp->val_len); >- break; >-@@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char >- case ASN_BIT_STR: >- vp->val.bitstring = (u_char *) malloc(vp->val_len); >- if (vp->val.bitstring == NULL) { >-- return -1; >-+ goto fail; >- } >- p = asn_parse_bitstring(var_val, &len, &vp->type, >- vp->val.bitstring, &vp->val_len); >-@@ -4640,12 +4625,28 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char >- break; >- default: >- snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type); >-- badtype = -1; >-+ goto fail; >- break; >- } >- DEBUGINDENTADD(-4); >-+ >-+ if (NULL == vplast) { >-+ pdu->variables = vp; >-+ } else { >-+ vplast->next_variable = vp; >-+ } >-+ vplast = vp; >-+ vp = NULL; >- } >-- return badtype; >-+ return 0; >-+ >-+ fail: >-+ DEBUGMSGTL(("recv", "error while parsing VarBindList\n")); >-+ /** if we were parsing a var, remove it from the pdu and free it */ >-+ if (vp) >-+ snmp_free_var(vp); >-+ >-+ return -1; >- } >- >- /* > >Property changes on: files/patch-snmplib_snmp__api.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-snmpusm.c >=================================================================== >--- files/patch-snmpusm.c (revision 481410) >+++ files/patch-snmpusm.c (working copy) >@@ -1,11 +1,11 @@ >---- snmplib/snmpusm.c.orig 2011-07-27 09:58:24.000000000 -0300 >-+++ snmplib/snmpusm.c 2011-07-27 09:57:48.000000000 -0300 >-@@ -91,6 +91,8 @@ >- oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; >+--- snmplib/snmpusm.c.orig 2018-07-16 16:33:40.000000000 +0200 >++++ snmplib/snmpusm.c 2018-10-07 10:19:02.166439000 +0200 >+@@ -117,6 +117,8 @@ >+ oid usmAESPrivProtocol[10] = { 1, 3, 6, 1, 6, 3, 10, 1, 2, 4 }; > /* backwards compat */ >- oid *usmAES128PrivProtocol = usmAESPrivProtocol; >-+oid *usmAES192PrivProtocol = usmAESPrivProtocol; >-+oid *usmAES256PrivProtocol = usmAESPrivProtocol; >+ oid *usmAES128PrivProtocol = usmAESPrivProtocol; >++oid *usmAES192PrivProtocol = usmAESPrivProtocol; >++oid *usmAES256PrivProtocol = usmAESPrivProtocol; > >- static u_int dummy_etime, dummy_eboot; /* For ISENGINEKNOWN(). */ >- >+ #ifdef NETSNMP_DRAFT_BLUMENTHAL_AES_04 >+ /* OIDs from http://www.snmp.com/eso/esoConsortiumMIB.txt */ >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 481410) >+++ pkg-plist (working copy) >@@ -1,4 +1,5 @@ > bin/agentxtrap >+bin/checkbandwidth > bin/encode_keychange > bin/fixproc > bin/ipf-mod.pl >@@ -18,11 +19,15 @@ > bin/snmpgetnext > bin/snmpinform > bin/snmpnetstat >+bin/snmppcap >+bin/snmpping >+bin/snmpps > bin/snmpset > bin/snmpstatus > bin/snmptable > bin/snmptest > %%TLS%%bin/snmptls >+bin/snmptop > bin/snmptranslate > bin/snmptrap > bin/snmpusm >@@ -54,6 +59,7 @@ > include/net-snmp/agent/mode_end_call.h > include/net-snmp/agent/multiplexer.h > include/net-snmp/agent/net-snmp-agent-includes.h >+include/net-snmp/agent/netsnmp_close_fds.h > include/net-snmp/agent/null.h > include/net-snmp/agent/old_api.h > include/net-snmp/agent/read_only.h >@@ -110,6 +116,7 @@ > include/net-snmp/library/md5.h > include/net-snmp/library/mib.h > include/net-snmp/library/mt_support.h >+include/net-snmp/library/netsnmp-attribute-format.h > include/net-snmp/library/oid_stash.h > include/net-snmp/library/parse.h > include/net-snmp/library/read_config.h >@@ -177,6 +184,13 @@ > include/net-snmp/system/darwin8.h > include/net-snmp/system/darwin9.h > include/net-snmp/system/darwin10.h >+include/net-snmp/system/darwin11.h >+include/net-snmp/system/darwin12.h >+include/net-snmp/system/darwin13.h >+include/net-snmp/system/darwin14.h >+include/net-snmp/system/darwin15.h >+include/net-snmp/system/darwin16.h >+include/net-snmp/system/darwin17.h > include/net-snmp/system/dragonfly.h > include/net-snmp/system/dynix.h > include/net-snmp/system/freebsd.h >@@ -194,13 +208,17 @@ > include/net-snmp/system/generic.h > include/net-snmp/system/hpux.h > include/net-snmp/system/irix.h >+include/net-snmp/system/kfreebsd.h > include/net-snmp/system/linux.h > include/net-snmp/system/mingw32.h >+include/net-snmp/system/mingw32msvc.h > include/net-snmp/system/mips.h > include/net-snmp/system/netbsd.h >+include/net-snmp/system/nto-qnx6.h > include/net-snmp/system/openbsd.h > include/net-snmp/system/openbsd4.h > include/net-snmp/system/openbsd5.h >+include/net-snmp/system/openbsd6.h > include/net-snmp/system/osf5.h > include/net-snmp/system/solaris.h > include/net-snmp/system/solaris2.3.h >@@ -253,6 +271,8 @@ > man/man1/snmpgetnext.1.gz > man/man1/snmpinform.1.gz > man/man1/snmpnetstat.1.gz >+man/man1/snmpps.1.gz >+man/man1/snmptop.1.gz > man/man1/snmpset.1.gz > man/man1/snmpstatus.1.gz > man/man1/snmptable.1.gz >@@ -375,7 +395,7 @@ > %%WITH_PERL%%man/man3/NetSNMP::default_store.3.gz > %%WITH_PERL%%man/man3/NetSNMP::netsnmp_request_infoPtr.3.gz > %%WITH_PERL%%man/man3/SNMP.3.gz >-%%WITH_PERL%%%%SITE_ARCH%%/Bundle/Makefile.subs.pl >+%%WITH_PERL%%%%SITE_ARCH%%/Bundle/MakefileSubs.pm > %%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/ASN.pm > %%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/OID.pm > %%WITH_PERL%%%%SITE_ARCH%%/NetSNMP/TrapReceiver.pm >@@ -430,6 +450,7 @@ > %%DATADIR%%/mib2c.mfd.conf > %%DATADIR%%/mib2c.notify.conf > %%DATADIR%%/mib2c.old-api.conf >+%%DATADIR%%/mib2c.org-mode.conf > %%DATADIR%%/mib2c.perl.conf > %%DATADIR%%/mib2c.raw-table.conf > %%DATADIR%%/mib2c.scalar.conf >@@ -552,6 +573,7 @@ > %%DATADIR%%/mibs/SNMP-USER-BASED-SM-MIB.txt > %%DATADIR%%/mibs/SNMP-USM-AES-MIB.txt > %%DATADIR%%/mibs/SNMP-USM-DH-OBJECTS-MIB.txt >+%%DATADIR%%/mibs/SNMP-USM-HMAC-SHA2-MIB.txt > %%DATADIR%%/mibs/SNMP-VIEW-BASED-ACM-MIB.txt > %%DATADIR%%/mibs/SNMPv2-CONF.txt > %%DATADIR%%/mibs/SNMPv2-MIB.txt
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=197865">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 232025
:
197865
|
202563
|
202690
|
202692
|
205132
|
205592
|
207965
|
207967