Tue Dec 20 23:57:33 2011 UTC ()
security update to 0.8.7i (with Plugin Architecture version 3.1)

     bug#0001963: Bandwidth summation "total in" and "total out"
		 are always 0
     bug#0002040: ICMP ping errors for Windows 7 with PHP 5.3
     bug#0002062: Multiple security vulnerabilities
     bug#0002063: Multiple value poller output incorrectly interpreted
		 as hexadecimal value
     bug#0002064: Removing "~" (tilde) by sanitize_uri() conflicts with
		 Apache UserDir translation
     bug#0002066: Graph without host id "Notice: Undefined variable:
		 host_id"
     bug#0002067: Custom time range filter not working
     bug#0002068: Missing header include in analyze_database.php
     bug#0002071: MySQL table poller_item is dropped always when "Data
		 Input Method" is changed or added.
     bug#0002079: Using input field of a script in graph title does not
		 work
     bug#0002080: Database password containing "@" does not connect
     bug#0002083: Adding a new users generates errors in apache logs
     bug#0002084: Incorrect normalization of hrStorageTable values
		 over 2^31
     bug#0002086: Incorrect usage of mysql custom tcp port
     bug#0002087: PHP recache problems due to missing slashes in reindex
		 table
     bug#0002093: Unit exponent value of 0 not imported with graph
		 template
     bug#0002094: CDEF: "another cdef" references not included in
		 template export
     bug#0002106: Command line add device does not accept "None" for
		 host template
     bug: Update host template cli script help to fix incorrect options
     bug: Refresh of Cacti log viewer not working
     bug: Problems saving User Graph Permissions in IE9
     bug: Bandwidth summation fails if NAN values are present
     bug: Special Type Code "host_id" available in Data Queries by Not
	 Data Input Methods
     bug: Do not generate error messages when creating non host based
	 graphs
     bug: Wrong index used for Data Queries using VALUE/REGEXP
     bug: Fix issue with title variable replacement failing when no host
	 is associated with graph
     bug: Cacti generating MySQL 1100 Errors when modifying the tree
     bug: Resolved "Fatal error: Cannot use string offset as an array"
	 in lib/data_query.php
     feature: Properly support ifHighSpeed replacement variable
     feature: Increase granularity of availability options to correct
	     spine bug
     feature: Replace "event count" with last changed date for host
	     availability


(tez)
diff -r1.1.1.1 -r1.2 pkgsrc/net/cacti/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/cacti/distinfo
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/cacti/Makefile (expand / switch to unified diff)

--- pkgsrc/net/cacti/Makefile 2011/11/22 22:23:13 1.1.1.1
+++ pkgsrc/net/cacti/Makefile 2011/12/20 23:57:33 1.2
@@ -1,22 +1,20 @@ @@ -1,22 +1,20 @@
1# $NetBSD: Makefile,v 1.1.1.1 2011/11/22 22:23:13 tez Exp $ 1# $NetBSD: Makefile,v 1.2 2011/12/20 23:57:33 tez Exp $
2# 2#
3 3
4DISTNAME= cacti-0.8.7h 4PKGNAME= cacti-0.8.7i
 5DISTNAME= cacti-0.8.7i-PIA-3.1
