[csw-devel] SF.net SVN: gar:[3847] csw/mgar/pkg/nagiosp/trunk

j_arndt at users.sourceforge.net j_arndt at users.sourceforge.net
Fri Mar 20 20:39:48 CET 2009


Revision: 3847
          http://gar.svn.sourceforge.net/gar/?rev=3847&view=rev
Author:   j_arndt
Date:     2009-03-20 19:39:47 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
nagios_plugins: software name renamed, deleted not needed files

Modified Paths:
--------------
    csw/mgar/pkg/nagiosp/trunk/Makefile
    csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec

Removed Paths:
-------------
    csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend
    csw/mgar/pkg/nagiosp/trunk/files/legal.diff
    csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff

Modified: csw/mgar/pkg/nagiosp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/Makefile	2009-03-20 17:57:29 UTC (rev 3846)
+++ csw/mgar/pkg/nagiosp/trunk/Makefile	2009-03-20 19:39:47 UTC (rev 3847)
@@ -2,7 +2,7 @@
 GARVERSION = 1.4.13
 CATEGORIES = apps
 
-DESCRIPTION = Plugins for Nagios
+DESCRIPTION = plugins for nagios
 define BLURB
   Long description
 endef

Deleted: csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend	2009-03-20 17:57:29 UTC (rev 3846)
+++ csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.depend	2009-03-20 19:39:47 UTC (rev 3847)
@@ -1,10 +0,0 @@
-P	CSWggettext    ggettext - GNU gettext
-P	CSWiconv       libiconv - GNU iconv library
-P	CSWjre6        jre6 - Java Development Kit 6
-P	CSWlibnet      libnet - the libnet packet construction library
-P	CSWlibpq       libpq - libraries needed by postgresql server and clients
-P	CSWmysql5rt    mysql5rt - run-time libraries for mysql5
-P	CSWoldaprt     openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P	CSWosslrt      openssl_rt - Openssl runtime libraries
-P	CSWsasl        sasl - Simple Authentication and Security Layer
-P	CSWzlib        zlib - Zlib Data Compression Library

Modified: csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec	2009-03-20 17:57:29 UTC (rev 3846)
+++ csw/mgar/pkg/nagiosp/trunk/files/CSWnagiosp.gspec	2009-03-20 19:39:47 UTC (rev 3847)
@@ -1,3 +1,3 @@
-%var            bitname nagiosp
+%var            bitname nagios_plugins
 %var            pkgname CSWnagiosp
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec

Deleted: csw/mgar/pkg/nagiosp/trunk/files/legal.diff
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/files/legal.diff	2009-03-20 17:57:29 UTC (rev 3846)
+++ csw/mgar/pkg/nagiosp/trunk/files/legal.diff	2009-03-20 19:39:47 UTC (rev 3847)
@@ -1,17 +0,0 @@
-diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/Makefile.in nagios-plugins-1.4.13/Makefile.in
---- nagios-plugins-1.4.13.orig/Makefile.in	2009-02-04 12:38:29.568808276 +0100
-+++ nagios-plugins-1.4.13/Makefile.in	2009-02-04 12:38:15.957832674 +0100
-@@ -1042,6 +1042,13 @@
- 	$(INSTALL) -d $(DESTDIR)$(docdir)
- 	$(INSTALL) -m 644 contrib.tar $(DESTDIR)$(docdir)
- 
-+INFO_DIST = BUGS ChangeLog FAQ README REQUIREMENTS SUPPORT
-+install-legal:
-+	$(INSTALL) -d $(DESTDIR)$(docdir)
-+	for i in $(INFO_DIST); do \
-+		$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir) ; \
-+	done
-+
- 
- tap:
- 	cd @TAP_DIR@ && $(MAKE)

Deleted: csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff
===================================================================
--- csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff	2009-03-20 17:57:29 UTC (rev 3846)
+++ csw/mgar/pkg/nagiosp/trunk/files/plugins-root.diff	2009-03-20 19:39:47 UTC (rev 3847)
@@ -1,81 +0,0 @@
-diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-root/Makefile.am nagios-plugins-1.4.13/plugins-root/Makefile.am
---- nagios-plugins-1.4.13.orig/plugins-root/Makefile.am	2008-07-02 22:00:08.000000000 +0200
-+++ nagios-plugins-1.4.13/plugins-root/Makefile.am	2009-02-02 15:04:58.121712871 +0100
-@@ -41,26 +41,18 @@
- 	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
- 	done
- 
--install-root: $(noinst_PROGRAMS)
--	@$(INSTALL_SUID)
-+install-root:
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 744 check_dhcp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 744 check_icmp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 744 pst3 $(DESTDIR)$(libexecdir)
- 
--install-exec-local: $(noinst_PROGRAMS)
--	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
--	rm -f $$TMPFILE; \
--	echo > $$TMPFILE; \
--	## See if we can create a setuid root executable in $(libexecdir).
--	## If not, then don't even try to install setuid plugins.
--	can_create_suid_root_executable=no; \
--	chown root $$TMPFILE > /dev/null 2>&1 \
--	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
--	  && can_create_suid_root_executable=yes; \
--	rm -f $$TMPFILE; \
--	if test $$can_create_suid_root_executable = yes; then \
--	  $(INSTALL_SUID); \
--	else \
--	  echo "WARNING: insufficient access; not installing setuid plugins"; \
--	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
--	fi
-+
-+install-exec-local:
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 744 check_dhcp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 744 check_icmp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 744 pst3 $(DESTDIR)$(libexecdir)
- 
- # /* Author Coreutils team sub-citation */
- 
-diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-root/Makefile.in nagios-plugins-1.4.13/plugins-root/Makefile.in
---- nagios-plugins-1.4.13.orig/plugins-root/Makefile.in	2008-09-25 10:33:20.000000000 +0200
-+++ nagios-plugins-1.4.13/plugins-root/Makefile.in	2009-02-02 15:04:14.144038426 +0100
-@@ -952,24 +952,19 @@
- test:
- 	perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
- 
--install-root: $(noinst_PROGRAMS)
--	@$(INSTALL_SUID)
-+install-root:
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 644 check_dhcp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 644 check_icmp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 644 pst3 $(DESTDIR)$(libexecdir)
- 
--install-exec-local: $(noinst_PROGRAMS)
--	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
--	rm -f $$TMPFILE; \
--	echo > $$TMPFILE; \
--	can_create_suid_root_executable=no; \
--	chown root $$TMPFILE > /dev/null 2>&1 \
--	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
--	  && can_create_suid_root_executable=yes; \
--	rm -f $$TMPFILE; \
--	if test $$can_create_suid_root_executable = yes; then \
--	  $(INSTALL_SUID); \
--	else \
--	  echo "WARNING: insufficient access; not installing setuid plugins"; \
--	  echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \
--	fi
-+
-+install-exec-local:
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 644 check_dhcp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 644 check_icmp $(DESTDIR)$(libexecdir)
-+	$(INSTALL) -m 644 pst3 $(DESTDIR)$(libexecdir)
-+#
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list