OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Jul-2007 13:33:08
Branch: HEAD Handle: 2007072812330700
Modified files:
openpkg-src/snmp snmp.patch snmp.spec
Log:
upgrading package: snmp 5.3.1 -> 5.4.1
Summary:
Revision Changes Path
1.12 +27 -27 openpkg-src/snmp/snmp.patch
1.90 +6 -6 openpkg-src/snmp/snmp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 snmp.patch
--- openpkg-src/snmp/snmp.patch 29 Nov 2005 22:09:02 -0000 1.11
+++ openpkg-src/snmp/snmp.patch 28 Jul 2007 11:33:07 -0000 1.12
@@ -1,7 +1,7 @@
Index: agent/auto_nlist.c
---- agent/auto_nlist.c.orig 2002-05-15 14:53:01 +0200
-+++ agent/auto_nlist.c 2005-11-29 23:02:46 +0100
-@@ -57,6 +57,7 @@
+--- agent/auto_nlist.c.orig 2006-10-14 23:28:37 +0200
++++ agent/auto_nlist.c 2007-07-28 13:31:50 +0200
+@@ -53,6 +53,7 @@
}
if (*ptr == 0) {
*ptr = (struct autonlist *) malloc(sizeof(struct autonlist));
@@ -10,21 +10,21 @@
it->left = 0;
it->right = 0;
Index: agent/mibgroup/mibII/tcp.c
---- 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 @@
+--- agent/mibgroup/mibII/tcp.c.orig 2007-07-17 01:59:44 +0200
++++ agent/mibgroup/mibII/tcp.c 2007-07-28 13:31:50 +0200
+@@ -84,7 +84,7 @@
* But only define it under FreeBSD, since it
* breaks other systems (notable AIX)
*/
--#if defined (freebsd4)
+-#ifdef freebsd4
+#if defined (freebsd4) || defined (__NetBSD__)
int hz = 1000;
#endif
Index: agent/mibgroup/mibII/tcpTable.c
---- 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 @@
+--- agent/mibgroup/mibII/tcpTable.c.orig 2006-11-07 00:43:27 +0100
++++ agent/mibgroup/mibII/tcpTable.c 2007-07-28 13:31:50 +0200
+@@ -100,6 +100,11 @@
#define TCPTABLE_REMOTEPORT pcb.inp_fport
#define TCPTABLE_IS_LINKED_LIST
@@ -36,7 +36,7 @@
#endif /* linux */
#endif /* WIN32 cygwin */
#endif /* solaris2 */
-@@ -737,12 +742,17 @@
+@@ -740,12 +745,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 2005-06-23 02:05:35 +0200
-+++ agent/mibgroup/ucd-snmp/diskio.c 2005-11-29 23:02:46 +0100
-@@ -580,6 +580,20 @@
+--- agent/mibgroup/ucd-snmp/diskio.c.orig 2007-01-16 10:53:48 +0100
++++ agent/mibgroup/ucd-snmp/diskio.c 2007-07-28 13:31:50 +0200
+@@ -593,6 +593,20 @@
case DISKIO_DEVICE:
*var_len = strlen(stat->dinfo->devices[indx].device_name);
return (u_char *) stat->dinfo->devices[indx].device_name;
@@ -78,7 +78,7 @@
case DISKIO_NREAD:
#if defined(freebsd5) && __FreeBSD_version >= 500107
long_ret = (signed long)
stat->dinfo->devices[indx].bytes[DEVSTAT_READ];
-@@ -617,6 +631,7 @@
+@@ -650,6 +664,7 @@
case DISKIO_LA15:
long_ret = devloads[indx].la15;
return (u_char *) & long_ret;
@@ -87,16 +87,16 @@
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-02-03 00:58:41
+0100
-+++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2005-11-29 23:02:46
+0100
+--- agent/mibgroup/ucd-snmp/memory_solaris2.c.orig 2006-09-15 02:48:50
+0200
++++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2007-07-28 13:31:50
+0200
@@ -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:49 +0100
-+++ agent/mibgroup/ucd-snmp/proc.c 2005-11-29 23:02:46 +0100
+--- agent/mibgroup/ucd-snmp/proc.c.orig 2007-03-12 20:56:39 +0100
++++ agent/mibgroup/ucd-snmp/proc.c 2007-07-28 13:31:50 +0200
@@ -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 2005-03-02 19:43:12 +0100
-+++ agent/mibgroup/util_funcs.c 2005-11-29 23:02:46 +0100
-@@ -408,6 +408,9 @@
+--- agent/mibgroup/util_funcs.c.orig 2007-01-11 23:13:56 +0100
++++ agent/mibgroup/util_funcs.c 2007-07-28 13:31:50 +0200
+@@ -461,6 +461,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 2004-10-21 01:52:35 +0200
-+++ include/net-snmp/library/system.h 2005-11-29 23:02:46 +0100
+--- include/net-snmp/library/system.h.orig 2007-01-11 23:13:56 +0100
++++ include/net-snmp/library/system.h 2007-07-28 13:31:50 +0200
@@ -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 2005-08-30 02:29:24 +0200
-+++ snmplib/system.c 2005-11-29 23:02:46 +0100
-@@ -871,7 +871,7 @@
+--- snmplib/system.c.orig 2007-01-11 23:13:56 +0100
++++ snmplib/system.c 2007-07-28 13:31:50 +0200
+@@ -894,7 +894,7 @@
#ifndef HAVE_SETENV
int
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.spec
============================================================================
$ cvs diff -u -r1.89 -r1.90 snmp.spec
--- openpkg-src/snmp/snmp.spec 20 Jul 2007 20:18:19 -0000 1.89
+++ openpkg-src/snmp/snmp.spec 28 Jul 2007 11:33:07 -0000 1.90
@@ -22,21 +22,18 @@
## SUCH DAMAGE.
##
-# FIXME: ms: version 5.1.1 mib modules tcpTable and udpTable are not yet
complete
-# FIXME: ms: (they only build on BSD when patched and fail completely on
NetBSD)
-
# package information
Name: snmp
Summary: Simple Network Management Protocol (SNMP) Toolkit
URL: http://www.net-snmp.org/
-Vendor: University of California Davis
+Vendor: The NET-SNMP Project
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: BASE
Group: Network
License: BSD
-Version: 5.3.1
-Release: 20070720
+Version: 5.4.1
+Release: 20070728
# package options
%option with_fsl yes
@@ -173,6 +170,9 @@
%if "%{with_perl}" == "yes"
--with-perl-modules \
--enable-embedded-perl \
+%else
+ --without-perl-modules \
+ --disable-embedded-perl \
%endif
--with-defaults
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
