From owner-svn-ports-all@freebsd.org Mon Jan 21 15:44:22 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F96814AD1E4; Mon, 21 Jan 2019 15:44:22 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 277EE8EC08; Mon, 21 Jan 2019 15:44:22 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4A80F1BB53; Mon, 21 Jan 2019 15:44:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0LFiL3T026162; Mon, 21 Jan 2019 15:44:21 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0LFiKW8026158; Mon, 21 Jan 2019 15:44:20 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201901211544.x0LFiKW8026158@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 21 Jan 2019 15:44:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490868 - in head/net-mgmt/nagios4: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/net-mgmt/nagios4: . files X-SVN-Commit-Revision: 490868 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 277EE8EC08 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2019 15:44:22 -0000 Author: mat Date: Mon Jan 21 15:44:20 2019 New Revision: 490868 URL: https://svnweb.freebsd.org/changeset/ports/490868 Log: Update to 4.4.3. While there, stop using the deprecated @unexec. Add missing php module dependency. [1] PR: 233530 [1] Submitted by: dinoex [1] Modified: head/net-mgmt/nagios4/Makefile (contents, props changed) head/net-mgmt/nagios4/distinfo (contents, props changed) head/net-mgmt/nagios4/files/patch-html_main.php (contents, props changed) head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (contents, props changed) head/net-mgmt/nagios4/pkg-plist (contents, props changed) Modified: head/net-mgmt/nagios4/Makefile ============================================================================== --- head/net-mgmt/nagios4/Makefile Mon Jan 21 15:44:16 2019 (r490867) +++ head/net-mgmt/nagios4/Makefile Mon Jan 21 15:44:20 2019 (r490868) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.4.2 +PORTVERSION= 4.4.3 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/ \ @@ -18,9 +18,9 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libpng.so:graphics/png \ libgd.so:graphics/gd -USES= cpe gmake jpeg perl5 +USES= cpe gmake jpeg perl5 php USE_PERL5= build -USE_PHP= xml +USE_PHP= xml filter USE_RC_SUBR= nagios CONFLICTS= nagios-[123].* nagios-devel-* @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-htmurl=${NAGIOSHTMURL} \ --with-cgiurl=${NAGIOSCGIURL} \ --with-lockfile=${NAGIOSDIR}/nagios.lock \ - --sbindir=${WWWDIR}/cgi-bin \ + --with-cgibindir=${WWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${WWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ Modified: head/net-mgmt/nagios4/distinfo ============================================================================== --- head/net-mgmt/nagios4/distinfo Mon Jan 21 15:44:16 2019 (r490867) +++ head/net-mgmt/nagios4/distinfo Mon Jan 21 15:44:20 2019 (r490868) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535968827 -SHA256 (nagios-4.4.2.tar.gz) = 3418923f326aa86dc8c84cfd0df788fa495a90d772f8071acf40fdbef0736853 -SIZE (nagios-4.4.2.tar.gz) = 11301454 +TIMESTAMP = 1548080769 +SHA256 (nagios-4.4.3.tar.gz) = bba8f0e8dc8cf72f7a7ae4e8ce9c60f5bd315629421b9ec34818a28b8da49f67 +SIZE (nagios-4.4.3.tar.gz) = 11302228 Modified: head/net-mgmt/nagios4/files/patch-html_main.php ============================================================================== --- head/net-mgmt/nagios4/files/patch-html_main.php Mon Jan 21 15:44:16 2019 (r490867) +++ head/net-mgmt/nagios4/files/patch-html_main.php Mon Jan 21 15:44:20 2019 (r490868) @@ -1,9 +1,9 @@ ---- html/main.php.orig 2018-06-25 21:25:22 UTC +--- html/main.php.orig 2019-01-15 14:58:00 UTC +++ html/main.php -@@ -146,31 +146,6 @@ $this_year = '2018'; +@@ -146,31 +146,6 @@ $this_year = '2019';
Nagios® Core™
Version
-
August 16, 2018
+
January 15, 2019
-
Check for updates
- - Modified: head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in Mon Jan 21 15:44:16 2019 (r490867) +++ head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in Mon Jan 21 15:44:20 2019 (r490868) @@ -1,6 +1,6 @@ ---- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01 UTC +--- sample-config/nagios.cfg.in.orig 2019-01-15 14:58:00 UTC +++ sample-config/nagios.cfg.in -@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c +@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.cfg cfg_file=@sysconfdir@/objects/timeperiods.cfg cfg_file=@sysconfdir@/objects/templates.cfg Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Mon Jan 21 15:44:16 2019 (r490867) +++ head/net-mgmt/nagios4/pkg-plist Mon Jan 21 15:44:20 2019 (r490868) @@ -426,5 +426,5 @@ @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%% -@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi -@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi +@preunexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi +@preunexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi