diff --git a/.cvsignore b/.cvsignore index 21a87be..7a046df 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -net-snmp-5.0.6.tar.gz +net-snmp-5.0.9.tar.gz diff --git a/net-snmp-5.0.8-ipv6-sock-close.patch b/net-snmp-5.0.8-ipv6-sock-close.patch new file mode 100644 index 0000000..5af7626 --- /dev/null +++ b/net-snmp-5.0.8-ipv6-sock-close.patch @@ -0,0 +1,10 @@ +--- net-snmp-5.0.8/agent/mibgroup/mibII/ipv6.c.orig 2003-02-25 16:35:58.000000000 +0200 ++++ net-snmp-5.0.8/agent/mibgroup/mibII/ipv6.c 2003-02-25 16:36:30.000000000 +0200 +@@ -1961,6 +1961,7 @@ + break; + } + long_return = (ifr.ifr_flags & flag) ? 1 : 2; ++ close(s); + return (u_char *) & long_return; + } + } diff --git a/net-snmp-5.0.8-readonly.patch b/net-snmp-5.0.8-readonly.patch new file mode 100644 index 0000000..d4db44e --- /dev/null +++ b/net-snmp-5.0.8-readonly.patch @@ -0,0 +1,15 @@ +--- net-snmp-5.0.8/agent/snmp_agent.c.readonly 2003-08-05 14:55:44.000000000 +0200 ++++ net-snmp-5.0.8/agent/snmp_agent.c 2003-08-06 16:05:56.000000000 +0200 +@@ -1133,6 +1133,12 @@ + int i, n = 0, r = 0; + + /* ++ * Update asp->status if necessary. Fixes ro/rw problem. ++ */ ++ if ( status != 0 && asp->status == 0 ) ++ asp->status = status; ++ ++ /* + * if this request was a set, clear the global now that we are + * done. + */ diff --git a/net-snmp.spec b/net-snmp.spec index 7c4d01e..273cd48 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -1,7 +1,9 @@ +%{!?tcp_wrappers:%define tcp_wrappers 1} + Summary: A collection of SNMP protocol tools and libraries. Name: net-snmp -Version: 5.0.6 -Release: 17 +Version: 5.0.9 +Release: 2 License: BSDish Group: System Environment/Daemons Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz @@ -10,25 +12,24 @@ Source2: ucd-snmp.redhat.conf Source3: ucd-snmpd.logrotate Source4: ucd5820stat Source5: ucd-snmptrapd.init -Patch1: ucd-snmp-4.2-ia64.patch -Patch2: ucd-snmp-4.2.1-manpage.patch -Patch3: ucd-snmp-4.2.1-walk.patch -Patch4: ucd-snmp-4.2.1-security3.patch -Patch5: ucd-snmp-4.2.1-tests_num.patch -Patch7: ucd-snmp-4.2.4.pre3-nodb.patch -Patch8: ucd-snmp-4.2.4.pre3-mnttab.patch -Patch9: net-snmp-5.0.1-initializer.patch -Patch10: net-snmp-5.0.1-nolibelf.patch -Patch11: net-snmp-5.0.6-syslog.patch -Patch12: net-snmp-5.0.6-nodb.patch -Patch13: net-snmp-5.0.6-compat.patch -Patch14: net-snmp-5.0.6-smux.patch -Patch15: net-snmp-5.0.6-libtool.patch -Patch16: net-snmp-5.0.6-smux_pktsz_err_rpt.patch +Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch +Patch2: net-snmp-5.0.1-initializer.patch +Patch3: net-snmp-5.0.6-syslog.patch +Patch4: net-snmp-5.0.6-compat.patch +Patch5: net-snmp-5.0.6-libtool.patch +Patch6: net-snmp-5.0.7-walk.patch +Patch9: net-snmp-5.0.8-ipv6-sock-close.patch +Patch10: net-snmp-5.0.8-readonly.patch +Patch11: net-snmp-5.0.8-newproc.patch +Patch12: net-snmp-5.0.8-libwrap.patch +Patch13: net-snmp-5.0.9-use-numeric.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp BuildRoot: %{_tmppath}/%{name}-root -BuildPrereq: tcp_wrappers, openssl-devel, bzip2-devel +BuildPrereq: openssl-devel, bzip2-devel, beecrypt-devel, elfutils-devel +%if %{tcp_wrappers} +BuildPrereq: tcp_wrappers +%endif #%define __libtoolize /bin/true @@ -76,23 +77,32 @@ applications for use with the NET-SNMP project's network management tools. You'll also need to have the net-snmp and net-snmp-utils packages installed. +%package perl +Group: Development/Libraries +Summary: The perl NET-SNMP module and the mib2c tool. +Requires: net-snmp = %{version}, perl >= 5 +BuildRequires: perl >= 5 + +%description perl +The net-snmp-perl package contains the perl files to use SNMP from within +Perl. + +Install the net-snmp-perl package, if you want to use mib2c or SNMP with perl. + %prep %setup -q -#%patch1 -p1 -b .ia64 -#%patch2 -p1 -b .manpage -#%patch3 -p1 -b .walk -#%patch4 -p1 -b .security3 -#%patch5 -p1 -b .tests_num -#%patch7 -p1 -b .nodb -#%patch8 -p1 -b .mnttab -%patch9 -p1 -b .initializer -%patch10 -p1 -b .nolibelf -%patch11 -p1 -b .syslog -%patch12 -p1 -b .nodb -%patch13 -p1 -b .compat -%patch14 -p1 -b .smux -%patch15 -p1 -b .libtool -%patch16 -p1 -b .smux_pktsz_err_rpt +%patch1 -p1 -b .mnttab +%patch2 -p1 -b .initializer +%patch3 -p1 -b .syslog +%patch4 -p1 -b .compat +%patch5 -p1 -b .libtool +%patch6 -p1 -b .walk +%patch9 -p1 -b .ipv6-sock-close +%patch10 -p1 -b .readonly +%patch11 -p1 -b .newproc +%patch12 -p1 -b .libwrap +%patch13 -p1 -b .use-numeric + # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -104,7 +114,9 @@ perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh --with-logfile="/var/log/snmpd.log" \ --with-persistent-directory="/var/net-snmp" \ --with-mib-modules="host agentx smux" \ +%if %{tcp_wrappers} --with-libwrap=/usr/lib \ +%endif --sysconfdir=%{_sysconfdir} \ --enable-ipv6 \ --enable-ucd-snmp-compatibility \ @@ -115,6 +127,12 @@ EOF make +pushd perl +# Use just built libs for perl module building, not the system libs. +perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor +make +popd + %install rm -rf ${RPM_BUILD_ROOT} %makeinstall ucdincludedir=${RPM_BUILD_ROOT}/usr/include/ucd-snmp @@ -138,6 +156,31 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mib2c.1* rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/snmpconf.1* ln -s snmptrap ${RPM_BUILD_ROOT}/usr/bin/snmpinform +# copy missing mib2c.conf files +cp local/mib2c.*.conf ${RPM_BUILD_ROOT}%{_datadir}/snmp + +pushd perl +make install_vendor +eval $(perl '-V:installvendorlib') + +# Urgs, what an evil hack. Brrr. +%if "%{_libdir}" == "/usr/lib64" +installvendorlib=`echo $installvendorlib | sed 's/lib/lib64/'` +%endif + +find $RPM_BUILD_ROOT%{_libdir} -name Makefile.subs.pl | xargs rm -f +find $RPM_BUILD_ROOT%{_libdir} -name perllocal.pod | xargs rm -f +find $RPM_BUILD_ROOT%{_libdir} -name .packlist | xargs rm -f + +find $RPM_BUILD_ROOT/$installvendorlib -type f -print \ + -o -type d -a \ + -name NetSNMP -printf '%%%%dir %%p\n' \ + -o -name SNMP -printf '%%%%dir %%p\n' | \ + sed "s@$RPM_BUILD_ROOT@@g" > ../perl.lst +popd +find $RPM_BUILD_ROOT -name '*.so' | xargs chmod 0755 + + %post /sbin/ldconfig /sbin/chkconfig --add snmpd @@ -177,7 +220,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/ucd5820stat %{_sbindir}/snmpd %{_sbindir}/snmptrapd -%attr(0644,root,root) %{_mandir}/man1/snmpd.1* %attr(0644,root,root) %{_mandir}/man[58]/* %files utils @@ -187,7 +229,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/ipf-mod.pl %{_bindir}/encode_keychange %{_bindir}/mib2c -%{_bindir}/net-snmp-config %{_bindir}/snmpbulkget %{_bindir}/snmpbulkwalk %{_bindir}/snmpconf @@ -230,13 +271,94 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/*.so %{_libdir}/*.a %{_libdir}/*.la - %{_includedir} /usr/include/ucd-snmp +%attr(0644,root,root) %{_mandir}/man3/*.3.* +%attr(0755,root,root) %{_bindir}/net-snmp-config -%attr(0644,root,root) %{_mandir}/man3/* +%files perl -f perl.lst +%defattr(-,root,root) +%{_bindir}/mib2c +%attr(0644,root,root) %{_mandir}/man3/*.3pm.* %changelog +* Mon Oct 13 2003 Phil Knirsch 5.0.9-2 +- Due to rpm-devel we need elfutils-devel, too (#103982). + +* Mon Sep 29 2003 Phil Knirsch 5.0.9-1 +- Updated to latest upstream version net-snmp-5.0.9 +- Added patch to fix net-snmp-perl problems (#105842). + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without tcp_wrappers + +* Wed Sep 17 2003 Phil Knirsch 5.0.8-11.1 +- rebuilt + +* Wed Sep 17 2003 Phil Knirsch 5.0.8-11 +- Fixed permission for net-snmp-config in net-snmp-devel + +* Mon Sep 08 2003 Phil Knirsch 5.0.8-10.1 +- rebuilt + +* Mon Sep 08 2003 Phil Knirsch 5.0.8-10 +- Moved net-snmp-config into devel package (#103927) + +* Fri Aug 22 2003 Phil Knirsch 5.0.8-9.1 +- rebuilt + +* Thu Aug 21 2003 Phil Knirsch 5.0.8-9 +- Added sample config to make net-snmp RFC 1213 compliant. + +* Fri Aug 15 2003 Phil Knirsch 5.0.8-8 +- Fixed problem with perl option (#102420). +- Added patch for libwrap fix (#77926). + +* Tue Aug 12 2003 Phil Knirsch 5.0.8-7.1 +- rebuilt + +* Tue Aug 12 2003 Phil Knirsch 5.0.8-7 +- Fixed build problems on ppc64 +- Fixed double packaged manpages (#102075). + +* Thu Aug 07 2003 Phil Knirsch +- Fixed problem with new proc output (#98619, #89960). + +* Wed Aug 06 2003 Phil Knirsch +- Fixed ro/rw problem with v2 and v3 request (#89612) + +* Tue Aug 05 2003 Phil Knirsch +- Fixed permission problem for debuginfo (#101456) + +* Thu Jul 31 2003 Phil Knirsch 5.0.8-6.1 +- Fixed file list for latest build. + +* Thu Jul 31 2003 Phil Knirsch 5.0.8-6 +- Fixed build problems for net-snmp-perl. + +* Sun Jul 27 2003 Florian La Roche 5.0.8-5 +- actually apply ipv6 patch + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Apr 29 2003 Phil Knirsch 5.0.8-3 +- bumped release and rebuilt. + +* Tue Apr 29 2003 Phil Knirsch 5.0.8-2 +- Hack to make it build on 64bit platforms with /usr/lib64 correctly. +- Fixed bug #85071 (leak of open descriptors for ipv6). + +* Fri Mar 28 2003 Phil Knirsch 5.0.8-1 +- Updated to latest upstream version 5.0.8 (bug #88580) + +* Thu Feb 13 2003 Phil Knirsch +- Included generation of perl stuff. Thanks to Harald Hoyer. + +* Wed Feb 12 2003 Phil Knirsch 5.0.7-1 +- Updated to net-snmp-5.0.7. Fixed especially the performance problem with + limited trees. + * Tue Feb 11 2003 Phil Knirsch 5.0.6-17 - Fixed ucd-snmp.redhat.conf (#78391). - Fixed snmpwalk examples in config file. diff --git a/sources b/sources index 21d8f24..1ca6fcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c67aae0d7d8fa00625361cece1a2138 net-snmp-5.0.6.tar.gz +cecd5ec74f5c546c1ea7ed7987b5932b net-snmp-5.0.9.tar.gz