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.

Package-Manager: portage-2.1.3.19

7 files changed, 138 insertions, 18 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/Manifest b/net-analyzer/cacti/Manifest
index aad807260073..58376813742a 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,17 +1,21 @@
 AUX cacti-0.8.6j-dos-large-values.patch 1127 RMD160 102be3fdad2334c50a5d8ce4a4655c0220842d82 SHA1 79fab202a7473c66b10909a982c2f9fcf70c9b50 SHA256 b677a380634a4db63b0b85aaf54103efefdbb0e0dcd7d15ce61b7e08949f8d55
-AUX postinstall-en.txt 2191 RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 SHA1 0c9fc10166b40ad42d38811dbb744f4accfe1bb8 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e
+AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d
 DIST cacti-0.8.6j.tar.gz 1126337 RMD160 981d24753d440af1d3fcfdb20cd988f73fcc44fe SHA1 4ed5b7ada8710c5474e7fc4aad4ad9339caf0188 SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46
 DIST cacti-0.8.7a.tar.gz 2002270 RMD160 7e1c66a2b91487d6bf8ccff25ce50e0c6f5a277d SHA1 ba6498a8af951698066c689e871b8c4b49f7d6f8 SHA256 5e75b0058bb6dc755221f540845699fb383a18f8f3011f0f81bf321db09bf623
+DIST cacti-0.8.7b.tar.gz 2005650 RMD160 e47f15957554fe6ac00dc4becffc06a790eae6f8 SHA1 fb4dd0374577b100bbe92fba05e084da2e685fe2 SHA256 f248e858879868d7bba2d53c459a3d61f0a9c19ee4843e3983cfe7a9d7fcaef9
 DIST cmd-php-non-unique-hosts.patch 372 RMD160 08d5e91a778fc38e116b40f5fb3405c9e216cd21 SHA1 1e63fac6823ea053bf5b7fe51aac41976444f82e SHA256 0ce9fef3ae873afbdadd37a6c380320d636cd7582f71166d238ec8237c070779
 DIST graph-issue-wrra-specs.patch 2897 RMD160 36130d276f4ae0221676eabff698345a4b08d23e SHA1 ed9dbc019bbc379d2de1e57a4487d21c58f71b14 SHA256 ff28e75401e898fd9e2a06506fe5d5dff26a14a6ffc55233ab53d4861402d495
 DIST graph_debug_lockup_fix.patch 927 RMD160 8bf2112cb537b330547b8b571cc573a0f3135123 SHA1 be180e9def1f51678ed9424950dd5d5c8d3bc578 SHA256 c8ea30c6bf5764663d106d28b3308377a8c2003cc2afd3d0ba0102ed5fddee1b
+DIST multiple_vulnerabilities-0.8.6j.patch 9284 RMD160 6c7fc9bf7dbba3d9c5b98b9538696826383ef8ff SHA1 7d00e4d42866967136f639c7600d06ef23fe223d SHA256 b9c31af5772758e87c4d784dcb0b96402f7bb9ec76dda2cfe41ea339e0778957
+DIST multiple_vulnerabilities-0.8.7a.patch 7294 RMD160 66dff07e6e9748c70b0c1d9cdadd84cc5b005735 SHA1 eb9c68a31d5b06aedcd32745ef582e6b937e5f98 SHA256 aa548d5273b3fd9029e00efedfbba487af957837086ea40152a66daaf65ceec2
 DIST ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132548862654f312 SHA1 41be27e18e136d79c5e3b2f99438a192fffdc383 SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170
 DIST sec_sql_injection-0.8.6j.patch 749 RMD160 c8c93f6bddd7e032cede65872cdea3df0850ec05 SHA1 3c44758623435c4311777e3a080d846dbe475736 SHA256 0f05946e598ce34b9507b8eeaa431c45280c2f6e07003cf583a11735fc01d245
 DIST snmpwalk_fix.patch 1056 RMD160 ba1a70dc95ceba6f5716dd8d8351db4a400abcc3 SHA1 e5cb384b87224e26e31063d13bb15e0bea12383c SHA256 ecf344ff6674306c52f6bbeea621d56310444ad12f679202b0de141485429106
 DIST thumbnail_graphs_not_working.patch 1515 RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 SHA1 3684fe33e37105c719c59bd3ba7e1aaf2795c9a8 SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd
 DIST tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e SHA1 bccc1293567c9160971537a3cbbf69ab0ca9cf81 SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180
 EBUILD cacti-0.8.6j-r7.ebuild 2468 RMD160 d94559eda2429d3aa8d91f0e10f7be5125954925 SHA1 46585ac9e73d04d11ac206f94ddacf6821307e21 SHA256 d88f293aeb9d330c94d7c3e5db1765f5298360e38fe4c785762045817bba9257
