Tue Sep 29 14:55:12 UTC 2009

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23564

Modified Files:
	net-snmp.spec 
Added Files:
	net-snmp-5.5-dir-fix.patch net-snmp-5.5-multilib.patch 
	net-snmp-5.5-sensors3.patch 
Removed Files:
	net-snmp-5.1.2-dir-fix.patch net-snmp-5.2.1-file_offset.patch 
	net-snmp-5.3.1-multilib.patch 
	net-snmp-5.4.1-config_libdir.patch 
	net-snmp-5.4.1-libwrap.patch net-snmp-5.4.1-sensors3.patch 
	net-snmp-5.4.1-shared-ip.patch 
	net-snmp-5.4.1-strange_libpath.patch 
	net-snmp-5.4.1-xen-crash.patch 
	net-snmp-5.4.2.1-proc-div0.patch 
Log Message:
- update to Net-SNMP 5.5
- remove static libraries from -devel subpackage
- rediff all patches to 5.5, remove unused/obsolete patches

net-snmp-5.5-dir-fix.patch:
 net-snmp-create-v3-user.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.5-dir-fix.patch ---
Let net-snmp-create-v3-user save settings into /etc/ instead of /usr/

diff -up net-snmp-5.5/net-snmp-create-v3-user.in.orig net-snmp-5.5/net-snmp-create-v3-user.in
--- net-snmp-5.5/net-snmp-create-v3-user.in.orig	2008-07-22 16:33:25.000000000 +0200
+++ net-snmp-5.5/net-snmp-create-v3-user.in	2009-09-29 16:30:36.000000000 +0200
@@ -158,7 +158,7 @@ if test ! -d $outfile ; then
     touch $outfile
 fi
 echo $line >> $outfile
-outfile="@datadir@/snmp/snmpd.conf"
+outfile="/etc/snmp/snmpd.conf"
 line="$token $user"
 echo "adding the following line to $outfile:"
 echo "  " $line

net-snmp-5.5-multilib.patch:
 config_api.3.def  |    4 ++--
 snmp_config.5.def |    2 +-
 snmpd.conf.5.def  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE net-snmp-5.5-multilib.patch ---
Make the man pages multilib safe.

diff -up net-snmp-5.5/man/config_api.3.def.orig net-snmp-5.5/man/config_api.3.def
--- net-snmp-5.5/man/config_api.3.def.orig	2009-04-21 11:36:52.000000000 +0200
+++ net-snmp-5.5/man/config_api.3.def	2009-09-29 11:45:44.000000000 +0200
@@ -256,7 +256,7 @@ machines and the second file can be used
 for one particular machine.
 .PP
 The default list of directories to search is
-SYSCONFDIR/snmp, followed by DATADIR/snmp, followed by LIBDIR/snmp,
+SYSCONFDIR/snmp, followed by DATADIR/snmp, followed by /usr/lib(64)/snmp,
 followed by $HOME/.snmp.
 This list can be changed by setting the environmental variable
 .I SNMPCONFPATH
@@ -326,7 +326,7 @@ function that it should abort the operat
 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:
diff -up net-snmp-5.5/man/snmp_config.5.def.orig net-snmp-5.5/man/snmp_config.5.def
--- net-snmp-5.5/man/snmp_config.5.def.orig	2007-06-18 23:17:15.000000000 +0200
+++ net-snmp-5.5/man/snmp_config.5.def	2009-09-29 11:45:22.000000000 +0200
@@ -11,7 +11,7 @@ First off, there are numerous places tha
 found and read from.  By default, the applications look for
 configuration files in the following 4 directories, in order:
 SYSCONFDIR/snmp,
-DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp.  In each of these
+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp.  In each of these
 directories, it looks for files with the extension of both
 .IR conf " and " local.conf
 (reading the second ones last).  In this manner, there are
diff -up net-snmp-5.5/man/snmpd.conf.5.def.orig net-snmp-5.5/man/snmpd.conf.5.def
--- net-snmp-5.5/man/snmpd.conf.5.def.orig	2009-06-01 17:53:30.000000000 +0200
+++ net-snmp-5.5/man/snmpd.conf.5.def	2009-09-29 11:44:59.000000000 +0200
@@ -1272,7 +1272,7 @@ filename), and call the initialisation r
 .RS
 .IP "Note:"
 If the specified PATH is not a fully qualified filename, it will
-be interpreted relative to LIBDIR/snmp/dlmod, and \fC.so\fR
+be interpreted relative to /usr/lib(64)/snmp/dlmod, and \fC.so\fR
 will be appended to the filename.
 .RE
 .PP

net-snmp-5.5-sensors3.patch:
 sensors.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE net-snmp-5.5-sensors3.patch ---
Compile with lm_sensors3.

