From: Peter Volkov Date: Mon, 26 Feb 2007 06:53:27 +0000 (+0000) Subject: Another patch from UPSTREAM. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2257c2a966d856eac9622e68225d403b57728eaf;p=gentoo.git Another patch from UPSTREAM. Package-Manager: portage-2.1.2-r9 --- diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog index 513d4e72d208..64bfbeb9c54a 100644 --- a/net-analyzer/cacti/ChangeLog +++ b/net-analyzer/cacti/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/cacti # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.87 2007/01/28 14:25:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.88 2007/02/26 06:53:27 pva Exp $ + +*cacti-0.8.6j-r2 (26 Feb 2007) + + 26 Feb 2007; -cacti-0.8.6j-r1.ebuild, + +cacti-0.8.6j-r2.ebuild: + Another patch from UPSTREAM. *cacti-0.8.6j-r1 (28 Jan 2007) diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index 9053c7530588..259facbe62c1 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -9,19 +9,20 @@ DIST dec06-vulnerability-scripts-0.8.6i.patch 4358 RMD160 8daaaf3d7d743206551502 DIST import_template_argument_space_removal.patch 634 RMD160 c0f8a1c135a58cd45a87549d2a170814f6f36337 SHA1 d9c27c69957c1755cda9095e938aacbe93fe127a SHA256 d0a64ebd1fba7a2dcd6e7b6bb08f4dbc39f238b6c492f4874451736344a6e460 DIST ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132548862654f312 SHA1 41be27e18e136d79c5e3b2f99438a192fffdc383 SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170 DIST poller_output_remainder.patch 1891 RMD160 7aab97b71d5915ca8085174f69318cb223eb6c5e SHA1 5e2d8b008c96f2761c12e1d94e225546a0e98e7b SHA256 2d8053d90dd363f4822072e58713b7d5f4b23825de4df2e9d429bfb5e8ec8201 +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.6i-r1.ebuild 2207 RMD160 b433dea9401bfafdf5b439b9a4ebcff9a6037da2 SHA1 c444a1fb47b16d1ba64dedf2973b1023c0f0c276 SHA256 db37167ca966c21e85d5c6927b80f4606882ed5433a4a5faf58db54902b43468 MD5 5ee79f5433fe5e00c41d76ebc24cddad cacti-0.8.6i-r1.ebuild 2207 RMD160 b433dea9401bfafdf5b439b9a4ebcff9a6037da2 cacti-0.8.6i-r1.ebuild 2207 SHA256 db37167ca966c21e85d5c6927b80f4606882ed5433a4a5faf58db54902b43468 cacti-0.8.6i-r1.ebuild 2207 -EBUILD cacti-0.8.6j-r1.ebuild 2117 RMD160 88bcc4bff63257ca3162a2a5c693152846e9cf02 SHA1 2133b7918e3c7ced0be5cda51fde70395e54ec95 SHA256 0321312ca4cb5f9f28c7306e14e215cc0f52cace913e7eb61b04154398ecf316 -MD5 2743b4f8b732b0b774abeadf31ffc09b cacti-0.8.6j-r1.ebuild 2117 -RMD160 88bcc4bff63257ca3162a2a5c693152846e9cf02 cacti-0.8.6j-r1.ebuild 2117 -SHA256 0321312ca4cb5f9f28c7306e14e215cc0f52cace913e7eb61b04154398ecf316 cacti-0.8.6j-r1.ebuild 2117 -MISC ChangeLog 12953 RMD160 ff16ffed20e30b9a2b43f1e4e10ac7c750b5b70b SHA1 e5a06e5d409c73f65ba41ff6ba4cc1011ab43cc6 SHA256 cd57678fd4c8608b59400f8f71bb4a675f549da353c94eac90e17c76dd5ea347 -MD5 d47ee80040418685767c3531c6c22da4 ChangeLog 12953 -RMD160 ff16ffed20e30b9a2b43f1e4e10ac7c750b5b70b ChangeLog 12953 -SHA256 cd57678fd4c8608b59400f8f71bb4a675f549da353c94eac90e17c76dd5ea347 ChangeLog 12953 +EBUILD cacti-0.8.6j-r2.ebuild 2153 RMD160 3b1c0148dfcfa015671eea1e8e468dcd52ead627 SHA1 c4bd5285ba3f58c66cdb5b8d7f3b6d83769ea88c SHA256 624eb035123d8a79a0c0a401394776cb27fdefdd40cdae5a5915db4a657cbc62 +MD5 9613b94a237904b1c62e04298d932af2 cacti-0.8.6j-r2.ebuild 2153 +RMD160 3b1c0148dfcfa015671eea1e8e468dcd52ead627 cacti-0.8.6j-r2.ebuild 2153 +SHA256 624eb035123d8a79a0c0a401394776cb27fdefdd40cdae5a5915db4a657cbc62 cacti-0.8.6j-r2.ebuild 2153 +MISC ChangeLog 13101 RMD160 fa9d53a0ba22287161f4f5629ee2ec37f14a0834 SHA1 014a057e48dde165113a562787d7f12f0db5aaaf SHA256 701c0d58ea576f43866a26f79f5b378fba6507936ad5f8779ddfdd3a956345f7 +MD5 3d35415a30396542bc98e885eea5cb6f ChangeLog 13101 +RMD160 fa9d53a0ba22287161f4f5629ee2ec37f14a0834 ChangeLog 13101 +SHA256 701c0d58ea576f43866a26f79f5b378fba6507936ad5f8779ddfdd3a956345f7 ChangeLog 13101 MISC metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 SHA1 6594e631af6d1c4d9712c9f73a7fb88c91d4d199 SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743 RMD160 cf7607206376845e26a2c6b348b73d6eb7c5c1c8 metadata.xml 743 @@ -29,6 +30,6 @@ SHA256 858f38f32b5bde1d8a4df2b9cde40a142dae76fb040dc7aaa5d1b0cc9184fb94 metadata 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 -MD5 ec617cd321855e116ab094492e78777d files/digest-cacti-0.8.6j-r1 789 -RMD160 5347f61cfcc225347878afdc8c8a0c824da9d470 files/digest-cacti-0.8.6j-r1 789 -SHA256 69bb30fcd9167388024f511f0e89a1f111307cf56f66b7ade7f0d893ef46d90e files/digest-cacti-0.8.6j-r1 789 +MD5 b3423859331f217ba597ee4516502268 files/digest-cacti-0.8.6j-r2 1066 +RMD160 a2ea6b39f15b24dde13c23ccf5fbcf8be12ea5df files/digest-cacti-0.8.6j-r2 1066 +SHA256 d3689347a3bbe22515239e9b39630c407ec40c241a58ffd8fe43d24016d18e23 files/digest-cacti-0.8.6j-r2 1066 diff --git a/net-analyzer/cacti/cacti-0.8.6j-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6j-r2.ebuild similarity index 94% rename from net-analyzer/cacti/cacti-0.8.6j-r1.ebuild rename to net-analyzer/cacti/cacti-0.8.6j-r2.ebuild index 293649c88f52..200abc2cbcec 100644 --- a/net-analyzer/cacti/cacti-0.8.6j-r1.ebuild +++ b/net-analyzer/cacti/cacti-0.8.6j-r2.ebuild @@ -1,6 +1,6 @@ # 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.6j-r1.ebuild,v 1.1 2007/01/28 14:25:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6j-r2.ebuild,v 1.1 2007/02/26 06:53:27 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="ping_php_version4_snmpgetnext - tree_console_missing_hosts" + tree_console_missing_hosts + thumbnail_graphs_not_working" 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/files/digest-cacti-0.8.6j-r1 b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r2 similarity index 74% rename from net-analyzer/cacti/files/digest-cacti-0.8.6j-r1 rename to net-analyzer/cacti/files/digest-cacti-0.8.6j-r2 index b5a0fb6ce505..7bc03c5a5855 100644 --- a/net-analyzer/cacti/files/digest-cacti-0.8.6j-r1 +++ b/net-analyzer/cacti/files/digest-cacti-0.8.6j-r2 @@ -4,6 +4,9 @@ SHA256 0ddf8a740a5725de67eeea71c38433447ff75388e6e399ce92ccadc36d25bd46 cacti-0. MD5 bedf583646e59dd628d4aced7e83fdf3 ping_php_version4_snmpgetnext.patch 1262 RMD160 94882973199b8e59c40ad43a132548862654f312 ping_php_version4_snmpgetnext.patch 1262 SHA256 1e19110c696eb56c6de68247c926c5ec7a2e7554df222f39a663556241644170 ping_php_version4_snmpgetnext.patch 1262 +MD5 1a3c9580a1f94d991502c8650d18b617 thumbnail_graphs_not_working.patch 1515 +RMD160 6b228cab1bc99b3f20ddb4e1d45b467fc8dadf35 thumbnail_graphs_not_working.patch 1515 +SHA256 3b18602aed1aa8b9773a75a4e89413cd12ce2670fd185eae113de1aa2c1186bd thumbnail_graphs_not_working.patch 1515 MD5 109afedcd49dc173da8c27fb23c322fe tree_console_missing_hosts.patch 771 RMD160 d33f3916317e989b379d1188f3ed23b7d61a7a9e tree_console_missing_hosts.patch 771 SHA256 5807bb408227b1c9f2ebecf220c048eb7c7148eee41fcd06fdc086124a206180 tree_console_missing_hosts.patch 771