# HG changeset patch # User Michael Schloh von Bennewitz # Date 1316077432 -7200 # Node ID 198005e4aad2aefd3cb05f0300bec50a2e257262 # Parent aa138c6f5dd6348ecc78a4d079ec57ab44f9cab6 Update to new version of vendor software. diff -r aa138c6f5dd6 -r 198005e4aad2 snmp/snmp.patch --- a/snmp/snmp.patch Sat Jul 09 16:54:58 2011 +0200 +++ b/snmp/snmp.patch Thu Sep 15 11:03:52 2011 +0200 @@ -1,7 +1,8 @@ Index: Makefile.in ---- Makefile.in.orig 2010-09-10 06:23:07.000000000 +0200 -+++ Makefile.in 2010-10-09 09:56:09.000000000 +0200 -@@ -18,7 +18,7 @@ +diff -Nau Makefile.in.orig Makefile.in +--- Makefile.in.orig 2011-07-02 00:35:46.000000000 +0200 ++++ Makefile.in 2011-09-15 09:22:50.255341188 +0200 +@@ -19,7 +19,7 @@ INCLUDESUBDIR=system INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \ darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \ @@ -11,8 +12,9 @@ hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \ solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \ Index: agent/auto_nlist.c ---- agent/auto_nlist.c.orig 2010-07-29 16:58:47.000000000 +0200 -+++ agent/auto_nlist.c 2010-10-09 09:08:23.000000000 +0200 +diff -Nau agent/auto_nlist.c.orig agent/auto_nlist.c +--- agent/auto_nlist.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/auto_nlist.c 2011-09-15 09:22:50.256627584 +0200 @@ -53,6 +53,7 @@ } if (*ptr == 0) { @@ -22,9 +24,10 @@ it->left = 0; it->right = 0; Index: agent/mibgroup/mibII/tcp.c ---- agent/mibgroup/mibII/tcp.c.orig 2010-08-13 17:04:33.000000000 +0200 -+++ agent/mibgroup/mibII/tcp.c 2010-10-09 09:08:23.000000000 +0200 -@@ -87,7 +87,7 @@ +diff -Nau agent/mibgroup/mibII/tcp.c.orig agent/mibgroup/mibII/tcp.c +--- agent/mibgroup/mibII/tcp.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/mibII/tcp.c 2011-09-15 09:22:50.258135285 +0200 +@@ -88,7 +88,7 @@ * But only define it under FreeBSD, since it * breaks other systems (notable AIX) */ @@ -34,9 +37,10 @@ #endif Index: agent/mibgroup/mibII/tcpTable.c ---- agent/mibgroup/mibII/tcpTable.c.orig 2010-06-16 15:13:25.000000000 +0200 -+++ agent/mibgroup/mibII/tcpTable.c 2010-10-09 09:08:23.000000000 +0200 -@@ -104,6 +104,11 @@ +diff -Nau agent/mibgroup/mibII/tcpTable.c.orig agent/mibgroup/mibII/tcpTable.c +--- agent/mibgroup/mibII/tcpTable.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/mibII/tcpTable.c 2011-09-15 09:22:50.260414149 +0200 +@@ -110,6 +110,11 @@ #define TCPTABLE_REMOTEPORT pcb.inp_fport #define TCPTABLE_IS_LINKED_LIST @@ -48,7 +52,7 @@ #endif /* linux */ #endif /* WIN32 cygwin */ #endif /* solaris2 */ -@@ -867,12 +872,17 @@ +@@ -892,12 +897,17 @@ nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb); if (!nnew) break; @@ -64,12 +68,13 @@ sizeof(struct inpcb)); +#endif - nnew->inp_next = tcp_head; - tcp_head = nnew; + if (nnew->pcb.inp_vflag & INP_IPV6) + free(nnew); Index: agent/mibgroup/ucd-snmp/diskio.c ---- agent/mibgroup/ucd-snmp/diskio.c.orig 2010-08-13 17:04:33.000000000 +0200 -+++ agent/mibgroup/ucd-snmp/diskio.c 2010-10-09 09:08:23.000000000 +0200 -@@ -618,6 +618,20 @@ +diff -Nau agent/mibgroup/ucd-snmp/diskio.c.orig agent/mibgroup/ucd-snmp/diskio.c +--- agent/mibgroup/ucd-snmp/diskio.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/ucd-snmp/diskio.c 2011-09-15 09:22:50.263188251 +0200 +@@ -800,6 +800,20 @@ case DISKIO_DEVICE: *var_len = strlen(stat->dinfo->devices[indx].device_name); return (u_char *) stat->dinfo->devices[indx].device_name; @@ -90,7 +95,7 @@ case DISKIO_NREAD: #if defined(freebsd5) && __FreeBSD_version >= 500107 long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; -@@ -675,6 +689,7 @@ +@@ -857,6 +871,7 @@ case DISKIO_LA15: long_ret = devloads[indx].la15; return (u_char *) & long_ret; @@ -99,27 +104,30 @@ default: ERROR_MSG("diskio.c: don't know how to handle this request."); Index: agent/mibgroup/ucd-snmp/memory_solaris2.c ---- agent/mibgroup/ucd-snmp/memory_solaris2.c.orig 2008-10-21 23:10:43.000000000 +0200 -+++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2010-10-09 09:08:23.000000000 +0200 +diff -Nau agent/mibgroup/ucd-snmp/memory_solaris2.c.orig agent/mibgroup/ucd-snmp/memory_solaris2.c +--- agent/mibgroup/ucd-snmp/memory_solaris2.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2011-09-15 09:22:50.264370106 +0200 @@ -1,3 +1,4 @@ +#undef _FILE_OFFSET_BITS /* swapctl doesn't support 64bit off_t */ #include /* local SNMP configuration details */ #if HAVE_STRING_H #include Index: agent/mibgroup/ucd-snmp/proc.c ---- agent/mibgroup/ucd-snmp/proc.c.orig 2010-07-29 16:58:47.000000000 +0200 -+++ agent/mibgroup/ucd-snmp/proc.c 2010-10-09 09:08:23.000000000 +0200 +diff -Nau agent/mibgroup/ucd-snmp/proc.c.orig agent/mibgroup/ucd-snmp/proc.c +--- agent/mibgroup/ucd-snmp/proc.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/ucd-snmp/proc.c 2011-09-15 09:22:50.265801863 +0200 @@ -1,3 +1,6 @@ +#ifdef solaris2 +#undef _FILE_OFFSET_BITS /* solaris procfs doesn't support 64bit off_t */ +#endif #include + #include - #ifdef solaris2 Index: agent/mibgroup/util_funcs.c ---- agent/mibgroup/util_funcs.c.orig 2010-05-16 20:12:40.000000000 +0200 -+++ agent/mibgroup/util_funcs.c 2010-10-09 09:08:23.000000000 +0200 -@@ -457,6 +457,9 @@ +diff -Nau agent/mibgroup/util_funcs.c.orig agent/mibgroup/util_funcs.c +--- agent/mibgroup/util_funcs.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/mibgroup/util_funcs.c 2011-09-15 09:22:50.267863457 +0200 +@@ -477,6 +477,9 @@ int fd[2][2], i, cnt; char ctmp[STRMAX], *cptr1, *cptr2, argvs[STRMAX], **argv, **aptr; @@ -130,32 +138,35 @@ * Setup our pipes */ Index: agent/snmpd.c ---- agent/snmpd.c.orig 2010-08-17 20:31:31.000000000 +0200 -+++ agent/snmpd.c 2010-10-09 09:08:23.000000000 +0200 -@@ -429,7 +429,7 @@ +diff -Nau agent/snmpd.c.orig agent/snmpd.c +--- agent/snmpd.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ agent/snmpd.c 2011-09-15 09:22:41.994430685 +0200 +@@ -440,7 +440,7 @@ + int log_set = 0; int uid = 0, gid = 0; int agent_mode = -1; - char *cptr, **argvptr; - char *pid_file = NULL; + char *pid_file = "@l_prefix@/var/snmp/snmpd.pid"; char option_compatability[] = "-Le"; #if HAVE_GETPID int fd; Index: apps/snmptrapd.c ---- apps/snmptrapd.c.orig 2010-08-13 20:50:07.000000000 +0200 -+++ apps/snmptrapd.c 2010-10-09 09:08:23.000000000 +0200 -@@ -652,6 +652,7 @@ +diff -Nau apps/snmptrapd.c.orig apps/snmptrapd.c +--- apps/snmptrapd.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ apps/snmptrapd.c 2011-09-15 09:22:50.270293197 +0200 +@@ -657,6 +657,7 @@ */ #if HAVE_GETPID strcat(options, "p:"); + parse_config_pidFile(NULL, "@l_prefix@/var/snmp/snmptrapd.pid"); #endif - #ifdef WIN32 + #ifndef NETSNMP_FEATURE_REMOVE_LOGGING_SYSLOG Index: include/net-snmp/library/system.h ---- include/net-snmp/library/system.h.orig 2010-03-25 16:06:26.000000000 +0100 -+++ include/net-snmp/library/system.h 2010-10-09 09:56:40.000000000 +0200 -@@ -141,7 +141,8 @@ +diff -Nau include/net-snmp/library/system.h.orig include/net-snmp/library/system.h +--- include/net-snmp/library/system.h.orig 2011-07-02 00:35:46.000000000 +0200 ++++ include/net-snmp/library/system.h 2011-09-15 09:22:50.271350973 +0200 +@@ -155,7 +155,8 @@ #endif #ifndef HAVE_SETENV NETSNMP_IMPORT @@ -166,26 +177,29 @@ NETSNMP_IMPORT Index: include/net-snmp/system/freebsd8.h ---- include/net-snmp/system/freebsd8.h.orig 2010-02-14 20:29:08.000000000 +0100 -+++ include/net-snmp/system/freebsd8.h 2010-10-09 09:08:23.000000000 +0200 +diff -Nau include/net-snmp/system/freebsd8.h.orig include/net-snmp/system/freebsd8.h +--- include/net-snmp/system/freebsd8.h.orig 2011-07-02 00:35:46.000000000 +0200 ++++ include/net-snmp/system/freebsd8.h 2011-09-15 09:22:50.272179012 +0200 @@ -1,3 +1,6 @@ +/* freebsd8 is a superset of freebsd7 */ +#include "freebsd7.h" +#define freebsd7 freebsd7 /* freebsd8 is a superset of freebsd4 */ - #include "freebsd4.h" - #define freebsd4 freebsd4 + #include "freebsd7.h" + #define freebsd7 freebsd7 Index: include/net-snmp/system/freebsd9.h ---- include/net-snmp/system/freebsd9.h.orig 2010-10-09 09:08:23.000000000 +0200 -+++ include/net-snmp/system/freebsd9.h 2010-10-09 09:08:23.000000000 +0200 +diff -Nau include/net-snmp/system/freebsd9.h.orig include/net-snmp/system/freebsd9.h +--- include/net-snmp/system/freebsd9.h.orig 1970-01-01 01:00:00.000000000 +0100 ++++ include/net-snmp/system/freebsd9.h 2011-09-15 09:22:50.272889416 +0200 @@ -0,0 +1,3 @@ +/* freebsd9 is a superset of freebsd8 */ +#include "freebsd8.h" +#define freebsd8 freebsd8 Index: snmplib/system.c ---- snmplib/system.c.orig 2010-07-29 16:58:47.000000000 +0200 -+++ snmplib/system.c 2010-10-09 09:08:23.000000000 +0200 -@@ -837,7 +837,7 @@ +diff -Nau snmplib/system.c.orig snmplib/system.c +--- snmplib/system.c.orig 2011-07-02 00:35:46.000000000 +0200 ++++ snmplib/system.c 2011-09-15 09:22:50.274625796 +0200 +@@ -1044,7 +1044,7 @@ #ifndef HAVE_SETENV int diff -r aa138c6f5dd6 -r 198005e4aad2 snmp/snmp.spec --- a/snmp/snmp.spec Sat Jul 09 16:54:58 2011 +0200 +++ b/snmp/snmp.spec Thu Sep 15 11:03:52 2011 +0200 @@ -31,8 +31,8 @@ Class: BASE Group: Network License: BSD -Version: 5.6.1 -Release: 20110106 +Version: 5.7 +Release: 20110914 # package options %option with_fsl yes @@ -44,7 +44,7 @@ %option with_mib_sendmail no # list of sources -Source0: http://switch.dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz +Source0: http://switch.dl.sourceforge.net/net-snmp/%{version}/net-snmp-%{version}.tar.gz Source1: rc.snmp Source2: fsl.snmp Source3: snmpd.conf @@ -93,23 +93,18 @@ agent/snmpd.c \ apps/snmptrapd.c - # adjust package for RPM support in Host MIB - # (because OpenPKG RPM is a little bit different) - %{l_shtool} subst \ - -e 's;/usr/include/rpm;%{l_prefix}/include/rpm;g' \ - -e 's;-lpopt\([^a-z]\);-lrpmpopt\1;g' \ - -e 's;db-3\.1;rpmdb;g' \ - -e 's;-lz\([^a-z]\);-lrpz\1;g' \ - -e 's;-lrpm\([^a-z]\);-lrpm -lrpmio\1;g' \ - -e 's;-lrpmio\([^a-z]\);-lrpmio -lrpmpopt -lrpmbz2 -lrpmz\1;g' \ - configure - # adjust package for not requiring --enable-shared for --with-perl-modules # (because it technically working also with static libraries on most platforms) %{l_shtool} subst \ -e 's/if test "x$enable_shared" != "xyes"; then/if false; then/g' \ configure + # remove incorrectly escaped shell construct quoting + %{l_shtool} subst \ + -e 's;x\$OSTYPE;x;' \ + -e 's;\(PERLPROG -e.*system\)([^)][^)]*;\1(echo;' \ + configure + # adjust package to install Perl packages into RPM_BUILD_ROOT %{l_shtool} subst \ -e "s;perl Makefile.PL;perl Makefile.PL PERL=$perl FULLPERL=$perl PREFIX=${RPM_BUILD_ROOT}%{l_prefix} INSTALLDIRS=vendor;g" \