- sane (sortable) archive filename

Changed files:
    archivelog-timeformat.patch -> 1.1
    nagios.spec -> 1.159

diff --git a/archivelog-timeformat.patch b/archivelog-timeformat.patch
new file mode 100644 (file)
index 0000000..9d9eef8
--- /dev/null
+++ b/archivelog-timeformat.patch
@@ -0,0 +1,26 @@
+set sane format for archived logs, so the files would be sortable
+ideally this should came from config (date_format=iso8601)
+
+--- nagios-3.2.3/base/logging.c~       2009-05-22 03:55:21.000000000 +0300
++++ nagios-3.2.3/base/logging.c        2010-12-04 23:33:52.112688537 +0200
+@@ -397,8 +397,7 @@
+       stat_result = stat(log_file, &log_file_stat);
+ 
+       /* get the archived filename to use */
+-      asprintf(&log_archive,"%s%snagios-%02d-%02d-%d-%02d.log",log_archive_path,(log_archive_path[strlen(log_archive_path)-1]=='/')?"":"/",t->tm_mon+1,t->tm_mday,t->tm_year+1900,t->tm_hour);
+-
++      asprintf(&log_archive,"%s%snagios-%04d-%02d-%02d-%02d.log",log_archive_path,(log_archive_path[strlen(log_archive_path)-1]=='/')?"":"/", t->tm_year+1900, t->tm_mon+1,t->tm_mday,t->tm_hour); 
+       /* rotate the log file */
+       rename_result=my_rename(log_file,log_archive);
+ 
+--- nagios-3.2.3/cgi/cgiutils.c~       2010-12-04 21:34:34.000000000 +0200
++++ nagios-3.2.3/cgi/cgiutils.c        2010-12-04 23:34:28.915968009 +0200
+@@ -1604,7 +1604,7 @@
+       t=localtime(&this_scheduled_log_rotation);
+ 
+       /* use the time that the log rotation occurred to figure out the name of the log file */
+-      snprintf(buffer,buffer_length,"%snagios-%02d-%02d-%d-%02d.log",log_archive_path,t->tm_mon+1,t->tm_mday,t->tm_year+1900,t->tm_hour);
++      snprintf(buffer,buffer_length,"%snagios-%04d-%02d-%02d-%02d.log",log_archive_path,t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour);
+       buffer[buffer_length-1]='\x0';
+ 
+       return;

diff --git a/nagios.spec b/nagios.spec
index ca21ebb8c3d299ceca08a1e4c93c768702aa7d9d..ed96678dfe7b18750b2a3f66d0e008eb89c4a86b 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8):    Program do monitorowania serwerów/usług/sieci
 Summary(pt_BR.UTF-8):  Programa para monitoração de máquinas e serviços
 Name:          nagios
 Version:       3.2.3
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -34,7 +34,8 @@ Patch3:               %{name}-cgi-http_charset.patch
 Patch4:                %{name}-cmd-typo.patch
 Patch5:                config.patch
 Patch6:                %{name}-googlemap.patch
-Patch7:                nagios-doc-usermacros.patch
+Patch7:                %{name}-doc-usermacros.patch
+Patch8:                archivelog-timeformat.patch
 URL:           http://www.nagios.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -200,6 +201,7 @@ aplicativos para o Nagios.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm
 
@@ -227,6 +229,11 @@ sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf
        s,=nagiosadmin,=*,g
 ' sample-config/*.cfg.in
 
+# fixup paths in doc
+%{__sed} -i -e '
+       s,/usr/local/nagios/var/archives/,/var/log/nagios/archives/,
+' html/docs/configmain.html
+
 %build
 cp -f /usr/share/automake/config.sub .
 %{__aclocal}