diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-10 07:06:19 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-03-10 07:08:54 +0000 |
commit | a1ec71eb2fda83d721e61ee87651c4f6a9f8eff7 (patch) | |
tree | 25936670797002dd0aacb6bb8c4c3230c06d2359 /community/cacti | |
parent | 1b80c14e734bb2de206aa19ba8a9fb34e96cfcb4 (diff) | |
download | aports-a1ec71eb2fda83d721e61ee87651c4f6a9f8eff7.tar.bz2 aports-a1ec71eb2fda83d721e61ee87651c4f6a9f8eff7.tar.xz |
community/cacti: backport fix in installer
ref https://github.com/Cacti/cacti/issues/3330
fixes #11287
Diffstat (limited to 'community/cacti')
-rw-r--r-- | community/cacti/APKBUILD | 4 | ||||
-rw-r--r-- | community/cacti/Fix-one-minor-error-on-upgrade.patch | 22 |
2 files changed, 25 insertions, 1 deletions
diff --git a/community/cacti/APKBUILD b/community/cacti/APKBUILD index 3a6c177167..5d3b168d19 100644 --- a/community/cacti/APKBUILD +++ b/community/cacti/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Jeff Bilyk <jbilyk@gmail.com> pkgname=cacti pkgver=1.2.10 -pkgrel=0 +pkgrel=1 pkgdesc="The complete rrdtool-based graphing solution" url="https://www.cacti.net" arch="noarch" @@ -15,6 +15,7 @@ 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 @@ -132,6 +133,7 @@ _php() { } sha512sums="8ed9bd895dc5763fabc20e4fb3c78eb2f520b05fca03b6aac843860402cf15e754af1eb9d65412ed10db6e93531806d1ef48957a08f56f2f8b40f235b4413cf3 cacti-1.2.10.tar.gz +da462f69e0c8a9790858803ec834b302eeb1df54a2f769135589f59df885c117ef2737a1a11b257a854179b9ea81d512e5f1202c9a688bfff9eb960ea079d431 Fix-one-minor-error-on-upgrade.patch 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 new file mode 100644 index 0000000000..34437fa08a --- /dev/null +++ b/community/cacti/Fix-one-minor-error-on-upgrade.patch @@ -0,0 +1,22 @@ +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() { |