Version bump. Cleaned a bit postinstall. Security fixes for bug 209918. Thank you Pierre-Yves Rofes <py AT gentoo.org> for report! Cleaned unstable vulnerable versions.

(Portage version: 2.1.3.19)

6 files changed, 129 insertions, 13 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index a5fb9b9fb871..996f7a6eda46 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.122 2008/02/05 10:53:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.123 2008/02/13 13:00:08 pva Exp $
+
+*cacti-0.8.7b (13 Feb 2008)
+*cacti-0.8.7a-r2 (13 Feb 2008)
+*cacti-0.8.6j-r8 (13 Feb 2008)
+
+  13 Feb 2008; <pva@gentoo.org> files/postinstall-en.txt, metadata.xml,
+  +cacti-0.8.6j-r8.ebuild, -cacti-0.8.7a.ebuild, -cacti-0.8.7a-r1.ebuild,
+  +cacti-0.8.7a-r2.ebuild, +cacti-0.8.7b.ebuild:
+  Version bump. Cleaned a bit postinstall. Security fixes for bug 209918.
+  Thank you Pierre-Yves Rofes <py AT gentoo.org> for report! Cleaned unstable
+  vulnerable versions.
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> cacti-0.8.7a.ebuild:
   Stable on ppc64
diff --git a/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild
new file mode 100644
index 000000000000..0cb03c91e9e1
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r8.ebuild,v 1.1 2008/02/13 13:00:08 pva Exp $
+
+inherit eutils webapp depend.apache depend.php
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+HAS_PATCHES=1
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+# patches
+if [ $HAS_PATCHES == 1 ] ; then
+	UPSTREAM_PATCHES="ping_php_version4_snmpgetnext
+					  tree_console_missing_hosts
+					  thumbnail_graphs_not_working
+					  graph_debug_lockup_fix
+					  snmpwalk_fix
+					  sec_sql_injection-0.8.6j
+					  multiple_vulnerabilities-0.8.6j"
+	for i in $UPSTREAM_PATCHES ; do
+		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
+	done
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp bundled-adodb"
+
+DEPEND=""
+
+want_apache
+need_php_cli
+need_php_httpd
+
+RDEPEND="!apache2? ( www-servers/lighttpd )
+	snmp? ( net-analyzer/net-snmp )
+	net-analyzer/rrdtool
+	!bundled-adodb? ( dev-php/adodb )
+	virtual/mysql
+	virtual/cron"
+
+src_unpack() {
+	if [ $HAS_PATCHES == 1 ] ; then
+		unpack ${MY_P}.tar.gz
+		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
+		# patches
+		for i in ${UPSTREAM_PATCHES} ; do
+			EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch
+		done ;
+	else
+		unpack ${MY_P}.tar.gz
+	fi
+
+	epatch "${FILESDIR}/${P}"-dos-large-values.patch
+
+	use bundled-adodb || sed -i -e \
+	's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+	"${S}"/include/config.php
+}
+
+pkg_setup() {
+	webapp_pkg_setup
+	has_php
+	if [ $PHP_VERSION = 5 ] ; then
+		phpUseFlags="cli mysql xml session pcre"
+	elif [ $PHP_VERSION = 4 ] ; then
+		phpUseFlags="cli mysql xml session pcre expat"
+	fi
+	use bundled-adodb || phpUseFlags="${phpUseFlags} sockets"
+	require_php_with_use ${phpUseFlags}
+}
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README
+	dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE}
+	rm -rf docs
+	use bundled-adodb || rm -rf lib/adodb
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/cacti/cacti-0.8.7a-r1.ebuild b/net-analyzer/cacti/cacti-0.8.7a-r2.ebuild
index 27062abc767c..b2a1de2d7f03 100644
--- a/net-analyzer/cacti/cacti-0.8.7a-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.7a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7a-r1.ebuild,v 1.1 2008/01/22 16:28:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7a-r2.ebuild,v 1.1 2008/02/13 13:00:08 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -15,7 +15,8 @@ SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 # patches
 if [ "${HAS_PATCHES}" == "1" ] ; then
 	UPSTREAM_PATCHES="graph-issue-wrra-specs
-					cmd-php-non-unique-hosts"
+					cmd-php-non-unique-hosts
+					multiple_vulnerabilities-0.8.7a"
 	for i in $UPSTREAM_PATCHES ; do
 		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
 	done
diff --git a/net-analyzer/cacti/cacti-0.8.7a.ebuild b/net-analyzer/cacti/cacti-0.8.7b.ebuild
index b8f8586bae6f..d3cb1944a893 100644
--- a/net-analyzer/cacti/cacti-0.8.7a.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.7b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7a.ebuild,v 1.3 2008/02/05 10:53:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7b.ebuild,v 1.1 2008/02/13 13:00:08 pva Exp $
 
 inherit eutils webapp depend.apache depend.php
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cacti.net/"
 SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
 
 # patches
-if [ $HAS_PATCHES == 1 ] ; then
+if [ "${HAS_PATCHES}" == "1" ] ; then
 	UPSTREAM_PATCHES=""
 	for i in $UPSTREAM_PATCHES ; do
 		SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch"
@@ -21,7 +21,7 @@ if [ $HAS_PATCHES == 1 ] ; then
 fi
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp bundled-adodb"
 
 DEPEND=""
@@ -38,7 +38,7 @@ RDEPEND="!apache2? ( www-servers/lighttpd )
 	virtual/cron"
 
 src_unpack() {
-	if [ $HAS_PATCHES == 1 ] ; then
+	if [ "${HAS_PATCHES}" == "1" ] ; then
 		unpack ${MY_P}.tar.gz
 		[ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P}
 		# patches
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
index e4e5e655954f..732c718005cb 100644
--- a/net-analyzer/cacti/files/postinstall-en.txt
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -4,7 +4,7 @@ New Install
 1. Create the new cacti database
    shell> mysqladmin -p --user=root create cacti
 2. Import the default cacti database:
-   shell> mysql -p cacti < ${MY_INSTALLDIR}/cacti.sql
+   shell> mysql -p --user=root cacti < ${MY_INSTALLDIR}/cacti.sql
 3. Create a MySQL username and password for cacti.
    shell> mysql -p --user=root mysql
    mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
@@ -16,9 +16,9 @@ New Install
 	\$database_default = "cacti";
 	\$database_hostname = "localhost";
 	\$database_username = "cactiuser";
-	\$database_password = "cacti";
+	\$database_password = "somepassword";
 
-5. Point your web browser to:  http://your-server/cacti/
+5. Point your web browser to:  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
    Make sure to fill in all of the path variables carefully and
     correctly on the following screen.
 6. After you've gone through the setup wizard, go back to the main cacti page
@@ -39,9 +39,9 @@ Upgrading
         \$database_default = "cacti";
         \$database_hostname = "localhost";
         \$database_username = "cactiuser";
-        \$database_password = "cacti";
-4. Point your web browser to: http://your-server/cacti/
-   Select "Upgrade:.
+        \$database_password = "somepassword";
+4. Point your web browser to: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/
+   Select "Upgrade".
    Make sure to fill in all of the path variables carefully and
    correctly on the following screen.
 
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index c13579549aea..4686fee68794 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 	<longdescription lang="en">
 		Cacti is a complete network graphing solution designed to harness the
 		power of RRDTool's data storage and graphing functionality. Cacti