Update to 4.4.1-1.

3 files changed, 19 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5855c138b625..7340e124d730 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Aug 31 05:18:22 UTC 2017
+# Tue Jun 26 08:30:38 UTC 2018
 pkgbase = nagios
 	pkgdesc = Nagios is an open source host, service and network monitoring program.
-	pkgver = 4.3.4
+	pkgver = 4.4.1
 	pkgrel = 1
 	url = http://www.nagios.org
 	install = nagios.install
@@ -21,15 +21,12 @@ pkgbase = nagios
 	optdepends = php
 	optdepends = php-fpm
 	optdepends = fcgiwrap
-	source = http://downloads.sourceforge.net/nagios/nagios-4.3.4.tar.gz
+	source = http://downloads.sourceforge.net/nagios/nagios-4.4.1.tar.gz
 	source = nagios.install
-	source = nagios.service
-	md5sums = e2229f9a98c2577d51576daf19713e4d
+	md5sums = c133c31316322e481289b642e2974be7
 	md5sums = e11fa7de430ed858269f82e179fc87ca
-	md5sums = 49e077f2d61ede589f55bfd03b597ab0
-	sha1sums = 15e38467fecf8c42200d1f253e5b7d4d124abec1
+	sha1sums = 1cd1e0251a552f49f4ca7fbd6147cf5dd2dabd84
 	sha1sums = 04008cee208226e60b099550bd9ec7dc78cb1457
-	sha1sums = 0df0b4c6976c1562b03e261926b7c2cae6061595
 
 pkgname = nagios
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ab570a25820..d8d164dafabb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Idares <idares at seznam dot cz>
 
 pkgname=nagios
-pkgver=4.3.4
+pkgver=4.4.1
 pkgrel=1
 pkgdesc="Nagios is an open source host, service and network monitoring program."
 license=('GPL')
@@ -12,8 +12,7 @@ makedepends=('unzip')
 optdepends=('monitoring-plugins: a bundle of standard plugins'
             'apache' 'php-apache' 'nginx' 'php' 'php-fpm' 'fcgiwrap')
 source=("http://downloads.sourceforge.net/nagios/$pkgname-$pkgver.tar.gz"
-        "nagios.install"
-        "nagios.service")
+        "nagios.install")
 install='nagios.install'
 
 _nagios_user="nagios"
@@ -49,19 +48,17 @@ build() {
 package() {
 	cd $srcdir/$pkgname-$pkgver
 
-	make \
-		prefix=$pkgdir/$_instdir \
-		BINDIR=$pkgdir/$_bindir \
-		LOGDIR=$pkgdir/$_vardir \
-		CFGDIR=$pkgdir/$_confdir \
-		HTTPD_CONF=$pkgdir/$_httpdconfdir \
-		CHECKRESULTDIR=$pkgdir/$_checkresultdir \
+	DESTDIR="$pkgdir/" make \
+		prefix=$_instdir \
+		BINDIR=$_bindir \
+		LOGDIR=$_vardir \
+		CFGDIR=$_confdir \
+		HTTPD_CONF=$_httpdconfdir \
+		CHECKRESULTDIR=$_checkresultdir \
 		install install-config
 
-	install -D -m 755 daemon-init $pkgdir/etc/nagios/
-#	install -D -m 644 sample-config/httpd.conf $pkgdir/$_httpdconfdir/nagios.conf
 	install -D -m 644 sample-config/httpd.conf $pkgdir/$_httpdconfdir/apache.example.conf
-	install -D -m 644 $srcdir/nagios.service $pkgdir/usr/lib/systemd/system/nagios.service
+	install -D -m 644 startup/default-service $pkgdir/usr/lib/systemd/system/nagios.service
 
 	mkdir $pkgdir/var/nagios/rw
 	chown $_nagios_user.$_nagios_group $pkgdir/var/nagios/rw
@@ -74,10 +71,8 @@ package() {
 
 }
 
-md5sums=('e2229f9a98c2577d51576daf19713e4d'
-         'e11fa7de430ed858269f82e179fc87ca'
-         '49e077f2d61ede589f55bfd03b597ab0')
-sha1sums=('15e38467fecf8c42200d1f253e5b7d4d124abec1'
-          '04008cee208226e60b099550bd9ec7dc78cb1457'
-          '0df0b4c6976c1562b03e261926b7c2cae6061595')
+md5sums=('c133c31316322e481289b642e2974be7'
+         'e11fa7de430ed858269f82e179fc87ca')
+sha1sums=('1cd1e0251a552f49f4ca7fbd6147cf5dd2dabd84'
+          '04008cee208226e60b099550bd9ec7dc78cb1457')
 
diff --git a/nagios.service b/nagios.service
deleted file mode 100644
index 69d6564019c9..000000000000
--- a/nagios.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Nagios Monitoring System
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/nagios /etc/nagios/nagios.cfg
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target