From e2e756ca7a8dc3614ddc917a3ca951773912833d Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Sun, 27 Apr 2008 17:54:59 +0000 Subject: Fix for autoconf-2.62, bug #218704 svn path=/; revision=36 --- net-analyzer/nagios-plugins/ChangeLog | 9 ++ net-analyzer/nagios-plugins/Manifest | 4 +- .../nagios-plugins-1.4.11-autoconf-2.62.patch | 18 +++ .../nagios-plugins-1.4.11-r101.ebuild | 125 -------------------- .../nagios-plugins-1.4.11-r102.ebuild | 126 +++++++++++++++++++++ 5 files changed, 156 insertions(+), 126 deletions(-) create mode 100644 net-analyzer/nagios-plugins/ChangeLog create mode 100644 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.11-autoconf-2.62.patch delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r101.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog new file mode 100644 index 0000000..00d85bc --- /dev/null +++ b/net-analyzer/nagios-plugins/ChangeLog @@ -0,0 +1,9 @@ +# ChangeLog for net-analyzer/nagios-plugins +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 27 Apr 2008; Tobias Scherbaum + +files/nagios-plugins-1.4.11-autoconf-2.62.patch, ++, + -nagios-plugins-1.4.11-r101.ebuild: + Fix for autoconf-2.62, bug #218704 + diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 8f18243..8762155 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,4 +1,6 @@ AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 +AUX nagios-plugins-1.4.11-autoconf-2.62.patch 558 RMD160 d9cbf67c2434ddc9971f95ccd7afd787f1e928b4 SHA1 67fcf7f4e9a72a743a37202e7475e47e13875483 SHA256 55656ea0a2e3daa60c906a099499fc1e7683720aa5f4adeebd149072dbe41dfe DIST nagios-plugins-1.4.11.tar.gz 1734230 RMD160 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15 SHA1 bc91a57ad6f5468b17f24429ba25225cfff45d59 SHA256 2cc1534a7f41da6cdb72d595c8643e62491fbab1bb768ab113eff20581ac05e5 -EBUILD nagios-plugins-1.4.11-r101.ebuild 3673 RMD160 b93ae3b88f35a13188e43a98f475916a3f6e6e92 SHA1 73478e75bfaeb3a40bbe2f07192ccdc2349ce535 SHA256 c8608995879e96859964221e5196c3784811269c8d06f09d934eea609d37ce6c +EBUILD nagios-plugins-1.4.11-r102.ebuild 3720 RMD160 71cf1392fa37f9a0e0c9753eb878f8b7108d0395 SHA1 2199829d1cd6a1997e721b5742df88b0beeba40b SHA256 d2eff9c87fba3a18bdbf557f848a7b6643f3a17381173fb420cfe6576d40175d +MISC ChangeLog 316 RMD160 270e94f91939cc304e4d366d211aa8abf3ec9862 SHA1 491581bf97b3d634b95f8743c353878489eed737 SHA256 95572e260500afd6c4ece55d44052779628c8de3be60357df4639a004115de57 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 new file mode 100644 index 0000000..6c5190e --- /dev/null +++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.11-autoconf-2.62.patch @@ -0,0 +1,18 @@ +--- 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-r101.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r101.ebuild deleted file mode 100644 index 891cd67..0000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r101.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.ebuild,v 1.3 2008/01/21 20:27:43 armin76 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? ( >=dev-db/postgresql-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) \ - $(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 ABOUT-NLS 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-r102.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild new file mode 100644 index 0000000..4333f43 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.11-r102.ebuild @@ -0,0 +1,126 @@ +# 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.3 2008/01/21 20:27:43 armin76 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? ( >=dev-db/postgresql-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) \ + $(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 ABOUT-NLS 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" +} -- cgit v1.2.3-65-gdbad