Hello community, here is the log from the commit of package webalizer for openSUSE:Factory checked in at 2013-11-15 16:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webalizer (Old) and /work/SRC/openSUSE:Factory/.webalizer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webalizer" Changes: -------- --- /work/SRC/openSUSE:Factory/webalizer/webalizer.changes 2012-06-26 17:41:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webalizer.new/webalizer.changes 2013-11-15 16:57:02.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Nov 14 22:31:51 UTC 2013 - [email protected] + +- update to update to 2.23-08 + * Fix sporadic eol problem with some IIS/W3C logs + * Fix compiler directive syntax error (broke some 64 bit systems) + - Changes/Additions: + * Modest speed improvements in hash table code +- rebase patches +- fix spec + * package flags too, not only the DIR + +------------------------------------------------------------------- Old: ---- webalizer-2.23-05-src.tar.bz2 New: ---- webalizer-2.23-08-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webalizer.spec ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package webalizer # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || apxs -q PREFIX) -%define editlvl 05 +%define editlvl 08 Name: webalizer Summary: A Web Server Log File Analysis Program @@ -26,7 +26,7 @@ Version: 2.23 Release: 0 Url: http://www.mrunix.net/webalizer/ -Source0: %{name}-%{version}-%{editlvl}-src.tar.bz2 +Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{version}-%{editlvl}-src.tar.bz2 Source1: flags.tar.bz2 Source2: flags.license.html # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches @@ -90,9 +90,9 @@ %patch0 %patch1 %patch3 -%patch4 -p1 +%patch4 %patch5 -%patch6 -p1 +%patch6 %{__cp} -a %{S:2} . %build @@ -140,5 +140,6 @@ %defattr(-,root,root) %doc flags.license.html %dir %{apache_serverroot}/htdocs/%{name}/flags +%{apache_serverroot}/htdocs/%{name}/flags/* %changelog ++++++ webalizer-2.21-02-fclose.diff ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,6 +1,8 @@ ---- wcmgr.c +Index: wcmgr.c +=================================================================== +--- wcmgr.c.orig +++ wcmgr.c -@@ -839,6 +839,7 @@ +@@ -848,6 +848,7 @@ void import_cache() exit(1); } } ++++++ webalizer-2.21-02-ia64.diff ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,6 +1,8 @@ ---- output.c +Index: output.c +=================================================================== +--- output.c.orig +++ output.c -@@ -835,7 +835,7 @@ +@@ -835,7 +835,7 @@ void top_sites_table(int flag) while(cnt--) { /* calculate totals */ @@ -9,7 +11,7 @@ { case OBJ_REG: h_reg++; break; case OBJ_GRP: h_grp++; break; -@@ -1025,7 +1025,7 @@ +@@ -1025,7 +1025,7 @@ void top_urls_table(int flag) while (cnt--) { /* calculate totals */ @@ -18,7 +20,7 @@ { case OBJ_REG: u_reg++; break; case OBJ_GRP: u_grp++; break; -@@ -1228,12 +1228,12 @@ +@@ -1228,12 +1228,12 @@ void top_entry_table(int flag) cnt=a_ctr; pointer=u_array; while (cnt--) { @@ -36,7 +38,7 @@ } pointer++; } -@@ -1332,7 +1332,7 @@ +@@ -1332,7 +1332,7 @@ void top_refs_table() while(cnt--) { /* calculate totals */ @@ -45,7 +47,7 @@ { case OBJ_REG: r_reg++; break; case OBJ_HIDE: r_hid++; break; -@@ -1497,7 +1497,7 @@ +@@ -1497,7 +1497,7 @@ void top_agents_table() while(cnt--) { /* calculate totals */ @@ -54,7 +56,7 @@ { case OBJ_REG: a_reg++; break; case OBJ_GRP: a_grp++; break; -@@ -1650,7 +1650,7 @@ +@@ -1650,7 +1650,7 @@ void top_search_table() cnt=tot_num=a_ctr; pointer=s_array; while(cnt--) { @@ -63,7 +65,7 @@ pointer++; } -@@ -1764,7 +1764,7 @@ +@@ -1764,7 +1764,7 @@ void top_users_table() while(cnt--) { /* calculate totals */ ++++++ webalizer-2.21-02-maxagent.diff ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,4 +1,6 @@ ---- webalizer.h +Index: webalizer.h +=================================================================== +--- webalizer.h.orig +++ webalizer.h @@ -19,7 +19,7 @@ #define MAXURLH 512 /* Max URL field size in htab */ ++++++ webalizer-2.21-02.diff ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,6 +1,8 @@ ---- Makefile.in +Index: Makefile.in +=================================================================== +--- Makefile.in.orig +++ Makefile.in -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ ETCDIR = @sysconfdir@ GEODB = @GEODB_LOC@ CC = @CC@ CFLAGS = @CFLAGS@ @CPPFLAGS@ @@ -9,9 +11,11 @@ WCMGR_LIBS = @WCMGR_LIBS@ DEFS = -DETCDIR=\"${ETCDIR}\" -DGEODB_LOC=\"${GEODB}\" @DEFS@ @OPTS@ LDFLAGS = @LDFLAGS@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -48,9 +48,6 @@ +@@ -48,9 +48,6 @@ if test "$GCC" = "yes"; then [ --enable-static Build as static executable [[default=no]]], LDFLAGS="--static ${LDFLAGS}") ++++++ webalizer-2.23-04-Makefile.patch ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,20 +1,17 @@ -diff -ruN webalizer-2.23-04-orig/Makefile.in webalizer-2.23-04/Makefile.in ---- webalizer-2.23-04-orig/Makefile.in 2011-01-03 05:54:32.000000000 +0100 -+++ webalizer-2.23-04/Makefile.in 2011-03-19 19:08:52.000000000 +0100 -@@ -18,10 +18,10 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = @datarootdir@ -+datadir = @datadir@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -21,7 +21,7 @@ exec_prefix = @exec_prefix@ + datadir = @datarootdir@ BINDIR = @bindir@ --MANDIR = ${datadir}/man/man1 +-MANDIR = @mandir@/man1 +MANDIR = @mandir@ ETCDIR = @sysconfdir@ GEODB = @GEODB_LOC@ CC = @CC@ -@@ -92,25 +92,25 @@ +@@ -92,25 +92,25 @@ distclean: clean install: all mkdir -p ${DESTDIR}${BINDIR} ++++++ webalizer-2.23-04-conf.patch ++++++ --- /var/tmp/diff_new_pack.YugiMF/_old 2013-11-15 16:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.YugiMF/_new 2013-11-15 16:57:03.000000000 +0100 @@ -1,6 +1,7 @@ -diff -ruN webalizer-2.23-04-orig/sample.conf webalizer-2.23-04/sample.conf ---- webalizer-2.23-04-orig/sample.conf 2011-01-03 05:53:33.000000000 +0100 -+++ webalizer-2.23-04/sample.conf 2011-03-20 22:26:49.000000000 +0100 +Index: sample.conf +=================================================================== +--- sample.conf.orig ++++ sample.conf @@ -26,7 +26,7 @@ # (bzip2 compressed file), it will be decompressed on the fly as it # is being read. @@ -19,7 +20,7 @@ # HistoryName allows you to specify the name of the history file produced # by the Webalizer. The history file keeps the data for previous months, -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ PageType cgi # relative to the default output directory. See the DNS.README file for # additional information. @@ -28,7 +29,7 @@ # DNSChildren allows you to specify how many "children" processes are # run to perform DNS lookups to create or update the DNS cache file. -@@ -182,7 +182,7 @@ +@@ -182,7 +182,7 @@ PageType cgi # normal system operations. Reasonable values should be between 5 and # 20. See the DNS.README file for additional information. @@ -37,7 +38,7 @@ # CacheIPs allows unresolved IP addresses to be cached in the DNS # database. Normally, only resolved addresses are saved. At some -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ PageType cgi # to the output directory being used unless an absolute name # (ie: starts with a leading '/') is specified. @@ -46,7 +47,7 @@ # The GeoIP option enables or disables the use of geolocation # services provided by the GeoIP library (http://www.maxmind.com), -@@ -229,7 +229,7 @@ +@@ -229,7 +229,7 @@ PageType cgi # (ie: starts with a leading '/'), then the name is relative to the # default output directory. This option should not normally be needed. ++++++ webalizer-2.23-05-src.tar.bz2 -> webalizer-2.23-08-src.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/CHANGES new/webalizer-2.23-08/CHANGES --- old/webalizer-2.23-05/CHANGES 2010-10-06 09:33:24.000000000 +0200 +++ new/webalizer-2.23-08/CHANGES 2013-02-27 19:22:58.000000000 +0100 @@ -243,7 +243,7 @@ This change also modified the format of the incremental data file. o Added the ability to display ALL sites, URLs, Referrers, - User Agents and Search Strings on a seperate HTML page from + User Agents and Search Strings on a separate HTML page from the normal statistics page. This adds the configuration keywords 'AllSites', 'AllURLs', 'AllReferrers', 'AllAgents' and 'AllSearchStr', which can have either a "yes" or "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/Copyright new/webalizer-2.23-08/Copyright --- old/webalizer-2.23-05/Copyright 2011-01-03 05:53:07.000000000 +0100 +++ new/webalizer-2.23-08/Copyright 2013-02-26 06:37:27.000000000 +0100 @@ -1,6 +1,6 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/Makefile.in new/webalizer-2.23-08/Makefile.in --- old/webalizer-2.23-05/Makefile.in 2011-01-03 05:54:32.000000000 +0100 +++ new/webalizer-2.23-08/Makefile.in 2013-02-27 22:00:44.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for webalizer - a web server log analysis program # -# Copyright (C) 1997-2011 Bradford L. Barrett +# Copyright (C) 1997-2013 Bradford L. Barrett # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ datadir = @datarootdir@ BINDIR = @bindir@ -MANDIR = ${datadir}/man/man1 +MANDIR = @mandir@/man1 ETCDIR = @sysconfdir@ GEODB = @GEODB_LOC@ CC = @CC@ @@ -78,7 +78,7 @@ wcmgr: wcmgr.o $(CC) ${LDFLAGS} -o wcmgr wcmgr.o ${WCMGR_LIBS} -wcmgr.o: wcmgr.c +wcmgr.o: wcmgr.c webalizer.h $(CC) ${CFLAGS} ${DEFS} -c wcmgr.c clean: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/Makefile.std new/webalizer-2.23-08/Makefile.std --- old/webalizer-2.23-05/Makefile.std 2011-01-03 05:55:05.000000000 +0100 +++ new/webalizer-2.23-08/Makefile.std 2013-02-26 06:37:27.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile for webalizer - a web server logfile analysis thingie # -# (c)1997-2011 by Bradford L. Barrett +# (c)1997-2013 by Bradford L. Barrett # Distributed under the GNU GPL. See "README" and "Copyright" # files supplied with this distribution for more information. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/README new/webalizer-2.23-08/README --- old/webalizer-2.23-05/README 2011-01-03 05:55:25.000000000 +0100 +++ new/webalizer-2.23-08/README 2013-02-26 06:37:27.000000000 +0100 @@ -1,5 +1,5 @@ The Webalizer - A web server log file analysis tool -Copyright 1997-2011 by Bradford L. Barrett +Copyright 1997-2013 by Bradford L. Barrett Distributed under the GNU GPL. See the files "COPYING" and "Copyright" supplied with the distribution for additional info. @@ -43,7 +43,7 @@ cache files used and produced by the webalizer. See the file DNS.README for additional information regarding DNS support. -This documentation applies to The Webalizer Version 2.21 +This documentation applies to The Webalizer Version 2.23 Running the Webalizer --------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/configure.in new/webalizer-2.23-08/configure.in --- old/webalizer-2.23-05/configure.in 2011-01-03 05:53:44.000000000 +0100 +++ new/webalizer-2.23-08/configure.in 2013-02-26 06:37:27.000000000 +0100 @@ -1,6 +1,6 @@ dnl dnl The Webalizer - A web server log file analysis program -dnl Copyright (C) 1997-2011 by Bradford L. Barrett +dnl Copyright (C) 1997-2013 by Bradford L. Barrett dnl dnl configure.in template for The Webalizer Version 2.23 dnl Process this file with autoconf to produce a configure script. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/dns_resolv.c new/webalizer-2.23-08/dns_resolv.c --- old/webalizer-2.23-05/dns_resolv.c 2011-01-03 05:51:00.000000000 +0100 +++ new/webalizer-2.23-08/dns_resolv.c 2013-02-26 06:37:27.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/graphs.c new/webalizer-2.23-08/graphs.c --- old/webalizer-2.23-05/graphs.c 2011-01-03 05:51:06.000000000 +0100 +++ new/webalizer-2.23-08/graphs.c 2013-02-26 06:37:27.000000000 +0100 @@ -1,7 +1,7 @@ /* graphs.c - produces graphs used by the Webalizer - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/hashtab.c new/webalizer-2.23-08/hashtab.c --- old/webalizer-2.23-05/hashtab.c 2011-01-10 02:47:49.000000000 +0100 +++ new/webalizer-2.23-08/hashtab.c 2013-08-26 06:45:28.000000000 +0200 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,11 +88,6 @@ DNODEPTR host_table[MAXHASH]; /* DNS hash table */ #endif /* USE_DNS */ -/* Last node pointers */ -HNODEPTR lm_hnode=NULL; -HNODEPTR ld_hnode=NULL; -RNODEPTR l_rnode=NULL; - /*********************************************/ /* DEL_HTABS - clear out our hash tables */ /*********************************************/ @@ -171,8 +166,6 @@ /* not hashed */ if ( (nptr=new_hnode(str)) != NULL) { - if (htab==sm_htab) lm_hnode=nptr; - else ld_hnode=nptr; nptr->flag = type; nptr->count = count; nptr->files = file; @@ -202,16 +195,6 @@ } else { - /* hashed (SPEEDUP) */ - if (htab==sm_htab) - { - if (lm_hnode!=NULL && strcmp(lm_hnode->string,str)==0) cptr=lm_hnode; - } - else - { - if (ld_hnode!=NULL && strcmp(ld_hnode->string,str)==0) cptr=ld_hnode; - } - while (cptr != NULL) { if (strcmp(cptr->string,str)==0) @@ -237,8 +220,6 @@ cptr->lasturl=find_url(log_rec.url); cptr->tstamp=tstamp; } - if (htab==sm_htab) lm_hnode=cptr; - else ld_hnode=cptr; return 0; } } @@ -247,8 +228,6 @@ /* not found... */ if ( (nptr = new_hnode(str)) != NULL) { - if (htab==sm_htab) lm_hnode=nptr; - else ld_hnode=nptr; nptr->flag = type; nptr->count = count; nptr->files = file; @@ -286,8 +265,6 @@ /* check if it's a hidden object */ if ((hide_sites)||(isinlist(hidden_sites,nptr->string)!=NULL)) nptr->flag=OBJ_HIDE; - if (htab==sm_htab) lm_hnode=nptr; - else ld_hnode=nptr; } } return nptr==NULL; @@ -318,8 +295,6 @@ htab[i]=NULL; } } - lm_hnode=NULL; - ld_hnode=NULL; } /*********************************************/ @@ -513,9 +488,6 @@ } else { - /* hashed (SPEEDUP) */ - if (l_rnode!=NULL && strcmp(l_rnode->string,str)==0) cptr=l_rnode; - while (cptr != NULL) { if (strcmp(cptr->string,str)==0) @@ -544,7 +516,6 @@ if (type==OBJ_GRP) nptr->flag=OBJ_GRP; else if (isinlist(hidden_refs,nptr->string)!=NULL) nptr->flag=OBJ_HIDE; - l_rnode=nptr; } return nptr==NULL; } @@ -574,7 +545,6 @@ htab[i]=NULL; } } - l_rnode=NULL; } /*********************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/linklist.c new/webalizer-2.23-08/linklist.c --- old/webalizer-2.23-05/linklist.c 2011-01-03 05:51:20.000000000 +0100 +++ new/webalizer-2.23-08/linklist.c 2013-02-27 19:22:58.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -190,10 +190,10 @@ strncpy(temp_buf,str,MAXKVAL-1); temp_buf[MAXKVAL-1]=0; - if (!sep) /* Space seperated */ + if (!sep) /* Space separated */ while (!isspace((unsigned char)*name) && *name!=0) name++; else - while (*name!=sep && *name!=0) name++; /* Quote seperated */ + while (*name!=sep && *name!=0) name++; /* Quote separated */ if (*name==0) name=temp_buf; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/output.c new/webalizer-2.23-08/output.c --- old/webalizer-2.23-05/output.c 2011-01-03 05:52:05.000000000 +0100 +++ new/webalizer-2.23-08/output.c 2013-02-26 06:37:27.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -175,7 +175,7 @@ fprintf(out_fp,"<!-- Generated by The Webalizer Ver. %s-%s -->\n", version,editlvl); fprintf(out_fp,"<!-- -->\n"); - fprintf(out_fp,"<!-- Copyright 1997-2011 Bradford L. Barrett -->\n"); + fprintf(out_fp,"<!-- Copyright 1997-2013 Bradford L. Barrett -->\n"); fprintf(out_fp,"<!-- -->\n"); fprintf(out_fp,"<!-- Distributed under the GNU GPL Version 2 -->\n"); fprintf(out_fp,"<!-- Full text may be found at: -->\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/parser.c new/webalizer-2.23-08/parser.c --- old/webalizer-2.23-05/parser.c 2011-01-03 05:51:34.000000000 +0100 +++ new/webalizer-2.23-08/parser.c 2013-02-27 19:22:58.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -117,7 +117,7 @@ size = strlen(buffer); /* get length of buffer */ eob = buffer+size; /* calculate end of buffer */ - fmt_logrec(buffer); /* seperate fields with \0's */ + fmt_logrec(buffer); /* separate fields with \0's */ /* Start out with date/time */ cp1=buffer; @@ -213,7 +213,7 @@ size = strlen(buffer); /* get length of buffer */ eob = buffer+size; /* calculate end of buffer */ - fmt_logrec(buffer); /* seperate fields with \0's */ + fmt_logrec(buffer); /* separate fields with \0's */ /* HOSTNAME */ cp1 = cpx = buffer; cp2=log_rec.hostname; @@ -380,7 +380,7 @@ size = strlen(buffer); /* get length of buffer */ eob = buffer+size; /* calculate end of buffer */ - fmt_logrec(buffer); /* seperate fields with \0's */ + fmt_logrec(buffer); /* separate fields with \0's */ /* date/time */ cp1=buffer; @@ -571,7 +571,7 @@ break; } - fmt_logrec(buffer); /* seperate fields with \0's */ + fmt_logrec(buffer); /* separate fields with \0's */ cp = buffer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/preserve.c new/webalizer-2.23-08/preserve.c --- old/webalizer-2.23-05/preserve.c 2011-01-03 05:51:40.000000000 +0100 +++ new/webalizer-2.23-08/preserve.c 2013-02-26 06:37:27.000000000 +0100 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/sample.conf new/webalizer-2.23-08/sample.conf --- old/webalizer-2.23-05/sample.conf 2011-01-03 05:53:33.000000000 +0100 +++ new/webalizer-2.23-08/sample.conf 2013-08-26 06:52:15.000000000 +0200 @@ -1,12 +1,12 @@ # # Sample Webalizer configuration file -# Copyright 1997-2011 by Bradford L. Barrett +# Copyright 1997-2013 by Bradford L. Barrett # # Distributed under the GNU General Public License. See the # files "Copyright" and "COPYING" provided with the webalizer # distribution for additional information. # -# This is a sample configuration file for the Webalizer (ver 2.20) +# This is a sample configuration file for the Webalizer (ver 2.23) # Lines starting with pound signs '#' are comment lines and are # ignored. Blank lines are skipped as well. Other lines are considered # as configuration lines, and have the form "ConfigOption Value" where @@ -76,7 +76,7 @@ #IncrementalName webalizer.current # ReportTitle is the text to display as the title. The hostname -# (unless blank) is appended to the end of this string (seperated with +# (unless blank) is appended to the end of this string (separated with # a space) to generate the final full title string. # Default is (for english) "Usage Statistics for". @@ -178,7 +178,7 @@ # DNS lookups. If used, the DNS cache filename MUST be specified as # well. The default value is zero (0), which disables DNS cache file # creation/updates at run time. The number of children processes to -# run may be anywhere from 1 to 100, however a large number may effect +# run may be anywhere from 1 to 100, however a large number may affect # normal system operations. Reasonable values should be between 5 and # 20. See the DNS.README file for additional information. @@ -359,7 +359,7 @@ # IgnoreState also shouldn't be used, but is here anyway. It is # similar to the IgnoreHist option, but for the incremental data -# file. If this is set to 'yes', any existing incrememtal data +# file. If this is set to 'yes', any existing incremental data # will be ignored and a new data file will be written at the end # of processing. USE WITH CAUTION. By ignoring an existing # incremental data file, all previous processing for the current @@ -464,7 +464,7 @@ #TopUsers 20 # The All* keywords allow the display of all URLs, Sites, Referrers -# User Agents, Search Strings and Usernames. If enabled, a seperate +# User Agents, Search Strings and Usernames. If enabled, a separate # HTML page will be created, and a link will be added to the bottom # of the appropriate "Top" table. There are a couple of conditions # for this to occur.. First, there must be more items than will fit @@ -474,7 +474,7 @@ # items. Grouped entries will be listed first, followed by individual # items. The value for these keywords can be either 'yes' or 'no', # with the default being 'no'. Please be aware that these pages can -# be quite large in size, particularly the sites page, and seperate +# be quite large in size, particularly the sites page, and separate # pages are generated for each month, which can consume quite a lot # of disk space depending on the traffic to your site. @@ -528,7 +528,7 @@ # the grouping record is displayed), follow with an identical Hide* # keyword with the same value. (see example below) In addition, # Group* keywords may have an optional label which will be displayed -# instead of the keywords value. The label should be seperated from +# instead of the keywords value. The label should be separated from # the value by at least one 'white-space' character, such as a space # or tab. If the match string contains whitespace (spaces or tabs), # the string should be quoted with either single or double quotes. @@ -666,7 +666,7 @@ # precidence over the Ignore* keywords. Note: Using Ignore/Include # combinations to selectivly process parts of a web site is _extremely # inefficent_!!! Avoid doing so if possible (ie: grep the records to a -# seperate file if you really want that kind of report). +# separate file if you really want that kind of report). # Example: Only show stats on Joe User's pages... #IgnoreURL * @@ -697,7 +697,7 @@ # what search strings are used to find your site. The first word is # a substring to match in the referrer field that identifies the search # engine, and the second is the URL variable used by that search engine -# to define it's search terms. +# to define its search terms. #SearchEngine .google. q= #SearchEngine yahoo.com p= @@ -723,7 +723,7 @@ #SearchCaseI yes # The Dump* keywords allow the dumping of Sites, URLs, Referrers -# User Agents, Usernames and Search strings to seperate tab delimited +# User Agents, Usernames and Search strings to separate tab delimited # text files, suitable for import into most database or spreadsheet # programs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/wcmgr.1 new/webalizer-2.23-08/wcmgr.1 --- old/webalizer-2.23-05/wcmgr.1 2011-01-03 05:54:43.000000000 +0100 +++ new/webalizer-2.23-08/wcmgr.1 2013-02-26 06:37:27.000000000 +0100 @@ -103,7 +103,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2011 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2013 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/wcmgr.c new/webalizer-2.23-08/wcmgr.c --- old/webalizer-2.23-05/wcmgr.c 2011-01-03 05:52:38.000000000 +0100 +++ new/webalizer-2.23-08/wcmgr.c 2013-08-26 06:35:57.000000000 +0200 @@ -3,7 +3,7 @@ webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -73,6 +73,11 @@ #include <db.h> #include "webalizer.h" +/* Stupid pre-processor tricks */ +#define xstr(x) #x +#define str(x) xstr(x) +#define SMAXHOST str(MAXHOST) /* String version of MAXHOST value */ + /*********************************************/ /* Forward reference local functions */ /*********************************************/ @@ -94,9 +99,9 @@ char *pname = "WCMGR - Webalizer (DNS) Cache file Manager"; char *version = "1.00"; /* program version */ -char *editlvl = "03"; /* edit level */ -char *moddate = "12-Jul-2008"; /* modification date */ -char *copyright = "Copyright 2007-2011 by Bradford L. Barrett"; +char *editlvl = "04"; /* edit level */ +char *moddate = "26-Aug-2013"; /* modification date */ +char *copyright = "Copyright 2007-2013 by Bradford L. Barrett"; int action = 'l'; /* action flag (default=list) */ int create = 0; /* cache creation flag */ @@ -125,6 +130,8 @@ char hostName[MAXHOST+1]; /* Hostname buffer (variable) */ } dns_rec; +#define DNSZ sizeof(struct dnsRec) /* define static record size */ + /*********************************************/ /* PRINT_VER - display version information */ /*********************************************/ @@ -327,7 +334,8 @@ t_rec++; memset(ip_buf, 0, sizeof(ip_buf)); strncpy(ip_buf, q.data, (q.size>47)?47:q.size); /* save IP address */ - memcpy(&dns_rec, r.data, r.size); + memcpy(&dns_rec, r.data, (r.size>DNSZ)?DNSZ:r.size); + if (dns_rec.numeric) t_num++; printf("%-15s [%s] %s\n",ip_buf, (dns_rec.timeStamp)? @@ -430,7 +438,7 @@ { /* got a record */ t_in++; - memcpy(&dns_rec, r.data, r.size); + memcpy(&dns_rec, r.data, (r.size>DNSZ)?DNSZ:r.size); /* get record ttl age */ if (dns_rec.timeStamp==0) age=0; @@ -592,7 +600,8 @@ /* We found it! display info */ memset(ip_buf, 0, sizeof(ip_buf)); strncpy(ip_buf, q.data, (q.size>47)?47:q.size); /* save IP address */ - memcpy(&dns_rec, r.data, r.size); + memcpy(&dns_rec, r.data, (r.size>DNSZ)?DNSZ:r.size); + if (verbose) { /* Verbose display */ @@ -815,7 +824,7 @@ { memset(&dns_rec, 0, sizeof(dns_rec)); memset(&ip_buf, 0, sizeof(ip_buf)); - i = sscanf(buffer,"%s\t%lu\t%d\t%s", + i = sscanf(buffer,"%47s\t%lu\t%d\t%" SMAXHOST "s", ip_buf, &dns_rec.timeStamp, &dns_rec.numeric, @@ -911,7 +920,7 @@ t_rec++; memset(ip_buf, 0, sizeof(ip_buf)); strncpy(ip_buf, q.data, (q.size>47)?47:q.size); /* save IP address */ - memcpy(&dns_rec, r.data, r.size); + memcpy(&dns_rec, r.data, (r.size>DNSZ)?DNSZ:r.size); /* Print out tab delimited line */ /* Format: IP timestamp numeric hostname */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/webalizer.1 new/webalizer-2.23-08/webalizer.1 --- old/webalizer-2.23-05/webalizer.1 2011-01-03 05:54:51.000000000 +0100 +++ new/webalizer-2.23-08/webalizer.1 2013-02-26 06:37:27.000000000 +0100 @@ -1,4 +1,4 @@ -.TH webalizer 1 "12-Jul-2008" "Version 2.20" "The Webalizer" +.TH webalizer 1 "26-Feb-2013" "Version 2.23" "The Webalizer" .SH NAME webalizer - A web server log file analysis tool. .SH SYNOPSIS @@ -37,7 +37,7 @@ children processes to use are not specified, the \fIwebazolver\fP will default to \fB5\fP. .PP -This documentation applies to The Webalizer Version 2.20 +This documentation applies to The Webalizer Version 2.23 .SH RUNNING THE WEBALIZER The \fIWebalizer\fP was designed to be run from a Unix command line prompt or as a \fBcrond(8)\fP job. Once executed, the general flow of the program is: @@ -898,7 +898,7 @@ .SH BUGS Please report bugs to the author. .SH COPYRIGHT -Copyright (C) 1997-2011 by Bradford L. Barrett. Distributed under +Copyright (C) 1997-2013 by Bradford L. Barrett. Distributed under the GNU GPL. See the files "\fICOPYING\fP" and "\fICopyright\fP", supplied with all distributions for additional information. .SH AUTHOR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/webalizer.c new/webalizer-2.23-08/webalizer.c --- old/webalizer-2.23-05/webalizer.c 2011-04-15 07:52:46.000000000 +0200 +++ new/webalizer-2.23-08/webalizer.c 2013-08-26 06:52:15.000000000 +0200 @@ -1,7 +1,7 @@ /* webalizer - a web server log analysis program - Copyright (C) 1997-2011 Bradford L. Barrett + Copyright (C) 1997-2013 Bradford L. Barrett This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -112,9 +112,9 @@ /*********************************************/ char *version = "2.23"; /* program version */ -char *editlvl = "05"; /* edit level */ -char *moddate = "14-Apr-2011"; /* modification date */ -char *copyright = "Copyright 1997-2011 by Bradford L. Barrett"; +char *editlvl = "08"; /* edit level */ +char *moddate = "26-Aug-2013"; /* modification date */ +char *copyright = "Copyright 1997-2013 by Bradford L. Barrett"; int verbose = 2; /* 2=verbose,1=err, 0=none */ int debug_mode = 0; /* debug mode flag */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/webalizer.h new/webalizer-2.23-08/webalizer.h --- old/webalizer-2.23-05/webalizer.h 2010-10-09 10:06:40.000000000 +0200 +++ new/webalizer-2.23-08/webalizer.h 2013-02-26 06:41:00.000000000 +0100 @@ -14,7 +14,7 @@ #define MAXHASH 4096 /* Size of our hash tables */ #define BUFSIZE 4096 /* Max buffer size for log record */ -#define MAXHOST 128 /* Max hostname buffer size */ +#define MAXHOST 256 /* Max hostname buffer size */ #define MAXURL 4096 /* Max HTTP request/URL field size */ #define MAXURLH 512 /* Max URL field size in htab */ #define MAXREF 1024 /* Max referrer field size */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.23-05/webalizer_lang.h new/webalizer-2.23-08/webalizer_lang.h --- old/webalizer-2.23-05/webalizer_lang.h 2013-11-15 16:57:03.000000000 +0100 +++ new/webalizer-2.23-08/webalizer_lang.h 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to lang/webalizer_lang.english -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
