rpms/net-snmp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

rediff all patches to get rid of fuzz=2

Browse Source
This commit is contained in:
Jan Šafránek 2008-07-25 11:03:32 +00:00
parent ec9aa7683d
commit a1ac73801a
19 changed files with 1201 additions and 1283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net-snmp-5.0.8-ipv6-sock-close.patch
View File

@ -1,6 +1,7 @@
--- net-snmp-5.0.8/agent/mibgroup/mibII/ipv6.c.orig 2003-02-25 16:35:58.000000000 +0200 diff -up net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c.backup_patch_2 net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c
+++ net-snmp-5.0.8/agent/mibgroup/mibII/ipv6.c 2003-02-25 16:36:30.000000000 +0200 --- net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c.backup_patch_2 2007-05-25 00:01:04.000000000 +0200
@@ -1961,6 +1961,7 @@ +++ net-snmp-5.4.1/agent/mibgroup/mibII/ipv6.c 2008-07-25 12:52:36.000000000 +0200
@@ -2017,6 +2017,7 @@ var_ifv6Entry(register struct variable *
break; break;
} }
long_return = (ifr.ifr_flags & flag) ? 1 : 2; long_return = (ifr.ifr_flags & flag) ? 1 : 2;

9
net-snmp-5.0.8-readonly.patch
View File

