From 9130d0827419688385d596ef643f870e18f3ba35 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 21 Jun 2021 18:07:44 -0400 Subject: net-analyzer/nagios-plugins: use binding := for dev-libs/openssl Needed for upcoming upgrade to OpenSSL 3.0.0 which has changed ABI. Acked-by: David Seifert Signed-off-by: Ionen Wolkens Signed-off-by: Sam James --- .../nagios-plugins/nagios-plugins-2.3.1-r1.ebuild | 112 --------------------- .../nagios-plugins/nagios-plugins-2.3.1-r2.ebuild | 112 +++++++++++++++++++++ .../nagios-plugins/nagios-plugins-2.3.3-r1.ebuild | 112 +++++++++++++++++++++ .../nagios-plugins/nagios-plugins-2.3.3.ebuild | 112 --------------------- 4 files changed, 224 insertions(+), 224 deletions(-) delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-2.3.3.ebuild (limited to 'net-analyzer/nagios-plugins') diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild deleted file mode 100644 index ac7c1e4a9ce1..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="http://nagios-plugins.org/" -SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" -IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -AUTOMAGIC_DEPEND=" - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Perl really needs to run during the build... -BDEPEND="${AUTOMAGIC_DEPEND} - dev-lang/perl" - -DEPEND=" - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - dev-libs/openssl:0 - ) - radius? ( net-dialup/freeradius-client )" - -# Basically everything in net-analyzer/monitoring-plugins collides with -# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. -RDEPEND="${BDEPEND} - ${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild new file mode 100644 index 000000000000..eca9702888e2 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r2.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="http://nagios-plugins.org/" +SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" +IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +AUTOMAGIC_DEPEND=" + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Perl really needs to run during the build... +BDEPEND="${AUTOMAGIC_DEPEND} + dev-lang/perl" + +DEPEND=" + ldap? ( net-nds/openldap ) + mysql? ( dev-db/mysql-connector-c ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + dev-libs/openssl:0= + ) + radius? ( net-dialup/freeradius-client )" + +# Basically everything in net-analyzer/monitoring-plugins collides with +# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. +RDEPEND="${BDEPEND} + ${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +DOCS=( + ACKNOWLEDGEMENTS + AUTHORS + CODING + ChangeLog + FAQ + NEWS + README + REQUIREMENTS + SUPPORT + THANKS +) + +PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) + +src_prepare() { + default + + # Fix the path to our perl interpreter + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ + "${S}"/plugins-scripts/*.pl \ + || die 'failed to fix perl interpreter path' +} + +src_configure() { + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with ssl openssl /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered. Bug #468296. + myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) + fi + + econf \ + $(use_with mysql) \ + $(use_with ipv6) \ + $(use_with ldap) \ + $(use_with postgres pgsql /usr) \ + $(use_with radius) \ + "${myconf[@]}" \ + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" +} + +pkg_postinst() { + elog "This ebuild has a number of USE flags that determine what you" + elog "are able to monitor. Depending on what you want to monitor, some" + elog "or all of these USE flags need to be set." + elog + elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins" +} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild new file mode 100644 index 000000000000..419243e3b736 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="http://nagios-plugins.org/" +SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" + +# Most of the plugins use automagic dependencies, i.e. the plugin will +# get built if the binary it uses is installed. For example, check_snmp +# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is +# installed. End result: most of our runtime dependencies are required +# at build time as well. +AUTOMAGIC_DEPEND=" + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( net-misc/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Perl really needs to run during the build... +BDEPEND="${AUTOMAGIC_DEPEND} + dev-lang/perl" + +DEPEND=" + ldap? ( net-nds/openldap ) + mysql? ( dev-db/mysql-connector-c ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + dev-libs/openssl:0= + ) + radius? ( net-dialup/freeradius-client )" + +# Basically everything in net-analyzer/monitoring-plugins collides with +# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. +RDEPEND="${BDEPEND} + ${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +DOCS=( + ACKNOWLEDGEMENTS + AUTHORS + CODING + ChangeLog + FAQ + NEWS + README + REQUIREMENTS + SUPPORT + THANKS +) + +PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) + +src_prepare() { + default + + # Fix the path to our perl interpreter + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ + "${S}"/plugins-scripts/*.pl \ + || die 'failed to fix perl interpreter path' +} + +src_configure() { + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with ssl openssl /usr) ) + else + myconf+=( --without-openssl ) + myconf+=( --without-gnutls ) + fi + + # The autodetection for these two commands can hang if localhost is + # down or ICMP traffic is filtered. Bug #468296. + myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) + fi + + econf \ + $(use_with mysql) \ + $(use_with ipv6) \ + $(use_with ldap) \ + $(use_with postgres pgsql /usr) \ + $(use_with radius) \ + "${myconf[@]}" \ + --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="/etc/nagios" +} + +pkg_postinst() { + elog "This ebuild has a number of USE flags that determine what you" + elog "are able to monitor. Depending on what you want to monitor, some" + elog "or all of these USE flags need to be set." + elog + elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins" +} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.3.ebuild deleted file mode 100644 index 2ab311c932b6..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="http://nagios-plugins.org/" -SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -AUTOMAGIC_DEPEND=" - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Perl really needs to run during the build... -BDEPEND="${AUTOMAGIC_DEPEND} - dev-lang/perl" - -DEPEND=" - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - dev-libs/openssl:0 - ) - radius? ( net-dialup/freeradius-client )" - -# Basically everything in net-analyzer/monitoring-plugins collides with -# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. -RDEPEND="${BDEPEND} - ${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}/usr/$(get_libdir)/nagios/plugins" -} -- cgit v1.2.3-65-gdbad