SOURCES: nagios-grapher-syntax_error.patch (NEW), nagios-grapher-i...

wolvverine wolvverine at pld-linux.org
Fri Oct 27 04:16:06 CEST 2006 

Author: wolvverine                   Date: Fri Oct 27 02:16:06 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 1.6.1RC1

---- Files affected:
SOURCES:
   nagios-grapher-syntax_error.patch (NONE -> 1.1)  (NEW), nagios-grapher-install.patch (1.1 -> 1.2) , nagios-grapher-install_init.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/nagios-grapher-syntax_error.patch
diff -u /dev/null SOURCES/nagios-grapher-syntax_error.patch:1.1
--- /dev/null	Fri Oct 27 04:16:06 2006
+++ SOURCES/nagios-grapher-syntax_error.patch	Fri Oct 27 04:16:01 2006
@@ -0,0 +1,13 @@
+Files nagios-grapher-1.6.1.orig/.configure.ac.swp and nagios-grapher-1.6.1/.configure.ac.swp differ
+diff -uNr nagios-grapher-1.6.1.orig/configure.ac nagios-grapher-1.6.1/configure.ac
+--- nagios-grapher-1.6.1.orig/configure.ac	2006-06-12 15:29:45.000000000 +0000
++++ nagios-grapher-1.6.1/configure.ac	2006-10-24 21:07:31.000000000 +0000
+@@ -248,7 +248,7 @@
+ 
+ dnl NG_INTERFACE
+ AC_ARG_WITH(ng-interface,
+-	AC_HELP_STRING(--with-ng-interface=INTERFACE], [the interface to use (default: network)]),
++	AC_HELP_STRING([--with-ng-interface=INTERFACE], [the interface to use (default: network)]),
+ 	NG_INTERFACE=$withval,
+ 	NG_INTERFACE=network
+ )

================================================================
Index: SOURCES/nagios-grapher-install.patch
diff -u SOURCES/nagios-grapher-install.patch:1.1 SOURCES/nagios-grapher-install.patch:1.2
--- SOURCES/nagios-grapher-install.patch:1.1	Wed Jun 21 15:48:43 2006
+++ SOURCES/nagios-grapher-install.patch	Fri Oct 27 04:16:01 2006
@@ -1,15 +1,18 @@
-diff -uNr NagiosGrapher-1.6-rc1.orig/Makefile.in NagiosGrapher-1.6-rc1/Makefile.in
---- NagiosGrapher-1.6-rc1.orig/Makefile.in	2006-06-07 18:22:37.000000000 +0200
-+++ NagiosGrapher-1.6-rc1/Makefile.in	2006-06-21 14:18:40.000000000 +0200
-@@ -125,14 +125,11 @@
+diff -uNr nagios-grapher-1.6.1.orig/Makefile.in nagios-grapher-1.6.1/Makefile.in
+--- nagios-grapher-1.6.1.orig/Makefile.in	2006-09-25 15:28:04.000000000 +0000
++++ nagios-grapher-1.6.1/Makefile.in	2006-10-24 21:32:09.000000000 +0000
+@@ -135,9 +135,7 @@
  
  dirs:
  	mkdir -p $(DESTDIR)/$(NG_SRVEXT_DIR)
--	chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_SRVEXT_DIR)	
+-	chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_SRVEXT_DIR)
  	mkdir -p $(DESTDIR)/$(NG_RRD)
--	chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_RRD)	
--
-+	
+-	chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_RRD)
+ 	mkdir -p $(DESTDIR)/etc/init.d
+ 	mkdir -p `dirname $(DESTDIR)/$(NG_LOGFILE)` 
+ 	mkdir -p $(DESTDIR)/$(NG_DAEMON)
+@@ -145,8 +143,7 @@
+ 
  logfile:
  	touch $(DESTDIR)/$(NG_LOGFILE)
 -	chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE)
@@ -18,7 +21,7 @@
  config-install:
  	mkdir -p $(DESTDIR)/$(NG_CONFIG)
  	mkdir -p $(DESTDIR)/$(NG_CONFIG_SUB)
-@@ -142,16 +139,9 @@
+@@ -156,16 +153,9 @@
  	cp -r cfg/templates/extra $(DESTDIR)/$(NG_CONFIG_SUB)
  	cp -r cfg/templates/standard $(DESTDIR)/$(NG_CONFIG_SUB)
  
@@ -28,25 +31,25 @@
 -
  cgi-install:
  	mkdir -p $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
- 	cp *.cgi $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
+ 	cp sbin/*.cgi $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
 -	chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
 -	chgrp -R $(APACHE_GROUP) $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
--	chmod 0755 -R $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
+-	chmod -R 0755 $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
  
  bin-install:
  	mkdir -p $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-@@ -160,10 +150,6 @@
+@@ -175,10 +165,6 @@
  		contrib/udpecho/udpecho.c \
  		$(DESTDIR)/$(NAGIOS_CONTRIBUTION)
  
 -	chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
 -	chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
--	chmod 0755 -R $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+-	chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
 -
  bin-compile:
  	gcc $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/fifo_write.c -o \
  		$(DESTDIR)/$(NAGIOS_CONTRIBUTION)/fifo_write
-@@ -171,16 +157,12 @@
+@@ -186,9 +172,6 @@
  	gcc $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/udpecho.c -o \
  		$(DESTDIR)/$(NAGIOS_CONTRIBUTION)/udpecho
  
@@ -55,11 +58,12 @@
 -
  perl-install:
  	mkdir -p $(DESTDIR)/$(PERL_INC)
- 	cp NagiosGrapher.pm $(DESTDIR)/$(PERL_INC)
+ 	cp lib/NagiosGrapher.pm $(DESTDIR)/$(PERL_INC)
+@@ -196,7 +179,6 @@
  
  init-script:
- 	cp nagios_grapher /etc/init.d
--	chmod 0755 /etc/init.d/nagios_grapher 
+ 	cp nagios_grapher $(DESTDIR)/etc/init.d
+-	chmod 0755 $(DESTDIR)/etc/init.d/nagios_grapher
  
  image-install:
  	mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES)

================================================================
Index: SOURCES/nagios-grapher-install_init.patch
diff -u SOURCES/nagios-grapher-install_init.patch:1.1 SOURCES/nagios-grapher-install_init.patch:1.2
--- SOURCES/nagios-grapher-install_init.patch:1.1	Wed Jun 21 15:46:49 2006
+++ SOURCES/nagios-grapher-install_init.patch	Fri Oct 27 04:16:01 2006
@@ -5,7 +5,7 @@
  	cp NagiosGrapher.pm $(DESTDIR)/$(PERL_INC)
  
  init-script:
--	cp nagios_grapher /etc/init.d
+-	cp nagios_grapher $(DESTDIR)/etc/init.d
 +	cp nagios_grapher $(DESTDIR)/etc/rc.d/init.d
  
  image-install:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nagios-grapher-install.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/nagios-grapher-install_init.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list