diff options
Diffstat (limited to 'net-analyzer/nagios-plugins')
| -rw-r--r-- | net-analyzer/nagios-plugins/ChangeLog | 14 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-check_http.patch | 11 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/files/nagios-plugins-1.4.11-autoconf-2.62.patch | 18 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r1.ebuild | 125 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild | 126 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild | 124 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild | 130 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.12.ebuild | 124 | ||||
| -rw-r--r-- | net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r3.ebuild (renamed from net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild) | 16 |
9 files changed, 22 insertions, 666 deletions
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog index 8bb9091dad01..f14e3e694a42 100644 --- a/net-analyzer/nagios-plugins/ChangeLog +++ b/net-analyzer/nagios-plugins/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-analyzer/nagios-plugins # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.112 2009/03/18 22:23:05 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.113 2009/05/15 17:32:37 dertobi123 Exp $ + +*nagios-plugins-1.4.13-r3 (15 May 2009) + + 15 May 2009; Tobias Scherbaum <dertobi123@gentoo.org> + -files/nagios-plugins-1.4.10-check_http.patch, + -files/nagios-plugins-1.4.11-autoconf-2.62.patch, + -nagios-plugins-1.4.11.ebuild, -nagios-plugins-1.4.11-r1.ebuild, + -nagios-plugins-1.4.11-r102.ebuild, -nagios-plugins-1.4.12.ebuild, + -nagios-plugins-1.4.12-r101.ebuild, -nagios-plugins-1.4.13-r2.ebuild, + +nagios-plugins-1.4.13-r3.ebuild: + Clean up, revbump and add suid use-flag (add suid-bit for check_ide_smart + and check_dhcp), #267751 18 Mar 2009; Brent Baude <ranger@gentoo.org> nagios-plugins-1.4.13-r1.ebuild: diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-check_http.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-check_http.patch deleted file mode 100644 index d128581337f9..000000000000 --- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.10-check_http.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/check_http.c.old 2007-07-21 18:29:01.000000000 +0200 -+++ plugins/check_http.c 2007-10-14 22:05:26.000000000 +0200 -@@ -1092,7 +1092,7 @@ redir (char *pos, char *status_line) - die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n")); - - while (pos) { -- sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i); -+ sscanf (pos, "%1[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i); - if (i == 0) { - pos += (size_t) strcspn (pos, "\r\n"); - pos += (size_t) strspn (pos, "\r\n"); diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.11-autoconf-2.62.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.11-autoconf-2.62.patch deleted file mode 100644 index 6c5190ebaef3..000000000000 --- a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.11-autoconf-2.62.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- gl/m4/extensions.m4.orig 2008-04-27 19:39:09.828332808 +0200 -+++ gl/m4/extensions.m4 2008-04-27 19:39:54.771082477 +0200 -@@ -16,6 +16,7 @@ - # ------------------------ - # Enable extensions on systems that normally disable them, - # typically due to standards-conformance issues. -+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[ - AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], - [ - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) -@@ -49,6 +50,7 @@ - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) - AC_DEFINE([_TANDEM_SOURCE]) - ]) -+]) - - # gl_USE_SYSTEM_EXTENSIONS - # ------------------------ diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r1.ebuild deleted file mode 100644 index 8118570010e2..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r1.ebuild,v 1.4 2008/05/31 08:22:02 dertobi123 Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=virtual/postgresql-base-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if ! use radius; then - EPATCH_OPTS="-p1 -d ${S}" epatch \ - "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch - fi - - epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch - epatch "${FILESDIR}"/${P}-autoconf-2.62.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr/nagios \ - --sysconfdir=/etc/nagios \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg - chmod +x "${S}"/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ - ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/nagios/libexec - exeinto /usr/nagios/libexec - doexe "${S}"/contrib/check_nagios_db.pl - fi - - dodir /usr/nagios/libexec/ - mv "${S}"/contrib "${D}"/usr/nagios/libexec/contrib - - chown root:nagios "${D}"/usr/nagios || die "Failed Chown of ${D}usr/nagios" - chown -R root:nagios "${D}"/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec" - - chmod -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec" - - chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp" -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild deleted file mode 100644 index cdd99399b01a..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild,v 1.6 2008/07/02 15:03:00 jer Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=virtual/postgresql-server-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if ! use radius; then - EPATCH_OPTS="-p1 -d ${S}" epatch \ - "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch - fi - - epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch - epatch "${FILESDIR}"/${P}-autoconf-2.62.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --sysconfdir=/etc/nagios || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg - chmod +x "${S}"/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ - ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/$(get_libdir)/nagios/plugins - exeinto /usr/$(get_libdir)/nagios/plugins - doexe "${S}"/contrib/check_nagios_db.pl - fi - - mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib - - chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \ - || die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins" - - chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" - - chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" - -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild deleted file mode 100644 index d68d999e27a7..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.11.ebuild,v 1.8 2008/05/21 18:09:33 dertobi123 Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=virtual/postgresql-base-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if ! use radius; then - EPATCH_OPTS="-p1 -d ${S}" epatch \ - "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch - fi - - epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr/nagios \ - --sysconfdir=/etc/nagios \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg - chmod +x "${S}"/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ - ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/nagios/libexec - exeinto /usr/nagios/libexec - doexe "${S}"/contrib/check_nagios_db.pl - fi - - dodir /usr/nagios/libexec/ - mv "${S}"/contrib "${D}"/usr/nagios/libexec/contrib - - chown root:nagios "${D}"/usr/nagios || die "Failed Chown of ${D}usr/nagios" - chown -R root:nagios "${D}"/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec" - - chmod -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec" - - chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp" -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild deleted file mode 100644 index b2e2be778cfe..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild,v 1.2 2009/01/02 14:06:30 cla Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=virtual/postgresql-base-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - dev-perl/Net-SNMP - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if ! use radius; then - EPATCH_OPTS="-p1 -d ${S}" epatch \ - "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch - fi - - epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch - epatch "${FILESDIR}"/${P}-pgsqlconfigure.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - if use postgres; then - conf="${conf} --with-pgsql=/usr" - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --sysconfdir=/etc/nagios || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg - chmod +x "${S}"/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ - ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/$(get_libdir)/nagios/plugins - exeinto /usr/$(get_libdir)/nagios/plugins - doexe "${S}"/contrib/check_nagios_db.pl - fi - - mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib - - chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \ - || die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins" - - chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" - - chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" - -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.12.ebuild deleted file mode 100644 index 4a0546b210a6..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.12.ebuild,v 1.2 2008/05/31 08:22:02 dertobi123 Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=virtual/postgresql-base-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if ! use radius; then - EPATCH_OPTS="-p1 -d ${S}" epatch \ - "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch - fi - - epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr/nagios \ - --sysconfdir=/etc/nagios \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg - chmod +x "${S}"/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ - ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/nagios/libexec - exeinto /usr/nagios/libexec - doexe "${S}"/contrib/check_nagios_db.pl - fi - - dodir /usr/nagios/libexec/ - mv "${S}"/contrib "${D}"/usr/nagios/libexec/contrib - - chown root:nagios "${D}"/usr/nagios || die "Failed Chown of ${D}usr/nagios" - chown -R root:nagios "${D}"/usr/nagios/libexec || die "Failed Chown of ${D}usr/nagios/libexec" - - chmod -R o-rwx "${D}"/usr/nagios/libexec || die "Failed Chmod of ${D}usr/nagios/libexec" - - chmod 04710 "${D}"/usr/nagios/libexec/check_icmp || die "Failed Chmod of ${D}usr/nagios/libexec/check_icmp" -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/nagios/libexec/contrib" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r3.ebuild index 9e5491a76a40..6992b7ccb6e9 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r3.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r2.ebuild,v 1.1 2009/02/18 18:35:07 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r3.ebuild,v 1.1 2009/05/15 17:32:37 dertobi123 Exp $ -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" +EAPI=1 inherit eutils autotools @@ -14,8 +13,8 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" +IUSE="+ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping +nagios-ssh nagios-game ups ipv6 radius +suid" DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) @@ -121,8 +120,11 @@ src_install() { chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" - chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" + if use suid ; then + + chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/{check_icmp,check_ide_smart,check_dhcp} \ + || die "Failed setting the suid bit for various plugins" + fi dosym /usr/$(get_libdir)/nagios/plugins/utils.sh /usr/$(get_libdir)/nagios/plugins/contrib/utils.sh dosym /usr/$(get_libdir)/nagios/plugins/utils.pm /usr/$(get_libdir)/nagios/plugins/contrib/utils.pm |