diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2020-04-19 03:43:10 +0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2020-04-19 04:34:41 +0300 |
| commit | 1bdd7c95090e362c85cbe28692f29fbe7f7ec15b (patch) | |
| tree | 0a4fb2291e58806e1f82e870040eaef977632da1 /community/cacti | |
| parent | 2f98e45f3759aafabb4bc65522726ae7c0d24d14 (diff) | |
community/cacti: upgrade to 1.2.11
Diffstat (limited to 'community/cacti')
| -rw-r--r-- | community/cacti/APKBUILD | 8 | ||||
| -rw-r--r-- | community/cacti/Fix-one-minor-error-on-upgrade.patch | 22 |
2 files changed, 3 insertions, 27 deletions
diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD index 3f1e8b05479..01bd3e3d7ec 100644 --- a/community/cacti/APKBUILD +++ b/community/cacti/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: Jeff Bilyk <jbilyk@gmail.com> pkgname=cacti -pkgver=1.2.10 -pkgrel=1 +pkgver=1.2.11 +pkgrel=0 pkgdesc="The complete rrdtool-based graphing solution" url="https://www.cacti.net" arch="noarch" @@ -15,7 +15,6 @@ depends="bash perl coreutils net-snmp-tools rrdtool ttf-dejavu" subpackages="$pkgname-doc $pkgname-lang $pkgname-setup $pkgname-php7:_php" install="$pkgname.pre-install $pkgname-setup.post-install" source="https://www.cacti.net/downloads/cacti-$pkgver.tar.gz - Fix-one-minor-error-on-upgrade.patch $pkgname.crontab $pkgname.nginx.conf $pkgname.php-fpm.conf @@ -138,8 +137,7 @@ _php() { "$subpkgdir"/etc/$php/php-fpm.d/$pkgname.conf } -sha512sums="8ed9bd895dc5763fabc20e4fb3c78eb2f520b05fca03b6aac843860402cf15e754af1eb9d65412ed10db6e93531806d1ef48957a08f56f2f8b40f235b4413cf3 cacti-1.2.10.tar.gz -da462f69e0c8a9790858803ec834b302eeb1df54a2f769135589f59df885c117ef2737a1a11b257a854179b9ea81d512e5f1202c9a688bfff9eb960ea079d431 Fix-one-minor-error-on-upgrade.patch +sha512sums="ab8a856fde55f405314fe0ec1eccccfb78105181fc081dcc04091963b08777550182867b45daea4f630f19dbb538ad7ca5c62f2dac9cd867524dfef113e2a220 cacti-1.2.11.tar.gz 70f47dbbca76489fc3a84452ee8065f9571ee627b3e346cd3c866501d723a609372c4fbd7e53c4bdcdb22439d876d78847f8902dfa43f3f66b2329639e795ab9 cacti.crontab 9b3fe765c6196c0e4988efaa7236d8a8b945725548371b4a0e2a371de374c9577a908d58dcef5a4e59e089ca923cfeb7c5ddea9ee983a5115239052cf9b8ab59 cacti.nginx.conf 056358fc69752fb5129729db91a22d06c97ca452068017ccfe0ede8f2bf42f62e5072415c7db2eb5b9346d6bc54092bc147044e40b2156d8037dfee4a7e55e5b cacti.php-fpm.conf" diff --git a/community/cacti/Fix-one-minor-error-on-upgrade.patch b/community/cacti/Fix-one-minor-error-on-upgrade.patch deleted file mode 100644 index 34437fa08aa..00000000000 --- a/community/cacti/Fix-one-minor-error-on-upgrade.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8e687065b7f456f969cccad97e2c55e5609638cd Mon Sep 17 00:00:00 2001 -From: TheWitness <thewitness@cacti.net> -Date: Sat, 7 Mar 2020 15:39:15 -0500 -Subject: [PATCH] Fix one minor error on upgrade - ---- - lib/installer.php | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/installer.php b/lib/installer.php -index 1deaee79f..5df797b77 100644 ---- a/lib/installer.php -+++ b/lib/installer.php -@@ -2957,6 +2957,8 @@ private function installTemplate() { - } else { - log_install_always('', __('No templates were selected for import')); - } -+ -+ return ''; - } - - private function installPoller() { |