@ -1,7 +1,8 @@
--- net-snmp-5.0.8/agent/snmp_agent.c.readonly 2003-08-05 14:55:44.000000000 +0200 diff -up net-snmp-5.4.1/agent/snmp_agent.c.backup_patch_3 net-snmp-5.4.1/agent/snmp_agent.c
+++ net-snmp-5.0.8/agent/snmp_agent.c 2003-08-06 16:05:56.000000000 +0200 --- net-snmp-5.4.1/agent/snmp_agent.c.backup_patch_3 2007-05-14 16:50:38.000000000 +0200
@@ -1133,6 +1133,12 @@ +++ net-snmp-5.4.1/agent/snmp_agent.c 2008-07-25 12:52:40.000000000 +0200
int i, n = 0, r = 0; @@ -1504,6 +1504,12 @@ netsnmp_wrap_up_request(netsnmp_agent_se
int i;
/* /*
+ * Update asp->status if necessary. Fixes ro/rw problem. + * Update asp->status if necessary. Fixes ro/rw problem.

9
net-snmp-5.1.2-dir-fix.patch
View File

@ -1,7 +1,8 @@
--- net-snmp-5.1.2/net-snmp-config.in.dir-fix 2004-06-17 15:39:28.000000000 +0200 diff -up net-snmp-5.4.1/net-snmp-config.in.backup_patch_6 net-snmp-5.4.1/net-snmp-config.in
+++ net-snmp-5.1.2/net-snmp-config.in 2004-11-16 10:26:28.928414992 +0100 --- net-snmp-5.4.1/net-snmp-config.in.backup_patch_6 2007-06-30 00:18:27.000000000 +0200
@@ -249,7 +249,7 @@ +++ net-snmp-5.4.1/net-snmp-config.in 2008-07-25 12:53:19.000000000 +0200
echo " " $line @@ -302,7 +302,7 @@ else
fi
echo $line >> $outfile echo $line >> $outfile
- outfile="@datadir@/snmp/snmpd.conf" - outfile="@datadir@/snmp/snmpd.conf"

44
net-snmp-5.2.1-file_offset.patch
View File

@ -1,17 +1,7 @@
--- net-snmp-5.2.1/include/net-snmp/agent/snmp_vars.h.long 2004-04-15 14:47:10.000000000 +0200 diff -up net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c.backup_patch_7 net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c
+++ net-snmp-5.2.1/include/net-snmp/agent/snmp_vars.h 2005-03-21 17:03:29.909271960 +0100 --- net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c.backup_patch_7 2007-05-18 20:08:01.000000000 +0200
@@ -73,7 +73,7 @@ +++ net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.c 2008-07-25 12:53:28.000000000 +0200
@@ -911,7 +911,7 @@ Get_FSIndex(char *dev)
struct nlist;
- extern long long_return;
+ extern fsblkcnt_t long_return;
extern u_char return_buf[];
extern oid nullOid[];
--- net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.c.long 2004-06-19 15:34:11.000000000 +0200
+++ net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.c 2005-03-21 17:03:29.910271808 +0100
@@ -773,7 +773,7 @@
return 0; return 0;
} }
@ -20,9 +10,10 @@
Get_FSSize(char *dev) Get_FSSize(char *dev)
{ {
struct HRFS_statfs statfs_buf; struct HRFS_statfs statfs_buf;
--- net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.h.long 2002-07-04 14:56:35.000000000 +0200 diff -up net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h.backup_patch_7 net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h
+++ net-snmp-5.2.1/agent/mibgroup/host/hr_filesys.h 2005-03-21 17:03:29.910271808 +0100 --- net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h.backup_patch_7 2002-07-04 14:58:04.000000000 +0200
@@ -12,7 +12,7 @@ +++ net-snmp-5.4.1/agent/mibgroup/host/hr_filesys.h 2008-07-25 12:53:28.000000000 +0200
@@ -12,7 +12,7 @@ extern int Get_Next_HR_FileSys(void
extern int Check_HR_FileSys_NFS(void); extern int Check_HR_FileSys_NFS(void);
extern int Get_FSIndex(char *); extern int Get_FSIndex(char *);
@ -31,9 +22,10 @@
#endif /* _MIBGROUP_HRFSYS_H */ #endif /* _MIBGROUP_HRFSYS_H */
--- net-snmp-5.2.1/agent/snmp_vars.c.long 2005-03-21 17:08:37.790466904 +0100 diff -up net-snmp-5.4.1/agent/snmp_vars.c.backup_patch_7 net-snmp-5.4.1/agent/snmp_vars.c
+++ net-snmp-5.2.1/agent/snmp_vars.c 2005-03-21 17:08:37.790466904 +0100 --- net-snmp-5.4.1/agent/snmp_vars.c.backup_patch_7 2006-09-15 02:48:50.000000000 +0200
@@ -223,7 +223,7 @@ +++ net-snmp-5.4.1/agent/snmp_vars.c 2008-07-25 12:53:28.000000000 +0200
@@ -224,7 +224,7 @@ extern netsnmp_subtree *subtrees;
* int name_len IN - number of sub-ids in the name * int name_len IN - number of sub-ids in the name
*/ */
@ -42,3 +34,15 @@
#ifndef ibm032 #ifndef ibm032
u_char return_buf[258]; u_char return_buf[258];
#else #else
diff -up net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h.backup_patch_7 net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h
--- net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h.backup_patch_7 2005-06-21 23:33:55.000000000 +0200
+++ net-snmp-5.4.1/include/net-snmp/agent/snmp_vars.h 2008-07-25 12:53:28.000000000 +0200
@@ -73,7 +73,7 @@ PERFORMANCE OF THIS SOFTWARE.
struct nlist;
- extern long long_return;
+ extern fsblkcnt_t long_return;
extern u_char return_buf[];
extern oid nullOid[];

9
net-snmp-5.3.1-multilib.patch
View File

@ -1,6 +1,7 @@
--- net-snmp-5.3.1.pre2/man/read_config.3.def.old 2003-04-25 16:02:55.000000000 +0200 diff -up net-snmp-5.4.1/man/read_config.3.def.backup_patch_8 net-snmp-5.4.1/man/read_config.3.def
+++ net-snmp-5.3.1.pre2/man/read_config.3.def 2006-05-23 09:41:35.000000000 +0200 --- net-snmp-5.4.1/man/read_config.3.def.backup_patch_8 2003-04-25 16:02:55.000000000 +0200
@@ -257,7 +257,7 @@ +++ net-snmp-5.4.1/man/read_config.3.def 2008-07-25 12:53:34.000000000 +0200
@@ -257,7 +257,7 @@ The configuration files read are found b
.I SNMPCONFPATH .I SNMPCONFPATH
environment variable (or its default value, which will be environment variable (or its default value, which will be
SYSCONFDIR/snmp, followed by SYSCONFDIR/snmp, followed by
@ -9,7 +10,7 @@
reading in the files found that match both the prefix registered and reading in the files found that match both the prefix registered and
the two suffixes the two suffixes
.I .conf .I .conf
@@ -285,7 +285,7 @@ @@ -285,7 +285,7 @@ function that it should abort the operat
SNMPCONFPATH SNMPCONFPATH
A colon separated list of directories to search for configuration A colon separated list of directories to search for configuration
files in. files in.

281
net-snmp-5.4-64bit.patch
View File

@ -1,62 +1,7 @@
--- net-snmp-5.4/agent/mibgroup/ucd-snmp/pass_persist.c.64bit 2006-10-18 04:59:10.000000000 +0200 diff -up net-snmp-5.4.1/agent/mibgroup/mibII/at.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/mibII/at.c
+++ net-snmp-5.4/agent/mibgroup/ucd-snmp/pass_persist.c 2006-11-27 13:56:30.000000000 +0100 --- net-snmp-5.4.1/agent/mibgroup/mibII/at.c.backup_patch_5 2006-12-27 20:17:49.000000000 +0100
@@ -218,6 +218,7 @@ +++ net-snmp-5.4.1/agent/mibgroup/mibII/at.c 2008-07-25 12:53:03.000000000 +0200
oid newname[MAX_OID_LEN]; @@ -128,9 +128,9 @@
int i, rtest, newlen;
static long long_ret;
+ static in_addr_t addr_ret;
char buf[SNMP_MAXBUF];
static char buf2[SNMP_MAXBUF];
static oid objid[MAX_OID_LEN];
@@ -366,13 +367,13 @@
*var_len = 0;
return (NULL);
}
- long_ret =
+ addr_ret =
(objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) +
(objid[2] << 8) + objid[3];
- long_ret = htonl(long_ret);
- *var_len = sizeof(long_ret);
+ addr_ret = htonl(addr_ret);
+ *var_len = sizeof(addr_ret);
vp->type = ASN_IPADDRESS;
- return ((unsigned char *) &long_ret);
+ return ((unsigned char *) &addr_ret);
}
}
*var_len = 0;
--- net-snmp-5.4/agent/mibgroup/ucd-snmp/pass.c.64bit 2005-08-18 02:44:02.000000000 +0200
+++ net-snmp-5.4/agent/mibgroup/ucd-snmp/pass.c 2006-11-27 13:56:30.000000000 +0100
@@ -287,6 +287,7 @@
oid newname[MAX_OID_LEN];
int i, rtest, fd, newlen;
static long long_ret;
+ static in_addr_t addr_ret;
char buf[SNMP_MAXBUF];
static char buf2[SNMP_MAXBUF];
static oid objid[MAX_OID_LEN];
@@ -412,13 +413,13 @@
*var_len = 0;
return (NULL);
}
- long_ret =
+ addr_ret =
(objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) +
(objid[2] << 8) + objid[3];
- long_ret = htonl(long_ret);
- *var_len = sizeof(long_ret);
+ addr_ret = htonl(addr_ret);
+ *var_len = sizeof(addr_ret);
vp->type = ASN_IPADDRESS;
- return ((unsigned char *) &long_ret);
+ return ((unsigned char *) &addr_ret);
}
}
*var_len = 0;
--- net-snmp-5.4/agent/mibgroup/mibII/at.c.64bit 2006-11-07 00:43:27.000000000 +0100
+++ net-snmp-5.4/agent/mibgroup/mibII/at.c 2006-11-27 13:59:46.000000000 +0100
@@ -126,9 +126,9 @@
#ifndef solaris2 #ifndef solaris2
static void ARP_Scan_Init(void); static void ARP_Scan_Init(void);
#ifdef ARP_SCAN_FOUR_ARGUMENTS #ifdef ARP_SCAN_FOUR_ARGUMENTS
@ -68,7 +13,7 @@
#endif #endif
#endif #endif
#endif #endif
@@ -204,7 +204,8 @@ @@ -206,7 +206,8 @@ var_atEntry(struct variable *vp,
oid lowest[16]; oid lowest[16];
oid current[16]; oid current[16];
static char PhysAddr[6], LowPhysAddr[6]; static char PhysAddr[6], LowPhysAddr[6];
@ -78,7 +23,7 @@
#ifdef ARP_SCAN_FOUR_ARGUMENTS #ifdef ARP_SCAN_FOUR_ARGUMENTS
u_short ifIndex, lowIfIndex = 0; u_short ifIndex, lowIfIndex = 0;
#endif /* ARP_SCAN_FOUR_ARGUMENTS */ #endif /* ARP_SCAN_FOUR_ARGUMENTS */
@@ -314,9 +315,9 @@ @@ -316,9 +317,9 @@ var_atEntry(struct variable *vp,
*var_len = sizeof(LowPhysAddr); *var_len = sizeof(LowPhysAddr);
return (u_char *) LowPhysAddr; return (u_char *) LowPhysAddr;
case IPMEDIANETADDRESS: /* also ATNETADDRESS */ case IPMEDIANETADDRESS: /* also ATNETADDRESS */
@ -91,7 +36,7 @@
case IPMEDIATYPE: case IPMEDIATYPE:
*var_len = sizeof long_return; *var_len = sizeof long_return;
long_return = lowIfType; long_return = lowIfType;
@@ -707,11 +708,11 @@ @@ -709,11 +710,11 @@ ARP_Scan_Init(void)
#ifdef ARP_SCAN_FOUR_ARGUMENTS #ifdef ARP_SCAN_FOUR_ARGUMENTS
static int static int
@ -105,80 +50,9 @@
#endif #endif
{ {
#ifndef NETSNMP_CAN_USE_SYSCTL #ifndef NETSNMP_CAN_USE_SYSCTL
--- net-snmp-5.4/agent/mibgroup/mibII/var_route.c.64bit 2006-11-07 00:43:27.000000000 +0100 diff -up net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c
+++ net-snmp-5.4/agent/mibgroup/mibII/var_route.c 2006-11-27 14:13:13.000000000 +0100 --- net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c.backup_patch_5 2003-02-22 05:19:51.000000000 +0100
@@ -434,6 +434,7 @@ +++ net-snmp-5.4.1/agent/mibgroup/mibII/ipCidrRouteTable_access.c 2008-07-25 12:53:03.000000000 +0200
static oid saveName[MAX_OID_LEN], Current[MAX_OID_LEN];
u_char *cp;
oid *op;
+ static in_addr_t addr_ret;
#if NEED_KLGETSA
struct sockaddr_in *sa;
#endif
@@ -538,13 +539,13 @@
switch (vp->magic) {
case IPROUTEDEST:
- *var_len = sizeof(uint32_t);
+ *var_len = sizeof(addr_ret);
#if NEED_KLGETSA
sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_dst);
return (u_char *) & (sa->sin_addr.s_addr);
#elif defined(hpux11)
- long_return = rt[RtIndex].Dest;
- return (u_char *) & long_return;
+ addr_ret = rt[RtIndex].Dest;
+ return (u_char *) & addr_ret;
#else
return (u_char *) & ((struct sockaddr_in *) &rthead[RtIndex]->
rt_dst)->sin_addr.s_addr;
@@ -597,13 +598,13 @@
long_return = -1;
return (u_char *) & long_return;
case IPROUTENEXTHOP:
- *var_len = sizeof(uint32_t);
+ *var_len = sizeof(addr_ret);
#if NEED_KLGETSA
sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_gateway);
return (u_char *) & (sa->sin_addr.s_addr);
#elif defined(hpux11)
- long_return = rt[RtIndex].NextHop;
- return (u_char *) & long_return;
+ addr_ret = rt[RtIndex].NextHop;
+ return (u_char *) & addr_ret;
#else
return (u_char *) & ((struct sockaddr_in *) &rthead[RtIndex]->
rt_gateway)->sin_addr.s_addr;
@@ -649,14 +650,14 @@
#if NETSNMP_NO_DUMMY_VALUES
return NULL;
#endif
- long_return = 0;
+ addr_ret = 0;
#elif defined(hpux11)
- long_return = rt[RtIndex].Mask;
- return (u_char *) & long_return;
+ addr_ret = rt[RtIndex].Mask;
+ return (u_char *) & addr_ret;
#else /* !NEED_KLGETSA && !hpux11 */
if (((struct sockaddr_in *) &rthead[RtIndex]->rt_dst)->sin_addr.
s_addr == 0)
- long_return = 0; /* Default route */
+ addr_ret = 0; /* Default route */
else {
#ifndef linux
if (!NETSNMP_KLOOKUP(rthead[RtIndex]->rt_ifp,
@@ -681,7 +682,7 @@
#endif /* linux */
}
#endif /* NEED_KLGETSA */
- return (u_char *) & long_return;
+ return (u_char *) & addr_ret;
case IPROUTEINFO:
*var_len = nullOidLen;
return (u_char *) nullOid;
--- net-snmp-5.4/agent/mibgroup/mibII/ipCidrRouteTable_access.c.64bit 2003-02-22 05:19:51.000000000 +0100
+++ net-snmp-5.4/agent/mibgroup/mibII/ipCidrRouteTable_access.c 2006-11-27 13:56:30.000000000 +0100
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
/** a global static we'll make use of a lot to map to the right /** a global static we'll make use of a lot to map to the right
datatype to return (which for SNMP integer's is always a long). */ datatype to return (which for SNMP integer's is always a long). */
@ -187,7 +61,7 @@
/* /*
@@ -32,18 +33,18 @@ @@ -32,18 +33,18 @@ u_long *
get_ipCidrRouteDest(void *data_context, size_t * ret_len) get_ipCidrRouteDest(void *data_context, size_t * ret_len)
{ {
RTENTRY *ourroute = (RTENTRY *) data_context; RTENTRY *ourroute = (RTENTRY *) data_context;
@ -212,7 +86,7 @@
} }
long * long *
@@ -59,9 +60,9 @@ @@ -59,9 +60,9 @@ u_long *
get_ipCidrRouteNextHop(void *data_context, size_t * ret_len) get_ipCidrRouteNextHop(void *data_context, size_t * ret_len)
{ {
RTENTRY *ourroute = (RTENTRY *) data_context; RTENTRY *ourroute = (RTENTRY *) data_context;
@ -225,3 +99,134 @@
} }
long * long *
diff -up net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c
--- net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c.backup_patch_5 2006-11-07 00:43:27.000000000 +0100
+++ net-snmp-5.4.1/agent/mibgroup/mibII/var_route.c 2008-07-25 12:53:03.000000000 +0200
@@ -434,6 +434,7 @@ var_ipRouteEntry(struct variable * vp,
static oid saveName[MAX_OID_LEN], Current[MAX_OID_LEN];
u_char *cp;
oid *op;
+ static in_addr_t addr_ret;
#if NEED_KLGETSA
struct sockaddr_in *sa;
#endif
@@ -538,13 +539,13 @@ var_ipRouteEntry(struct variable * vp,
switch (vp->magic) {
case IPROUTEDEST:
- *var_len = sizeof(uint32_t);
+ *var_len = sizeof(addr_ret);
#if NEED_KLGETSA
sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_dst);
return (u_char *) & (sa->sin_addr.s_addr);
#elif defined(hpux11)
- long_return = rt[RtIndex].Dest;
- return (u_char *) & long_return;
+ addr_ret = rt[RtIndex].Dest;
+ return (u_char *) & addr_ret;
#else
return (u_char *) & ((struct sockaddr_in *) &rthead[RtIndex]->
rt_dst)->sin_addr.s_addr;
@@ -597,13 +598,13 @@ var_ipRouteEntry(struct variable * vp,
long_return = -1;
return (u_char *) & long_return;
case IPROUTENEXTHOP:
- *var_len = sizeof(uint32_t);
+ *var_len = sizeof(addr_ret);
#if NEED_KLGETSA
sa = klgetsa((struct sockaddr_in *) rthead[RtIndex]->rt_gateway);
return (u_char *) & (sa->sin_addr.s_addr);
#elif defined(hpux11)
- long_return = rt[RtIndex].NextHop;
- return (u_char *) & long_return;
+ addr_ret = rt[RtIndex].NextHop;
+ return (u_char *) & addr_ret;
#else
return (u_char *) & ((struct sockaddr_in *) &rthead[RtIndex]->
rt_gateway)->sin_addr.s_addr;
@@ -649,14 +650,14 @@ var_ipRouteEntry(struct variable * vp,
#if NETSNMP_NO_DUMMY_VALUES
return NULL;
#endif
- long_return = 0;
+ addr_ret = 0;
#elif defined(hpux11)
- long_return = rt[RtIndex].Mask;
- return (u_char *) & long_return;
+ addr_ret = rt[RtIndex].Mask;
+ return (u_char *) & addr_ret;
#else /* !NEED_KLGETSA && !hpux11 */
if (((struct sockaddr_in *) &rthead[RtIndex]->rt_dst)->sin_addr.
s_addr == 0)
- long_return = 0; /* Default route */
+ addr_ret = 0; /* Default route */
else {
#ifndef linux
if (!NETSNMP_KLOOKUP(rthead[RtIndex]->rt_ifp,
@@ -681,7 +682,7 @@ var_ipRouteEntry(struct variable * vp,
#endif /* linux */
}
#endif /* NEED_KLGETSA */
- return (u_char *) & long_return;
+ return (u_char *) & addr_ret;
case IPROUTEINFO:
*var_len = nullOidLen;
return (u_char *) nullOid;
diff -up net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c
--- net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c.backup_patch_5 2005-08-18 02:44:02.000000000 +0200
+++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass.c 2008-07-25 12:53:03.000000000 +0200
@@ -287,6 +287,7 @@ var_extensible_pass(struct variable *vp,
oid newname[MAX_OID_LEN];
int i, rtest, fd, newlen;
static long long_ret;
+ static in_addr_t addr_ret;
char buf[SNMP_MAXBUF];
static char buf2[SNMP_MAXBUF];
static oid objid[MAX_OID_LEN];
@@ -412,13 +413,13 @@ var_extensible_pass(struct variable *vp,
*var_len = 0;
return (NULL);
}
- long_ret =
+ addr_ret =
(objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) +
(objid[2] << 8) + objid[3];
- long_ret = htonl(long_ret);
- *var_len = sizeof(long_ret);
+ addr_ret = htonl(addr_ret);
+ *var_len = sizeof(addr_ret);
vp->type = ASN_IPADDRESS;
- return ((unsigned char *) &long_ret);
+ return ((unsigned char *) &addr_ret);
}
}
*var_len = 0;
diff -up net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c.backup_patch_5 net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c
--- net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c.backup_patch_5 2006-10-18 04:59:10.000000000 +0200
+++ net-snmp-5.4.1/agent/mibgroup/ucd-snmp/pass_persist.c 2008-07-25 12:53:03.000000000 +0200
@@ -218,6 +218,7 @@ var_extensible_pass_persist(struct varia
oid newname[MAX_OID_LEN];
int i, rtest, newlen;
static long long_ret;
+ static in_addr_t addr_ret;
char buf[SNMP_MAXBUF];
static char buf2[SNMP_MAXBUF];
static oid objid[MAX_OID_LEN];
@@ -366,13 +367,13 @@ var_extensible_pass_persist(struct varia
*var_len = 0;
return (NULL);
}
- long_ret =
+ addr_ret =
(objid[0] << (8 * 3)) + (objid[1] << (8 * 2)) +
(objid[2] << 8) + objid[3];
- long_ret = htonl(long_ret);
- *var_len = sizeof(long_ret);
+ addr_ret = htonl(addr_ret);
+ *var_len = sizeof(addr_ret);
vp->type = ASN_IPADDRESS;
- return ((unsigned char *) &long_ret);
+ return ((unsigned char *) &addr_ret);
}
}
*var_len = 0;

7
net-snmp-5.4-exec-crash.patch
View File

@ -1,6 +1,7 @@
--- net-snmp-5.4/agent/mibgroup/agent/extend.c.orig 2006-10-18 21:07:35.000000000 +0200 diff -up net-snmp-5.4.1/agent/mibgroup/agent/extend.c.backup_patch_14 net-snmp-5.4.1/agent/mibgroup/agent/extend.c
+++ net-snmp-5.4/agent/mibgroup/agent/extend.c 2007-06-27 14:30:08.000000000 +0200 --- net-snmp-5.4.1/agent/mibgroup/agent/extend.c.backup_patch_14 2007-07-06 17:32:59.000000000 +0200
@@ -448,6 +448,9 @@ +++ net-snmp-5.4.1/agent/mibgroup/agent/extend.c 2008-07-25 12:53:44.000000000 +0200
@@ -450,6 +450,9 @@ extend_parse_config(const char *token, c
extension->command = strdup( exec_command ); extension->command = strdup( exec_command );
if (cptr) if (cptr)
extension->args = strdup( cptr ); extension->args = strdup( cptr );

29
net-snmp-5.4.1-config_libdir.patch
View File

@ -1,6 +1,7 @@
--- net-snmp-5.4/configure.libdir 2006-11-27 14:27:52.000000000 +0100 diff -up net-snmp-5.4.1/configure.backup_patch_9 net-snmp-5.4.1/configure
+++ net-snmp-5.4/configure 2006-11-27 14:31:34.000000000 +0100 --- net-snmp-5.4.1/configure.backup_patch_9 2008-07-25 12:52:01.000000000 +0200
@@ -5161,7 +5161,7 @@ +++ net-snmp-5.4.1/configure 2008-07-25 12:53:35.000000000 +0200
@@ -5252,7 +5252,7 @@ freebsd* | dragonfly*)
# Let's accept both of them until this is cleared up. # Let's accept both of them until this is cleared up.
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
@ -9,7 +10,7 @@
;; ;;
esac esac
else else
@@ -5178,15 +5178,15 @@ @@ -5269,15 +5269,15 @@ hpux10.20* | hpux11*)
case $host_cpu in case $host_cpu in
ia64*) ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
@ -28,7 +29,7 @@
;; ;;
esac esac
;; ;;
@@ -5222,7 +5222,7 @@ @@ -5313,7 +5313,7 @@ netbsd*)
newos6*) newos6*)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
@ -37,7 +38,7 @@
;; ;;
nto-qnx*) nto-qnx*)
@@ -5249,7 +5249,7 @@ @@ -5344,7 +5344,7 @@ sysv4 | sysv4.3*)
case $host_vendor in case $host_vendor in
motorola) motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
@ -46,7 +47,7 @@
;; ;;
ncr) ncr)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
@@ -8761,13 +8761,13 @@ @@ -8905,13 +8905,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -62,7 +63,7 @@
allow_undefined_flag="-z nodefs" allow_undefined_flag="-z nodefs"
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else else
@@ -8822,7 +8822,7 @@ @@ -8973,7 +8973,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -71,7 +72,7 @@
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags, # Warning - without using the other run time loading flags,
@@ -8936,7 +8936,7 @@ @@ -9087,7 +9087,7 @@ if test -z "$aix_libpath"; then aix_libp
# does not break anything, and helps significantly (at the cost of a little # does not break anything, and helps significantly (at the cost of a little
# extra space). # extra space).
freebsd2.2*) freebsd2.2*)
@ -80,18 +81,18 @@
hardcode_libdir_flag_spec='-R$libdir' hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
@@ -9504,7 +9504,7 @@ @@ -9504,7 +9504,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown shlibpath_overrides_runpath=unknown
version_type=none version_type=none
dynamic_linker="$host_os ld.so" dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib $LIBDIR" +sys_lib_dlsearch_path_spec="/lib $LIBDIR"
if test "$GCC" = yes; then if test "$GCC" = yes; then
case $host_os in case $host_os in
@@ -9363,7 +9363,7 @@ @@ -9555,7 +9555,7 @@ BEGIN {RS=" "; FS="/|\n";} {
sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` }'`
fi sys_lib_search_path_spec=`echo $lt_search_path_spec`
else else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib $LIBDIR /usr/local/lib" + sys_lib_search_path_spec="/lib $LIBDIR /usr/local/lib"

7
net-snmp-5.4.1-hmac-check.patch
View File

@ -4,9 +4,10 @@ Source: upstream, https://sourceforge.net/tracker/index.php?func=detail&aid=1989
Reviewed-by: Jan Safranek <jsafrane@redhat.com> Reviewed-by: Jan Safranek <jsafrane@redhat.com>
diff -up net-snmp-5.0.9/snmplib/scapi.c.orig net-snmp-5.0.9/snmplib/scapi.c diff -up net-snmp-5.0.9/snmplib/scapi.c.orig net-snmp-5.0.9/snmplib/scapi.c
--- net-snmp-5.0.9/snmplib/scapi.c.orig 2008-06-04 10:19:26.000000000 +0200 diff -up net-snmp-5.4.1/snmplib/scapi.c.backup_patch_17 net-snmp-5.4.1/snmplib/scapi.c
+++ net-snmp-5.0.9/snmplib/scapi.c 2008-06-04 10:20:45.000000000 +0200 --- net-snmp-5.4.1/snmplib/scapi.c.backup_patch_17 2006-09-15 14:47:01.000000000 +0200
@@ -460,6 +460,9 @@ sc_check_keyed_hash(const oid * authtype +++ net-snmp-5.4.1/snmplib/scapi.c 2008-07-25 12:54:00.000000000 +0200
@@ -562,6 +562,9 @@ sc_check_keyed_hash(const oid * authtype
QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit); QUITFUN(SNMPERR_GENERR, sc_check_keyed_hash_quit);
} }

