From a9a9124bf244ef11c5779d6d58f614510d808da5 Mon Sep 17 00:00:00 2001
From: Will Sinatra <wpsinatra@gmail.com>
Date: Mon, 20 Jul 2020 09:31:03 -0400
Subject: main/nagios: upgrade to 4.4.6

---
 main/nagios/APKBUILD | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index e31168dad9a..76e2a6f73e1 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -1,32 +1,34 @@
+# Contributor: Will Sinatra <wpsinatra@gmail.com>
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=nagios
-pkgver=3.5.1
-pkgrel=6
+pkgver=4.4.6
+pkgrel=0
 pkgdesc="Popular monitoring tool"
 url="https://www.nagios.org/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="perl"
 install="$pkgname.pre-install"
-makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp"
-source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+makedepends="gd-dev perl-dev libpng-dev libjpeg perl-net-snmp unzip"
+source="https://downloads.sourceforge.net/nagios/nagios-$pkgver.tar.gz
 	nagios.confd
 	nagios.initd
 	lighttpd-nagios.conf"
-subpackages="${pkgname}-web::noarch"
+subpackages="
+	$pkgname-web::noarch
+	$pkgname-openrc::noarch
+	$pkgname-apache::noarch"
 pkgusers="nagios"
 pkggroups="nagios"
-
-_builddir="$srcdir/$pkgname"
+options="!check" #no checks
 
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,20 +39,18 @@ build() {
 		--datadir=/usr/share/nagios \
 		--localstatedir=/var \
 		--bindir=/usr/sbin \
-		--sbindir=/usr/lib/nagios/cgi-bin \
+		--with-cgibindir=/usr/lib/nagios/cgi-bin \
 		--datadir=/usr/share/nagios/htdocs \
 		--libexecdir=/usr/lib/nagios/plugins \
 		--localstatedir=/var/nagios \
 		--with-nagios-user=nagios \
 		--with-nagios-group=nagios \
 		--enable-embedded-perl \
-		--with-perlcache \
-		|| return 1
-	make all || return 1
+		--with-perlcache
+	make all
 }
 
 package() {
-	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	make DESTDIR="$pkgdir" install-config
 	make DESTDIR="$pkgdir" install-commandmode
@@ -67,7 +67,12 @@ web() {
 	install -m644 -D "$srcdir"/lighttpd-nagios.conf "$subpkgdir"/etc/lighttpd/nagios.conf
 }
 
-sha512sums="48e2ecb91002b08203937b12a438c87c62cd3c5c401a0ed9e861cd6d79074c7017ed373e9379f013d87dea1fd7cb8e3d85112d55c87ac91aed96b256868c112d  nagios-3.5.1.tar.gz
+apache() {
+	depends="apache2 apache2-utils"
+	install -m644 -D "$srcdir"/nagios-$pkgver/sample-config/httpd.conf "$subpkgdir"/etc/apache2/sites-available/nagios.conf
+}
+
+sha512sums="6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550  nagios-4.4.6.tar.gz
 8575902dcb7252f195847f9997b424c1ef9bee7dfacdd124c922fc119f583923c34847ce77c505783662d91f7290b1a85dc5e382ac50d177406bfb3876d4e40a  nagios.confd
 a004ed1cf8e7d9faeb849cd714095dbe5157c707618d2cce92c98c78604b896bb806b55aa69b2db8ca3e954bd629f9e3db5d2676015f87d6be5da32fa9ec5664  nagios.initd
 6f1448db1964e378dbc7460a6d321638f4d0f7a08bc078824edca12fb6653fb0200b3be365fa519e7b2ff566802701878975bb97e65d65dc54d3da34dae21588  lighttpd-nagios.conf"
-- 
cgit v1.2.3