Patch to resolve symbol. #422647; Add init script and default configuration file. #422975

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

6 files changed, 199 insertions, 7 deletions

diff --git a/net-analyzer/bsnmp/ChangeLog b/net-analyzer/bsnmp/ChangeLog
index 2b74b05612c1..e592e9679308 100644
--- a/net-analyzer/bsnmp/ChangeLog
+++ b/net-analyzer/bsnmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/bsnmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bsnmp/ChangeLog,v 1.4 2012/06/12 02:23:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bsnmp/ChangeLog,v 1.5 2012/07/04 11:10:19 naota Exp $
+
+*bsnmp-1.12-r1 (04 Jul 2012)
+
+  04 Jul 2012; Naohiro Aota <naota@gentoo.org> +bsnmp-1.12-r1.ebuild,
+  +files/bsnmp-1.12-mibII.patch, +files/bsnmpd.init, +files/snmpd.config:
+  Patch to resolve symbol. #422647; Add init script and default configuration
+  file. #422975
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> bsnmp-1.11a.ebuild,
   bsnmp-1.12.ebuild:
@@ -21,4 +28,3 @@
   +files/bsnmp-1.10-gcc34.patch, +metadata.xml, +bsnmp-1.11a.ebuild:
   Initial import from gentoo-alt overlay, SNMP daemon for FreeBSD. Not yet
   fixed to work on Linux, so just ~x86-fbsd.
-
diff --git a/net-analyzer/bsnmp/Manifest b/net-analyzer/bsnmp/Manifest
index 8c3f5bd7d6b5..58f58f39c0a3 100644
--- a/net-analyzer/bsnmp/Manifest
+++ b/net-analyzer/bsnmp/Manifest
@@ -1,18 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX bsnmp-1.10-gcc34.patch 311 RMD160 e54a961b5a805b56d92be7067811cd84233015e5 SHA1 9a571cb33147fb152ceb32cb918172fc84eda6ae SHA256 fc9b78f0bbc30017363512305d5abf38086a459e90b04d88b3f3b76ffefdfada
+AUX bsnmp-1.12-mibII.patch 465 RMD160 5c68ed7e78090389425e844bd4916706dc67a6f0 SHA1 041eea6b6e11f6b3142e9dff8c540d417a324465 SHA256 f06e61404895729378d7c9af8e58b1dd5f418b53b4fffa4078d93a8e61c6f59a
+AUX bsnmpd.init 348 RMD160 a62fb416506d4bf25d2cacebe7fa6478486c3364 SHA1 c3a50d96a440d1715db22c9dfddb68246cdb70a1 SHA256 1652fc981ed116694d23a9d668e790a7b0c1421bf6b41391812d58c61a4e0d21
+AUX snmpd.config 2426 RMD160 1609512e101cc8e1864fdf7129cd8164265a1c5a SHA1 06fc06f0ce0254d599dd2702293c0e8913e6208d SHA256 56d6ece23cd8cb8814f7e4166cb9f577a1a956beb2ad554420e82d4e8b71db27
 AUX werror.patch 532 RMD160 2946bd2145d8ffaec4d2a010d37207e873acdc61 SHA1 2a84d2071427b3e42377faa9269a01eeb21416a9 SHA256 b9ee3526665d6baee8833688eca094c1c5c3bc8163c34bdef60765620b75093d
 DIST bsnmp-1.11a.tar.gz 408165 RMD160 ab1e423450cab9f1268f3e5346b223c806f1c10c SHA1 8af663b69c7942a62334d8151563c3577f0cef25 SHA256 72d74b12742b153ac9c0bb4deb86bda6fc982eb41c775cc6fd7f343924b887f8
 DIST bsnmp-1.12.tar.gz 418653 RMD160 d7ea4c2c07870f42073f7e758abbd6dfe4afefc9 SHA1 9a028c7f66a59fb6ac3293e67810abf27cbcaa6a SHA256 986d02d71c55693ec0b90b24564cb43195ce03254e85a8cd70457b318eefbee0
 EBUILD bsnmp-1.11a.ebuild 950 RMD160 897aea9ce23cb1b2a4044b9d15c10da74ef5211a SHA1 8e75edf17d37803dbc898b1f3dec8cff8e20a711 SHA256 314f0a057b74af92512c3f2c1273640fc85c5cc5922866ea6166e4f03a32fb43
