[Midnightbsd-cvs] mports [22045] trunk/net-mgmt/net-snmp/files: revert update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Oct 30 14:35:43 EDT 2016
Revision: 22045
http://svnweb.midnightbsd.org/mports/?rev=22045
Author: laffer1
Date: 2016-10-30 14:35:43 -0400 (Sun, 30 Oct 2016)
Log Message:
-----------
revert update
Modified Paths:
--------------
trunk/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
trunk/net-mgmt/net-snmp/files/patch-agent__auto_nlist.c
trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__agent__extend.c
trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swrun_kinfo.c
trunk/net-mgmt/net-snmp/files/patch-freebsd8.h
trunk/net-mgmt/net-snmp/files/patch-freebsd9.h
trunk/net-mgmt/net-snmp/files/patch-generic.h
trunk/net-mgmt/net-snmp/files/patch-local:snmpconf
Modified: trunk/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in
===================================================================
--- trunk/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/extra-patch-local:Makefile.in 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,11 +0,0 @@
---- ./local/Makefile.in.orig 2012-06-12 10:48:43.000000000 -0400
-+++ ./local/Makefile.in 2012-06-12 10:48:50.000000000 -0400
-@@ -16,7 +16,7 @@
- #
- SNMPCONFPATH=@SNMPCONFPATH@
- PERSISTENT_DIRECTORY=@PERSISTENT_DIRECTORY@
--PERLSCRIPTS=snmpcheck tkmib mib2c fixproc ipf-mod.pl snmpconf traptoemail snmp-bridge-mib net-snmp-cert
-+PERLSCRIPTS=snmpcheck mib2c fixproc ipf-mod.pl snmpconf traptoemail snmp-bridge-mib net-snmp-cert
- SHELLSCRIPTS=mib2c-update
- SCRIPTSMADEFORPERL=snmpcheck.made tkmib.made mib2c.made fixproc.made \
- ipf-mod.pl.made snmpconf.made traptoemail.made snmp-bridge-mib.made \
Modified: trunk/net-mgmt/net-snmp/files/patch-agent__auto_nlist.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent__auto_nlist.c 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-agent__auto_nlist.c 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,10 +0,0 @@
---- ./agent/auto_nlist.c.orig 2012-10-09 18:28:58.000000000 -0400
-+++ ./agent/auto_nlist.c 2013-04-10 14:26:21.000000000 -0400
-@@ -56,6 +56,7 @@
- static char *n_name = NULL;
- #endif
- *ptr = (struct autonlist *) malloc(sizeof(struct autonlist));
-+ bzero(*ptr, sizeof(struct autonlist));
- it = *ptr;
- it->left = 0;
- it->right = 0;
Modified: trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__agent__extend.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__agent__extend.c 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__agent__extend.c 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,44 +0,0 @@
---- ./agent/mibgroup/agent/extend.c.orig 2012-10-09 18:28:58.000000000 -0400
-+++ ./agent/mibgroup/agent/extend.c 2012-10-24 07:46:37.000000000 -0400
-@@ -34,7 +34,7 @@
- size_t oid_len;
- long num_entries;
- netsnmp_extend *ehead;
-- netsnmp_handler_registration *reg[3];
-+ netsnmp_handler_registration *reg[4];
- struct extend_registration_block_s *next;
- } extend_registration_block;
- extend_registration_block *ereg_head = NULL;
-@@ -222,10 +222,13 @@
- rc = netsnmp_register_watched_scalar2( reg, winfo );
- if (rc != SNMPERR_SUCCESS)
- goto bail;
-+ eptr->reg[3] = reg;
-
- return eptr;
-
- bail:
-+ if (eptr->reg[3])
-+ netsnmp_unregister_handler(eptr->reg[3]);
- if (eptr->reg[2])
- netsnmp_unregister_handler(eptr->reg[2]);
- if (eptr->reg[1])
-@@ -267,6 +270,7 @@
- netsnmp_unregister_handler( eptr->reg[0] );
- netsnmp_unregister_handler( eptr->reg[1] );
- netsnmp_unregister_handler( eptr->reg[2] );
-+ netsnmp_unregister_handler( eptr->reg[3] );
- SNMP_FREE(eptr);
- }
- ereg_head = NULL;
-@@ -550,6 +554,10 @@
- }
-
- eptr = _register_extend( oid_buf, oid_len );
-+ if (!eptr) {
-+ snmp_log(LOG_ERR, "Failed to register extend entry '%s' - possibly duplicate name.\n", exec_name );
-+ return;
-+ }
- extension = _new_extension( exec_name, flags, eptr );
- if (extension) {
- extension->command = strdup( exec_command );
Modified: trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swrun_kinfo.c
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swrun_kinfo.c 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swrun_kinfo.c 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,11 +0,0 @@
---- ./agent/mibgroup/host/data_access/swrun_kinfo.c.orig 2012-10-09 18:28:58.000000000 -0400
-+++ ./agent/mibgroup/host/data_access/swrun_kinfo.c 2013-02-12 18:55:42.000000000 -0500
-@@ -186,7 +186,7 @@
- #if HAVE_KVM_GETPROC2
- argv = kvm_getargv2( kd, &(proc_table[i]), 0);
- #else
-- argv = kvm_getargv( kd, &(proc_table[i]), 0);
-+ argv = kvm_getargv( kd, &(proc_table[i]), BUFSIZ);
- #endif
-
- entry->hrSWRunName_len = snprintf(entry->hrSWRunName,
Modified: trunk/net-mgmt/net-snmp/files/patch-freebsd8.h
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-freebsd8.h 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-freebsd8.h 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,5 +0,0 @@
---- include/net-snmp/system/freebsd8.h.orig 2009-01-24 13:29:00.000000000 +0900
-+++ include/net-snmp/system/freebsd8.h 2009-01-24 23:23:25.000000000 +0900
-@@ -0,0 +1,2 @@
-+#include "freebsd7.h"
-+#define freebsd7 freebsd7
Modified: trunk/net-mgmt/net-snmp/files/patch-freebsd9.h
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-freebsd9.h 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-freebsd9.h 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,5 +0,0 @@
---- include/net-snmp/system/freebsd9.h.orig 2009-09-11 10:02:17.000000000 -0400
-+++ include/net-snmp/system/freebsd9.h 2009-09-11 10:02:17.000000000 -0400
-@@ -0,0 +1,2 @@
-+#include "freebsd8.h"
-+#define freebsd8 freebsd8
Modified: trunk/net-mgmt/net-snmp/files/patch-generic.h
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-generic.h 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-generic.h 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,14 +0,0 @@
---- include/net-snmp/system/generic.h.orig 2008-03-26 10:28:25.802233395 +0900
-+++ include/net-snmp/system/generic.h 2008-03-26 10:29:40.629721291 +0900
-@@ -1,3 +1,5 @@
-+#ifndef __NET_SNMP_SYSTEM_GENERIC_H__
-+#define __NET_SNMP_SYSTEM_GENERIC_H__
-
- #define bsdlike bsdlike
-
-@@ -72,3 +74,5 @@
- */
- #define INP_NEXT_SYMBOL inp_next
- #define INP_PREV_SYMBOL inp_prev
-+
-+#endif /* !__NET_SNMP_SYSTEM_GENERIC_H__ */
Modified: trunk/net-mgmt/net-snmp/files/patch-local:snmpconf
===================================================================
--- trunk/net-mgmt/net-snmp/files/patch-local:snmpconf 2016-10-30 18:26:20 UTC (rev 22044)
+++ trunk/net-mgmt/net-snmp/files/patch-local:snmpconf 2016-10-30 18:35:43 UTC (rev 22045)
@@ -1,35 +0,0 @@
---- local/snmpconf.orig Sun Aug 21 10:23:23 2005
-+++ local/snmpconf Wed Nov 30 12:19:42 2005
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!%%PERL%% -w
-
- #
- # A simple configuration file builder based on questions listed in
-@@ -31,7 +31,7 @@
- $opts{'c'} = &my_getenv("SNMPSHAREPATH") . "/snmpconf-data";
- }
- else {
-- $opts{'c'} = "/usr/local/share/snmp/snmpconf-data";
-+ $opts{'c'} = "%%PREFIX%%/share/snmp/snmpconf-data";
- }
-
- # default config file path
-@@ -39,7 +39,7 @@
- $confpath = &my_getenv("SNMPCONFPATH");
- }
- else {
-- $confpath = "/usr/local/share/snmp";
-+ $confpath = "%%PREFIX%%/share/snmp";
- }
-
- # home environment variable
-@@ -100,7 +100,7 @@
- $ENV_SEPARATOR = ';';
- }
- my @searchpath = split(/$ENV_SEPARATOR/, $confpath);
--push @searchpath, "/usr/local/etc/snmp";
-+push @searchpath, "%%PREFIX%%/etc/snmp";
- push @searchpath, ".";
- push @searchpath, "$home";
-
More information about the Midnightbsd-cvs
mailing list