packages: webalizer/webalizer.spec, webalizer/webalizer-forwardcompat.patch...

[arekm]

Author: arekm                        Date: Fri Nov  5 07:58:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 21; allow this webalizer to read new webalizer history data and don't overflow (magic header for webalizer.hist needs to be changed manually)

---- Files affected:
packages/webalizer:
   webalizer.spec (1.96 -> 1.97) , webalizer-forwardcompat.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/webalizer/webalizer.spec
diff -u packages/webalizer/webalizer.spec:1.96 packages/webalizer/webalizer.spec:1.97
--- packages/webalizer/webalizer.spec:1.96	Wed Sep  8 15:22:45 2010
+++ packages/webalizer/webalizer.spec	Fri Nov  5 08:58:52 2010
@@ -17,7 +17,7 @@
 Summary(uk.UTF-8):	Програма аналізу log-файлу web/ftp/proxy-сервера
 Name:		webalizer
 Version:	%{ver}_%{patchlvl}
-Release:	20
+Release:	21
 License:	GPL v2
 Group:		Networking/Utilities
 Source0:	ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlvl}-src.tar.bz2
@@ -32,6 +32,7 @@
 Patch2:		%{name}-conf.patch
 Patch3:		%{name}-debian_gcc2_fix.patch
 Patch4:		%{name}-largefile.patch
+Patch5:		%{name}-forwardcompat.patch
 URL:		http://www.mrunix.net/webalizer/
 BuildRequires:	autoconf
 %{!?with_db3:BuildRequires:	db-devel}
@@ -111,6 +112,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 mv -f po/{no,nb}.po
 mv -f po/{sr,sr at latin}.po
@@ -189,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2010/11/05 07:58:52  arekm
+- rel 21; allow this webalizer to read new webalizer history data and don't overflow (magic header for webalizer.hist needs to be changed manually)
+
 Revision 1.96  2010/09/08 13:22:45  lisu
 - reversed
 

================================================================
Index: packages/webalizer/webalizer-forwardcompat.patch
diff -u /dev/null packages/webalizer/webalizer-forwardcompat.patch:1.1
--- /dev/null	Fri Nov  5 08:58:58 2010
+++ packages/webalizer/webalizer-forwardcompat.patch	Fri Nov  5 08:58:52 2010
@@ -0,0 +1,24 @@
+--- webalizer-2.01-10/preserve.c~	2001-10-24 08:22:42.000000000 +0200
++++ webalizer-2.01-10/preserve.c	2010-11-05 08:51:42.005261759 +0100
+@@ -82,7 +82,7 @@
+ 
+ void get_history()
+ {
+-   int i,numfields;
++   int i, j = 0,numfields;
+    FILE *hist_fp;
+    char buffer[BUFSIZE];
+ 
+@@ -101,8 +101,11 @@
+       if (verbose>1) printf("%s %s\n",msg_get_hist,hist_fname);
+       while ((fgets(buffer,BUFSIZE,hist_fp)) != NULL)
+       {
++         if (buffer[0]=='#') { continue; } /* skip comments */
++         j++;
++
+          i = atoi(buffer) -1;
+-         if (i>11)
++         if (i>11 || j > 12)
+          {
+             if (verbose)
+                fprintf(stderr,"%s (mth=%d)\n",msg_bad_hist,i+1);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/webalizer/webalizer.spec?r1=1.96&r2=1.97&f=u