Major rewrite, see ChangeLog.

6 files changed, 115 insertions, 2 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 373f958682c7..4f645508ec79 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.21 2003/09/19 18:50:17 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.22 2003/09/19 21:49:33 max Exp $
+
+*net-snmp-5.0.9-r1 (19 Sep 2003)
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  files/snmpd.conf, files/snmpd.rc6:
+  Major cleanup/rewrite: quote variables where possible; whitespace consistancy;
+  use more ebuild semantics (use_with, use_enable); put config in /etc/snmp
+  instead of /usr/share; add smux support; and new rc6 and corresponding conf
+  file for extra flexibility. Drop unneccessary die() calls. Start with an empty
+  set of SNMPD_FLAGS in snmpd.conf. Add "use logger" to depend() of snmpd.rc6.
+  Drop unneeded --with-cflags, --host, and --enable-shared parameters to econf.
+  Clean up ssl flags. Enable ucd-snmp compatibility and block virtual/snmp.
+  Fixes bugs 5882, 15536, 27177, 27308, and probably 14288.
 
 *net-snmp-5.0.9 (19 Sep 2003)
 
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 143bca5088b4..2e0befe11c63 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,14 +1,16 @@
 MD5 e9652ee261ab7fa0a15ca4346fef5dae net-snmp-5.0.6-r1.ebuild 2339
+MD5 af673c59f726aef68b081657b4d1aade net-snmp-5.0.9-r1.ebuild 1619
 MD5 52ff1c265a8058cc42976a90b05f20e4 net-snmp-5.0.2a.ebuild 1939
 MD5 27c1bf363cb549b6f39007da6b586aee net-snmp-5.0.9.ebuild 2484
 MD5 85397b284de6b10475f9a9f4b7b6bfde net-snmp-5.0.2a-r1.ebuild 2038
 MD5 ae60955f464f7e68e04a6cd773eb5bcd net-snmp-5.0.6.ebuild 2304
 MD5 997405b5ca453b42d691d47c97861f33 net-snmp-5.0.1.ebuild 1807
-MD5 d08cb9d9cef1e2a5920ab3e9d6301cd6 ChangeLog 3055
+MD5 62498d1261fecf3a96e16690a7fdb749 ChangeLog 3807
 MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
 MD5 6463901c07219b77218dba820029a6e4 net-snmp-5.0.8.ebuild 2489
 MD5 d967ea531257d3b6328dffa4637b27ff files/net-snmp-5.0.6-gentoo.diff 885
 MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6-r1 67
+MD5 8cadda02e3a8f7279f531b660164c310 files/digest-net-snmp-5.0.9-r1 67
 MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a-r1 68
 MD5 d127de412720bd3804be2526d4ac7dea files/digest-net-snmp-5.0.1 67
 MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6 67
@@ -16,3 +18,5 @@ MD5 d87102db9b8bd989270ab11bec140004 files/digest-net-snmp-5.0.8 67
 MD5 8cadda02e3a8f7279f531b660164c310 files/digest-net-snmp-5.0.9 67
 MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a 68
 MD5 aab0f5782525e1224951f71ba800f172 files/net-snmpd.rc6 736
+MD5 3dbefb627701207ff9d4ca9a0ba061aa files/snmpd.conf 215
+MD5 0f64c604facf62ebcb8a419461565eca files/snmpd.rc6 476
diff --git a/net-analyzer/net-snmp/files/digest-net-snmp-5.0.9-r1 b/net-analyzer/net-snmp/files/digest-net-snmp-5.0.9-r1
new file mode 100644
index 000000000000..6c16ce856e79
--- /dev/null
+++ b/net-analyzer/net-snmp/files/digest-net-snmp-5.0.9-r1
@@ -0,0 +1 @@
+MD5 cecd5ec74f5c546c1ea7ed7987b5932b net-snmp-5.0.9.tar.gz 2345822
diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf
new file mode 100644
index 000000000000..b19dd59be37e
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmpd.conf
@@ -0,0 +1,8 @@
+# Initial options
+SNMPD_FLAGS=""
+
+# Enable syslog and disable file log
+#SNMPD_FLAGS="${SNMPD_FLAGS} -s -l /dev/null"
+
+# Enable agentx socket as /var/agentx/master
+#SNMPD_FLAGS="${SNMPD_FLAGS} -x /var/agentx/master"
diff --git a/net-analyzer/net-snmp/files/snmpd.rc6 b/net-analyzer/net-snmp/files/snmpd.rc6
new file mode 100644
index 000000000000..e059d02ff623
--- /dev/null
+++ b/net-analyzer/net-snmp/files/snmpd.rc6
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	if [ ! -e /etc/snmp/snmpd.conf ] ; then
+		eerror "You need an /etc/snmp/snmpd.conf to run snmpd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting net-snmpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/snmpd \
+		-- -C -c /etc/snmp/snmpd.conf ${SNMPD_FLAGS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping net-snmpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/snmpd
+	eend $?
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.0.9-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.0.9-r1.ebuild
new file mode 100644
index 000000000000..3c2f811695da
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.0.9-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.0.9-r1.ebuild,v 1.1 2003/09/19 21:49:33 max Exp $
+
+DESCRIPTION="Software for generating and retrieving SNMP data."
+HOMEPAGE="http://net-snmp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/net-snmp/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~alpha"
+IUSE="ssl ipv6 tcpd"
+
+PROVIDES="virtual/snmp"
+DEPEND="virtual/glibc
+	<sys-libs/db-2
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/sed-4
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )"
+RDEPEND="${DEPEND}
+	!virtual/snmp"
+
+S="${WORKDIR}/${P%[a-z]}"
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_with ssl openssl` `use_enable -ssl internal-md5`"
+	myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} `use_enable ipv6`"
+
+	econf \
+		--with-sys-location="Unknown" \
+		--with-sys-contact="root@Unknown" \
+		--with-default-snmp-version="3" \
+		--with-mib-modules="host smux" \
+		--with-logfile=/var/log/net-snmpd.log \
+		--with-persistent-directory=/var/lib/net-snmp \
+		--enable-ucd-snmp-compatibility \
+		--with-zlib \
+		${myconf}
+
+	# Parallel build doesn't work.
+	make || die "compile problem"
+}
+
+src_install () {
+	einstall exec_prefix="${D}/usr" persistentdir="${D}/var/lib/net-snmp"
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING \
+		README* TODO EXAMPLE.conf.def
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/snmpd.rc6" snmpd
+	insinto /etc/conf.d
+	newins "${FILESDIR}/snmpd.conf" snmpd
+
+	keepdir /var/lib/net-snmp
+}