From 832f41e79e64c38a084ec640b3a0aa41e1e97e3a Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sun, 7 Jan 2007 15:39:48 +0000 Subject: [PATCH] Include patches released by upstream. Should close vulnerabilities reported in bug #159278. Package-Manager: portage-2.1.1-r2 --- net-analyzer/cacti/ChangeLog | 10 +- net-analyzer/cacti/Manifest | 19 +++- net-analyzer/cacti/cacti-0.8.6i-r1.ebuild | 93 +++++++++++++++++++ .../cacti/files/digest-cacti-0.8.6i-r1 | 15 +++ 4 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 net-analyzer/cacti/cacti-0.8.6i-r1.ebuild create mode 100644 net-analyzer/cacti/files/digest-cacti-0.8.6i-r1 diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog index ad4e9551f9ca..f45c105c6277 100644 --- a/net-analyzer/cacti/ChangeLog +++ b/net-analyzer/cacti/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/cacti -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.78 2006/11/23 19:46:07 vivo Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.79 2007/01/07 15:39:48 pva Exp $ + +*cacti-0.8.6i-r1 (07 Jan 2007) + + 07 Jan 2007; Peter Volkov +cacti-0.8.6i-r1.ebuild: + Include patches released by upstream. Should close vulnerabilities reported + in bug #159278. 23 Nov 2006; Francesco Riosa cacti-0.8.6h_p20060108-r2.ebuild, cacti-0.8.6i.ebuild: diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index 4ffc9d795825..5afdba6cc1df 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -4,22 +4,30 @@ RMD160 0408ae8197dc71636bd8692de86bb6ce21310897 files/postinstall-en.txt 2191 SHA256 c5a9ead9474eb3ef2b98f210c68f4ad6b24680321d9fbfe6e419c86e891fbe9e files/postinstall-en.txt 2191 DIST cacti-0.8.6h.tar.gz 1096877 RMD160 3c09869e5b7b6a4fbb449efff25db12814b39288 SHA1 0d31e5f7dc11d8cc6d61b3c4ca17a27c476759fc SHA256 69b6ad51ee21c5367dc67a752a3745804531280356eb261d81f9636a647ca17e DIST cacti-0.8.6i.tar.gz 1122700 RMD160 2c5ea7dc594c455c710f8c253a25805883395a2f SHA1 bd8032fe7e1e792c38ed8f8774a692fbc17e295c SHA256 3998dae625314309c58cea0fc1e48fb08cf4c2973013413f2726cdc5cf1ac6ac +DIST dec06-vulnerability-poller-0.8.6i.patch 5994 RMD160 cf60d715e6ae9285c6a0bd562fcd65290dcd1bdb SHA1 3f0eef9611837b7e30c785e11171e744545bce94 SHA256 4bb02a9022be25a1340e328f3c911a5386a8fb0c23a95285fcc8d8912dacc605 +DIST dec06-vulnerability-scripts-0.8.6i.patch 4358 RMD160 8daaaf3d7d743206551502c3945c81fc689999c1 SHA1 e175a14fbb9915cce2ea40943337bfac47e9d640 SHA256 89d48d5758ef0517f8d34a95dee02662af80efc8f988b87cfbc68c6e169c9f36 DIST fix_search_session_clear_issue.patch 1154 RMD160 40f69cb5611aec1a5e5faa91b6bb50f97c00608a SHA1 85155b6f6f7763913d54de18d47850f2cd332449 SHA256 e789254e185b258293fcb31053bbb59d0c243c25582987858539a80ec9b4e9bc DIST fix_sql_syntax_related_to_default_rra_id.patch 1058 RMD160 70d67c3b8f32eb4a6bdc4df97d11b63865afc352 SHA1 3d9b94c196b9000cd1c319c8e2e5e84620d76759 SHA256 458e1a64e97dc592b10e354b046079d5ea31101dd4f1f4d0e689c5d2ab363106 +DIST import_template_argument_space_removal.patch 634 RMD160 c0f8a1c135a58cd45a87549d2a170814f6f36337 SHA1 d9c27c69957c1755cda9095e938aacbe93fe127a SHA256 d0a64ebd1fba7a2dcd6e7b6bb08f4dbc39f238b6c492f4874451736344a6e460 DIST mysql_5x_strict.patch 2593 RMD160 2da88ac06035f889db1538fc0910b475dd1ec768 SHA1 fae60a7aed2090fdf47a0aabe7a57c4c667e48bb SHA256 c39beb645f8ae1c375f45a388db5a7939944668e5d079567f2e51e13badb95f1 DIST nth_percentile_empty_return_set_issue.patch 4792 RMD160 9684f0744c889f3113070f8abdd7e653b1f4679c SHA1 254ef9ac6cf11a068e616b157b6700efd458fabc SHA256 63a9dfb702a50ba73b8d84da6a86588927eb192e022d07dcbe8ea7d5f9389982 +DIST poller_output_remainder.patch 1891 RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e SHA1 5e2d8b008c96f2761c12e1d94e225546a0e98e7b SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201 EBUILD cacti-0.8.6h_p20060108-r2.ebuild 2148 RMD160 7ae920137db6caaf1f4af1ff6b029773b7bf7844 SHA1 1c14bd3e2e8f582290333a8b92d8a39a652fe300 SHA256 0dff7e67148401dca3ed4b0dab919e7765b1fcfe1ecac677a11947ed2a818239 MD5 47bd60acdc316b950edf5e8a5cdb2229 cacti-0.8.6h_p20060108-r2.ebuild 2148 RMD160 7ae920137db6caaf1f4af1ff6b029773b7bf7844 cacti-0.8.6h_p20060108-r2.ebuild 2148 SHA256 0dff7e67148401dca3ed4b0dab919e7765b1fcfe1ecac677a11947ed2a818239 cacti-0.8.6h_p20060108-r2.ebuild 2148 +EBUILD cacti-0.8.6i-r1.ebuild 2209 RMD160 d37f7dd16e54ac5a3a39134b4f8a7c287d0d0b1b SHA1 ed307dd9fbecab52cd776099d7e8cdc68b3600f9 SHA256 c691987796aa53f9e2c6b2bcaa1d4f47deb6051c9fae1b89cc3aeadfb3b0222a +MD5 395fc97b014e5eba52b9ee237b9d7bfc cacti-0.8.6i-r1.ebuild 2209 +RMD160 d37f7dd16e54ac5a3a39134b4f8a7c287d0d0b1b cacti-0.8.6i-r1.ebuild 2209 +SHA256 c691987796aa53f9e2c6b2bcaa1d4f47deb6051c9fae1b89cc3aeadfb3b0222a cacti-0.8.6i-r1.ebuild 2209 EBUILD cacti-0.8.6i.ebuild 2012 RMD160 a26fc6e886b7fc4ae6f90089554ba1022993dd45 SHA1 df49434c290bc692fb3f70492aba8b158a364cae SHA256 3a58b3bedc7269f5206ee98aeda93c1b216674ffb9acfcc6a187f8c195e764e5 MD5 71bbba16f9371a43f48c701d3c7fb9e8 cacti-0.8.6i.ebuild 2012 RMD160 a26fc6e886b7fc4ae6f90089554ba1022993dd45 cacti-0.8.6i.ebuild 2012 SHA256 3a58b3bedc7269f5206ee98aeda93c1b216674ffb9acfcc6a187f8c195e764e5 cacti-0.8.6i.ebuild 2012 -MISC ChangeLog 11707 RMD160 7c6c8a8d18b4061fac050376333a3b781c8f81ca SHA1 ba9e0a8f20602c6de9d3b6b24c5f75d0561e8662 SHA256 ac406c44f7d4cd6968f6a76c9ce5e1fc8c036aac71815abc9991a976a5614945 -MD5 76869fb5df82622806d864e7b2ecfdd4 ChangeLog 11707 -RMD160 7c6c8a8d18b4061fac050376333a3b781c8f81ca ChangeLog 11707 -SHA256 ac406c44f7d4cd6968f6a76c9ce5e1fc8c036aac71815abc9991a976a5614945 ChangeLog 11707 +MISC ChangeLog 11905 RMD160 cdd72e465b4694a022b68d3f21f167a766da55c4 SHA1 b96d33eece3de5129ee906152c4c7e711c554ad2 SHA256 770ac97cd1066a4836e0018350fc6dc2baaa65b21618726c5c27d6f4e9a30909 +MD5 c840aab541e470d6a4a875a5a8800fcb ChangeLog 11905 +RMD160 cdd72e465b4694a022b68d3f21f167a766da55c4 ChangeLog 11905 +SHA256 770ac97cd1066a4836e0018350fc6dc2baaa65b21618726c5c27d6f4e9a30909 ChangeLog 11905 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743 @@ -30,3 +38,6 @@ SHA256 55e6747633e87e5da14c070454423ed0914ca0acb8c43eb68c89873dd51dd1a2 files/di MD5 2871d9c68b9fc9c1b4913ce66a84fbf0 files/digest-cacti-0.8.6i 241 RMD160 44671e3f132273b94162aacae7739ec6f7f7d072 files/digest-cacti-0.8.6i 241 SHA256 8921a96c3bb8026e4af5f531ee0f53780de61b190a6159957109a20ecfec9e6b files/digest-cacti-0.8.6i 241 +MD5 2b7a8cbe3c24b2359cb5d26537b808e0 files/digest-cacti-0.8.6i-r1 1394 +RMD160 9d15af37d721c2d83f56a6403ad9abc5c4bc34e5 files/digest-cacti-0.8.6i-r1 1394 +SHA256 db0b3cfd6c831c8368801968daf70e8868b73802b120af351e2ea0741ab61a2d files/digest-cacti-0.8.6i-r1 1394 diff --git a/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild new file mode 100644 index 000000000000..ff3c6cbc5e6c --- /dev/null +++ b/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6i-r1.ebuild,v 1.1 2007/01/07 15:39:48 pva Exp $ + +inherit eutils webapp depend.apache depend.php + +# Support for _p* in version. +MY_P=${P/_p*/} +# (patched versions) +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="poller_output_remainder + dec06-vulnerability-poller-0.8.6i + dec06-vulnerability-scripts-0.8.6i + import_template_argument_space_removal" + 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" + +DEPEND="" + +want_apache +need_php_cli +need_php_httpd + +# alpha doesn't have lighttpd keyworded yet +# sparc doesn't have a stable keyword for lighttpd yet +RDEPEND="!alpha? ( !sparc? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) ) ) + snmp? ( net-analyzer/net-snmp ) + net-analyzer/rrdtool + 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 +} + +pkg_setup() { + webapp_pkg_setup + has_php + if [ $PHP_VERSION = 5 ] ; then + require_php_with_use cli mysql xml + elif [ $PHP_VERSION = 4 ] ; then + require_php_with_use cli mysql xml expat + fi +} + +src_compile() { + einfo "Nothing to compile." +} + +src_install() { + webapp_src_preinst + + dodoc LICENSE + rm LICENSE README + + dodoc docs/{CHANGELOG,CONTRIB,INSTALL,README,REQUIREMENTS,UPGRADE} + rm -rf docs + + 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/files/digest-cacti-0.8.6i-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.6i-r1 new file mode 100644 index 000000000000..5518d1fcba6f --- /dev/null +++ b/net-analyzer/cacti/files/digest-cacti-0.8.6i-r1 @@ -0,0 +1,15 @@ +MD5 341b5828d95db91f81f5fbba65411d63 cacti-0.8.6i.tar.gz 1122700 +RMD160 2c5ea7dc594c455c710f8c253a25805883395a2f cacti-0.8.6i.tar.gz 1122700 +SHA256 3998dae625314309c58cea0fc1e48fb08cf4c2973013413f2726cdc5cf1ac6ac cacti-0.8.6i.tar.gz 1122700 +MD5 17b2997b6708a8bcf99c702b6cec047d dec06-vulnerability-poller-0.8.6i.patch 5994 +RMD160 cf60d715e6ae9285c6a0bd562fcd65290dcd1bdb dec06-vulnerability-poller-0.8.6i.patch 5994 +SHA256 4bb02a9022be25a1340e328f3c911a5386a8fb0c23a95285fcc8d8912dacc605 dec06-vulnerability-poller-0.8.6i.patch 5994 +MD5 5ce8da430a63ea8e675d0eef46e8b60a dec06-vulnerability-scripts-0.8.6i.patch 4358 +RMD160 8daaaf3d7d743206551502c3945c81fc689999c1 dec06-vulnerability-scripts-0.8.6i.patch 4358 +SHA256 89d48d5758ef0517f8d34a95dee02662af80efc8f988b87cfbc68c6e169c9f36 dec06-vulnerability-scripts-0.8.6i.patch 4358 +MD5 c56da30a12487610393aa2eaa7fe8c6a import_template_argument_space_removal.patch 634 +RMD160 c0f8a1c135a58cd45a87549d2a170814f6f36337 import_template_argument_space_removal.patch 634 +SHA256 d0a64ebd1fba7a2dcd6e7b6bb08f4dbc39f238b6c492f4874451736344a6e460 import_template_argument_space_removal.patch 634 +MD5 3b7ad717cbf8874fd96ea9f45d97cfbc poller_output_remainder.patch 1891 +RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e poller_output_remainder.patch 1891 +SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201 poller_output_remainder.patch 1891 -- 2.26.2