Date: Saturday, January 27, 2018 @ 17:29:48 Author: dvzrv Revision: 287507
archrelease: copy trunk to community-any Added: cacti/repos/community-any/PKGBUILD (from rev 287506, cacti/trunk/PKGBUILD) cacti/repos/community-any/tmpfiles.conf (from rev 287506, cacti/trunk/tmpfiles.conf) Deleted: cacti/repos/community-any/PKGBUILD cacti/repos/community-any/tmpfiles.conf ---------------+ PKGBUILD | 120 ++++++++++++++++++++++++++++---------------------------- tmpfiles.conf | 4 - 2 files changed, 62 insertions(+), 62 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-27 17:29:36 UTC (rev 287506) +++ PKGBUILD 2018-01-27 17:29:48 UTC (rev 287507) @@ -1,60 +0,0 @@ -# $Id$ -# Maintainer: David Runge <d...@sleepmap.de> -# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: tuxbubling <tuxbubl...@jabber.fr> - -pkgname=cacti -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') -url="https://www.cacti.net" -license=('GPL2') -depends=('rrdtool' 'mariadb' 'php-gd' 'net-snmp' 'xorg-fonts-100dpi') -backup=('etc/webapps/cacti/.htaccess' - '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() { - # create directories - install -dm0755 "${pkgdir}/usr/share/webapps/${pkgname}" \ - "${pkgdir}/etc/webapps/${pkgname}" \ - "${pkgdir}/var/log/" "${pkgdir}/var/lib/${pkgname}/" - - # move sources - mv "$srcdir/${pkgname}-${pkgver}"/* \ - "${pkgdir}/usr/share/webapps/${pkgname}" - - # 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" - - # 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" -} Copied: cacti/repos/community-any/PKGBUILD (from rev 287506, cacti/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-27 17:29:48 UTC (rev 287507) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: David Runge <d...@sleepmap.de> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: tuxbubling <tuxbubl...@jabber.fr> + +pkgname=cacti +pkgver=1.1.30 +pkgrel=2 +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=('GPL2') +depends=('rrdtool' 'mariadb' 'php-gd' 'net-snmp' 'xorg-fonts-100dpi') +backup=('etc/webapps/cacti/.htaccess' + 'etc/webapps/cacti/config.php') +source=("https://www.${pkgname}.net/downloads/${pkgname}-${pkgver}.tar.gz" + 'tmpfiles.conf') +sha512sums=('2516deffcbd5a2394b2fdde0359f9a52eeabe019d340ebd7c9f26de454984243760b54733fd4d0e63e3d04fc2b511d3e0066bfc8ed9aaa6374c809705d06e828' + '6d25f182141ca7d13388f7241eb27d783ea99b991c0b147382f8ec9eeeb521303531f8ad9dd7c968cb36b7bb657cb517b8c7f46fd1d777e1b10923d76e4efbd6') + +prepare() { + cd "${pkgname}-${pkgver}" + # remove unneeded executable bits + find . -executable -type f -and -not -path "*scripts*" -exec chmod 644 {} \; +} + +package() { + # create directories + install -dm0755 "${pkgdir}/usr/share/webapps/${pkgname}" \ + "${pkgdir}/etc/webapps/${pkgname}" \ + "${pkgdir}/var/log/" "${pkgdir}/var/lib/${pkgname}/" + + # move sources + mv "$srcdir/${pkgname}-${pkgver}"/* \ + "${pkgdir}/usr/share/webapps/${pkgname}" + + # 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" + + # 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: tmpfiles.conf =================================================================== --- tmpfiles.conf 2018-01-27 17:29:36 UTC (rev 287506) +++ tmpfiles.conf 2018-01-27 17:29:48 UTC (rev 287507) @@ -1,2 +0,0 @@ -d /var/log/cacti 0755 http:http - -d /var/lib/cacti/rra 0755 http:http - Copied: cacti/repos/community-any/tmpfiles.conf (from rev 287506, cacti/trunk/tmpfiles.conf) =================================================================== --- tmpfiles.conf (rev 0) +++ tmpfiles.conf 2018-01-27 17:29:48 UTC (rev 287507) @@ -0,0 +1,2 @@ +d /var/log/cacti 0755 http http +d /var/lib/cacti/rra 0755 http http