OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 13-Feb-2009 20:40:05
Branch: HEAD Handle: 2009021319400500
Modified files:
openpkg-src/snmp snmp.patch snmp.spec
Log:
modifying package: snmp-5.4.2.1 20081101 -> 20090213
Summary:
Revision Changes Path
1.15 +32 -9 openpkg-src/snmp/snmp.patch
1.97 +3 -6 openpkg-src/snmp/snmp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 snmp.patch
--- openpkg-src/snmp/snmp.patch 1 Nov 2008 10:00:33 -0000 1.14
+++ openpkg-src/snmp/snmp.patch 13 Feb 2009 19:40:05 -0000 1.15
@@ -1,6 +1,6 @@
Index: agent/auto_nlist.c
--- agent/auto_nlist.c.orig 2008-06-05 23:11:53 +0200
-+++ agent/auto_nlist.c 2008-11-01 10:39:12 +0100
++++ agent/auto_nlist.c 2009-02-13 20:32:38 +0100
@@ -53,6 +53,7 @@
}
if (*ptr == 0) {
@@ -11,7 +11,7 @@
it->right = 0;
Index: agent/mibgroup/mibII/tcp.c
--- agent/mibgroup/mibII/tcp.c.orig 2008-06-05 23:11:53 +0200
-+++ agent/mibgroup/mibII/tcp.c 2008-11-01 10:40:01 +0100
++++ agent/mibgroup/mibII/tcp.c 2009-02-13 20:32:38 +0100
@@ -84,7 +84,7 @@
* But only define it under FreeBSD, since it
* breaks other systems (notable AIX)
@@ -23,7 +23,7 @@
Index: agent/mibgroup/mibII/tcpTable.c
--- agent/mibgroup/mibII/tcpTable.c.orig 2007-10-14 14:12:58 +0200
-+++ agent/mibgroup/mibII/tcpTable.c 2008-11-01 10:39:12 +0100
++++ agent/mibgroup/mibII/tcpTable.c 2009-02-13 20:32:38 +0100
@@ -100,6 +100,11 @@
#define TCPTABLE_REMOTEPORT pcb.inp_fport
#define TCPTABLE_IS_LINKED_LIST
@@ -56,7 +56,7 @@
tcp_head = nnew;
Index: agent/mibgroup/ucd-snmp/diskio.c
--- agent/mibgroup/ucd-snmp/diskio.c.orig 2008-06-05 23:11:53 +0200
-+++ agent/mibgroup/ucd-snmp/diskio.c 2008-11-01 10:39:12 +0100
++++ agent/mibgroup/ucd-snmp/diskio.c 2009-02-13 20:32:38 +0100
@@ -593,6 +593,20 @@
case DISKIO_DEVICE:
*var_len = strlen(stat->dinfo->devices[indx].device_name);
@@ -88,7 +88,7 @@
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 2006-09-15 02:48:50
+0200
-+++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2008-11-01 10:39:12
+0100
++++ agent/mibgroup/ucd-snmp/memory_solaris2.c 2009-02-13 20:32:38
+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
*/
@@ -96,7 +96,7 @@
#include <string.h>
Index: agent/mibgroup/ucd-snmp/proc.c
--- agent/mibgroup/ucd-snmp/proc.c.orig 2008-06-05 23:11:53 +0200
-+++ agent/mibgroup/ucd-snmp/proc.c 2008-11-01 10:39:12 +0100
++++ agent/mibgroup/ucd-snmp/proc.c 2009-02-13 20:32:38 +0100
@@ -1,3 +1,6 @@
+#ifdef solaris2
+#undef _FILE_OFFSET_BITS /* solaris procfs doesn't support 64bit off_t */
@@ -106,7 +106,7 @@
#ifdef solaris2
Index: agent/mibgroup/util_funcs.c
--- agent/mibgroup/util_funcs.c.orig 2007-08-16 16:12:47 +0200
-+++ agent/mibgroup/util_funcs.c 2008-11-01 10:39:12 +0100
++++ agent/mibgroup/util_funcs.c 2009-02-13 20:32:38 +0100
@@ -461,6 +461,9 @@
int fd[2][2], i, cnt;
char ctmp[STRMAX], *cptr1, *cptr2, argvs[STRMAX], **argv,
@@ -117,9 +117,32 @@
/*
* Setup our pipes
*/
+Index: agent/snmpd.c
+--- agent/snmpd.c.orig 2008-08-17 22:50:55 +0200
++++ agent/snmpd.c 2009-02-13 20:33:03 +0100
+@@ -424,7 +424,7 @@
+ 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 2007-08-16 11:35:12 +0200
++++ apps/snmptrapd.c 2009-02-13 20:32:38 +0100
+@@ -748,6 +748,7 @@
+ */
+ #if HAVE_GETPID
+ strcat(options, "p:");
++ parse_config_pidFile(NULL, "@l_prefix@/var/snmp/snmptrapd.pid");
+ #endif
+
+ #ifdef WIN32
Index: include/net-snmp/library/system.h
--- include/net-snmp/library/system.h.orig 2007-01-11 23:13:56 +0100
-+++ include/net-snmp/library/system.h 2008-11-01 10:39:12 +0100
++++ include/net-snmp/library/system.h 2009-02-13 20:32:38 +0100
@@ -114,7 +114,8 @@
char *strdup(const char *);
#endif
@@ -132,7 +155,7 @@
int calculate_time_diff(struct timeval *,
Index: snmplib/system.c
--- snmplib/system.c.orig 2008-06-05 23:11:53 +0200
-+++ snmplib/system.c 2008-11-01 10:39:12 +0100
++++ snmplib/system.c 2009-02-13 20:32:38 +0100
@@ -894,7 +894,7 @@
#ifndef HAVE_SETENV
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/snmp/snmp.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 snmp.spec
--- openpkg-src/snmp/snmp.spec 1 Nov 2008 10:00:34 -0000 1.96
+++ openpkg-src/snmp/snmp.spec 13 Feb 2009 19:40:05 -0000 1.97
@@ -32,7 +32,7 @@
Group: Network
License: BSD
Version: 5.4.2.1
-Release: 20081101
+Release: 20090213
# package options
%option with_fsl yes
@@ -89,11 +89,8 @@
%patch -p0
# provide a default PID file location
- %{l_shtool} subst \
- -e 's;\(pid_file =\) NULL;\1 "%{l_prefix}/var/snmp/snmpd.pid";' \
- agent/snmpd.c
- %{l_shtool} subst \
- -e 's;\(pid_file =\) NULL;\1 "%{l_prefix}/var/snmp/snmptrapd.pid";' \
+ %{l_shtool} subst %{l_value -s -a} \
+ agent/snmpd.c \
apps/snmptrapd.c
# adjust package for RPM support in Host MIB
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
