Use php-net-ipv4/6 and refactoring

Correct license
Fix mixed tab indent
Use install as much as possible

4 files changed, 31 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9af90bc6f2a..3d017024efeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = librenms
 	pkgdesc = Autodiscovering PHP/MySQL-based network monitoring system.
 	pkgver = 1.37
-	pkgrel = 2
-	url = http://www.librenms.org/
-	install = librenms.install
+	pkgrel = 3
+	url = https://www.librenms.org/
 	arch = any
-	license = GPLv3
+	license = GPL3
 	depends = php
 	depends = php-intl
 	depends = php-gd
-	depends = php-pear
+	depends = php-net-ipv4
+	depends = php-net-ipv6
 	depends = net-snmp
 	depends = graphviz
 	depends = php-snmp
@@ -22,7 +22,7 @@ pkgbase = librenms
 	depends = git
 	depends = mysql-python
 	backup = etc/webapps/librenms/config.php
-	source = https://github.com/librenms/librenms/archive/1.37.tar.gz
+	source = librenms-1.37.tar.gz::https://github.com/librenms/librenms/archive/1.37.tar.gz
 	source = librenms.logrotate
 	source = librenms.sysusers
 	source = librenms.tmpfile
@@ -30,7 +30,7 @@ pkgbase = librenms
 	source = nginx.example.conf
 	sha256sums = 86dbcb2875c7bb4df8e042d9fc08e771cb60f6db55ba59259a14c6a8b6eaa281
 	sha256sums = 4189c171e4edb55ff11c80b313fed6ff4226ddb38f1e7c97e741e59e1c83afb8
-	sha256sums = b70ec2b7950719d6b502da52d983e1661c81da1494d423598f9043ce600f0399
+	sha256sums = ee2a2d465e01b65863a603406d2bee8858ec488546cb84d5c4fdb3166cc062a3
 	sha256sums = ad83d03b8459e87ecd77f9ffebe56ccb9cc2dff1d52ce1151ef79a1e26653361
 	sha256sums = aed1a35b2d84f3b40e0d519ccdb56a5929896ae7cfedd3766f5df4b51fac3319
 	sha256sums = e1722c586e61e320c2382b2322150e176c61523dccb81eeec6c3d4618819110c
diff --git a/PKGBUILD b/PKGBUILD
index cb4a9fb72e96..2fead40630ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,28 @@
 # Maintainer: Nils Czernia <nils[at]czserver[dot]de>
 pkgname=librenms
 pkgver=1.37
-pkgrel=2
+pkgrel=3
 pkgdesc='Autodiscovering PHP/MySQL-based network monitoring system.'
 arch=('any')
-url='http://www.librenms.org/'
-license=('GPLv3')
-depends=('php' 'php-intl' 'php-gd' 'php-pear' 'net-snmp' 'graphviz' 'php-snmp' 'php-mcrypt' 'fping' 'imagemagick' 'whois' 'nmap' 'rrdtool' 'git' 'mysql-python')
+url='https://www.librenms.org/'
+license=('GPL3')
+depends=(
+    'php' 'php-intl' 'php-gd' 'php-net-ipv4' 'php-net-ipv6' 'net-snmp'
+    'graphviz' 'php-snmp' 'php-mcrypt' 'fping' 'imagemagick' 'whois' 'nmap'
+    'rrdtool' 'git' 'mysql-python'
+)
 backup=("etc/webapps/${pkgname}/config.php")
