[arch-commits] Commit in cacti/trunk (PKGBUILD cacti-php7_2.patch)

[Sergej Pupykin]

    Date: Friday, April 22, 2016 @ 13:27:13
  Author: spupykin
Revision: 171584

upgpkg: cacti 0.8.8_g-3

upd

Added:
  cacti/trunk/cacti-php7_2.patch
Modified:
  cacti/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    9 ++++++---
 cacti-php7_2.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-22 09:59:45 UTC (rev 171583)
+++ PKGBUILD	2016-04-22 11:27:13 UTC (rev 171584)
@@ -4,7 +4,7 @@
 
 pkgname=cacti
 pkgver=0.8.8_g
-pkgrel=2
+pkgrel=3
 pkgdesc="complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality"
 arch=(any)
 url="http://www.cacti.net"
@@ -14,13 +14,16 @@
 	'etc/webapps/cacti/config.php')
 install=cacti.install
 source=("http://www.cacti.net/downloads/$pkgname-${pkgver/_/}.tar.gz"
-	"cacti-php7.patch")
+	"cacti-php7.patch"
+	"cacti-php7_2.patch")
 md5sums=('75f660d54152182e1dbbf0db73143098'
-         'f8bc449356b00a5a697522e1e0ca4c54')
+         'f8bc449356b00a5a697522e1e0ca4c54'
+         '7c20c6dfee134849ecfa60b5e99b9b9e')
 
 prepare() {
   cd $srcdir/$pkgname-${pkgver/_/}
   patch -p1 -i $srcdir/cacti-php7.patch
+  patch -p1 -i $srcdir/cacti-php7_2.patch
 }
 
 package() {

Added: cacti-php7_2.patch
===================================================================
--- cacti-php7_2.patch	                        (rev 0)
+++ cacti-php7_2.patch	2016-04-22 11:27:13 UTC (rev 171584)
@@ -0,0 +1,11 @@
+--- cacti-0.8.8g/lib/adodb/adodb-lib.inc.php	2010-08-21 17:03:22.000000000 +0200
++++ cacti-0.8.8g-php7/lib/adodb/adodb-lib.inc.php	2016-04-21 12:30:45.707940772 +0200
+@@ -534,7 +534,7 @@
+ 		//because we have to call MetaType.
+ 		//php can't do a $rsclass::MetaType()
+ 		$rsclass = $zthis->rsPrefix.$zthis->databaseType;
+-		$recordSet =& new $rsclass(-1,$zthis->fetchMode);
++		$recordSet = new $rsclass(-1,$zthis->fetchMode);
+ 		$recordSet->connection = &$zthis;
+ 		
+ 		if (is_string($cacheRS) && $cacheRS == $rs) {