OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Steffen Weinreich Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-Nov-2005 23:09:03 Branch: HEAD Handle: 2005112922090200 Modified files: openpkg-src/snmp snmp.patch snmp.spec Log: upgrading package: snmp 5.2.1 -> 5.2.2 Summary: Revision Changes Path 1.11 +27 -43 openpkg-src/snmp/snmp.patch 1.79 +2 -2 openpkg-src/snmp/snmp.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/snmp/snmp.patch ============================================================================ $ cvs diff -u -r1.10 -r1.11 snmp.patch --- openpkg-src/snmp/snmp.patch 3 Oct 2005 15:53:36 -0000 1.10 +++ openpkg-src/snmp/snmp.patch 29 Nov 2005 22:09:02 -0000 1.11 @@ -1,6 +1,6 @@ Index: agent/auto_nlist.c --- agent/auto_nlist.c.orig 2002-05-15 14:53:01 +0200 -+++ agent/auto_nlist.c 2004-08-07 20:15:11 +0200 ++++ agent/auto_nlist.c 2005-11-29 23:02:46 +0100 @@ -57,6 +57,7 @@ } if (*ptr == 0) { @@ -10,9 +10,9 @@ it->left = 0; it->right = 0; Index: agent/mibgroup/mibII/tcp.c ---- agent/mibgroup/mibII/tcp.c.orig 2004-06-04 09:20:03 +0200 -+++ agent/mibgroup/mibII/tcp.c 2004-08-07 20:16:20 +0200 -@@ -68,7 +68,7 @@ +--- agent/mibgroup/mibII/tcp.c.orig 2005-09-16 16:46:59 +0200 ++++ agent/mibgroup/mibII/tcp.c 2005-11-29 23:02:46 +0100 +@@ -78,7 +78,7 @@ * But only define it under FreeBSD, since it * breaks other systems (notable AIX) */ @@ -22,9 +22,9 @@ #endif Index: agent/mibgroup/mibII/tcpTable.c ---- agent/mibgroup/mibII/tcpTable.c.orig 2004-07-21 08:26:18 +0200 -+++ agent/mibgroup/mibII/tcpTable.c 2004-08-07 20:21:16 +0200 -@@ -96,6 +96,11 @@ +--- agent/mibgroup/mibII/tcpTable.c.orig 2005-09-27 23:24:11 +0200 ++++ agent/mibgroup/mibII/tcpTable.c 2005-11-29 23:02:46 +0100 +@@ -97,6 +97,11 @@ #define TCPTABLE_REMOTEPORT pcb.inp_fport #define TCPTABLE_IS_LINKED_LIST @@ -34,9 +34,9 @@ +#endif + #endif /* linux */ - #endif /* WIN32 */ + #endif /* WIN32 cygwin */ #endif /* solaris2 */ -@@ -736,12 +741,17 @@ +@@ -737,12 +742,17 @@ nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb); if (!nnew) break; @@ -55,9 +55,9 @@ nnew->inp_next = tcp_head; tcp_head = nnew; Index: agent/mibgroup/ucd-snmp/diskio.c ---- agent/mibgroup/ucd-snmp/diskio.c.orig 2004-06-29 13:57:08 +0200 -+++ agent/mibgroup/ucd-snmp/diskio.c 2004-08-07 20:15:11 +0200 -@@ -474,6 +474,20 @@ +--- agent/mibgroup/ucd-snmp/diskio.c.orig 2005-06-23 02:05:35 +0200 ++++ agent/mibgroup/ucd-snmp/diskio.c 2005-11-29 23:02:46 +0100 +@@ -580,6 +580,20 @@ case DISKIO_DEVICE: *var_len = strlen(stat->dinfo->devices[indx].device_name); return (u_char *) stat->dinfo->devices[indx].device_name; @@ -78,25 +78,25 @@ case DISKIO_NREAD: #if defined(freebsd5) && __FreeBSD_version >= 500107 long_ret = (signed long) stat->dinfo->devices[indx].bytes[DEVSTAT_READ]; -@@ -502,6 +516,7 @@ - long_ret = (signed long) stat->dinfo->devices[indx].num_writes; - #endif +@@ -617,6 +631,7 @@ + case DISKIO_LA15: + long_ret = devloads[indx].la15; return (u_char *) & long_ret; +#endif 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 2004-01-29 14:53:59 +0100 -+++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2004-08-07 20:15:11 +0200 +--- agent/mibgroup/ucd-snmp/memory_solaris2.c.orig 2004-02-03 00:58:41 +0100 ++++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2005-11-29 23:02:46 +0100 @@ -1,3 +1,4 @@ +#undef _FILE_OFFSET_BITS /* swapctl doesn't support 64bit off_t */ #include <net-snmp/net-snmp-config.h> /* local SNMP configuration details */ #if HAVE_STRING_H #include <string.h> Index: agent/mibgroup/ucd-snmp/proc.c ---- agent/mibgroup/ucd-snmp/proc.c.orig 2004-02-17 06:40:43 +0100 -+++ agent/mibgroup/ucd-snmp/proc.c 2004-08-07 20:15:11 +0200 +--- agent/mibgroup/ucd-snmp/proc.c.orig 2004-02-17 06:40:49 +0100 ++++ agent/mibgroup/ucd-snmp/proc.c 2005-11-29 23:02:46 +0100 @@ -1,3 +1,6 @@ +#ifdef solaris2 +#undef _FILE_OFFSET_BITS /* solaris procfs doesn't support 64bit off_t */ @@ -105,9 +105,9 @@ #ifdef solaris2 Index: agent/mibgroup/util_funcs.c ---- agent/mibgroup/util_funcs.c.orig 2004-06-18 14:58:24 +0200 -+++ agent/mibgroup/util_funcs.c 2004-08-07 20:15:20 +0200 -@@ -391,6 +391,9 @@ +--- agent/mibgroup/util_funcs.c.orig 2005-03-02 19:43:12 +0100 ++++ agent/mibgroup/util_funcs.c 2005-11-29 23:02:46 +0100 +@@ -408,6 +408,9 @@ int fd[2][2], i, cnt; char ctmp[STRMAX], *cptr1, *cptr2, argvs[STRMAX], **argv, **aptr; @@ -118,8 +118,8 @@ * Setup our pipes */ Index: include/net-snmp/library/system.h ---- include/net-snmp/library/system.h.orig 2003-11-30 23:31:42 +0100 -+++ include/net-snmp/library/system.h 2004-08-07 20:15:20 +0200 +--- include/net-snmp/library/system.h.orig 2004-10-21 01:52:35 +0200 ++++ include/net-snmp/library/system.h 2005-11-29 23:02:46 +0100 @@ -114,7 +114,8 @@ char *strdup(const char *); #endif @@ -131,9 +131,9 @@ int calculate_time_diff(struct timeval *, Index: snmplib/system.c ---- snmplib/system.c.orig 2004-12-25 05:51:17.000000000 +0100 -+++ snmplib/system.c 2005-10-03 17:46:26.922736673 +0200 -@@ -866,7 +866,7 @@ +--- snmplib/system.c.orig 2005-08-30 02:29:24 +0200 ++++ snmplib/system.c 2005-11-29 23:02:46 +0100 +@@ -871,7 +871,7 @@ #ifndef HAVE_SETENV int @@ -142,19 +142,3 @@ { char *cp; int ret; -@@ -1063,12 +1063,14 @@ - * If the release is ordered higher, return 1. - * Be aware that "ordered higher" is not a guarantee of correctness. - */ -+#if HAVE_SYS_UTSNAME_H -+#include <sys/utsname.h> -+#endif - int - netsnmp_os_prematch(const char *ospmname, - const char *ospmrelprefix) - { - #if HAVE_SYS_UTSNAME_H --#include <sys/utsname.h> - static int printOSonce = 1; - struct utsname utsbuf; - if ( 0 != uname(&utsbuf)) @@ . patch -p0 <<'@@ .' Index: openpkg-src/snmp/snmp.spec ============================================================================ $ cvs diff -u -r1.78 -r1.79 snmp.spec --- openpkg-src/snmp/snmp.spec 3 Oct 2005 15:53:36 -0000 1.78 +++ openpkg-src/snmp/snmp.spec 29 Nov 2005 22:09:02 -0000 1.79 @@ -35,8 +35,8 @@ Class: BASE Group: Network License: BSD -Version: 5.2.1 -Release: 20051003 +Version: 5.2.2 +Release: 20051129 # package options %option with_fsl yes @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org