From ca72d8634da58509ea07cf5c9bc428b789bb7e58 Mon Sep 17 00:00:00 2001 From: sem Date: Thu, 20 May 2010 13:55:28 +0000 Subject: - Update to 0.8.7f Bug and security fixes release. Release notes: http://www.cacti.net/release_notes_0_8_7f.php --- net-mgmt/cacti/Makefile | 6 +++--- net-mgmt/cacti/distinfo | 21 +++------------------ net-mgmt/cacti/pkg-plist | 4 ++-- 3 files changed, 8 insertions(+), 23 deletions(-) (limited to 'net-mgmt') diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile index 5ed37f207b57..8589047a53a7 100644 --- a/net-mgmt/cacti/Makefile +++ b/net-mgmt/cacti/Makefile @@ -6,15 +6,15 @@ # PORTNAME= cacti -PORTVERSION= 0.8.7e${PATCHLEVEL} +PORTVERSION= 0.8.7f${PATCHLEVEL} CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ DISTFILES= ${PORTNAME}-${SITEDISTVERSION}${EXTRACT_SUFX} # Vendor's patches PATCH_SITES= http://www.cacti.net/downloads/patches/${SITEDISTVERSION}/ -PATCHFILES= cli_add_graph.patch snmp_invalid_response.patch template_duplication.patch cross_site_fix.patch sql_injection_template_export.patch -PATCHLEVEL= 5 +PATCHFILES= +PATCHLEVEL= PATCH_DIST_STRIP= -p1 diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo index 2d4552d02762..d80473ad1026 100644 --- a/net-mgmt/cacti/distinfo +++ b/net-mgmt/cacti/distinfo @@ -1,18 +1,3 @@ -MD5 (cacti-0.8.7e.tar.gz) = 7563a58a57d2c6cc0da28cc341a30969 -SHA256 (cacti-0.8.7e.tar.gz) = 1983f16cd5cf5e30b33b43b167e324713f0711167f5dcde57f3cbfbeddbaa7ff -SIZE (cacti-0.8.7e.tar.gz) = 2232297 -MD5 (cli_add_graph.patch) = 8599b4c9433cb1751086ef394bba66ee -SHA256 (cli_add_graph.patch) = 504af2148efab2699e4cdc17581e8555d1a5d40dfbd30a316e7637378a6c6f11 -SIZE (cli_add_graph.patch) = 556 -MD5 (snmp_invalid_response.patch) = 85c71f16fcbf79a11f24609b973199d8 -SHA256 (snmp_invalid_response.patch) = 4259979a2d9fdc51a6ef3a88368fe97adace3a7f1c3b895dea61757de9822db8 -SIZE (snmp_invalid_response.patch) = 921 -MD5 (template_duplication.patch) = b1bd81dc89aa3e30365d0c9d45956255 -SHA256 (template_duplication.patch) = c6ab6d2396f6b6519607f7908df642a575d32a75430e2b74381a6046d57f8ad9 -SIZE (template_duplication.patch) = 9190 -MD5 (cross_site_fix.patch) = 4323da80d4dc0238fc4902dcd27f47f0 -SHA256 (cross_site_fix.patch) = 75b7d4687722d96e0d32afb3832f93a54e8518c0c949e1dcd9ae634623564b28 -SIZE (cross_site_fix.patch) = 8705 -MD5 (sql_injection_template_export.patch) = 7e82d147a279f5726dc1ad6bf838f6b0 -SHA256 (sql_injection_template_export.patch) = cdcec3946e81edde690b34627c52620bb702de0a3a823bcb571f421b093effed -SIZE (sql_injection_template_export.patch) = 636 +MD5 (cacti-0.8.7f.tar.gz) = c50a49e3b439dba1fd44ddc34276d4df +SHA256 (cacti-0.8.7f.tar.gz) = dfb59586a6d19537608647eac71bbc70be5c7c98f261c4d55bedadb69b3bffc5 +SIZE (cacti-0.8.7f.tar.gz) = 2235858 diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist index 3cb2aad5d64c..04296e59bb0a 100644 --- a/net-mgmt/cacti/pkg-plist +++ b/net-mgmt/cacti/pkg-plist @@ -12,6 +12,7 @@ %%CACTIDIR%%/cli/add_graphs.php %%CACTIDIR%%/cli/add_perms.php %%CACTIDIR%%/cli/add_tree.php +%%CACTIDIR%%/cli/convert_innodb.php %%CACTIDIR%%/cli/copy_user.php %%CACTIDIR%%/cli/host_update_template.php %%CACTIDIR%%/cli/import_template.php @@ -425,7 +426,6 @@ %%CACTIDIR%%/lib/variables.php %%CACTIDIR%%/lib/xml.php %%CACTIDIR%%/log/.htaccess -%%CACTIDIR%%/log/.placeholder @unexec [ ! -s %%PREFIX%%/%%CACTIDIR%%/log/cacti.log ] && rm -f %%PREFIX%%/%%CACTIDIR%%/log/cacti.log %%CACTIDIR%%/logout.php %%CACTIDIR%%/poller.php @@ -443,7 +443,7 @@ %%CACTIDIR%%/resource/snmp_queries/netware_cpu.xml %%CACTIDIR%%/resource/snmp_queries/netware_disk.xml %%CACTIDIR%%/rra.php -%%CACTIDIR%%/rra/.placeholder +%%CACTIDIR%%/rra/.htaccess %%CACTIDIR%%/script_server.php %%CACTIDIR%%/script_server.pl %%CACTIDIR%%/scripts/3com_cable_modem.pl -- cgit