From 75b178ec537877625195af135ca98164682247f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
Date: Fri, 10 Dec 2004 12:05:30 +0000
Subject: [PATCH] - new net-snmp-5.2, patch clean-up, new mib added

---
 .cvsignore    |  2 +-
 net-snmp.spec | 54 +++++++++++++--------------------------------------
 sources       |  2 +-
 3 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1969fb7..d0de548 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-net-snmp-5.1.2.tar.gz
+net-snmp-5.2.tar.gz
diff --git a/net-snmp.spec b/net-snmp.spec
index 13e72bc..f81deaa 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -2,10 +2,11 @@
 
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
-Version: 5.1.2
-Release: 12
+Version: 5.2
+Release: 1
 License: BSDish
 Group: System Environment/Daemons
+URL: http://net-snmp.sourceforge.net/
 Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz
 Source1: net-snmp.redhat.conf
 Source2: net-snmpd.init
@@ -13,31 +14,18 @@ Source3: net-snmptrapd.init
 Source4: net-snmpd.logrotate
 Source5: ucd5820stat
 Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
-# Drop for 5.1.3
+# Drop for 5.3
 Patch2: net-snmp-5.0.6-syslog.patch
 Patch3: net-snmp-5.0.6-compat.patch
 Patch4: net-snmp-5.0.6-libtool.patch
-# Drop for 5.1.3
+# Drop for 5.3
 Patch5: net-snmp-5.0.8-ipv6-sock-close.patch
 Patch6: net-snmp-5.0.8-readonly.patch
-Patch7: net-snmp-5.1.2-libwrap.patch
-# Drop for 5.1.3
-Patch9: net-snmp-5.1-xs-label-iid.patch
 Patch10: net-snmp-5.1-async-getnext.patch
-# Drop for 5.1.3
-Patch11: net-snmp-5.1.1-hr_storage-mbuf-v2.patch
 Patch12: net-snmp-5.1.1-pie.patch
-Patch13: net-snmp-5.1.2-bsdcompat.patch
 Patch14: net-snmp-5.1-64bit.patch
 Patch15: net-snmp-5.1.1-ipAdEntIfIndex.patch
-Patch16: net-snmp-5.1.1-quiet-memshared.patch
-# Drop for 5.1.3
-Patch17: net-snmp-5.0.9-smux-stack-var.patch
-Patch18: net-snmp-5.1.2.rc1-agentx-little64.patch
 Patch19: net-snmp-5.1.2-lelf.patch
-# Drop for 5.1.3
-Patch20: net-snmp-5.0.9-HUP_doublefree.patch
-Patch21: net-snmp-5.1.2-null.patch
 Patch22: net-snmp-5.1.2-dir-fix.patch
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -124,44 +112,24 @@ and applications.
 %setup -q
 %patch1 -p1 -b .mnttab
 
-# Drop for 5.1.3
+# Drop for 5.3?
 %patch2 -p1 -b .syslog
 
-#%patch3 -p1 -b .compat
 %patch4 -p1 -b .libtool
 
-# Drop for 5.1.3
+# Drop for 5.3?
 %patch5 -p1 -b .ipv6-sock-close
 
 %patch6 -p1 -b .readonly
-%patch7 -p1 -b .libwrap
-
-# Drop for 5.1.3
-%patch9 -p1 -b .xs-label-iid
-
 %patch10 -p1 -b .async-getnext
 
-# Drop for 5.1.3
-%patch11 -p1 -b .hr_storage-mbuf-v2
-
 %ifnarch ia64
 %patch12 -p1 -b .pie
 %endif
-%patch13 -p1 -b .bsdcompat
+
 %patch14 -p1 -b .64bit
 %patch15 -p1 -b .ipAdEntIfIndex
-%patch16 -p1 -b .quiet-memshared
-
-# Drop for 5.1.3
-%patch17 -p1 -b .stack
-
-%patch18 -p1 -b .agentx-little64
 %patch19 -p1 -b .lelf
-
-# Drop for 5.1.3
-%patch20 -p1 -b .hup
-%patch21 -p1 -b .null
-
 %patch22 -p1 -b .dir-fix
 
 # Do this patch with a perl hack...
@@ -178,7 +146,7 @@ export LDFLAGS="-L%{_libdir}"
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
 %ifarch %{ix86} x86_64
-	--with-mib-modules="host agentx smux ucd-snmp/lmSensors"	\
+	--with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio"	\
 %else
 	--with-mib-modules="host agentx smux "	\
 %endif
@@ -317,6 +285,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/encode_keychange
 %{_bindir}/snmp*
 %{_bindir}/traptoemail
+%{_bindir}/mib2c-update
 %attr(0644,root,root)	%{_mandir}/man1/snmp*.1*
 
 %files devel
@@ -339,6 +308,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.la
 
 %changelog
+* Tue Nov 30 2004 Radek Vokal <rvokal@redhat.com> 5.2-1
+- net-snmp-5.2, patch clean-up
+
 * Mon Nov 15 2004 Radek Vokal <rvokal@redhat.com> 5.1.2-12
 - snmpd crash with 'interfaces' directives in snmpd.conf fixed #139010
 - rather dirty patch fixing conf directory for net-snmp-config
diff --git a/sources b/sources
index 29a8848..eed5f5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8080555ab3f90011f25d5122042d9a8d  net-snmp-5.1.2.tar.gz
+af1c18209474ec4851b06504aae2a7c1  net-snmp-5.2.tar.gz