[Nagiosplug-checkins] nagiosplug ACKNOWLEDGEMENTS,1.2,1.3 CHANGES,1.10,1.11 Makefile.am,1.28,1.29 README,1.8,1.9 configure.in,1.152,1.153

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8469

Modified Files:
	ACKNOWLEDGEMENTS CHANGES Makefile.am README configure.in 
Log Message:
Separation of root setuid plugins into plugins-root/


Index: README
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- README	4 Feb 2005 00:26:22 -0000	1.8
+++ README	21 Sep 2005 10:06:37 -0000	1.9
@@ -85,8 +85,13 @@
    'libexec/' subdirectory in the base directory you specified with
    the --prefix argument to the configure script.
 
+4) There are some plugins that require setuid. If you run make install as 
+   a non root user, they will not be installed. To install, switch to root and 
+   run:
 
-4) Verify that your host configuration file (hosts.cfg) for Nagios contains
+	make install-root
+
+5) Verify that your host configuration file (hosts.cfg) for Nagios contains
    the correct paths to the new plugins.
 
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	12 Sep 2005 10:31:29 -0000	1.28
+++ Makefile.am	21 Sep 2005 10:06:37 -0000	1.29
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl lib plugins plugins-scripts m4 po
+SUBDIRS = intl lib plugins plugins-scripts plugins-root m4 po
 
 EXTRA_DIST = config.rpath \
 	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING FAQ LEGAL \
@@ -16,6 +16,9 @@
 dist-hook:
 	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
 
+install-root:
+	cd plugins-root && $(MAKE) $@
+
 test:
 	cd plugins; $(MAKE) test
 	cd plugins-scripts; $(MAKE) test

Index: CHANGES
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/CHANGES,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CHANGES	4 Mar 2005 20:43:19 -0000	1.10
+++ CHANGES	21 Sep 2005 10:06:37 -0000	1.11
@@ -1,5 +1,11 @@
 This file documents the major additions and syntax changes between releases.
 
+1.4.3
+	Setuid plugins (check_dhcp, check_icmp) separated into plugins-root/. Run make install as root to install
+
+1.4.2
+	Fix for Redhat ES4 for check_dns and check_dig
+
 1.4
 	IPv6 support in check_ping, check_by_ssh, check_http, check_ldap, check_smtp, check_tcp
 	Internationalisation support

Index: ACKNOWLEDGEMENTS
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/ACKNOWLEDGEMENTS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ACKNOWLEDGEMENTS	23 Dec 2004 09:30:55 -0000	1.2
+++ ACKNOWLEDGEMENTS	21 Sep 2005 10:06:37 -0000	1.3
@@ -25,5 +25,5 @@
 Coreutils team
 Copyright (C) 91, 1995-2004 Free Software Foundation, Inc.
 http://www.gnu.org/software/coreutils/
-Use of macros and lib files in m4/np_coreutils.m4 and lib/
+Use of macros and lib files in m4/np_coreutils.m4 and lib/. Setuid installs in plugins-root
 

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- configure.in	20 Sep 2005 16:11:24 -0000	1.152
+++ configure.in	21 Sep 2005 10:06:37 -0000	1.153
@@ -1546,6 +1546,7 @@
   lib/Makefile 
   m4/Makefile 
   plugins/Makefile 
+  plugins-root/Makefile
   plugins-scripts/Makefile 
   plugins-scripts/subst 
   plugins-scripts/utils.pm