From a9a56bc80f0f0ef5a1e334554f647d253455bc0a Mon Sep 17 00:00:00 2001
From: Valery Kartel <valery.kartel@gmail.com>
Date: Sat, 21 Oct 2017 16:01:21 +0300
Subject: community/cacti: upgrade to 1.1.26 + some fixes

- minor fixes in APKBUILD
- remove executable bit from scripts and images
- add mariadb-client as dependency for cacti-setup
- add missing php modules to cacti-php* subpackages
- fix error in php-fpm pool definition
---
 community/cacti/APKBUILD           | 29 +++++++++++++++++------------
 community/cacti/cacti.php-fpm.conf |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'community')

diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD
index 89f06fd6ea..8b32671c61 100644
--- a/community/cacti/APKBUILD
+++ b/community/cacti/APKBUILD
@@ -1,13 +1,14 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=cacti
-pkgver=1.1.25
+pkgver=1.1.26
 pkgrel=0
 pkgdesc="The complete rrdtool-based graphing solution"
 url="http://www.cacti.net"
 arch="noarch"
 license="GPL2+"
-pkgusers="cacti"
+options="!check"
+pkgusers=$pkgname
 pkggroups="www-data"
 depends="bash perl coreutils net-snmp-tools rrdtool ttf-dejavu"
 makedepends=""
@@ -30,9 +31,12 @@ package() {
 		"$pkgdir"/etc/$pkgname \
 		"$pkgdir"/var/log
 
-	cp -r * "$pkgdir"/usr/share/webapps/$pkgname/ || return 1
+	cp -r * "$pkgdir"/usr/share/webapps/$pkgname
 	install -Dm600 "$srcdir"/$pkgname.crontab "$pkgdir"/etc/crontabs/$pkgname
 
+	# fix permissions
+	find "$pkgdir" -perm 755 -type f -exec chmod -x {} \;
+
 	# remove development data
 	rm -fr "$pkgdir"/usr/share/webapps/$pkgname/locales/po \
 		"$pkgdir"/usr/share/webapps/$pkgname/locales/update-pot.sh
@@ -50,15 +54,15 @@ package() {
 	# move variable and writable data to cacti's home
 	local dir; for dir in cache plugins resource rra scripts; do
 		mv "$pkgdir"/usr/share/webapps/$pkgname/$dir \
-			"$pkgdir"/var/lib/$pkgname/$dir || return 1
-		chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/$pkgname/$dir
+			"$pkgdir"/var/lib/$pkgname/$dir
+		chown -R $pkgname: "$pkgdir"/var/lib/$pkgname/$dir
 		ln -s /var/lib/$pkgname/$dir "$pkgdir"/usr/share/webapps/$pkgname/$dir
 	done
 
 	# move log to /var/log
 	mv "$pkgdir"/usr/share/webapps/$pkgname/log \
-		"$pkgdir"/var/log/$pkgname || return 1
-	chown -R $pkgusers:$pkggroups "$pkgdir"/var/log/$pkgname
+		"$pkgdir"/var/log/$pkgname
+	chown -R $pkgname: "$pkgdir"/var/log/$pkgname
 	ln -s /var/log/$pkgname "$pkgdir"/usr/share/webapps/$pkgname/log
 
 	# move config to /etc
@@ -111,7 +115,7 @@ lang() {
 
 setup() {
 	pkgdesc="$pkgdesc (initial setup)"
-	depends="$pkgname $pkgname-doc"
+	depends="$pkgname $pkgname-doc mariadb-client"
 
 	mkdir -p "$subpkgdir"/usr/share/webapps/$pkgname
 	mv "$pkgdir"/usr/share/webapps/$pkgname/install \
@@ -123,15 +127,16 @@ _php() {
 	local php=${subpkgname#$pkgname-}
 	pkgdesc="$pkgdesc ($php dependencies)"
 	install_if="$php-config $pkgname=$pkgver-r$pkgrel"
-	depends="$php $php-gd $php-gmp $php-json $php-ldap $php-pdo_mysql
-		$php-openssl $php-posix $php-snmp $php-sockets $php-xml $php-zlib"
+	depends="$php $php-gd $php-gmp $php-json $php-ldap $php-mbstring $php-pdo_mysql
+		$php-openssl $php-posix $php-session $php-simplexml $php-snmp $php-sockets
+		$php-xml $php-zlib"
 
 	# cacti's php-fpm pool config
 	install -Dm644 "$srcdir"/$pkgname.php-fpm.conf \
 		"$subpkgdir"/etc/$php/php-fpm.d/$pkgname.conf
 }
 
-sha512sums="f5574cf0ba9d8fa39a6e547c9fe2a3c007901987abb82ff50d63672009bbf257ee58f47f02cea512dda6809e880e87e8a3ad826c26a9421f195569816d6489e0  cacti-1.1.25.tar.gz
+sha512sums="b0f7fef2e8728197f6b9e5d1f51e0fd82e4db72465a70dc8cbadca0e4c72ce9c49f2565394c3eef3a41d83b8c00c23e0454bb55c1904c79243e5d8fa1b6b6372  cacti-1.1.26.tar.gz
 70f47dbbca76489fc3a84452ee8065f9571ee627b3e346cd3c866501d723a609372c4fbd7e53c4bdcdb22439d876d78847f8902dfa43f3f66b2329639e795ab9  cacti.crontab
 9b3fe765c6196c0e4988efaa7236d8a8b945725548371b4a0e2a371de374c9577a908d58dcef5a4e59e089ca923cfeb7c5ddea9ee983a5115239052cf9b8ab59  cacti.nginx.conf
-695a5e8439ef0ed29068c87b1d711f66c5a24cf31c3c213784f83d6aef8608a07e99bfa2343a6487762572b6022926c3846f704494c7806e9a1aa2c49e18513b  cacti.php-fpm.conf"
+056358fc69752fb5129729db91a22d06c97ca452068017ccfe0ede8f2bf42f62e5072415c7db2eb5b9346d6bc54092bc147044e40b2156d8037dfee4a7e55e5b  cacti.php-fpm.conf"
diff --git a/community/cacti/cacti.php-fpm.conf b/community/cacti/cacti.php-fpm.conf
index ff090101f4..65e9d6e577 100644
--- a/community/cacti/cacti.php-fpm.conf
+++ b/community/cacti/cacti.php-fpm.conf
@@ -5,7 +5,7 @@ user = cacti
 group = cacti
 
 listen = /var/lib/cacti/socket
-listen.user = cacti
+listen.owner = cacti
 listen.group = www-data
 
 pm = dynamic
-- 
cgit v1.2.3