Version bump. Remove old versions.

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

5 files changed, 16 insertions, 169 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index e4f41ca5adb1..b3e70e7c57c5 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/pnp4nagios
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.50 2012/11/29 17:01:03 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.51 2013/05/11 13:43:34 idl0r Exp $
+
+*pnp4nagios-0.6.21 (11 May 2013)
+
+  11 May 2013; Christian Ruppert <idl0r@gentoo.org> -pnp4nagios-0.6.14.ebuild,
+  -pnp4nagios-0.6.14-r1.ebuild, -pnp4nagios-0.6.18.ebuild,
+  +pnp4nagios-0.6.21.ebuild, -files/pnp4nagios-0.6.7-makefile.patch:
+  Version bump. Remove old versions.
 
   29 Nov 2012; <ago@gentoo.org> pnp4nagios-0.6.19-r1.ebuild:
   Stable for ppc, wrt bug #430358
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.7-makefile.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.7-makefile.patch
deleted file mode 100644
index d26263e1a4a1..000000000000
--- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.7-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur pnp4nagios-0.6.7.orig/Makefile.in pnp4nagios-0.6.7/Makefile.in
---- pnp4nagios-0.6.7.orig/Makefile.in	2010-10-19 08:26:19.000000000 +0200
-+++ pnp4nagios-0.6.7/Makefile.in	2010-10-19 08:31:51.000000000 +0200
-@@ -123,8 +123,13 @@
- 
- install-unstripped:
- 	cd $(SRC_BASE) && $(MAKE) $@
--	cd $(SRC_SHARE) && $(MAKE) $@
--	cd $(SRC_SCRIPTS) && $(MAKE) $@
-+	cd $(SRC_SHARE) && $(MAKE) install
-+	if [ x$(KOHANA) = xyes ]; then \
-+		cd $(SRC_LIB) && $(MAKE) install; \
-+	fi
-+
-+	cd $(SRC_SCRIPTS) && $(MAKE) install
-+	cd $(SRC_CONFIG) && $(MAKE) install
- 	$(MAKE) install-basic
- 
- install-basic:
-diff -Naur pnp4nagios-0.6.7.orig/src/Makefile.in pnp4nagios-0.6.7/src/Makefile.in
---- pnp4nagios-0.6.7.orig/src/Makefile.in	2010-10-19 08:26:19.000000000 +0200
-+++ pnp4nagios-0.6.7/src/Makefile.in	2010-10-19 08:28:08.000000000 +0200
-@@ -83,7 +83,7 @@
- #
- ###############################
- npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
--	$(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
- 
- ###############################
- #
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.14-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.14-r1.ebuild
deleted file mode 100644
index ad5330407bd1..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.14-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.14-r1.ebuild,v 1.1 2012/06/25 19:45:21 prometheanfire Exp $
-
-EAPI="2"
-
-inherit depend.apache eutils
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
-	>=dev-lang/php-5.3
-	>=net-analyzer/rrdtool-1.2
-	|| ( net-analyzer/nagios-core net-analyzer/icinga )"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--mandir=/usr/share/man \
-		--with-perfdata-dir=/var/nagios/perfdata \
-		--with-perfdata-spool-dir=/var/spool/pnp
-}
-
-src_compile() {
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config || die "emake install failed"
-	doinitd "${FILESDIR}/npcd"
-	rm "${D}/usr/share/pnp/install.php"
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}"/98_pnp4nagios.conf
-	fi
-}
-
-pkg_postinst() {
-	elog "Please make sure to enable URL rewriting in Apache or any other"
-	elog "webserver you're using, to get pnp4nagios running!"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild
deleted file mode 100644
index 588779f78569..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild,v 1.6 2012/06/18 10:32:43 ago Exp $
-
-EAPI="2"
-
-inherit depend.apache eutils
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-
-SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-
-DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
-	|| ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3 )
-	|| ( >=dev-lang/php-4.3[gd-external] >=dev-lang/php-4.3[gd] )
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes
-	media-fonts/dejavu
-	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--mandir=/usr/share/man \
-		--with-perfdata-dir=/var/nagios/perfdata \
-		--with-perfdata-spool-dir=/var/spool/pnp
-}
-
-src_compile() {
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-config || die "emake install failed"
-	doinitd "${FILESDIR}/npcd"
-	rm "${D}/usr/share/pnp/install.php"
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}"/98_pnp4nagios.conf
-	fi
-}
-
-pkg_postinst() {
-	elog "Please make sure to enable URL rewriting in Apache or any other"
-	elog "webserver you're using, to get pnp4nagios running!"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild
index 4e4b6e33d646..191ee745840d 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild,v 1.1 2012/07/22 21:45:07 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.21.ebuild,v 1.1 2013/05/11 13:43:34 idl0r Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit depend.apache eutils
 
@@ -73,6 +73,10 @@ src_install() {
 		insinto "${APACHE_MODULES_CONFDIR}"
 		doins "${FILESDIR}"/98_pnp4nagios.conf
 	fi
+
+	# Bug 430358 - CVE-2012-3457
+	find "${D}/etc/pnp" -type f -exec chmod 0640 {} \;
+	find "${D}/etc/pnp" -type d -exec chmod 0750 {} \;
 }
 
 pkg_postinst() {