From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B8D9A138ACF for ; Sat, 22 Nov 2014 21:29:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91305E0830; Sat, 22 Nov 2014 21:29:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09D70E0830 for ; Sat, 22 Nov 2014 21:29:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2C67340590 for ; Sat, 22 Nov 2014 21:29:35 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2352) id 683D7AB2A; Sat, 22 Nov 2014 21:29:34 +0000 (UTC) From: "Michael Orlitzky (mjo)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mjo@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-core/files: nagios4 lighttpd_nagios4.conf use-MAKE-instead-of-bare-make.patch 99_nagios4.conf use-INSTALL-to-install-themes.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: nagios4 lighttpd_nagios4.conf use-MAKE-instead-of-bare-make.patch 99_nagios4.conf use-INSTALL-to-install-themes.patch X-VCS-Directories: net-analyzer/nagios-core/files X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20141122212934.683D7AB2A@oystercatcher.gentoo.org> Date: Sat, 22 Nov 2014 21:29:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8e75e187-ca2c-4a9e-a7db-d6e396ae9b98 X-Archives-Hash: 7b3658dff4d1755b9e066f5165ea0255 mjo 14/11/22 21:29:34 Added: nagios4 lighttpd_nagios4.conf use-MAKE-instead-of-bare-make.patch 99_nagios4.conf use-INSTALL-to-install-themes.patch Log: Version bump with permission from creffett, bug #485756. Thanks to Tomas Mozes and others for testing. (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!) Revision Changes Path 1.1 net-analyzer/nagios-core/files/nagios4 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/nagios4?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/nagios4?rev=1.1&content-type=text/plain Index: nagios4 =================================================================== #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios4,v 1.1 2014/11/22 21:29:34 mjo Exp $ extra_commands="checkconfig" extra_started_commands="reload" nagios_config="/etc/nagios/nagios.cfg" nagios_cmdfile="/var/nagios/rw/nagios.cmd" command="/usr/sbin/nagios" command_args="-d ${nagios_config}" pidfile="/var/nagios/nagios.lock" start_stop_daemon_args="-e HOME=/var/nagios/home" depend(){ need net use dns logger firewall after mysql postgresql } reload(){ checkconfig || return 1 ebegin "Reloading configuration" start-stop-daemon --signal HUP --pidfile ${pidfile} eend $? } checkconfig(){ ebegin "Verifying config files" # Silent Check /usr/sbin/nagios -v ${nagios_config} > /dev/null 2>&1 && return 0 # Now we know there's problem - run again and display errors /usr/sbin/nagios -v ${nagios_config} eend $? "Configuration Error. Please fix your config file." } start_pre() { checkconfig || return 1 touch /var/nagios/nagios.log /var/nagios/status.sav chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav rm -f ${nagios_cmdfile} } stop_post() { rm -f /var/nagios/status.log /var/nagios/nagios.tmp ${pidfile} \ ${nagios_cmdfile} } 1.1 net-analyzer/nagios-core/files/lighttpd_nagios4.conf file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/lighttpd_nagios4.conf?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/lighttpd_nagios4.conf?rev=1.1&content-type=text/plain Index: lighttpd_nagios4.conf =================================================================== server.modules += ("mod_cgi") server.modules += ("mod_alias") $HTTP["url"] =~ "^/nagios/cgi-bin/" { dir-listing.activate = "disable" cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "" ) } alias.url += ( "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", "/nagios" => "/usr/share/nagios/htdocs" ) 1.1 net-analyzer/nagios-core/files/use-MAKE-instead-of-bare-make.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/use-MAKE-instead-of-bare-make.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/use-MAKE-instead-of-bare-make.patch?rev=1.1&content-type=text/plain Index: use-MAKE-instead-of-bare-make.patch =================================================================== >From e043015081c9dc6869b282da76ae0de5ac9840a2 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 5 Nov 2014 13:46:04 -0500 Subject: [PATCH 1/1] Use $(MAKE) instead of bare "make" in subtarget of install-html. When running make as a subprocess of itself, it's best to invoke it as $(MAKE). The rest of Makefile.in does this correctly, but there was one instance where it was forgotten. For posterity, this can lead to warnings like, make[1]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. More info is available at, https://www.gnu.org/software/make/manual/html_node/Error-Messages.html --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index f487c47..1341160 100644 --- a/Makefile.in +++ b/Makefile.in @@ -222,7 +222,7 @@ test-perl: cgis install-html: cd $(SRC_HTM) && $(MAKE) install - make install-exfoliation + $(MAKE) install-exfoliation install-base: cd $(SRC_BASE) && $(MAKE) install -- 2.0.4 1.1 net-analyzer/nagios-core/files/99_nagios4.conf file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/99_nagios4.conf?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/99_nagios4.conf?rev=1.1&content-type=text/plain Index: 99_nagios4.conf =================================================================== ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/ AllowOverride AuthConfig Options ExecCGI Require all granted Alias /nagios /usr/share/nagios/htdocs AllowOverride AuthConfig Require all granted 1.1 net-analyzer/nagios-core/files/use-INSTALL-to-install-themes.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-core/files/use-INSTALL-to-install-themes.patch?rev=1.1&content-type=text/plain Index: use-INSTALL-to-install-themes.patch =================================================================== >From 26bef86bad804836babd9d99accfc247eb744132 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 12 Nov 2014 08:35:28 -0500 Subject: [PATCH 1/1] Use $(INSTALL) to install themes. Most of the images installed under the htdocs folder are installed mode 644 with owner:group nagios:nagios. This is due to the use of $(INSTALL) in html/Makefile. However, the theme images and stylesheets are currently installed with a simple "cp -r", which leads to inconsistencies like the following: $ cd /usr/share/nagios/htdocs/images $ ls action*.gif -rw-rw-r-- 1 nagios nagios 1.3K 2014-11-12 08:22 action.gif -rw-r--r-- 1 root root 1.3K 2014-11-12 08:22 action-graph.gif -rw-r--r-- 1 root root 171 2014-11-12 08:22 action-nagios.gif -rw-r--r-- 1 root root 162 2014-11-12 08:22 action-orig.gif By using $(INSTALL) in the install-exfoliation and install-classicui targets, we enforce some consistency. --- Makefile.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1341160..67e1502 100644 --- a/Makefile.in +++ b/Makefile.in @@ -300,8 +300,11 @@ install-webconf: @echo "" install-exfoliation: - cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets - cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images + for file in contrib/exfoliation/stylesheets/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done + + for file in contrib/exfoliation/images/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done @echo "" @echo "*** Exfoliation theme installed ***" @@ -309,8 +312,11 @@ install-exfoliation: @echo "" install-classicui: - cp -rf html/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets - cp -rf html/images/* $(DESTDIR)$(HTMLDIR)/images + for file in html/stylesheets/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done + + for file in html/images/*.*; \ + do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done @echo "" @echo "*** Classic theme installed ***" -- 2.0.4