5CATEGORIES= net 6CATEGORIES= net
6DISTFILES= cacti-0.8.7h.tar.gz 
7DISTFILES+= cacti-plugin-0.8.7h-PA-v3.0.tar.gz 
8MASTER_SITES= http://www.cacti.net/downloads/ 7MASTER_SITES= http://www.cacti.net/downloads/
9MASTER_SITES+= http://www.cacti.net/downloads/pia/ 
10 8
11MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.cacti.net/ 10HOMEPAGE= http://www.cacti.net/
13COMMENT= Frontend to rrdtool for monitoring systems and services 11COMMENT= Frontend to rrdtool for monitoring systems and services
14LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
15 13
16USE_LANGUAGES= # none 14USE_LANGUAGES= # none
17USE_TOOLS+= pax 15USE_TOOLS+= pax
18NO_BUILD= yes 16NO_BUILD= yes
19PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
20 18
21DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql 19DEPENDS+= ${PHP_PKG_PREFIX}-mysql-[0-9]*:../../databases/php-mysql
22DEPENDS+= ${PHP_PKG_PREFIX}-snmp-[0-9]*:../../net/php-snmp/ 20DEPENDS+= ${PHP_PKG_PREFIX}-snmp-[0-9]*:../../net/php-snmp/
@@ -65,29 +63,26 @@ SUBST_VARS.paths+= PKG_PHP_MAJOR_VERS @@ -65,29 +63,26 @@ SUBST_VARS.paths+= PKG_PHP_MAJOR_VERS
65 63
66SUBST_CLASSES+= docs 64SUBST_CLASSES+= docs
67SUBST_STAGE.docs= pre-configure 65SUBST_STAGE.docs= pre-configure
68SUBST_FILES.docs= docs/txt/manual.txt docs/html/*.html 66SUBST_FILES.docs= docs/txt/manual.txt docs/html/*.html
69SUBST_SED.docs= -e 's,/var/www/html/cacti,${CACTIDIR},g' 67SUBST_SED.docs= -e 's,/var/www/html/cacti,${CACTIDIR},g'
70 68
71OWN_DIRS_PERMS+= ${CACTI_LOGDIR} ${CACTI_USER} ${CACTI_GROUP} 755 69OWN_DIRS_PERMS+= ${CACTI_LOGDIR} ${CACTI_USER} ${CACTI_GROUP} 755
72OWN_DIRS_PERMS+= ${CACTI_RRADIR} ${CACTI_USER} ${CACTI_GROUP} 755 70OWN_DIRS_PERMS+= ${CACTI_RRADIR} ${CACTI_USER} ${CACTI_GROUP} 755
73SPECIAL_PERMS+= share/cacti/log/cacti.log ${CACTI_USER} ${CACTI_GROUP} 755 71SPECIAL_PERMS+= share/cacti/log/cacti.log ${CACTI_USER} ${CACTI_GROUP} 755
74 72
75INSTALLATION_DIRS= share/examples/cacti 73INSTALLATION_DIRS= share/examples/cacti
76INSTALLATION_DIRS+= share/cacti 74INSTALLATION_DIRS+= share/cacti
77 75
78pre-patch: 
79 ${CP} -R ${WRKDIR}/cacti-plugin-arch/files/* ${WRKDIR} 
80 
81post-extract: 76post-extract:
82 ${CP} ${FILESDIR}/httpd-cacti.conf ${WRKDIR}/ 77 ${CP} ${FILESDIR}/httpd-cacti.conf ${WRKDIR}/
83 ${CP} ${FILESDIR}/freebsd_memory.pl ${WRKSRC}/scripts/ 78 ${CP} ${FILESDIR}/freebsd_memory.pl ${WRKSRC}/scripts/
84 ${CP} ${FILESDIR}/netbsd_memory.pl ${WRKSRC}/scripts/ 79 ${CP} ${FILESDIR}/netbsd_memory.pl ${WRKSRC}/scripts/
85 ${CP} ${FILESDIR}/solaris_memory.pl ${WRKSRC}/scripts/ 80 ${CP} ${FILESDIR}/solaris_memory.pl ${WRKSRC}/scripts/
86 81
87do-install: 82do-install:
88 ${INSTALL_DATA} ${WRKDIR}/httpd-cacti.conf ${DESTDIR}${EGDIR}/httpd-cacti.conf 83 ${INSTALL_DATA} ${WRKDIR}/httpd-cacti.conf ${DESTDIR}${EGDIR}/httpd-cacti.conf
89 ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \; 84 ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \;
90 cd ${WRKSRC} && ${PAX} -wr * ${DESTDIR}${CACTIDIR} 85 cd ${WRKSRC} && ${PAX} -wr * ${DESTDIR}${CACTIDIR}
91 86
92 87
93.include "../../databases/rrdtool/buildlink3.mk" 88.include "../../databases/rrdtool/buildlink3.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/cacti/distinfo (expand / switch to unified diff)

--- pkgsrc/net/cacti/distinfo 2011/11/22 22:23:13 1.1.1.1
+++ pkgsrc/net/cacti/distinfo 2011/12/20 23:57:33 1.2
@@ -1,12 +1,9 @@ @@ -1,12 +1,9 @@
1$NetBSD: distinfo,v 1.1.1.1 2011/11/22 22:23:13 tez Exp $ 1$NetBSD: distinfo,v 1.2 2011/12/20 23:57:33 tez Exp $
2 2
3SHA1 (cacti-0.8.7h.tar.gz) = 4311cff2ec8883c013efd0225c73d145bcc1cf00 3SHA1 (cacti-0.8.7i-PIA-3.1.tar.gz) = 84cb6326645a2d08059dcc6767f777147a0a4607
4RMD160 (cacti-0.8.7h.tar.gz) = 923492a3f36e5d320570ebfad9b4136acf7b9eb7 4RMD160 (cacti-0.8.7i-PIA-3.1.tar.gz) = 691d2fad7d7071475076556ab643a480ef2ee84c
5Size (cacti-0.8.7h.tar.gz) = 2249323 bytes 5Size (cacti-0.8.7i-PIA-3.1.tar.gz) = 2270714 bytes
6SHA1 (cacti-plugin-0.8.7h-PA-v3.0.tar.gz) = a144fcf32d31a268a338d84adf8db3b63f3fe5a9 
7RMD160 (cacti-plugin-0.8.7h-PA-v3.0.tar.gz) = 87e22690f74e8fd6d367063684aabbd582691a24 
8Size (cacti-plugin-0.8.7h-PA-v3.0.tar.gz) = 252949 bytes 
9SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282 6SHA1 (patch-cacti.sql) = 37e18026c4136630d939ab5a7a4d6336bf166282
10SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663 7SHA1 (patch-include_global.php) = fb0d2f15596b051c60ed6032ecb9038315b7c663
11SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b 8SHA1 (patch-include_global__settings.php) = 54ffd0c3fc9d927595b1568a874c45a4a6033f7b
12SHA1 (patch-install_index.php) = 84b25c39a4ce1bc6144cffcdb9e32bf257cfcae6 9SHA1 (patch-install_index.php) = 84b25c39a4ce1bc6144cffcdb9e32bf257cfcae6