From 71ab4a46c8163dc64f190ce4f6b378755138d81f Mon Sep 17 00:00:00 2001
From: Phil Knirsch <pknirsch@fedoraproject.org>
Date: Thu, 14 Oct 2004 13:29:44 +0000
Subject: [PATCH] - Marked all patches which are in net-snmp CVS for removal -
 Extended the libwrap and bsdcompat patches

---
 net-snmp.spec | 45 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/net-snmp.spec b/net-snmp.spec
index 2928069..f9beeb7 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.1.2
-Release: 8
+Release: 10
 License: BSDish
 Group: System Environment/Daemons
 Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz
@@ -13,24 +13,29 @@ Source3: net-snmptrapd.init
 Source4: net-snmpd.logrotate
 Source5: ucd5820stat
 Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch
+# Drop for 5.1.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
 Patch5: net-snmp-5.0.8-ipv6-sock-close.patch
 Patch6: net-snmp-5.0.8-readonly.patch
-Patch7: net-snmp-5.1-libwrap.patch
-Patch8: net-snmp-5.1-sensors.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-bsdcompat.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
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
@@ -116,18 +121,27 @@ and applications.
 %prep
 %setup -q
 %patch1 -p1 -b .mnttab
+
+# Drop for 5.1.3
 %patch2 -p1 -b .syslog
-%patch3 -p1 -b .compat
+
+#%patch3 -p1 -b .compat
 %patch4 -p1 -b .libtool
+
+# Drop for 5.1.3
 %patch5 -p1 -b .ipv6-sock-close
+
 %patch6 -p1 -b .readonly
 %patch7 -p1 -b .libwrap
-%ifarch %{ix86}
-%patch8 -p1 -b .sensors
-%endif
+
+# 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
@@ -135,9 +149,14 @@ and applications.
 %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
 
 # Do this patch with a perl hack...
@@ -153,7 +172,7 @@ export LDFLAGS="-L%{_libdir}"
 	--with-sys-location="Unknown"			\
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
-	--with-mib-modules="host agentx smux"		\
+	--with-mib-modules="host agentx smux ucd-snmp/lmSensors"	\
 %if %{tcp_wrappers}
 	--with-libwrap=%{_libdir}			\
 %endif
@@ -311,6 +330,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.la
 
 %changelog
+* Thu Oct 14 2004 Phil Knirsch <pknirsch@redhat.com> 5.1.2-10
+- Marked all patches which are in net-snmp CVS for removal
+- Extended the libwrap and bsdcompat patches
+
+* Mon Oct 11 2004 Phil Knirsch <pknirsch@redhat.com> 5.1.2-9
+- Droped obsolete lm-sensors patch and enabled lmSensors module
+- Marked several patches to be removed for 5.1.3
+
 * Wed Sep 29 2004 Warren Togami <wtogami@redhat.com> 5.1.2-8
 - remove README* that do not apply to Linux
 - trim massive ChangeLog