rpms/net-snmp/devel net-snmp-5.3.1-64bit.patch, NONE, 1.1 net-snmp-5.3.1-multilib.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 net-snmp.spec, 1.71, 1.72 sources, 1.17, 1.18 net-snmp-5.2-64bit.diff, 1.1, NONE net-snmp-5.3-5.3.0.1.patch, 1.1, NONE net-snmp-5.3-agent-registry-unregister-free.patch, 1.1, NONE net-snmp-5.3-diskio.patch, 1.1, NONE net-snmp-5.3-disman.patch, 1.1, NONE net-snmp-5.3-oid-names.patch, 1.1, NONE net-snmp-5.3.0.1-ifnumber.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 23 09:04:59 UTC 2006
Author: rvokal
Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6901
Modified Files:
.cvsignore net-snmp.spec sources
Added Files:
net-snmp-5.3.1-64bit.patch net-snmp-5.3.1-multilib.patch
Removed Files:
net-snmp-5.2-64bit.diff net-snmp-5.3-5.3.0.1.patch
net-snmp-5.3-agent-registry-unregister-free.patch
net-snmp-5.3-diskio.patch net-snmp-5.3-disman.patch
net-snmp-5.3-oid-names.patch net-snmp-5.3.0.1-ifnumber.patch
Log Message:
- update to 5.3.1.pre2
- fix multilib issues (#192736)
On system with /usr/lib64 use net-snmp-config64 and net-snmp-config64.h
net-snmp-5.3.1-64bit.patch:
mibII/at.c | 17 +++++++++--------
mibII/ipCidrRouteTable_access.c | 19 ++++++++++---------
mibII/var_route.c | 22 +++++++++++++---------
ucd-snmp/pass.c | 9 +++++----
ucd-snmp/pass_persist.c | 9 +++++----
5 files changed, 42 insertions(+), 34 deletions(-)
--- NEW FILE net-snmp-5.3.1-64bit.patch ---
--- agent/mibgroup/mibII/at.c
+++ agent/mibgroup/mibII/at.c
@@ -117,9 +117,9 @@
#ifndef solaris2
static void ARP_Scan_Init(void);
#ifdef ARP_SCAN_FOUR_ARGUMENTS
-static int ARP_Scan_Next(u_long *, char *, u_long *, u_short *);
+static int ARP_Scan_Next(u_int *, char *, u_long *, u_short *);
#else
-static int ARP_Scan_Next(u_long *, char *, u_long *);
+static int ARP_Scan_Next(u_int *, char *, u_long *);
#endif
#endif
#endif
@@ -195,7 +195,8 @@
oid lowest[16];
oid current[16];
static char PhysAddr[6], LowPhysAddr[6];
- u_long Addr, LowAddr, foundone;
+ u_int Addr, LowAddr, foundone;
+ static int addr_ret;
#ifdef ARP_SCAN_FOUR_ARGUMENTS
u_short ifIndex, lowIfIndex = 0;
#endif /* ARP_SCAN_FOUR_ARGUMENTS */
@@ -305,9 +306,9 @@
*var_len = sizeof(LowPhysAddr);
return (u_char *) LowPhysAddr;
case IPMEDIANETADDRESS: /* also ATNETADDRESS */
- *var_len = sizeof long_return;
- long_return = LowAddr;
- return (u_char *) & long_return;
+ *var_len = sizeof addr_ret;
+ addr_ret = LowAddr;
+ return (u_char *) & addr_ret;
case IPMEDIATYPE:
*var_len = sizeof long_return;
long_return = lowIfType;
@@ -676,11 +677,11 @@
#ifdef ARP_SCAN_FOUR_ARGUMENTS
static int
-ARP_Scan_Next(u_long * IPAddr, char *PhysAddr, u_long * ifType,
+ARP_Scan_Next(u_int * IPAddr, char *PhysAddr, u_long * ifType,
u_short * ifIndex)
#else
static int
-ARP_Scan_Next(u_long * IPAddr, char *PhysAddr, u_long * ifType)
+ARP_Scan_Next(u_int * IPAddr, char *PhysAddr, u_long * ifType)
#endif
{
#ifndef CAN_USE_SYSCTL
--- agent/mibgroup/mibII/ipCidrRouteTable_access.c
+++ agent/mibgroup/mibII/ipCidrRouteTable_access.c
@@ -22,6 +22,7 @@
/** 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). */
static u_long long_ret;
+static in_addr_t addr_ret;
/*
@@ -32,18 +33,18 @@
get_ipCidrRouteDest(void *data_context, size_t * ret_len)
{
RTENTRY *ourroute = (RTENTRY *) data_context;
- long_ret = ((struct sockaddr_in *) (&ourroute->rt_dst))->sin_addr.s_addr;
- *ret_len = sizeof(long_ret);
- return &long_ret;
+ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_dst))->sin_addr.s_addr;
+ *ret_len = sizeof(addr_ret);
+ return &addr_ret;
}
u_long *
get_ipCidrRouteMask(void *data_context, size_t * ret_len)
{
RTENTRY *ourroute = (RTENTRY *) data_context;
- long_ret = ((struct sockaddr_in *) (&ourroute->rt_genmask))->sin_addr.s_addr;
- *ret_len = sizeof(long_ret);
- return &long_ret;
+ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_genmask))->sin_addr.s_addr;
+ *ret_len = sizeof(addr_ret);
+ return &addr_ret;
}
long *
@@ -59,9 +60,9 @@
get_ipCidrRouteNextHop(void *data_context, size_t * ret_len)
{
RTENTRY *ourroute = (RTENTRY *) data_context;
- long_ret = ((struct sockaddr_in *) (&ourroute->rt_gateway))->sin_addr.s_addr;
- *ret_len = sizeof(long_ret);
- return &long_ret;
+ addr_ret = ((struct sockaddr_in *) (&ourroute->rt_gateway))->sin_addr.s_addr;
+ *ret_len = sizeof(addr_ret);
+ return &addr_ret;
}
long *
--- agent/mibgroup/mibII/var_route.c
+++ agent/mibgroup/mibII/var_route.c
@@ -412,6 +412,7 @@
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
@@ -514,12 +515,13 @@
switch (vp->magic) {
case IPROUTEDEST:
+ *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;
@@ -572,12 +574,13 @@
long_return = -1;
return (u_char *) & long_return;
case IPROUTENEXTHOP:
+ *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;
@@ -614,6 +617,7 @@
long_return = 0;
return (u_char *) & long_return;
case IPROUTEMASK:
+ *var_len = sizeof(addr_ret);
#if NEED_KLGETSA
/*
* XXX - Almost certainly not right
@@ -622,14 +626,14 @@
#if 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
klookup((unsigned long) rthead[RtIndex]->rt_ifp,
@@ -648,7 +652,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;
--- agent/mibgroup/ucd-snmp/pass.c
+++ agent/mibgroup/ucd-snmp/pass.c
@@ -251,6 +251,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];
@@ -373,13 +374,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;
--- agent/mibgroup/ucd-snmp/pass_persist.c
+++ agent/mibgroup/ucd-snmp/pass_persist.c
@@ -184,6 +184,7 @@
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];
@@ -329,13 +330,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.3.1-multilib.patch:
read_config.3.def | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE net-snmp-5.3.1-multilib.patch ---
--- net-snmp-5.3.1.pre2/man/read_config.3.def.old 2003-04-25 16:02:55.000000000 +0200
+++ net-snmp-5.3.1.pre2/man/read_config.3.def 2006-05-23 09:41:35.000000000 +0200
@@ -257,7 +257,7 @@
.I SNMPCONFPATH
environment variable (or its default value, which will be
SYSCONFDIR/snmp, followed by
-DATADIR/snmp, followed by LIBDIR/snmp, followed by $HOME/.snmp) and
+DATADIR/snmp, followed by /usr/lib/snmp (or /usr/lib64/snmp), followed by $HOME/.snmp) and
reading in the files found that match both the prefix registered and
the two suffixes
.I .conf
@@ -285,7 +285,7 @@
SNMPCONFPATH
A colon separated list of directories to search for configuration
files in.
-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp
+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp
.SH "SEE ALSO"
.BR mib_api "(3), " snmp_api (3)
.\" Local Variables:
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 30 Dec 2005 10:46:02 -0000 1.17
+++ .cvsignore 23 May 2006 09:04:55 -0000 1.18
@@ -1 +1 @@
-net-snmp-5.3.tar.gz
+net-snmp-5.3.1.pre2.tar.gz
Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- net-snmp.spec 15 Apr 2006 11:10:07 -0000 1.71
+++ net-snmp.spec 23 May 2006 09:04:55 -0000 1.72
@@ -2,8 +2,8 @@
Summary: A collection of SNMP protocol tools and libraries.
Name: net-snmp
-Version: 5.3
-Release: 8
+Version: 5.3.1.pre2
+Release: 1
License: BSDish
Group: System Environment/Daemons
@@ -21,22 +21,17 @@
Patch6: net-snmp-5.0.8-readonly.patch
Patch7: net-snmp-5.1-async-getnext.patch
Patch8: net-snmp-5.1.1-pie.patch
-Patch9: net-snmp-5.2-64bit.diff
+Patch9: net-snmp-5.3.1-64bit.patch
#kills virtual interfaces
#Patch10: net-snmp-5.1.1-ipAdEntIfIndex.patch
Patch12: net-snmp-5.1.2-dir-fix.patch
Patch19: net-snmp-5.2.1-file_offset.patch
-Patch20: net-snmp-5.3-5.3.0.1.patch
Patch21: net-snmp-5.3.0.1-maxsensors.patch
-Patch22: net-snmp-5.3-agent-registry-unregister-free.patch
Patch23: net-snmp-5.3-proc_if_inet6.patch
Patch24: net-snmp-5.3-size_t.patch
Patch25: net-snmp-5.3-ipv6_retrans_ms.patch
Patch26: net-snmp-5.3_vendorperl.patch
-Patch27: net-snmp-5.3-oid-names.patch
-Patch28: net-snmp-5.3-disman.patch
-Patch29: net-snmp-5.3-diskio.patch
-Patch30: net-snmp-5.3.0.1-ifnumber.patch
+Patch27: net-snmp-5.3.1-multilib.patch
Prereq: /sbin/chkconfig
Obsoletes: ucd-snmp
@@ -136,17 +131,13 @@
%patch9 -b .64bit
%patch12 -p1 -b .dir-fix
%patch19 -p1 -b .file_offset
-%patch20 -p1 -b .5.3.0.1
%patch21 -p1 -b .maxsensors
-%patch22 -p0
+#%patch22 -p0
%patch23 -p1 -b .proc_if
%patch24 -p1 -b .size_t
%patch25 -p1 -b .retrans_ms
%patch26 -p0
-%patch27 -p0 -b .oid
-%patch28 -p1 -b .disman
-%patch29 -p1 -b .diskio
-%patch30 -p0 -b .ifnumbed
+%patch27 -p1 -b .multilib
# Do this patch with a perl hack...
perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -195,6 +186,11 @@
%makeinstall ucdincludedir=${RPM_BUILD_ROOT}/usr/include/ucd-snmp
# remove .la files
+%ifarch x86_64 s390x
+mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config64
+mv ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config64.h
+%endif
+
rm ${RPM_BUILD_ROOT}%{_libdir}/*.la
install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
@@ -315,7 +311,11 @@
%{_libdir}/lib*.so
/usr/include/*
%attr(0644,root,root) %{_mandir}/man3/*.3.*
+%ifarch x86_64 s390x
+%attr(0755,root,root) %{_bindir}/net-snmp-config64
+%else
%attr(0755,root,root) %{_bindir}/net-snmp-config
+%endif
%files perl -f perl.lst
%defattr(-,root,root)
@@ -329,6 +329,11 @@
%{_libdir}/*.a
%changelog
+* Tue May 23 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.pre2-1
+- update to 5.3.1.pre2
+- fix multilib issues (#192736)
+ On system with /usr/lib64 use net-snmp-config64 and net-snmp-config64.h
+
* Sat Apr 15 2006 Radek Vokál <rvokal at redhat.com> 5.3-8
- fix missing IF-MIB::ifNumber.0 (#189007)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 30 Dec 2005 10:46:02 -0000 1.17
+++ sources 23 May 2006 09:04:56 -0000 1.18
@@ -1 +1 @@
-0dc8e4c8440c011139b71e59cd3b421a net-snmp-5.3.tar.gz
+0930ce05346508de725613d4abbf8b04 net-snmp-5.3.1.pre2.tar.gz
--- net-snmp-5.2-64bit.diff DELETED ---
--- net-snmp-5.3-5.3.0.1.patch DELETED ---
--- net-snmp-5.3-agent-registry-unregister-free.patch DELETED ---
--- net-snmp-5.3-diskio.patch DELETED ---
--- net-snmp-5.3-disman.patch DELETED ---
--- net-snmp-5.3-oid-names.patch DELETED ---
--- net-snmp-5.3.0.1-ifnumber.patch DELETED ---
More information about the fedora-cvs-commits
mailing list