[arch-commits] Commit in cacti/repos/community-any (4 files)

[David Runge]

    Date: Saturday, January 5, 2019 @ 13:49:24
  Author: dvzrv
Revision: 420675

archrelease: copy trunk to community-any

Added:
  cacti/repos/community-any/PKGBUILD
    (from rev 420674, cacti/trunk/PKGBUILD)
  cacti/repos/community-any/tmpfiles.conf
    (from rev 420674, cacti/trunk/tmpfiles.conf)
Deleted:
  cacti/repos/community-any/PKGBUILD
  cacti/repos/community-any/tmpfiles.conf

---------------+
 PKGBUILD      |  122 ++++++++++++++++++++++++++++----------------------------
 tmpfiles.conf |    4 -
 2 files changed, 64 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-05 13:46:49 UTC (rev 420674)
+++ PKGBUILD	2019-01-05 13:49:24 UTC (rev 420675)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: tuxbubling <tuxbubling at jabber.fr>
-
-pkgname=cacti
-pkgver=1.1.38
-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=('1f91156416a9988fa149f9b8fc9fc7df904e4cf6d9a19a62d06c7de1ded99ddaec2f5b5f1a21b0effc4dee7b9c1d1911ca5aaa6113b57edc7e2f42b7969343b5'
-            '6d25f182141ca7d13388f7241eb27d783ea99b991c0b147382f8ec9eeeb521303531f8ad9dd7c968cb36b7bb657cb517b8c7f46fd1d777e1b10923d76e4efbd6')
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # remove unneeded executable bits
-  find . -executable -type f -and -not -path "*scripts*" -exec chmod -c 644 {} \;
-}
-
-package() {
-  # create directories
-  install -vdm0755 "${pkgdir}/usr/share/webapps/${pkgname}" \
-    "${pkgdir}/etc/webapps/${pkgname}" \
-    "${pkgdir}/var/log/" "${pkgdir}/var/lib/${pkgname}/"
-
-  # move sources
-  mv -v "$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 -sv "/etc/webapps/${pkgname}/.htaccess" \
-    "${pkgdir}/usr/share/webapps/${pkgname}/.htaccess"
-  ln -sv "/etc/webapps/${pkgname}/config.php" \
-    "${pkgdir}/usr/share/webapps/${pkgname}/include/config.php"
-
-  # move and symlink var directory
-  mv -v "${pkgdir}/usr/share/webapps/${pkgname}/rra" \
-    "${pkgdir}/var/lib/${pkgname}/rra"
-  ln -sv "/var/lib/${pkgname}/rra" \
-    "${pkgdir}/usr/share/webapps/${pkgname}/rra"
-
-  # move and symlink log directory
-  mv -v "${pkgdir}/usr/share/webapps/${pkgname}/log" \
-    "${pkgdir}/var/log/${pkgname}"
-  ln -sv "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/log"
-
-  # tmpfiles.d
-  install -vDm 644 "${srcdir}/tmpfiles.conf" \
-    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
-}

Copied: cacti/repos/community-any/PKGBUILD (from rev 420674, cacti/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-05 13:49:24 UTC (rev 420675)
@@ -0,0 +1,62 @@
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: tuxbubling <tuxbubling at jabber.fr>
+
+pkgname=cacti
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="Network graphing solution using RRDTool"
+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=('8010f7c486d17f49983880551fa15acbda32078f4ac1d3be032a8e5c587bef70ceae8a34bb49fd2d1db13a1ad48674695ab53fa6fe858fa7e96dd64a03a8db17'
+            '6d25f182141ca7d13388f7241eb27d783ea99b991c0b147382f8ec9eeeb521303531f8ad9dd7c968cb36b7bb657cb517b8c7f46fd1d777e1b10923d76e4efbd6')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # remove unneeded executable bits
+  find . -executable -type f -and -not -path "*scripts*" -exec chmod -c 644 {} \;
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  install -vDm 644 {CHANGELOG,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
+  rm -v {CHANGELOG,LICENSE,README.md}
+  # create directories
+  install -vdm 0755 "${pkgdir}/usr/share/webapps/${pkgname}" \
+    "${pkgdir}/etc/webapps/${pkgname}" \
+    "${pkgdir}/var/log/" "${pkgdir}/var/lib/${pkgname}/"
+
+  # move sources
+  cp -av "../${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 -sv "/etc/webapps/${pkgname}/.htaccess" \
+    "${pkgdir}/usr/share/webapps/${pkgname}/.htaccess"
+  ln -sv "/etc/webapps/${pkgname}/config.php" \
+    "${pkgdir}/usr/share/webapps/${pkgname}/include/config.php"
+
+  # move and symlink var directory
+  mv -v "${pkgdir}/usr/share/webapps/${pkgname}/rra" \
+    "${pkgdir}/var/lib/${pkgname}/rra"
+  ln -sv "/var/lib/${pkgname}/rra" \
+    "${pkgdir}/usr/share/webapps/${pkgname}/rra"
+
+  # move and symlink log directory
+  mv -v "${pkgdir}/usr/share/webapps/${pkgname}/log" \
+    "${pkgdir}/var/log/${pkgname}"
+  ln -sv "/var/log/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/log"
+
+  # tmpfiles.d
+  install -vDm 644 "${srcdir}/tmpfiles.conf" \
+    "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+}

Deleted: tmpfiles.conf
===================================================================
--- tmpfiles.conf	2019-01-05 13:46:49 UTC (rev 420674)
+++ tmpfiles.conf	2019-01-05 13:49:24 UTC (rev 420675)
@@ -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 420674, cacti/trunk/tmpfiles.conf)
===================================================================
--- tmpfiles.conf	                        (rev 0)
+++ tmpfiles.conf	2019-01-05 13:49:24 UTC (rev 420675)
@@ -0,0 +1,2 @@
+d /var/log/cacti 0755 http http
+d /var/lib/cacti/rra 0755 http http