Author: glen Date: Sun Nov 30 15:43:02 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 1.6.1-rc5-0.5
---- Files affected:
SOURCES:
nagios-grapher-perl_path.patch (1.1 -> 1.2) , nagios-grapher-init.patch (1.1
-> 1.2) , nagios-grapher-install.patch (1.2 -> 1.3) ,
nagios-grapher-layout.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/nagios-grapher-perl_path.patch
diff -u SOURCES/nagios-grapher-perl_path.patch:1.1
SOURCES/nagios-grapher-perl_path.patch:1.2
--- SOURCES/nagios-grapher-perl_path.patch:1.1 Sun Oct 29 01:02:11 2006
+++ SOURCES/nagios-grapher-perl_path.patch Sun Nov 30 16:42:56 2008
@@ -1,7 +1,6 @@
-diff -uNr nagios-grapher-1.6.1.orig/sbin/graphs.cgi
nagios-grapher-1.6.1/sbin/graphs.cgi
---- nagios-grapher-1.6.1.orig/sbin/graphs.cgi 2006-08-01 10:10:41.000000000
+0000
-+++ nagios-grapher-1.6.1/sbin/graphs.cgi 2006-10-28 22:40:43.000000000
+0000
-@@ -350,7 +350,7 @@
+--- NagiosGrapher-1.6.1-rc5-0.5/sbin/graphs.cgi.in~ 2007-08-15
13:23:16.000000000 +0300
++++ NagiosGrapher-1.6.1-rc5-0.5/sbin/graphs.cgi.in 2008-11-30
16:02:07.189748976 +0200
+@@ -352,7 +352,7 @@
}
sub action_showcalendar {
================================================================
Index: SOURCES/nagios-grapher-init.patch
diff -u SOURCES/nagios-grapher-init.patch:1.1
SOURCES/nagios-grapher-init.patch:1.2
--- SOURCES/nagios-grapher-init.patch:1.1 Wed Jun 21 16:44:35 2006
+++ SOURCES/nagios-grapher-init.patch Sun Nov 30 16:42:56 2008
@@ -1,6 +1,5 @@
-diff -uNr NagiosGrapher-1.6-rc1.orig/contrib/nagios_grapher.redhat
NagiosGrapher-1.6-rc1/contrib/nagios_grapher.redhat
---- NagiosGrapher-1.6-rc1.orig/contrib/nagios_grapher.redhat 2006-04-28
10:56:06.000000000 +0200
-+++ NagiosGrapher-1.6-rc1/contrib/nagios_grapher.redhat 2006-06-21
16:37:05.000000000 +0200
+--- NagiosGrapher-1.6-rc1.orig/init_scripts/nagios_grapher.redhat
2006-04-28 10:56:06.000000000 +0200
++++ NagiosGrapher-1.6-rc1/init_scripts/nagios_grapher.redhat 2006-06-21
16:37:05.000000000 +0200
@@ -8,7 +8,7 @@
NAME=collect2.pl
================================================================
Index: SOURCES/nagios-grapher-install.patch
diff -u SOURCES/nagios-grapher-install.patch:1.2
SOURCES/nagios-grapher-install.patch:1.3
--- SOURCES/nagios-grapher-install.patch:1.2 Fri Oct 27 04:16:01 2006
+++ SOURCES/nagios-grapher-install.patch Sun Nov 30 16:42:57 2008
@@ -1,69 +1,43 @@
-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)
- mkdir -p $(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)
--
-+
- config-install:
- mkdir -p $(DESTDIR)/$(NG_CONFIG)
- mkdir -p $(DESTDIR)/$(NG_CONFIG_SUB)
-@@ -156,16 +153,9 @@
- cp -r cfg/templates/extra $(DESTDIR)/$(NG_CONFIG_SUB)
- cp -r cfg/templates/standard $(DESTDIR)/$(NG_CONFIG_SUB)
-
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_CONFIG)/*.ncfg
-- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NG_CONFIG)/*.ncfg
--
--
- cgi-install:
- mkdir -p $(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 -R 0755 $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
+--- NagiosGrapher-1.6.1-rc5-0.5/Makefile.in 2008-11-30 16:15:10.740089873
+0200
++++ NagiosGrapher-1.6.1-rc5-0.5/Makefile.in 2008-11-30 16:19:01.309650319
+0200
+@@ -1,5 +1,8 @@
+ PERL = @PERL@
+
++CC = gcc
++CFLAGS = -O2 -Wall
++
+ # NAGIOS_VERSION = @NAGIOS_VERSION@
+ NAGIOS_CONFIG = @NAGIOS_CONFIG@
+ NAGIOS_CONFIG_CGI = @NAGIOS_CONFIG_CGI@
+@@ -196,7 +199,7 @@
+ chmod -R 0755 $(DESTDIR)/$(NAGIOS_FOLDER_CGI)
bin-install:
- mkdir -p $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-@@ -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 -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
--
+- mkdir -p $(NAGIOS_CONTRIBUTION)
++ mkdir -p $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+ cp bin/collect2.pl \
+ bin/fifo_write.pl \
+ contrib/fifo_write/C/fifo_write \
+@@ -208,17 +211,19 @@
+ chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+
bin-compile:
- gcc $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/fifo_write.c -o \
- $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/fifo_write
-@@ -186,9 +172,6 @@
- gcc $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/udpecho.c -o \
- $(DESTDIR)/$(NAGIOS_CONTRIBUTION)/udpecho
-
-- chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
-- chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
--
- perl-install:
- mkdir -p $(DESTDIR)/$(PERL_INC)
- cp lib/NagiosGrapher.pm $(DESTDIR)/$(PERL_INC)
-@@ -196,7 +179,6 @@
+- gcc contrib/fifo_write/C/fifo_write.c -o \
++ mkdir -p $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
++ $(CC) $(CFLAGS) contrib/fifo_write/C/fifo_write.c -o \
+ contrib/fifo_write/C/fifo_write
+
+- gcc contrib/udpecho/udpecho.c -o \
++ $(CC) $(CFLAGS) contrib/udpecho/udpecho.c -o \
+ contrib/udpecho/udpecho
+
+ chown -R $(NAGIOS_PROC_USER) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
+ chgrp -R $(NAGIOS_PROC_GROUP) $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
++ chmod -R 0755 $(DESTDIR)/$(NAGIOS_CONTRIBUTION)
- init-script:
- cp nagios_grapher $(DESTDIR)/etc/init.d
-- chmod 0755 $(DESTDIR)/etc/init.d/nagios_grapher
+ perl-install:
+- mkdir -p $(PERL_INC)/NagiosGrapher/Hooks
++ mkdir -p $(DESTDIR)/$(PERL_INC)/NagiosGrapher/Hooks
- image-install:
- mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES)
+ cp lib/NagiosGrapher.pm $(DESTDIR)/$(PERL_INC)
+ cp lib/NagiosGrapher/*.pm $(DESTDIR)/$(PERL_INC)/NagiosGrapher
================================================================
Index: SOURCES/nagios-grapher-layout.patch
diff -u /dev/null SOURCES/nagios-grapher-layout.patch:1.1
--- /dev/null Sun Nov 30 16:43:04 2008
+++ SOURCES/nagios-grapher-layout.patch Sun Nov 30 16:42:57 2008
@@ -0,0 +1,17 @@
+--- NagiosGrapher-1.6.1-rc5-0.5/config.layout 2008-11-30 16:24:48.476405031
+0200
++++ NagiosGrapher-1.6.1-rc5-0.5/config.layout 2008-11-30 17:15:20.052656483
+0200
+@@ -135,12 +135,10 @@
+ ng_interface_pipe: /var/lib/nagios/rw/ngraph.pipe
+ ng_logfile: /var/log/nagios/ngraph.log
+ ng_rrd: /var/lib/nagios/rrd
+- ng_rrd_font:
/usr/local/rrdtool/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+- # and to add for fontfile in ngraph.ncfg:
+- # ng_rrd_font:
${datadir}/rrdtool/fonts/DejaVuSansMono-Roman.ttf
++ ng_rrd_font:
/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+ ng_cgi: /nagios/cgi-bin
+ ng_logos: /nagios/images/logos
+- init_script_dir: /etc/init.d
++ init_script_dir: /etc/rc.d/init.d
+ </Layout>
+
+ <Layout OpenBSD>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nagios-grapher-perl_path.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nagios-grapher-init.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nagios-grapher-install.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
