Date: Wednesday, January 10, 2018 @ 09:30:33
Author: dvzrv
Revision: 280961
upgpkg: cacti 1.1.30-1
Updating maintainer. Upgrading to 1.1.30. Switching to correct license (GPL2).
Removing install file and replacing it with tmpfiles.d integration. Switching
to sha512sums.
Adding prepare() to remove unneeded executable bits from source files. Minor
fixes.
Added:
cacti/trunk/tmpfiles.conf
Modified:
cacti/trunk/PKGBUILD
Deleted:
cacti/trunk/cacti.install
---------------+
PKGBUILD | 68 ++++++++++++++++++++++++++++++++++++++------------------
cacti.install | 7 -----
tmpfiles.conf | 2 +
3 files changed, 49 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-10 09:27:28 UTC (rev 280960)
+++ PKGBUILD 2018-01-10 09:30:33 UTC (rev 280961)
@@ -1,34 +1,60 @@
# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: David Runge <d...@sleepmap.de>
+# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com>
# Contributor: tuxbubling <tuxbubl...@jabber.fr>
pkgname=cacti
-pkgver=1.1.29
+pkgver=1.1.30
pkgrel=1
-pkgdesc="complete network graphing solution designed to harness the power of
RRDTool's data storage and graphing functionality"
-arch=(any)
+pkgdesc="Complete network graphing solution designed to harness the power of
RRDTool's data storage and graphing functionality."
+arch=('any')
url="https://www.cacti.net";
-license=('GPL')
-depends=('rrdtool' 'mariadb' 'php' 'php-gd' 'net-snmp' 'xorg-fonts-100dpi')
+license=('GPL2')
+depends=('rrdtool' 'mariadb' 'php-gd' 'net-snmp' 'xorg-fonts-100dpi')
backup=('etc/webapps/cacti/.htaccess'
- 'etc/webapps/cacti/config.php')
-install=cacti.install
-source=("https://www.cacti.net/downloads/$pkgname-${pkgver/_/}.tar.gz";)
-sha256sums=('16f19adc5d9a398336cb05a15af43cb073e268c94a9c29cae06622a95527c1e3')
+ 'etc/webapps/cacti/config.php')
+source=("https://www.${pkgname}.net/downloads/${pkgname}-${pkgver}.tar.gz";
+ 'tmpfiles.conf')
+sha512sums=('2516deffcbd5a2394b2fdde0359f9a52eeabe019d340ebd7c9f26de454984243760b54733fd4d0e63e3d04fc2b511d3e0066bfc8ed9aaa6374c809705d06e828'
+
'272a5e666e5f1c61b3165dcf1b229a88e8c1bb9c75e857721f65961795abf9cecf691d6291cba9401ce70733183191dfdfb8e4e941426cfdb06f2c9e0b129b0a')
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ # remove unneeded executable bits
+ find . -executable -type f -and -not -path "*scripts*" -exec chmod 644 {} \;
+}
+
package() {
- mkdir -p "$pkgdir"/usr/share/webapps/cacti "$pkgdir"/etc/webapps/cacti
- mv "$srcdir"/$pkgname-${pkgver/_/}/* "$pkgdir"/usr/share/webapps/cacti
- echo "Require all denied" >> "$pkgdir"/etc/webapps/cacti/.htaccess
- mv "$pkgdir"/usr/share/webapps/cacti/include/config.php
"$pkgdir"/etc/webapps/cacti
- ln -s /etc/webapps/cacti/.htaccess
"$pkgdir"/usr/share/webapps/cacti/.htaccess
- ln -s /etc/webapps/cacti/config.php
"$pkgdir"/usr/share/webapps/cacti/include/config.php
+ # create directories
+ install -dm0755 "${pkgdir}/usr/share/webapps/${pkgname}" \
+ "${pkgdir}/etc/webapps/${pkgname}" \
+ "${pkgdir}/var/log/" "${pkgdir}/var/lib/${pkgname}/"
- install -dm0755 "$pkgdir"/var/log/ "$pkgdir"/var/lib/cacti/
+ # move sources
+ mv "$srcdir/${pkgname}-${pkgver}"/* \
+ "${pkgdir}/usr/share/webapps/${pkgname}"
- mv "$pkgdir"/usr/share/webapps/cacti/rra "$pkgdir"/var/lib/cacti/rra
- ln -s /var/lib/cacti/rra "$pkgdir"/usr/share/webapps/cacti/rra
+ # move and symlink configuration
+ echo "Require all denied" >> "${pkgdir}/etc/webapps/${pkgname}/.htaccess"
+ mv "${pkgdir}/usr/share/webapps/${pkgname}/include/config.php" \
+ "${pkgdir}/etc/webapps/${pkgname}"
+ ln -s "/etc/webapps/${pkgname}/.htaccess" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/.htaccess"
+ ln -s "/etc/webapps/${pkgname}/config.php" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/include/config.php"
- mv "$pkgdir"/usr/share/webapps/cacti/log "$pkgdir"/var/log/cacti
- ln -s /var/log/cacti "$pkgdir"/usr/share/webapps/cacti/log
+ # move and symlink var directory
+ mv "${pkgdir}/usr/share/webapps/${pkgname}/rra" \
+ "${pkgdir}/var/lib/${pkgname}/rra"
+ ln -s "/var/lib/${pkgname}/rra" \
+ "${pkgdir}/usr/share/webapps/${pkgname}/rra"
+
+ # move and symlink log directory
+ mv "${pkgdir}/usr/share/webapps/${pkgname}/log" \
+ "${pkgdir}/var/log/${pkgname}"
+ ln -s "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/log"
+
+ # tmpfiles.d
+ install -Dm644 "${srcdir}/tmpfiles.conf" \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
}
Deleted: cacti.install
===================================================================
--- cacti.install 2018-01-10 09:27:28 UTC (rev 280960)
+++ cacti.install 2018-01-10 09:30:33 UTC (rev 280961)
@@ -1,7 +0,0 @@
-post_upgrade() {
- post_install
-}
-
-post_install() {
- chown -R http:http var/log/cacti var/lib/cacti/rra
-}
Added: tmpfiles.conf
===================================================================
--- tmpfiles.conf (rev 0)
+++ tmpfiles.conf 2018-01-10 09:30:33 UTC (rev 280961)
@@ -0,0 +1,2 @@
+d /var/log/cacti 0755 http:http -
+d /var/lib/cacti/rra 0755 http:http -
