Version bump, also fixes #274567

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 9 insertions, 138 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 91c832382dd9..6617795c9ee6 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # 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.115 2009/05/31 08:13:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.116 2009/09/16 16:25:42 dertobi123 Exp $
+
+*nagios-plugins-1.4.14 (16 Sep 2009)
+
+  16 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-plugins-1.4.13.ebuild, -nagios-plugins-1.4.13-r4.ebuild,
+  +nagios-plugins-1.4.14.ebuild:
+  Version bump, also fixes #274567
 
   31 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   nagios-plugins-1.4.13-r4.ebuild:
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.13.ebuild
deleted file mode 100644
index 6b3c2145de74..000000000000
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13.ebuild
+++ /dev/null
@@ -1,129 +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.13.ebuild,v 1.7 2009/01/07 14:32:10 ranger 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}"/${PN}-1.4.12-pgsqlconfigure.patch
-
-	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 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-r4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
index fbda8369d064..41bd2ffc2238 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.13-r4.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.2 2009/05/31 08:13:37 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.14.ebuild,v 1.1 2009/09/16 16:25:42 dertobi123 Exp $
 
 EAPI=1
 
@@ -56,13 +56,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch
 	epatch "${FILESDIR}"/${PN}-1.4.12-pgsqlconfigure.patch
 
-	# Fix my.cnf usage, #253893, upstream fix commitid 917fcc7, will be fixed
-	# upstream in 1.4.14
-	epatch "${FILESDIR}"/${P}-mysqlpass-917fcc7.patch
-
-	# check_ups Logout, #243384 ,will be fixed upstream in 1.4.14
-	epatch "${FILESDIR}"/${P}-upslogout.patch
-
 	eautoreconf
 }