From bb2ccb05355a7aef3616f72556450d1d3a9f6117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
Date: Tue, 16 Nov 2004 08:54:28 +0000
Subject: [PATCH] - snmpd crash with 'interfaces' directives in snmpd.conf
 fixed #139010 - rather dirty patch fixing conf directory for net-snmp-config

---
 net-snmp-5.1.2-dir-fix.patch | 11 +++++++++++
 net-snmp.spec                | 11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 net-snmp-5.1.2-dir-fix.patch

diff --git a/net-snmp-5.1.2-dir-fix.patch b/net-snmp-5.1.2-dir-fix.patch
new file mode 100644
index 0000000..5905bfa
--- /dev/null
+++ b/net-snmp-5.1.2-dir-fix.patch
@@ -0,0 +1,11 @@
+--- net-snmp-5.1.2/net-snmp-config.in.dir-fix	2004-06-17 15:39:28.000000000 +0200
++++ net-snmp-5.1.2/net-snmp-config.in	2004-11-16 10:26:28.928414992 +0100
+@@ -249,7 +249,7 @@
+       echo "  " $line
+       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
diff --git a/net-snmp.spec b/net-snmp.spec
index f7564b0..13e72bc 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: 11
+Release: 12
 License: BSDish
 Group: System Environment/Daemons
 Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz
@@ -37,6 +37,8 @@ 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
 BuildRoot: %{_tmppath}/%{name}-root
@@ -158,6 +160,9 @@ and applications.
 
 # 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...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -334,6 +339,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.la
 
 %changelog
+* 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
+
 * Fri Oct 15 2004 Radek Vokal <rvokal@redhat.com> 5.1.2-11
 - Logrotate support added (#125004)