69
net-snmp-5.4.1-hostname.patch
View File

@ -1,36 +1,6 @@
--- net-snmp-5.4/snmplib/snmpUDPDomain.c.orig 2006-09-20 01:42:17.000000000 +0200 diff -up net-snmp-5.4.1/apps/snmptrapd_log.c.backup_patch_12 net-snmp-5.4.1/apps/snmptrapd_log.c
+++ net-snmp-5.4/snmplib/snmpUDPDomain.c 2007-05-03 12:17:30.000000000 +0200 --- net-snmp-5.4.1/apps/snmptrapd_log.c.backup_patch_12 2007-05-31 16:39:14.000000000 +0200
@@ -87,6 +87,7 @@ +++ net-snmp-5.4.1/apps/snmptrapd_log.c 2008-07-25 12:53:41.000000000 +0200
netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len)
{
netsnmp_udp_addr_pair *addr_pair = NULL;
+ struct hostent *host;
if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) {
addr_pair = (netsnmp_udp_addr_pair *) data;
@@ -104,6 +105,10 @@
return strdup("UDP: unknown");
}
+ if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) {
+ host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET);
+ return (host ? strdup(host->h_name) : NULL);
+ }
sprintf(tmp, "UDP: [%s]:%hu",
inet_ntoa(to->sin_addr), ntohs(to->sin_port));
return strdup(tmp);
--- net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h.orig 2005-09-15 15:46:58.000000000 +0200
+++ net-snmp-5.3.1/include/net-snmp/library/snmp_transport.h 2007-05-02 17:21:30.000000000 +0200
@@ -19,6 +19,7 @@
#define NETSNMP_TRANSPORT_FLAG_STREAM 0x01
#define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02
#define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04
+#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */
/* The standard SNMP domains. */
--- net-snmp-5.4.1/apps/snmptrapd_log.c.orig 2007-05-31 16:39:14.000000000 +0200
+++ net-snmp-5.4.1/apps/snmptrapd_log.c 2007-08-07 13:46:40.000000000 +0200
@@ -626,6 +626,8 @@ realloc_handle_ip_fmt(u_char ** buf, siz @@ -626,6 +626,8 @@ realloc_handle_ip_fmt(u_char ** buf, siz
char fmt_cmd = options->cmd; /* what we're formatting */ char fmt_cmd = options->cmd; /* what we're formatting */
u_char *temp_buf = NULL; u_char *temp_buf = NULL;
@ -210,3 +180,36 @@
return 0; return 0;
} }
} }
diff -up net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h.backup_patch_12 net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h
--- net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h.backup_patch_12 2006-10-27 22:19:44.000000000 +0200
+++ net-snmp-5.4.1/include/net-snmp/library/snmp_transport.h 2008-07-25 12:53:41.000000000 +0200
@@ -19,6 +19,7 @@ extern "C" {
#define NETSNMP_TRANSPORT_FLAG_STREAM 0x01
#define NETSNMP_TRANSPORT_FLAG_LISTEN 0x02
#define NETSNMP_TRANSPORT_FLAG_TUNNELED 0x04
+#define NETSNMP_TRANSPORT_FLAG_HOSTNAME 0x80 /* for fmtaddr hook */
/* The standard SNMP domains. */
diff -up net-snmp-5.4.1/snmplib/snmpUDPDomain.c.backup_patch_12 net-snmp-5.4.1/snmplib/snmpUDPDomain.c
--- net-snmp-5.4.1/snmplib/snmpUDPDomain.c.backup_patch_12 2007-06-11 00:15:24.000000000 +0200
+++ net-snmp-5.4.1/snmplib/snmpUDPDomain.c 2008-07-25 12:53:41.000000000 +0200
@@ -90,6 +90,7 @@ static char *
netsnmp_udp_fmtaddr(netsnmp_transport *t, void *data, int len)
{
netsnmp_udp_addr_pair *addr_pair = NULL;
+ struct hostent *host;
if (data != NULL && len == sizeof(netsnmp_udp_addr_pair)) {
addr_pair = (netsnmp_udp_addr_pair *) data;
@@ -107,6 +108,10 @@ netsnmp_udp_fmtaddr(netsnmp_transport *t
return strdup("UDP: unknown");
}
+ if ( t && t->flags & NETSNMP_TRANSPORT_FLAG_HOSTNAME ) {
+ host = gethostbyaddr((char *)&to->sin_addr, 4, AF_INET);
+ return (host ? strdup(host->h_name) : NULL);
+ }
sprintf(tmp, "UDP: [%s]:%hu",
inet_ntoa(to->sin_addr), ntohs(to->sin_port));
return strdup(tmp);

13
net-snmp-5.4.1-perl-set.patch
View File

@ -3,9 +3,10 @@
Source: jbjohnso@us.ibm.com, accepted upstream, SVN rev. 17097 Source: jbjohnso@us.ibm.com, accepted upstream, SVN rev. 17097
diff -urN net-snmp-5.4.1/perl/SNMP/SNMP.xs net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.xs diff -urN net-snmp-5.4.1/perl/SNMP/SNMP.xs net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.xs
--- net-snmp-5.4.1/perl/SNMP/SNMP.xs 2008-06-13 15:48:46.000000000 -0500 diff -up net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_19 net-snmp-5.4.1/perl/SNMP/SNMP.xs
+++ net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.xs 2008-06-13 15:48:05.000000000 -0500 --- net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_19 2008-07-25 12:54:02.000000000 +0200
@@ -3072,7 +3072,7 @@ +++ net-snmp-5.4.1/perl/SNMP/SNMP.xs 2008-07-25 12:54:05.000000000 +0200
@@ -3072,7 +3072,7 @@ snmp_set(sess_ref, varlist_ref, perl_cal
res = __add_var_val_str(pdu, oid_arr, oid_arr_len, res = __add_var_val_str(pdu, oid_arr, oid_arr_len,
(varbind_val_f && SvOK(*varbind_val_f) ? (varbind_val_f && SvOK(*varbind_val_f) ?
SvPV(*varbind_val_f,na):NULL), SvPV(*varbind_val_f,na):NULL),
@ -14,7 +15,7 @@ diff -urN net-snmp-5.4.1/perl/SNMP/SNMP.xs net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.x
SvCUR(*varbind_val_f):0), type); SvCUR(*varbind_val_f):0), type);
if (verbose && res == FAILURE) if (verbose && res == FAILURE)
@@ -4266,7 +4266,7 @@ @@ -4266,7 +4266,7 @@ snmp_trapV1(sess_ref,enterprise,agent,ge
res = __add_var_val_str(pdu, oid_arr, oid_arr_len, res = __add_var_val_str(pdu, oid_arr, oid_arr_len,
(varbind_val_f && SvOK(*varbind_val_f) ? (varbind_val_f && SvOK(*varbind_val_f) ?
SvPV(*varbind_val_f,na):NULL), SvPV(*varbind_val_f,na):NULL),
@ -23,7 +24,7 @@ diff -urN net-snmp-5.4.1/perl/SNMP/SNMP.xs net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.x
SvCUR(*varbind_val_f):0), SvCUR(*varbind_val_f):0),
type); type);
@@ -4424,7 +4424,7 @@ @@ -4424,7 +4424,7 @@ snmp_trapV2(sess_ref,uptime,trap_oid,var
res = __add_var_val_str(pdu, oid_arr, oid_arr_len, res = __add_var_val_str(pdu, oid_arr, oid_arr_len,
(varbind_val_f && SvOK(*varbind_val_f) ? (varbind_val_f && SvOK(*varbind_val_f) ?
SvPV(*varbind_val_f,na):NULL), SvPV(*varbind_val_f,na):NULL),
@ -32,7 +33,7 @@ diff -urN net-snmp-5.4.1/perl/SNMP/SNMP.xs net-snmp-5.4.1-f9fix/perl/SNMP/SNMP.x
SvCUR(*varbind_val_f):0), SvCUR(*varbind_val_f):0),
type); type);
@@ -4563,7 +4563,7 @@ @@ -4563,7 +4563,7 @@ snmp_inform(sess_ref,uptime,trap_oid,var
res = __add_var_val_str(pdu, oid_arr, oid_arr_len, res = __add_var_val_str(pdu, oid_arr, oid_arr_len,
(varbind_val_f && SvOK(*varbind_val_f) ? (varbind_val_f && SvOK(*varbind_val_f) ?
SvPV(*varbind_val_f,na):NULL), SvPV(*varbind_val_f,na):NULL),

13
net-snmp-5.4.1-perl-snprintf.patch
View File

@ -3,9 +3,10 @@
Source: upstream, http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=rev&sortby=date&revision=16770 Source: upstream, http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=rev&sortby=date&revision=16770
Reviewed-By: Jan Safranek <jsafrane@redhat.com> Reviewed-By: Jan Safranek <jsafrane@redhat.com>
--- branches/V5-4-patches/net-snmp/perl/SNMP/SNMP.xs 2007/12/21 23:19:29 16769 diff -up net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_18 net-snmp-5.4.1/perl/SNMP/SNMP.xs
+++ branches/V5-4-patches/net-snmp/perl/SNMP/SNMP.xs 2007/12/22 19:22:44 16770 --- net-snmp-5.4.1/perl/SNMP/SNMP.xs.backup_patch_18 2007-06-19 00:28:09.000000000 +0200
@@ -470,14 +470,16 @@ +++ net-snmp-5.4.1/perl/SNMP/SNMP.xs 2008-07-25 12:54:02.000000000 +0200
@@ -470,14 +470,16 @@ int flag;
if (flag == USE_ENUMS) { if (flag == USE_ENUMS) {
for(ep = tp->enums; ep; ep = ep->next) { for(ep = tp->enums; ep; ep = ep->next) {
if (ep->value == *var->val.integer) { if (ep->value == *var->val.integer) {
@ -24,7 +25,7 @@ Reviewed-By: Jan Safranek <jsafrane@redhat.com>
len = strlen(buf); len = strlen(buf);
} }
break; break;
@@ -486,21 +488,25 @@ @@ -486,21 +488,25 @@ int flag;
case ASN_COUNTER: case ASN_COUNTER:
case ASN_TIMETICKS: case ASN_TIMETICKS:
case ASN_UINTEGER: case ASN_UINTEGER:
@ -56,7 +57,7 @@ Reviewed-By: Jan Safranek <jsafrane@redhat.com>
case ASN_NULL: case ASN_NULL:
break; break;
@@ -512,14 +518,14 @@ @@ -512,14 +518,14 @@ int flag;
break; break;
case SNMP_ENDOFMIBVIEW: case SNMP_ENDOFMIBVIEW:
@ -77,7 +78,7 @@ Reviewed-By: Jan Safranek <jsafrane@redhat.com>
case ASN_COUNTER64: case ASN_COUNTER64:
#ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES #ifdef NETSNMP_WITH_OPAQUE_SPECIAL_TYPES
@@ -538,19 +544,19 @@ @@ -538,19 +544,19 @@ int flag;
#endif #endif
case ASN_BIT_STR: case ASN_BIT_STR:

28
net-snmp-5.4.1-pie.patch
View File

@ -1,16 +1,6 @@
--- net-snmp-5.4.1/apps/Makefile.in.orig 2007-07-05 01:26:56.000000000 +0200 diff -up net-snmp-5.4.1/agent/Makefile.in.backup_patch_4 net-snmp-5.4.1/agent/Makefile.in
+++ net-snmp-5.4.1/apps/Makefile.in 2007-08-07 11:05:41.000000000 +0200 --- net-snmp-5.4.1/agent/Makefile.in.backup_patch_4 2007-07-05 01:26:56.000000000 +0200
@@ -115,7 +115,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX +++ net-snmp-5.4.1/agent/Makefile.in 2008-07-25 12:52:44.000000000 +0200
$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
--- net-snmp-5.4.1/agent/Makefile.in.orig 2007-07-05 01:26:56.000000000 +0200
+++ net-snmp-5.4.1/agent/Makefile.in 2007-08-07 11:05:19.000000000 +0200
@@ -139,7 +139,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c @@ -139,7 +139,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c
$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?
@ -20,3 +10,15 @@
libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
diff -up net-snmp-5.4.1/apps/Makefile.in.backup_patch_4 net-snmp-5.4.1/apps/Makefile.in
--- net-snmp-5.4.1/apps/Makefile.in.backup_patch_4 2007-07-05 01:26:56.000000000 +0200
+++ net-snmp-5.4.1/apps/Makefile.in 2008-07-25 12:52:44.000000000 +0200
@@ -115,7 +115,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX
$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}

1452
net-snmp-5.4.1-sensors3.patch
View File

File diff suppressed because it is too large Load Diff

105
net-snmp-5.4.1-shared-ip.patch
View File

@ -1,13 +1,56 @@
--- net-snmp-5.3.1/include/net-snmp/library/container.h.orig 2005-12-04 19:43:04.000000000 +0100 diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c
+++ net-snmp-5.3.1/include/net-snmp/library/container.h 2007-05-04 10:01:38.000000000 +0200 --- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.backup_patch_13 2007-05-17 23:53:28.000000000 +0200
@@ -370,8 +370,32 @@ +++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c 2008-07-25 12:53:42.000000000 +0200
@@ -272,11 +272,15 @@ _netsnmp_ioctl_ipaddress_container_load_
/*
* add entry to container
*/
- if (CONTAINER_INSERT(container, entry) < 0)
- {
- DEBUGMSGTL(("access:ipaddress:container","error with ipaddress_entry: insert into container failed.\n"));
+ rc = CONTAINER_TRY_INSERT(container, entry);
+ if (rc < 0) {
+ static int logged = 0;
+ if (!logged) {
+ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n");
+ logged = 1;
+ }
+ rc = 0;
netsnmp_access_ipaddress_entry_free(entry);
- continue;
}
}
diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.backup_patch_13 2006-09-15 02:48:50.000000000 +0200
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c 2008-07-25 12:53:42.000000000 +0200
@@ -324,7 +324,16 @@ _load_v6(netsnmp_container *container, i
/*
* add entry to container
*/
- CONTAINER_INSERT(container, entry);
+ rc = CONTAINER_TRY_INSERT(container, entry);
+ if (rc < 0) {
+ static int logged = 0;
+ if (!logged) {
+ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n");
+ logged = 1;
+ }
+ netsnmp_access_ipaddress_entry_free(entry);
+ }
+
}
fclose(in);
diff -up net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13 net-snmp-5.4.1/include/net-snmp/library/container.h
--- net-snmp-5.4.1/include/net-snmp/library/container.h.backup_patch_13 2005-12-04 19:43:04.000000000 +0100
+++ net-snmp-5.4.1/include/net-snmp/library/container.h 2008-07-25 12:53:42.000000000 +0200
@@ -370,8 +370,32 @@ extern "C" {
} }
} }
return rc; return rc;
- }
+ } + }
+ +
-
+ NETSNMP_STATIC_INLINE + NETSNMP_STATIC_INLINE
+ int CONTAINER_TRY_INSERT(netsnmp_container *x, const void *k) + int CONTAINER_TRY_INSERT(netsnmp_container *x, const void *k)
+ { + {
@ -30,14 +73,16 @@
+ } + }
+ } + }
+ return CONTAINER_INSERT(start, k); + return CONTAINER_INSERT(start, k);
+ } }
-
+ +
/*------------------------------------------------------------------ /*------------------------------------------------------------------
* These functions should EXACTLY match the function version in * These functions should EXACTLY match the function version in
* container.c. If you change one, change them both. * container.c. If you change one, change them both.
--- net-snmp-5.3.1/snmplib/container.c.orig 2006-04-21 02:24:47.000000000 +0200 diff -up net-snmp-5.4.1/snmplib/container.c.backup_patch_13 net-snmp-5.4.1/snmplib/container.c
+++ net-snmp-5.3.1/snmplib/container.c 2007-05-04 10:34:23.000000000 +0200 --- net-snmp-5.4.1/snmplib/container.c.backup_patch_13 2006-08-25 11:41:06.000000000 +0200
@@ -286,6 +286,29 @@ +++ net-snmp-5.4.1/snmplib/container.c 2008-07-25 12:53:42.000000000 +0200
@@ -286,6 +286,29 @@ int CONTAINER_INSERT(netsnmp_container *
return rc; return rc;
} }
@ -67,45 +112,3 @@
/*------------------------------------------------------------------ /*------------------------------------------------------------------
* These functions should EXACTLY match the inline version in * These functions should EXACTLY match the inline version in
* container.h. If you change one, change them both. * container.h. If you change one, change them both.
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c.orig 2007-05-17 23:53:28.000000000 +0200
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_ioctl.c 2007-08-07 13:49:49.000000000 +0200
@@ -272,11 +272,15 @@ _netsnmp_ioctl_ipaddress_container_load_
/*
* add entry to container
*/
- if (CONTAINER_INSERT(container, entry) < 0)
- {
- DEBUGMSGTL(("access:ipaddress:container","error with ipaddress_entry: insert into container failed.\n"));
+ rc = CONTAINER_TRY_INSERT(container, entry);
+ if (rc < 0) {
+ static int logged = 0;
+ if (!logged) {
+ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n");
+ logged = 1;
+ }
+ rc = 0;
netsnmp_access_ipaddress_entry_free(entry);
- continue;
}
}
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.orig 2006-09-15 02:48:50.000000000 +0200
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c 2007-08-07 13:47:55.000000000 +0200
@@ -324,7 +324,16 @@ _load_v6(netsnmp_container *container, i
/*
* add entry to container
*/
- CONTAINER_INSERT(container, entry);
+ rc = CONTAINER_TRY_INSERT(container, entry);
+ if (rc < 0) {
+ static int logged = 0;
+ if (!logged) {
+ snmp_log(LOG_NOTICE, "Duplicate IP address detected, some interfaces may not be visible in IP-MIB\n");
+ logged = 1;
+ }
+ netsnmp_access_ipaddress_entry_free(entry);
+ }
+
}
fclose(in);