-source=("https://github.com/librenms/${pkgname}/archive/${pkgver}.tar.gz"
-        "librenms.logrotate"
-		"librenms.sysusers"
-		"librenms.tmpfile"
-        "apache.example.conf"
-        "nginx.example.conf")
-install="librenms.install"
+source=(
+    "${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"
+    "librenms.logrotate"
+    "librenms.sysusers"
+    "librenms.tmpfile"
+    "apache.example.conf"
+    "nginx.example.conf"
+)
 sha256sums=('86dbcb2875c7bb4df8e042d9fc08e771cb60f6db55ba59259a14c6a8b6eaa281'
             '4189c171e4edb55ff11c80b313fed6ff4226ddb38f1e7c97e741e59e1c83afb8'
-            'b70ec2b7950719d6b502da52d983e1661c81da1494d423598f9043ce600f0399'
+            'ee2a2d465e01b65863a603406d2bee8858ec488546cb84d5c4fdb3166cc062a3'
             'ad83d03b8459e87ecd77f9ffebe56ccb9cc2dff1d52ce1151ef79a1e26653361'
             'aed1a35b2d84f3b40e0d519ccdb56a5929896ae7cfedd3766f5df4b51fac3319'
             'e1722c586e61e320c2382b2322150e176c61523dccb81eeec6c3d4618819110c')
@@ -34,19 +39,13 @@ prepare() {
 }
 
 package() {
-    install -dm0755 "$pkgdir"/usr/share/webapps
-    install -dm0750 "$pkgdir"/etc/webapps/${pkgname}
+    install -d "$pkgdir"/{{etc,usr/share}/webapps/$pkgname,var/log/$pkgname}
     install -dm0755 "$pkgdir"/etc/logrotate.d
-    install -dm0775 "$pkgdir"/var/log/${pkgname}
 
-    cd "$srcdir"/${pkgname}-${pkgver}
-    cp config.php.default "$pkgdir"/etc/webapps/${pkgname}/config.php
-    cp config.php.default "$pkgdir"/etc/webapps/${pkgname}/config.php.default
-    rm config.php.default
-    ln -s /etc/webapps/${pkgname}/config.php "$pkgdir"/usr/share/webapps/${pkgname}/config.php
-    ln -s /etc/webapps/${pkgname}/config.php.default "$pkgdir"/usr/share/webapps/${pkgname}/config.php.default
+    cp -R ${pkgname}-${pkgver}/. "$pkgdir"/usr/share/webapps/${pkgname}/
 
-    cp -a "$srcdir"/${pkgname}-${pkgver} "$pkgdir"/usr/share/webapps/${pkgname}
+    install -Dm644 ${pkgname}-${pkgver}/config.php.default "$pkgdir"/etc/webapps/${pkgname}/config.php
+    ln -s /etc/webapps/${pkgname}/config.php "$pkgdir"/usr/share/webapps/${pkgname}/config.php
 
     install -D -m644 "${srcdir}"/${pkgname}.logrotate "$pkgdir"/etc/logrotate.d/${pkgname}
     install -dm0775 "$pkgdir"/usr/share/webapps/${pkgname}/rrd
@@ -55,6 +54,6 @@ package() {
     install -dm0755 "$pkgdir"/etc/php/conf.d/
     echo 'open_basedir = ${open_basedir}:/usr/share/webapps/librenms:/etc/webapps/librenms:/proc' > "$pkgdir"/etc/php/conf.d/${pkgname}.ini
 
-	install -D -m644 "$srcdir"/${pkgname}.sysusers "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
-	install -D -m644 "$srcdir"/${pkgname}.tmpfile "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
+    install -D -m644 "$srcdir"/${pkgname}.sysusers "$pkgdir/usr/lib/sysusers.d/${pkgname}.conf"
+    install -D -m644 "$srcdir"/${pkgname}.tmpfile "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/librenms.install b/librenms.install
deleted file mode 100644
index 3cab675c43ff..000000000000
--- a/librenms.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# Maintainer: Nils Czernia <nils[at]czserver[dot]de>
-
-post_install() {
-    echo "Install new pear modules"
-    pear install Net_IPv4
-    pear install Net_IPv6
-    echo "You have to configure the database configuration"
-    echo "in ${_etcdir}/config.php"
-}
diff --git a/librenms.sysusers b/librenms.sysusers
index 9bb19dd98b39..870b03159071 100644
--- a/librenms.sysusers
+++ b/librenms.sysusers
@@ -1,4 +1,4 @@
 # Type  Name      ID        GECOS                   Home directory
 ######################################################################
-u       librenms  -         "LibreNMS user"         /usr/share/webapps/librenms
+u       librenms  -         "LibreNMS user"         -
 m       http      librenms