diff -up net-snmp-5.5/agent/mibgroup/hardware/sensors.h.orig net-snmp-5.5/agent/mibgroup/hardware/sensors.h
--- net-snmp-5.5/agent/mibgroup/hardware/sensors.h.orig	2009-04-24 00:53:26.000000000 +0200
+++ net-snmp-5.5/agent/mibgroup/hardware/sensors.h	2009-09-29 12:00:18.000000000 +0200
@@ -7,7 +7,7 @@ config_require(hardware/sensors/picld_se
 config_require(hardware/sensors/kstat_sensors)
 # endif
 #else
-config_require(hardware/sensors/lmsensors_v2)
+config_require(hardware/sensors/lmsensors_v3)
 #endif
 
 /* config_require(hardware/sensors/dummy_sensors) */


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- net-snmp.spec	14 Sep 2009 09:53:25 -0000	1.188
+++ net-snmp.spec	29 Sep 2009 14:55:12 -0000	1.189
@@ -3,12 +3,12 @@
 
 # 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 major_ver 5.4.2.1
+%define major_ver 5.5
 
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: %{major_ver}
-Release: 17%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 
 License: BSD and MIT
@@ -25,16 +25,9 @@ Source7: net-snmp-config
 Source8: net-snmp-trapd.redhat.conf
 Source9: net-snmpd.sysconfig
 Patch1: net-snmp-5.4.1-pie.patch
-Patch2: net-snmp-5.1.2-dir-fix.patch
-Patch3: net-snmp-5.2.1-file_offset.patch
-Patch4: net-snmp-5.3.1-multilib.patch
-Patch5: net-snmp-5.4.1-config_libdir.patch
-Patch6: net-snmp-5.4.1-strange_libpath.patch
-Patch7: net-snmp-5.4.1-shared-ip.patch
-Patch8: net-snmp-5.4.1-sensors3.patch
-Patch9: net-snmp-5.4.1-xen-crash.patch
-Patch10: net-snmp-5.4.1-libwrap.patch
-Patch11: net-snmp-5.4.2.1-proc-div0.patch
+Patch2: net-snmp-5.5-dir-fix.patch
+Patch3: net-snmp-5.5-multilib.patch
+Patch4: net-snmp-5.5-sensors3.patch
 
 Requires(pre): chkconfig
 Requires(post): chkconfig
@@ -166,15 +159,8 @@ Net-SNMP toolkit library.
 %endif
 
 %patch2 -p1 -b .dir-fix
-%patch3 -p1 -b .file_offset
-%patch4 -p1 -b .multilib
-%patch5 -p1 -b .libdir
-%patch6 -p1 -b .libpath
-%patch7 -p1 -b .shared-ip
-%patch8 -p1 -b .sensors
-%patch9 -p1 -b .xen-crash
-%patch10 -p1 -b .libwrap
-%patch11 -p1 -b .proc-div0
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .sensors
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -194,7 +180,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
 %endif
 
 %configure \
-    --enable-static --enable-shared			\
+    --disable-static --enable-shared			\
     --with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT"	\
 %ifnarch s390 s390x
     --with-ldflags="$LDFLAGS -lcrypto -lsensors"	\
@@ -206,7 +192,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
     --with-persistent-directory="/var/lib/net-snmp"	\
     --with-mib-modules="$MIBS"				\
 %if %{tcp_wrappers}
-    --with-libwrap=%{_libdir}				\
+    --with-libwrap=yes				\
 %endif
     --sysconfdir=%{_sysconfdir}				\
     --enable-ipv6					\
@@ -219,9 +205,8 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
     --with-sys-contact="root at localhost" <<EOF
 
 EOF
-#exit 0
 
-make %{?smp_mflags} 
+make %{?_smp_mflags} 
 
 pushd perl
 # Use just built libs for perl module building, not the system libs.
@@ -372,10 +357,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/ucd5820stat
 %{_bindir}/ipf-mod.pl
 %{_bindir}/snmpconf
+%{_bindir}/net-snmp-create-v3-user
 %{_sbindir}/*
 %attr(0644,root,root)	%{_mandir}/man[58]/snmp*d*
 %attr(0644,root,root)	%{_mandir}/man5/snmp_config.5.gz
 %attr(0644,root,root)	%{_mandir}/man5/variables*
+%attr(0644,root,root)	%{_mandir}/man1/net-snmp-create-v3-user*
 %dir %{_datadir}/snmp
 %{_datadir}/snmp/snmpconf-data
 %dir %{_localstatedir}/lib/net-snmp
@@ -393,7 +380,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %files devel
 %defattr(0644,root,root,0755)
 %{_libdir}/lib*.so
-%{_libdir}/*.a
 /usr/include/*
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
 %attr(0755,root,root)	%{_bindir}/net-snmp-config*
@@ -429,6 +415,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs
 
 %changelog
+* Tue Sep 29 2009 Jan Safranek Jan Safranek <jsafranek at redhat.com> 5.5-1
+- update to Net-SNMP 5.5
+- remove static libraries from -devel subpackage
+
 * Mon Sep 14 2009 Jan Safranek <orion at cora.nwra.com> 1:5.4.2.1-17
 - implement force-reload command in initscripts (#523126)
 


--- net-snmp-5.1.2-dir-fix.patch DELETED ---


--- net-snmp-5.2.1-file_offset.patch DELETED ---


--- net-snmp-5.3.1-multilib.patch DELETED ---


--- net-snmp-5.4.1-config_libdir.patch DELETED ---


--- net-snmp-5.4.1-libwrap.patch DELETED ---


--- net-snmp-5.4.1-sensors3.patch DELETED ---


--- net-snmp-5.4.1-shared-ip.patch DELETED ---


--- net-snmp-5.4.1-strange_libpath.patch DELETED ---


--- net-snmp-5.4.1-xen-crash.patch DELETED ---


--- net-snmp-5.4.2.1-proc-div0.patch DELETED ---


