summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-09-11 07:36:50 +0200
committerJeroen Roovers <jer@gentoo.org>2015-09-11 08:07:38 +0200
commit04f490a46e9caa270d777b0938371818e5470cb8 (patch)
treee82e3846f4fcdff52d7e8727f3bd855d77715fa0
parentdev-python/certifi: Stable for HPPA PPC64 (bug #560102). (diff)
downloadgentoo-04f490a46e9caa270d777b0938371818e5470cb8.tar.gz
gentoo-04f490a46e9caa270d777b0938371818e5470cb8.tar.bz2
gentoo-04f490a46e9caa270d777b0938371818e5470cb8.zip
net-analyzer/net-snmp: Disable smux by default (bug #509638 by Andrey Volkov).
Package-Manager: portage-2.2.20.1
-rw-r--r--net-analyzer/net-snmp/files/snmpd.conf3
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3-r1.ebuild (renamed from net-analyzer/net-snmp/net-snmp-5.7.3.ebuild)0
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild163
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild180
4 files changed, 3 insertions, 343 deletions
diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf
index 83c3c1d92b82..ba8ba66128b2 100644
--- a/net-analyzer/net-snmp/files/snmpd.conf
+++ b/net-analyzer/net-snmp/files/snmpd.conf
@@ -5,6 +5,9 @@
# Initial (empty) options.
SNMPD_FLAGS=""
+# Disable smux by default
+SNMPD_FLAGS="${SNMPD_FLAGS} -I -smux"
+
# Enable connection logging.
#SNMPD_FLAGS="${SNMPD_FLAGS} -a"
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r1.ebuild
index 78e4d61d2caa..78e4d61d2caa 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r1.ebuild
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild
deleted file mode 100644
index 1160dfb6c18e..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=1
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/${PN}/${PN}/${PV/_pre*/}-pre-releases/${P/_pre*/}.${PV/*_}.tar.gz
- https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
-
-COMMON_DEPEND="
- ssl? ( >=dev-libs/openssl-0.9.6d )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- rpm? (
- app-arch/rpm
- dev-libs/popt
- )
- bzip2? ( app-arch/bzip2 )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- elf? ( dev-libs/elfutils )
- python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- pci? ( sys-apps/pciutils )
- lm_sensors? ( sys-apps/lm_sensors )
- netlink? ( dev-libs/libnl:3 )
- mysql? ( virtual/mysql )
-"
-DEPEND="
- ${COMMON_DEPEND}
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- perl? (
- X? ( dev-perl/perl-tk )
- !minimal? ( dev-perl/TermReadKey )
- )
- selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- rpm? ( bzip2 zlib )
-"
-
-RESTRICT=test
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # snmpconf generates config files with proper selinux context
- use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
- epatch "${WORKDIR}"/patches/*.patch
-
- epatch_user
-
- eautoconf
-}
-
-src_configure() {
- # keep this in the same line, configure.ac arguments are passed down to config.h
- local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable"
- use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-
- econf \
- $(use_enable !ssl internal-md5) \
- $(use_enable ipv6) \
- $(use_enable mfd-rewrites) \
- $(use_enable perl embedded-perl) \
- $(use_enable ucd-compat ucd-snmp-compatibility) \
- $(use_with bzip2) \
- $(use_with elf) \
- $(use_with mysql) \
- $(use_with netlink nl) \
- $(use_with pci) \
- $(use_with perl perl-modules INSTALLDIRS=vendor) \
- $(use_with python python-modules) \
- $(use_with rpm) \
- $(use_with ssl openssl) \
- $(use_with tcpd libwrap) \
- $(use_with zlib) \
- --enable-shared --disable-static \
- --with-default-snmp-version="3" \
- --with-install-prefix="${D}" \
- --with-ldflags="${LDFLAGS}" \
- --with-logfile="/var/log/net-snmpd.log" \
- --with-mib-modules="${mibs}" \
- --with-persistent-directory="/var/lib/net-snmp" \
- --with-sys-contact="root@Unknown" \
- --with-sys-location="Unknown"
-}
-
-src_compile() {
- emake \
- OTHERLDFLAGS="${LDFLAGS}" \
- sedscript all
-
- use doc && emake docsdox
-}
-
-src_install () {
- # bug #317965
- emake -j1 DESTDIR="${D}" install
-
- if use perl ; then
- perl_delete_localpod
- use X || rm -f "${D}"/usr/bin/tkmib
- else
- rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
- fi
-
- dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
- newdoc EXAMPLE.conf.def EXAMPLE.conf
-
- use doc && dohtml docs/html/*
-
- keepdir /var/lib/net-snmp
-
- newinitd "${FILESDIR}"/snmpd.init.2 snmpd
- newconfd "${FILESDIR}"/snmpd.conf snmpd
-
- newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
- newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
- systemd_dounit "${FILESDIR}"/snmpd.service
- systemd_dounit "${FILESDIR}"/snmptrapd.service
-
- insinto /etc/snmp
- newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
- # Remove everything not required for an agent.
- # Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
- if use minimal; then
- rm -rf \
- "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
- "${D}"/usr/share/snmp/snmpconf-data \
- "${D}"/usr/share/snmp/*.conf \
- "${D}"/**/*.pl
- fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild
deleted file mode 100644
index a5bce40b369e..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=1
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/${PN}/${PN}/${PV/_pre*/}-pre-releases/${P/_pre*/}.${PV/*_}.tar.gz
- https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
-
-COMMON_DEPEND="
- ssl? ( >=dev-libs/openssl-0.9.6d )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- rpm? (
- app-arch/rpm
- dev-libs/popt
- )
- bzip2? ( app-arch/bzip2 )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- elf? ( dev-libs/elfutils )
- python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- pci? ( sys-apps/pciutils )
- lm_sensors? ( sys-apps/lm_sensors )
- netlink? ( dev-libs/libnl:3 )
- mysql? ( virtual/mysql )
- perl? ( dev-lang/perl )
-"
-DEPEND="
- ${COMMON_DEPEND}
- doc? ( app-doc/doxygen )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- perl? (
- X? ( dev-perl/perl-tk )
- !minimal? ( dev-perl/TermReadKey )
- )
- selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- rpm? ( bzip2 zlib )
-"
-
-RESTRICT=test
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # snmpconf generates config files with proper selinux context
- use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
- epatch "${WORKDIR}"/patches/*.patch
-
- epatch_user
-
- eautoconf
-}
-
-src_configure() {
- # keep this in the same line, configure.ac arguments are passed down to config.h
- local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable"
- use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-
- econf \
- $(use_enable !ssl internal-md5) \
- $(use_enable ipv6) \
- $(use_enable mfd-rewrites) \
- $(use_enable perl embedded-perl) \
- $(use_enable ucd-compat ucd-snmp-compatibility) \
- $(use_with bzip2) \
- $(use_with elf) \
- $(use_with mysql) \
- $(use_with netlink nl) \
- $(use_with pci) \
- $(use_with perl perl-modules INSTALLDIRS=vendor) \
- $(use_with python python-modules) \
- $(use_with rpm) \
- $(use_with ssl openssl) \
- $(use_with tcpd libwrap) \
- $(use_with zlib) \
- --enable-shared --disable-static \
- --with-default-snmp-version="3" \
- --with-install-prefix="${D}" \
- --with-ldflags="${LDFLAGS}" \
- --with-logfile="/var/log/net-snmpd.log" \
- --with-mib-modules="${mibs}" \
- --with-persistent-directory="/var/lib/net-snmp" \
- --with-sys-contact="root@Unknown" \
- --with-sys-location="Unknown"
-}
-
-src_compile() {
- emake \
- OTHERLDFLAGS="${LDFLAGS}" \
- sedscript all
-
- use doc && emake docsdox
-}
-
-src_install () {
- # bug #317965
- emake -j1 DESTDIR="${D}" install
-
- if use perl ; then
- perl_delete_localpod
- if ! use X; then
- rm "${D}"/usr/bin/tkmib || die
- fi
- else
- rm -f \
- "${D}"/usr/bin/fixproc \
- "${D}"/usr/bin/ipf-mod.pl \
- "${D}"/usr/bin/mib2c \
- "${D}"/usr/bin/net-snmp-cert \
- "${D}"/usr/bin/snmp-bridge-mib \
- "${D}"/usr/bin/snmpcheck \
- "${D}"/usr/bin/snmpconf \
- "${D}"/usr/bin/tkmib \
- "${D}"/usr/bin/traptoemail \
- "${D}"/usr/share/snmp/mib2c.perl.conf \
- "${D}"/usr/share/snmp/snmp_perl_trapd.pl \
- || die
- fi
-
- dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
- newdoc EXAMPLE.conf.def EXAMPLE.conf
-
- use doc && dohtml docs/html/*
-
- keepdir /var/lib/net-snmp
-
- newinitd "${FILESDIR}"/snmpd.init.2 snmpd
- newconfd "${FILESDIR}"/snmpd.conf snmpd
-
- newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
- newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
- systemd_dounit "${FILESDIR}"/snmpd.service
- systemd_dounit "${FILESDIR}"/snmptrapd.service
-
- insinto /etc/snmp
- newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
- # Remove everything not required for an agent.
- # Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
- if use minimal; then
- rm -rf \
- "${D}"/**/*.pl \
- "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
- "${D}"/usr/share/snmp/*.conf \
- "${D}"/usr/share/snmp/snmpconf-data \
- || die
- fi
-}