97
net-snmp-5.4.1-strange_libpath.patch
View File

@ -1,34 +1,6 @@
--- net-snmp-5.4.1/configure.mnttab.orig 2007-07-27 19:04:19.000000000 +0200 diff -up net-snmp-5.4.1/configure.backup_patch_11 net-snmp-5.4.1/configure
+++ net-snmp-5.4.1/configure.mnttab 2007-08-07 13:32:45.000000000 +0200 --- net-snmp-5.4.1/configure.backup_patch_11 2008-07-25 12:53:35.000000000 +0200
@@ -27930,7 +27930,7 @@ if test "${with_libwrap+set}" = set; the +++ net-snmp-5.4.1/configure 2008-07-25 12:53:39.000000000 +0200
if test "$with_libwrap" != "no"; then
if test "$with_libwrap" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
- LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
+ LDFLAGS="${LDFLAGS} -L$with_libwrap"
fi
_libs=${LIBS}
@@ -28134,7 +28134,7 @@ echo "${ECHO_T}yes" >&6
#define NETSNMP_USE_LIBWRAP 1
_ACEOF
- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib"
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap"
_wraplibs="$_wraplibs -lwrap"
else
echo "$as_me: failed program was:" >&5
@@ -28362,7 +28362,7 @@ echo "${ECHO_T}yes" >&6
#define NETSNMP_USE_LIBWRAP 1
_ACEOF
- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib"
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap"
_wraplibs="$_wraplibs -lwrap -lnsl"
else
echo "$as_me: failed program was:" >&5
--- net-snmp-5.4.1/configure.libdir.orig 2007-08-07 13:31:31.000000000 +0200
+++ net-snmp-5.4.1/configure.libdir 2007-08-07 13:32:05.000000000 +0200
@@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the @@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the
if test "$with_libwrap" != "no"; then if test "$with_libwrap" != "no"; then
if test "$with_libwrap" != "yes"; then if test "$with_libwrap" != "yes"; then
@ -56,37 +28,9 @@
_wraplibs="$_wraplibs -lwrap -lnsl" _wraplibs="$_wraplibs -lwrap -lnsl"
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
--- net-snmp-5.4.1/configure.orig 2007-08-07 13:31:31.000000000 +0200 diff -up net-snmp-5.4.1/configure.in.backup_patch_11 net-snmp-5.4.1/configure.in
+++ net-snmp-5.4.1/configure 2007-08-07 13:33:29.000000000 +0200 --- net-snmp-5.4.1/configure.in.backup_patch_11 2007-07-27 19:02:00.000000000 +0200
@@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the +++ net-snmp-5.4.1/configure.in 2008-07-25 12:53:39.000000000 +0200
if test "$with_libwrap" != "no"; then
if test "$with_libwrap" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
- LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
+ LDFLAGS="${LDFLAGS} -L$with_libwrap"
fi
_libs=${LIBS}
@@ -28126,7 +28126,7 @@ echo "${ECHO_T}yes" >&6
#define NETSNMP_USE_LIBWRAP 1
_ACEOF
- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib"
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap"
_wraplibs="$_wraplibs -lwrap"
else
echo "$as_me: failed program was:" >&5
@@ -28354,7 +28354,7 @@ echo "${ECHO_T}yes" >&6
#define NETSNMP_USE_LIBWRAP 1
_ACEOF
- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib"
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap"
_wraplibs="$_wraplibs -lwrap -lnsl"
else
echo "$as_me: failed program was:" >&5
--- net-snmp-5.4.1/configure.in.orig 2007-07-27 19:02:00.000000000 +0200
+++ net-snmp-5.4.1/configure.in 2007-08-07 13:33:55.000000000 +0200
@@ -2714,7 +2714,7 @@ AC_ARG_WITH(libwrap, @@ -2714,7 +2714,7 @@ AC_ARG_WITH(libwrap,
if test "$with_libwrap" != "no"; then if test "$with_libwrap" != "no"; then
if test "$with_libwrap" != "yes"; then if test "$with_libwrap" != "yes"; then
@ -114,32 +58,3 @@
_wraplibs="$_wraplibs -lwrap -lnsl", _wraplibs="$_wraplibs -lwrap -lnsl",
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
--- net-snmp-5.4.1/configure.libpath.orig 2007-08-07 13:31:31.000000000 +0200
+++ net-snmp-5.4.1/configure.libpath 2007-08-07 13:34:52.000000000 +0200
@@ -27922,7 +27922,7 @@ if test "${with_libwrap+set}" = set; the
if test "$with_libwrap" != "no"; then
if test "$with_libwrap" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
- LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
+ LDFLAGS="${LDFLAGS} -L$with_libwrap"
fi
_libs=${LIBS}
@@ -28126,7 +28126,7 @@ echo "${ECHO_T}yes" >&6
#define NETSNMP_USE_LIBWRAP 1
_ACEOF
- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib"
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap"
_wraplibs="$_wraplibs -lwrap"
else
echo "$as_me: failed program was:" >&5
@@ -28354,7 +28354,7 @@ echo "${ECHO_T}yes" >&6
#define NETSNMP_USE_LIBWRAP 1
_ACEOF
- test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap/lib"
+ test "$with_libwrap" != no -a "$with_libwrap" != yes && _wraplibs="-L$with_libwrap"
_wraplibs="$_wraplibs -lwrap -lnsl"
else
echo "$as_me: failed program was:" >&5

249
net-snmp-5.4.1-xen-crash.patch
View File

@ -4,131 +4,10 @@ Reviewed-By: Jan Safranek <jsafrane@redhat.com>
Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c
=================================================================== ===================================================================
--- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c (revision 16711) diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c
+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c (working copy) --- net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c.backup_patch_16 2007-07-17 01:59:44.000000000 +0200
@@ -258,9 +258,10 @@ +++ net-snmp-5.4.1/agent/mibgroup/ip-mib/data_access/ipaddress_common.c 2008-07-25 12:53:57.000000000 +0200
if ((NULL != rowreq_ctx) && @@ -411,6 +411,7 @@ static int _access_ipaddress_entry_compa
(MFD_SUCCESS ==
ipAddressTable_indexes_set(rowreq_ctx,
+ ipaddress_entry->ia_address_len + 1,
+ ipaddress_entry->ia_address,
ipaddress_entry->ia_address_len,
- ipaddress_entry->ia_address,
- ipaddress_entry->ia_address_len))) {
+ ipaddress_entry->if_index))) {
if (CONTAINER_INSERT(container, rowreq_ctx) < 0) {
DEBUGMSGTL (("ipAddressTable:access","container insert failed for new entry\n"));
ipAddressTable_release_rowreq_ctx(rowreq_ctx);
Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c
===================================================================
--- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c (revision 16711)
+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c (working copy)
@@ -348,10 +348,18 @@
*mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV4;
break;
+ case INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4Z:
+ *mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV4Z;
+ break;
+
case INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6:
*mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV6;
break;
+ case INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6Z:
+ *mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV6Z;
+ break;
+
default:
snmp_log(LOG_ERR, "couldn't map value %ld for ipAddressAddrType\n",
raw_ipAddressAddrType_val);
@@ -382,8 +390,11 @@
ipAddressTable_indexes_set_tbl_idx(ipAddressTable_mib_index * tbl_idx,
u_long ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
- size_t ipAddressAddr_val_ptr_len)
+ size_t ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex)
{
+ uint32_t zone = htonl(ipAddressAddr_ifIndex);
+
DEBUGMSGTL(("verbose:ipAddressTable:ipAddressTable_indexes_set_tbl_idx", "called\n"));
/*
@@ -409,6 +420,11 @@
memcpy(tbl_idx->ipAddressAddr, ipAddressAddr_val_ptr,
ipAddressAddr_val_ptr_len * sizeof(ipAddressAddr_val_ptr[0]));
+ /** zone */
+ tbl_idx->ipAddressAddr_len += sizeof(zone);
+ memcpy(&tbl_idx->ipAddressAddr[ipAddressAddr_val_ptr_len *
+ sizeof(ipAddressAddr_val_ptr[0])],
+ &zone, sizeof(zone));
return MFD_SUCCESS;
} /* ipAddressTable_indexes_set_tbl_idx */
@@ -430,7 +446,8 @@
ipAddressTable_indexes_set(ipAddressTable_rowreq_ctx * rowreq_ctx,
u_long ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
- size_t ipAddressAddr_val_ptr_len)
+ size_t ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex)
{
DEBUGMSGTL(("verbose:ipAddressTable:ipAddressTable_indexes_set",
"called\n"));
@@ -439,7 +456,8 @@
ipAddressTable_indexes_set_tbl_idx(&rowreq_ctx->tbl_idx,
ipAddressAddrType_val,
ipAddressAddr_val_ptr,
- ipAddressAddr_val_ptr_len))
+ ipAddressAddr_val_ptr_len,
+ ipAddressAddr_ifIndex))
return MFD_ERROR;
/*
Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h
===================================================================
--- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h (revision 16711)
+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h (working copy)
@@ -106,7 +106,9 @@
* simplistic map of address length to type
*/
#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4 4
+#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4Z 5
#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6 16
+#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6Z 17
/*************************************************************
Index: agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h
===================================================================
--- agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h (revision 16711)
+++ agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h (working copy)
@@ -273,14 +273,16 @@
u_long ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
size_t
- ipAddressAddr_val_ptr_len);
+ ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex);
int ipAddressTable_indexes_set(ipAddressTable_rowreq_ctx *
rowreq_ctx,
u_long
ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
size_t
- ipAddressAddr_val_ptr_len);
+ ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex);
Index: agent/mibgroup/ip-mib/data_access/ipaddress_common.c
===================================================================
--- agent/mibgroup/ip-mib/data_access/ipaddress_common.c (revision 16711)
+++ agent/mibgroup/ip-mib/data_access/ipaddress_common.c (working copy)
@@ -411,6 +415,7 @@
{ {
const netsnmp_ipaddress_entry *lh = (const netsnmp_ipaddress_entry *)lhs; const netsnmp_ipaddress_entry *lh = (const netsnmp_ipaddress_entry *)lhs;
const netsnmp_ipaddress_entry *rh = (const netsnmp_ipaddress_entry *)rhs; const netsnmp_ipaddress_entry *rh = (const netsnmp_ipaddress_entry *)rhs;
@ -136,7 +15,7 @@ Index: agent/mibgroup/ip-mib/data_access/ipaddress_common.c
netsnmp_assert(NULL != lhs); netsnmp_assert(NULL != lhs);
netsnmp_assert(NULL != rhs); netsnmp_assert(NULL != rhs);
@@ -426,5 +431,17 @@ @@ -426,5 +427,17 @@ static int _access_ipaddress_entry_compa
/* /*
* length equal, compare address * length equal, compare address
*/ */
@ -155,3 +34,121 @@ Index: agent/mibgroup/ip-mib/data_access/ipaddress_common.c
+ +
+ return 0; + return 0;
} }
diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c.backup_patch_16 2006-12-06 16:10:40.000000000 +0100
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.c 2008-07-25 12:53:57.000000000 +0200
@@ -348,10 +348,18 @@ ipAddressAddrType_map(u_long * mib_ipAdd
*mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV4;
break;
+ case INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4Z:
+ *mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV4Z;
+ break;
+
case INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6:
*mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV6;
break;
+ case INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6Z:
+ *mib_ipAddressAddrType_val_ptr = INETADDRESSTYPE_IPV6Z;
+ break;
+
default:
snmp_log(LOG_ERR, "couldn't map value %ld for ipAddressAddrType\n",
raw_ipAddressAddrType_val);
@@ -382,8 +390,11 @@ int
ipAddressTable_indexes_set_tbl_idx(ipAddressTable_mib_index * tbl_idx,
u_long ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
- size_t ipAddressAddr_val_ptr_len)
+ size_t ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex)
{
+ uint32_t zone = htonl(ipAddressAddr_ifIndex);
+
DEBUGMSGTL(("verbose:ipAddressTable:ipAddressTable_indexes_set_tbl_idx", "called\n"));
/*
@@ -409,6 +420,11 @@ ipAddressTable_indexes_set_tbl_idx(ipAdd
memcpy(tbl_idx->ipAddressAddr, ipAddressAddr_val_ptr,
ipAddressAddr_val_ptr_len * sizeof(ipAddressAddr_val_ptr[0]));
+ /** zone */
+ tbl_idx->ipAddressAddr_len += sizeof(zone);
+ memcpy(&tbl_idx->ipAddressAddr[ipAddressAddr_val_ptr_len *
+ sizeof(ipAddressAddr_val_ptr[0])],
+ &zone, sizeof(zone));
return MFD_SUCCESS;
} /* ipAddressTable_indexes_set_tbl_idx */
@@ -430,7 +446,8 @@ int
ipAddressTable_indexes_set(ipAddressTable_rowreq_ctx * rowreq_ctx,
u_long ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
- size_t ipAddressAddr_val_ptr_len)
+ size_t ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex)
{
DEBUGMSGTL(("verbose:ipAddressTable:ipAddressTable_indexes_set",
"called\n"));
@@ -439,7 +456,8 @@ ipAddressTable_indexes_set(ipAddressTabl
ipAddressTable_indexes_set_tbl_idx(&rowreq_ctx->tbl_idx,
ipAddressAddrType_val,
ipAddressAddr_val_ptr,
- ipAddressAddr_val_ptr_len))
+ ipAddressAddr_val_ptr_len,
+ ipAddressAddr_ifIndex))
return MFD_ERROR;
/*
diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h.backup_patch_16 2005-12-01 18:00:57.000000000 +0100
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_constants.h 2008-07-25 12:53:57.000000000 +0200
@@ -106,7 +106,9 @@ extern "C" {
* simplistic map of address length to type
*/
#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4 4
+#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV4Z 5
#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6 16
+#define INTERNAL_IPADDRESSTABLE_IPADDRESSADDRTYPE_IPV6Z 17
/*************************************************************
diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c.backup_patch_16 2007-05-17 23:53:28.000000000 +0200
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable_data_access.c 2008-07-25 12:53:57.000000000 +0200
@@ -258,9 +258,10 @@ _add_new_entry(netsnmp_ipaddress_entry *
if ((NULL != rowreq_ctx) &&
(MFD_SUCCESS ==
ipAddressTable_indexes_set(rowreq_ctx,
- ipaddress_entry->ia_address_len,
+ ipaddress_entry->ia_address_len + 1,
ipaddress_entry->ia_address,
- ipaddress_entry->ia_address_len))) {
+ ipaddress_entry->ia_address_len,
+ ipaddress_entry->if_index))) {
if (CONTAINER_INSERT(container, rowreq_ctx) < 0) {
DEBUGMSGTL (("ipAddressTable:access","container insert failed for new entry\n"));
ipAddressTable_release_rowreq_ctx(rowreq_ctx);
diff -up net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h.backup_patch_16 net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h
--- net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h.backup_patch_16 2006-01-25 17:28:12.000000000 +0100
+++ net-snmp-5.4.1/agent/mibgroup/ip-mib/ipAddressTable/ipAddressTable.h 2008-07-25 12:53:57.000000000 +0200
@@ -273,14 +273,16 @@ config_require(ip-mib/ipAddressTable/ipA
u_long ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
size_t
- ipAddressAddr_val_ptr_len);
+ ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex);
int ipAddressTable_indexes_set(ipAddressTable_rowreq_ctx *
rowreq_ctx,
u_long
ipAddressAddrType_val,
char *ipAddressAddr_val_ptr,
size_t
- ipAddressAddr_val_ptr_len);
+ ipAddressAddr_val_ptr_len,
+ u_long ipAddressAddr_ifIndex);

41
net-snmp.spec
View File

@ -1,8 +1,5 @@
%{!?tcp_wrappers:%define tcp_wrappers 1} %{!?tcp_wrappers:%define tcp_wrappers 1}
# TODO: rediff all patches and remove following line:
%define _default_patch_fuzz 2
# Arches on which we need to prevent arch conflicts on net-snmp-config.h # Arches on which we need to prevent arch conflicts on net-snmp-config.h
%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 sparc sparcv9 sparc64
%define major_ver 5.4.1 %define major_ver 5.4.1
@ -35,16 +32,15 @@ Patch6: net-snmp-5.1.2-dir-fix.patch
Patch7: net-snmp-5.2.1-file_offset.patch Patch7: net-snmp-5.2.1-file_offset.patch
Patch8: net-snmp-5.3.1-multilib.patch Patch8: net-snmp-5.3.1-multilib.patch
Patch9: net-snmp-5.4.1-config_libdir.patch Patch9: net-snmp-5.4.1-config_libdir.patch
#Patch10: net-snmp-5.4.1-ethtool-config.patch Patch10: net-snmp-5.4.1-strange_libpath.patch
Patch11: net-snmp-5.4.1-strange_libpath.patch Patch11: net-snmp-5.4.1-hostname.patch
Patch12: net-snmp-5.4.1-hostname.patch Patch12: net-snmp-5.4.1-shared-ip.patch
Patch13: net-snmp-5.4.1-shared-ip.patch Patch13: net-snmp-5.4-exec-crash.patch
Patch14: net-snmp-5.4-exec-crash.patch Patch14: net-snmp-5.4.1-sensors3.patch
Patch15: net-snmp-5.4.1-sensors3.patch Patch15: net-snmp-5.4.1-xen-crash.patch
Patch16: net-snmp-5.4.1-xen-crash.patch Patch16: net-snmp-5.4.1-hmac-check.patch
Patch17: net-snmp-5.4.1-hmac-check.patch Patch17: net-snmp-5.4.1-perl-snprintf.patch
Patch18: net-snmp-5.4.1-perl-snprintf.patch Patch18: net-snmp-5.4.1-perl-set.patch
Patch19: net-snmp-5.4.1-perl-set.patch
Requires(pre): chkconfig Requires(pre): chkconfig
Requires(post): chkconfig Requires(post): chkconfig
@ -168,16 +164,15 @@ and applications.
%patch7 -p1 -b .file_offset %patch7 -p1 -b .file_offset
%patch8 -p1 -b .multilib %patch8 -p1 -b .multilib
%patch9 -p1 -b .libdir %patch9 -p1 -b .libdir
#%patch10 -p1 -b .ethtool %patch10 -p1 -b .libpath
%patch11 -p1 -b .libpath %patch11 -p1 -b .hostname
%patch12 -p1 -b .hostname %patch12 -p1 -b .shared-ip
%patch13 -p1 -b .shared-ip %patch13 -p1 -b .exec
%patch14 -p1 -b .exec %patch14 -p1 -b .sensors
%patch15 -p0 -b .sensors %patch15 -p1 -b .xen-crash
%patch16 -p0 -b .xen-crash %patch16 -p1 -b .hmac-check
%patch17 -p1 -b .hmac-check %patch17 -p1 -b .perl-snprintf
%patch18 -p3 -b .perl-snprintf %patch18 -p1 -b .perl-set
%patch19 -p1 -b .perl-set
# Do this patch with a perl hack... # Do this patch with a perl hack...
perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh

15
ucd-snmp-4.2.4.pre3-mnttab.patch
View File

@ -1,8 +1,9 @@
--- ucd-snmp-4.2.4.pre3/configure.mnttab Tue Apr 9 13:56:13 2002 diff -up net-snmp-5.4.1/configure.backup_patch_1 net-snmp-5.4.1/configure
+++ ucd-snmp-4.2.4.pre3/configure Tue Apr 9 13:58:14 2002 --- net-snmp-5.4.1/configure.backup_patch_1 2007-07-27 19:04:19.000000000 +0200
@@ -7148,15 +7148,7 @@ +++ net-snmp-5.4.1/configure 2008-07-25 12:52:01.000000000 +0200
if eval "test \"`echo '$''{'ac_cv_ETC_MNTTAB'+set}'`\" = set"; then @@ -26579,15 +26579,7 @@ echo $ECHO_N "checking for mount table l
echo $ac_n "(cached) $ac_c" 1>&6 if test "${ac_cv_ETC_MNTTAB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else else
- ac_cv_ETC_MNTTAB="unknown" - ac_cv_ETC_MNTTAB="unknown"
-for i in /etc/mnttab /etc/mtab /etc/filesystems -for i in /etc/mnttab /etc/mtab /etc/filesystems
@ -15,5 +16,5 @@
- -
+ ac_cv_ETC_MNTTAB="/etc/mtab" + ac_cv_ETC_MNTTAB="/etc/mtab"
fi fi
echo "$as_me:$LINENO: result: $ac_cv_ETC_MNTTAB" >&5
echo "$ac_t""$ac_cv_ETC_MNTTAB" 1>&6 echo "${ECHO_T}$ac_cv_ETC_MNTTAB" >&6