-EBUILD cacti-0.8.7a-r1.ebuild 2303 RMD160 fa428aace6e4449463575451c4475332598923d4 SHA1 12cdcae70f70598fa087c93b271f9142238c9beb SHA256 e2ae86e85ea7f703c653e00e056db9b45648f5f8d504c4ff5f7f1d1a430edba2
-EBUILD cacti-0.8.7a.ebuild 2238 RMD160 cb3bb445234be8c5beb7051672a66c5418d22247 SHA1 f9c5822501a89da1c30b75785d70bbcae654e2df SHA256 482661ba02a5c0cd4afdb17e0604fcefe00e42053a874de3c8e0219f16e89f3a
-MISC ChangeLog 17887 RMD160 da00240e197f9280a579fb634cef3ba97d84a1e3 SHA1 8d140b70fca4006e6bd3f2fd469e1e56544e419e SHA256 af963257ed83b6a60388dc7e4555c51b8e2fdc832400c2f6da93a602b52517f0
-MISC metadata.xml 646 RMD160 aba1a1b33b779ca833d51b3f4e26f64b531b4ab5 SHA1 2eaabae404ac516b6f6bc3cb1802d1d08d57e51a SHA256 0269abacb0ac96dc71aa2075c573736414bb3d67ec169a1d0bd2f52e3afc2056
+EBUILD cacti-0.8.6j-r8.ebuild 2510 RMD160 a6ac5a57326eee6d3afa4be015c209a47c9eece5 SHA1 0602c1d82a55ae5629c9dd619b2640d414094620 SHA256 0b46b296dfdd6f6e209480d27d6e605aaba72addf913ed401b180e96dfdee5ea
+EBUILD cacti-0.8.7a-r2.ebuild 2340 RMD160 e1dd6ba8a918a39ee73cb59e7fe8df4156f51221 SHA1 5dcb362b507e0a4493010a4940d830bd5b879963 SHA256 41cbd6a9fcb42d814a27c284946c8df0ce43337dcc4626a0b52d58689b020f38
+EBUILD cacti-0.8.7b.ebuild 2248 RMD160 f505828889708a820d02192b15477ed87ad08216 SHA1 a9896a09e47e7d085bc8784181481c2d0c95bf25 SHA256 9093f7a74725648ce31775ac209a347948db579fddac0f08a273c6de0fe484db
+MISC ChangeLog 18345 RMD160 171c2a25fd1973dd4c2d959da57da9d30398ff0c SHA1 0ce297a2522a8fff3f8b38fe5f4ca1f2ea610f61 SHA256 966a18abda0d28dc5bbf9b28644142f435d4883f4c2a17ae5728602fad659d03
+MISC metadata.xml 735 RMD160 d1e8474cb11fdd1d140f1b20c2e1ffc4b23ab330 SHA1 5a41b6f664ee7414c13bf4b38c3bf99a8e3cb6c7 SHA256 d9b5280fb57b197cefec501e8d93fbe9d0a21531d60cd4e2ce3ce8a5ec17eda6
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