+EBUILD bsnmp-1.12-r1.ebuild 1134 RMD160 e473ad73a3bd96918d2ea7f1e5db7b08fb8ca86f SHA1 33e4535337b253cc3ba04a6fe5f4948fb369cfee SHA256 42ebabc9bd867852e53e92425a752ae6fe00cb3092b32a330a635c962c8df4c5
 EBUILD bsnmp-1.12.ebuild 996 RMD160 a380cf8685a95635772803afc339ba94900a7605 SHA1 f40f377b21ac51b3d0471a43679c09bb35f6d2ab SHA256 3399ae8d5fa57c2d324e2628aaff23c677603e1dfad4fe9b07fe28ece5ac085e
-MISC ChangeLog 872 RMD160 b07a3e584e73c9c7d3db559c672af34b8ff3b201 SHA1 d61f76e8e8d675c055732c6242826ab19119c221 SHA256 a4ac37aa50183e83089814f867fc341e5dd7dcebb03e48d60840261a36b5f34b
+MISC ChangeLog 1138 RMD160 7355326d1c946843e966ef5c6d933a431acf0057 SHA1 bd10abb7ef94ac76436675d4c141f5beff37d14e SHA256 e8cb82b56abf7bceea50711746fa2702c73170191720520186e5fcd0a058130e
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/WqDIACgkQ/ejvha5XGaO78wCeJcvcrD5Kya7XskDDqCG10ZTx
-lS8An0flHWATAeiB+ZEVQjN95kIZnEiN
-=NcGK
+iQIcBAEBCAAGBQJP9CScAAoJEDYO1FT4VRUUv+0QAIvDKSL6nsTHZgNYFl9Gz+kY
+YULOKXY0wlwPk2K2iNnqnTqE2BUConeoSEP7C+0VZCl4yrG9elI6zaZSSMuz9ZW7
+ngbgH1D/v8WEn2df0WnLDqh7myn88Q2igqSWsivDCXrsyTkiZEtkCgJTih//Ovhe
+Sbk3eLKubzK2Cc2YWDaFKdxu5wcp8R1NKb69gQO+CBR9LQP6YTd3+hN/7yMZiApx
+k0UIaJQHp3a23ijrvWWDUIr7nuIs23YCOKLj0Ls3S1Ce3YTcMhNux0KVaqo6kTj3
+l85MTWEjkzSKo2xkW+BMjimXmYx3MjMJAObvwseQrzcpJA+0u3qdazuT8slemPQw
+LpDpEh9cZiaS05E+/AUkxRtfIJjtUwk8GPyshynyG087iZG5s3Lf/oVwDP76Id5P
+++rZ+1jVF1+K5c1LqwDp34XskSmM8/KGy75FyJ44C7YaYjBfcuErJj4a9ZC8FqEz
+2I0hIhP0TziyMo0yjrvv+FaOD0VRRyKPaOZPJ+grrxZ4KzxPSRvPE5rECUIXCpYW
+iEqCmT8x8UVuupjo2L/ZnTw7k1g9x4uGugJokGPolZUt4OyauFs4vmrkSuzy4lQm
+sn4ZsoQ2OJvUk/POVBU2cQBTScoqvB0b3mkH3V1wN1hPgHa50MF3nHcfHbLWdrTe
+GYZv91DI88hbG5hhHDx9
+=DqAZ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
new file mode 100644
index 000000000000..761963bf1f89
--- /dev/null
+++ b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild,v 1.1 2012/07/04 11:10:19 naota Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Mini-SNMP Daemon and Library"
+HOMEPAGE="http://people.freebsd.org/~harti/"
+SRC_URI="http://people.freebsd.org/~harti/bsnmp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+IUSE="tcpd"
+
+DEPEND="dev-libs/libbegemot
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.10-gcc34.patch"
+	epatch "${FILESDIR}/werror.patch"
+	epatch "${FILESDIR}/${P}-mibII.patch"
+}
+
+src_compile() {
+	if use elibc_glibc; then
+		# bsnmp is bsd-based, without this it will fail
+		append-flags "-D_BSD_SOURCE"
+	fi
+
+	filter-flags -fno-inline
+
+	econf \
+		--with-libbegemot=/usr \
+		$(use_with tcpd tcpwrappers) \
+		|| die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	newinitd "${FILESDIR}"/bsnmpd.init bsnmpd || die
+	insinto /etc
+	doins "${FILESDIR}"/snmpd.config
+}
diff --git a/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch b/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch
new file mode 100644
index 000000000000..c93191823d6e
--- /dev/null
+++ b/net-analyzer/bsnmp/files/bsnmp-1.12-mibII.patch
@@ -0,0 +1,13 @@
+diff --git a/snmp_mibII/Makefile.in b/snmp_mibII/Makefile.in
+index d14c179..3a99850 100755
+--- a/snmp_mibII/Makefile.in
++++ b/snmp_mibII/Makefile.in
+@@ -10,7 +10,7 @@ MOD=	mibII
+ SRCS=	${MOD}_tree.c mibII.c mibII_ifmib.c mibII_ip.c			\
+ 	mibII_interfaces.c mibII_ipaddr.c mibII_ifstack.c		\
+ 	mibII_rcvaddr.c mibII_nettomedia.c mibII_tcp.c mibII_udp.c	\
+-	mibII_route.c
++	mibII_route.c mibII_begemot.c
+ INCS=	snmp_${MOD}.h
+ DEFS=	mibII_tree.def
+ MAN3=	snmp_mibII.3
diff --git a/net-analyzer/bsnmp/files/bsnmpd.init b/net-analyzer/bsnmp/files/bsnmpd.init
new file mode 100644
index 000000000000..82be65577c70
--- /dev/null
+++ b/net-analyzer/bsnmp/files/bsnmpd.init
@@ -0,0 +1,12 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bsnmp/files/bsnmpd.init,v 1.1 2012/07/04 11:10:19 naota Exp $
+
+description="Mini-SNMP Daemon"
+command="/usr/bin/bsnmpd"
+pidfile="/var/run/snmpd.pid"
+
+depend() {
+    use net
+}
diff --git a/net-analyzer/bsnmp/files/snmpd.config b/net-analyzer/bsnmp/files/snmpd.config
new file mode 100644
index 000000000000..26f9f1aeb163
--- /dev/null
+++ b/net-analyzer/bsnmp/files/snmpd.config
@@ -0,0 +1,98 @@
+# $FreeBSD: src/etc/snmpd.config,v 1.9.10.1.8.1 2012/03/03 06:15:13 kensmith Exp $
+#
+# Example configuration file for bsnmpd(1).
+#
+
+#
+# Set some common variables
+#
+location := "Room 200"
+contact := "sysmeister@example.com"
+system := 1	# FreeBSD
+traphost := localhost
+trapport := 162
+
+# Change this!
+read := "public"
+# Uncomment begemotSnmpdCommunityString.0.2 below that sets the community
+# string to enable write access.
+write := "geheim"
+trap := "mytrap"
+
+#
+# Configuration
+#
+%snmpd
+begemotSnmpdDebugDumpPdus	= 2
+begemotSnmpdDebugSyslogPri	= 7
+
+#
+# Set the read and write communities.
+#
+# The default value of the community strings is NULL (note, that this is
+# different from the empty string). This disables both read and write access.
+# To enable read access only the read community string must be set. Setting
+# the write community string enables both read and write access with that
+# string.
+#
+# Be sure to understand the security implications of SNMPv2 - the community
+# strings are readable on the wire!
+#
+begemotSnmpdCommunityString.0.1	= $(read)
+# begemotSnmpdCommunityString.0.2	= $(write)
+begemotSnmpdCommunityDisable	= 1
+
+# open standard SNMP ports
+begemotSnmpdPortStatus.0.0.0.0.161 = 1
+
+# open a unix domain socket
+begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1
+begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4
+
+# send traps to the traphost
+begemotTrapSinkStatus.[$(traphost)].$(trapport) = 4
+begemotTrapSinkVersion.[$(traphost)].$(trapport) = 2
+begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
+
+sysContact	= $(contact)
+sysLocation	= $(location)
+sysObjectId 	= 1.3.6.1.4.1.12325.1.1.2.1.$(system)
+
+snmpEnableAuthenTraps = 2
+
+#
+# Load MIB-2 module
+#
+begemotSnmpdModulePath."mibII"	= "/usr/lib/libsnmp_mibII.so.3.0"
+
+# Force a polling rate for the 64-bit interface counters in case
+# the automatic computation is wrong (which may be the case if an interface
+# announces the wrong bit rate via its MIB).
+#%mibII
+#begemotIfForcePoll = 2000
+
+#
+# Netgraph module
+#
+#begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
+#
+#%netgraph
+#begemotNgControlNodeName = "snmpd"
+
+#
+# pf(4) module
+#
+#begemotSnmpdModulePath."pf"	= "/usr/lib/snmp_pf.so"
+
+#
+# Host resources module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
+
+#
+# Bridge module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
+