diff options
Diffstat (limited to 'community/cacti')
| -rw-r--r-- | community/cacti/APKBUILD | 75 | ||||
| -rw-r--r-- | community/cacti/cacti.crontab | 2 |
2 files changed, 59 insertions, 18 deletions
diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD index 1ae7705ad76..8f4b96b1edd 100644 --- a/community/cacti/APKBUILD +++ b/community/cacti/APKBUILD @@ -2,25 +2,61 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Jeff Bilyk <jbilyk@gmail.com> pkgname=cacti -pkgver=1.2.12 +pkgver=1.2.26 pkgrel=0 pkgdesc="The complete rrdtool-based graphing solution" -url="https://www.cacti.net" +url="https://www.cacti.net/" arch="noarch" license="GPL-2.0-or-later" options="!check" pkgusers=$pkgname pkggroups="www-data" -depends="bash perl coreutils net-snmp-tools rrdtool ttf-dejavu" -subpackages="$pkgname-doc $pkgname-lang $pkgname-setup $pkgname-php7:_php" +depends="bash perl coreutils net-snmp-tools rrdtool font-dejavu" +subpackages="$pkgname-doc $pkgname-lang $pkgname-setup $pkgname-php:_php" install="$pkgname.pre-install $pkgname-setup.post-install" -source="https://www.cacti.net/downloads/cacti-$pkgver.tar.gz +source="cacti-src-$pkgver.tar.gz::https://www.cacti.net/downloads/cacti-$pkgver.tar.gz $pkgname.crontab $pkgname.nginx.conf $pkgname.php-fpm.conf " # secfixes: +# 1.2.26-r0: +# - CVE-2023-46490 +# - CVE-2023-49084 +# - CVE-2023-49085 +# - CVE-2023-49086 +# - CVE-2023-50250 +# - CVE-2023-50569 +# - CVE-2023-51448 +# 1.2.25-r0: +# - CVE-2023-30534 +# - CVE-2023-39360 +# - CVE-2023-39361 +# - CVE-2023-39357 +# - CVE-2023-39362 +# - CVE-2023-39359 +# - CVE-2023-39358 +# - CVE-2023-39365 +# - CVE-2023-39364 +# - CVE-2023-39366 +# - CVE-2023-39510 +# - CVE-2023-39511 +# - CVE-2023-39512 +# - CVE-2023-39513 +# - CVE-2023-39514 +# - CVE-2023-39515 +# - CVE-2023-39516 +# - CVE-2023-49088 +# 1.2.20-r0: +# - CVE-2022-0730 +# 1.2.17-r0: +# - CVE-2020-35701 +# 1.2.13-r0: +# - CVE-2020-11022 +# - CVE-2020-11023 +# - CVE-2020-13625 +# - CVE-2020-14295 # 1.2.8-r0: # - CVE-2020-8813 # - CVE-2020-7237 @@ -32,7 +68,7 @@ package() { "$pkgdir"/etc/$pkgname \ "$pkgdir"/var/log - cp -r * "$pkgdir"/usr/share/webapps/$pkgname + cp -r ./* "$pkgdir"/usr/share/webapps/$pkgname install -Dm600 "$srcdir"/$pkgname.crontab "$pkgdir"/etc/crontabs/$pkgname # fix permissions @@ -44,7 +80,7 @@ package() { # switch to system fonts rm -fr "$pkgdir"/usr/share/webapps/$pkgname/include/fonts - ln -s /usr/share/fonts/ttf-dejavu \ + ln -s /usr/share/fonts/dejavu \ "$pkgdir"/var/lib/$pkgname/fonts ln -s /var/lib/$pkgname/fonts \ "$pkgdir"/usr/share/webapps/$pkgname/include/fonts @@ -81,10 +117,10 @@ doc() { mv docs "$subpkgdir"/usr/share/webapps/$pkgname/ local file; - for file in $(find ./ -name "LICENSE" -o -name "NEWS" \ - -o -name "README*" -o -name "VERSION" \ - -o -name "CHANGELOG" -o -name "*.rst") - do + find ./ -name "LICENSE" -o -name "NEWS" \ + -o -name "README*" -o -name "VERSION" \ + -o -name "CHANGELOG" -o -name "*.rst" \ + | while read -r file; do mkdir -p "$subpkgdir"/usr/share/webapps/$pkgname/${file%/*} mv $file "$subpkgdir"/usr/share/webapps/$pkgname/$file done @@ -125,19 +161,24 @@ setup() { } _php() { - local php=${subpkgname#$pkgname-} + local php=php82 pkgdesc="$pkgdesc ($php dependencies)" install_if="$php-config $pkgname=$pkgver-r$pkgrel" - depends="$php $php-gd $php-gmp $php-json $php-ldap $php-mbstring $php-pdo_mysql + depends="$php $php-gd $php-gmp $php-ldap $php-mbstring $php-pdo_mysql $php-opcache $php-openssl $php-posix $php-session $php-simplexml $php-snmp $php-sockets - $php-xml $php-zlib" + $php-xml $php-fpm" + provides="cacti-php81=$pkgver-r$pkgrel" # for backward compatibility + replaces="cacti-php81" # for backward compatibility # cacti's php-fpm pool config install -Dm644 "$srcdir"/$pkgname.php-fpm.conf \ "$subpkgdir"/etc/$php/php-fpm.d/$pkgname.conf + amove etc/crontabs/$pkgname } -sha512sums="df6a512a2e8faa70b8ee0b2ab72ea9e21db465f3978a3ecedf17cd34cb16793d3b0107f01f8cd8400fb15b162c27214680f22657f6f0d59853de88c49966087c cacti-1.2.12.tar.gz -70f47dbbca76489fc3a84452ee8065f9571ee627b3e346cd3c866501d723a609372c4fbd7e53c4bdcdb22439d876d78847f8902dfa43f3f66b2329639e795ab9 cacti.crontab +sha512sums=" +43bfa2fa5b87267191f845de8be38025b795509eb12817e5ff9884b20676655ec4e5230e015abe2afa9f10354317eec39081613e5c9fec4f6a6f314bedf873ab cacti-src-1.2.26.tar.gz +2ff197a75e366b4fdb2f651643a08b5b14140225edd5aea673cfbedeb92aab0b4625c789896990cc023e35fb20c2370c917253c92f51568b293f39452f1a6b74 cacti.crontab 9b3fe765c6196c0e4988efaa7236d8a8b945725548371b4a0e2a371de374c9577a908d58dcef5a4e59e089ca923cfeb7c5ddea9ee983a5115239052cf9b8ab59 cacti.nginx.conf -056358fc69752fb5129729db91a22d06c97ca452068017ccfe0ede8f2bf42f62e5072415c7db2eb5b9346d6bc54092bc147044e40b2156d8037dfee4a7e55e5b cacti.php-fpm.conf" +056358fc69752fb5129729db91a22d06c97ca452068017ccfe0ede8f2bf42f62e5072415c7db2eb5b9346d6bc54092bc147044e40b2156d8037dfee4a7e55e5b cacti.php-fpm.conf +" diff --git a/community/cacti/cacti.crontab b/community/cacti/cacti.crontab index 40e2c1ab013..3d250ffd2d7 100644 --- a/community/cacti/cacti.crontab +++ b/community/cacti/cacti.crontab @@ -1 +1 @@ -*/5 * * * * php /usr/share/webapps/cacti/poller.php >/dev/null 2>&1 +*/5 * * * * php82 /usr/share/webapps/cacti/poller.php >/dev/null 2>&1 |