Hello community,
here is the log from the commit of package webalizer for openSUSE:Factory
checked in at Mon Mar 21 10:42:28 CET 2011.
--------
--- webalizer/webalizer.changes 2010-09-01 15:59:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/webalizer/webalizer.changes 2011-03-19 19:20:41.000000000 +0100
@@ -1,0 +2,17 @@
+Sat Mar 19 18:17:06 UTC 2011 - chris@computersalat.de
+
+- update to 2.23
+ o Fix sporadic eol problem with some IIS/W3C logs
+ o Fix compiler directive syntax error (broke some 64 bit systems)
+ o Modest speed improvements in hash table code
+ - for further changes please see CHANGES file
+- fix License: GPLv2+
+- spec-cleaner
+- remove obsolete define patch
+- add Makefile patch
+ o fix for data-/mandir
+- remove Obsoletes/Provides webalize
+- remove author from spec
+- preun: do not remove var/lib/webalizer/*
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
webalizer-2.21-02-define.diff
webalizer-2.21-02-src.tar.bz2
New:
----
webalizer-2.23-04-Makefile.patch
webalizer-2.23-04-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webalizer.spec ++++++
--- /var/tmp/diff_new_pack.BuhOyN/_old 2011-03-21 10:39:02.000000000 +0100
+++ /var/tmp/diff_new_pack.BuhOyN/_new 2011-03-21 10:39:02.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package webalizer (Version 2.21)
+# spec file for package webalizer
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,30 +15,44 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || apxs -q PREFIX)
+%define editlvl 04
Name: webalizer
-BuildRequires: apache2-devel db-devel gd-devel libGeoIP-devel libapr-util1-devel libjpeg-devel libpng-devel mm pcre-devel xorg-x11 xorg-x11-devel
-%define editlvl 02
-License: LGPLv2.1+
+Summary: A Web Server Log File Analysis Program
+Version: 2.23
+Release: 1
+License: GPLv2+
Group: Productivity/Networking/Web/Utilities
-Provides: webalize
-Obsoletes: webalize
-AutoReqProv: on
-Version: 2.21
-Release: 11
Url: http://www.mrunix.net/webalizer/
-Summary: A Web Server Log File Analysis Program
Source: %{name}-%{version}-%{editlvl}-src.tar.bz2
-Patch: %{name}-%{version}-%{editlvl}.diff
-Patch1: %{name}-%{version}-%{editlvl}-ia64.diff
-Patch3: %{name}-%{version}-%{editlvl}-maxagent.diff
-Patch4: %{name}-%{version}-%{editlvl}-configuration.diff
-Patch5: %{name}-%{version}-%{editlvl}-fclose.diff
-Patch6: %{name}-%{version}-%{editlvl}-define.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Patch0: %{name}-2.21-02.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Patch1: %{name}-2.21-02-ia64.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Patch3: %{name}-2.21-02-maxagent.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Patch4: %{name}-2.21-02-configuration.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
+Patch5: %{name}-2.21-02-fclose.diff
+# FIX-DATADIR - fix for datadir and mandir
+Patch6: %{name}-2.23-04-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || apxs -q PREFIX)
+BuildRequires: apache2-devel
+BuildRequires: db-devel
+BuildRequires: gd-devel
+BuildRequires: libGeoIP-devel
+BuildRequires: libapr-util1-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: mm
+BuildRequires: pcre-devel
+BuildRequires: xorg-x11
+BuildRequires: xorg-x11-devel
+#Provides: webalize
+#Obsoletes: webalize
%description
Webalizer is a web server log file analysis program which produces
@@ -54,15 +68,9 @@
Combined log formats as defined by NCSA and others, and variations of
these which it attempts to handle intelligently.
-
-
-Authors:
---------
- Bradford L. Barrett
-
%prep
%setup -q -n %{name}-%{version}-%{editlvl}
-%patch
+%patch0
%patch1
%patch3
%patch4
@@ -72,39 +80,39 @@
%build
%{suse_update_config -f}
autoconf
-CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr \
- --with-gdlib=%{_libdir} \
- --with-gd=/usr/include/gd \
+CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ./configure \
+ --prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
- --enable-dns \
--enable-bz2 \
--enable-geoip \
+ --with-gdlib=%{_libdir} \
+ --with-gd=/usr/include/gd \
%{_target_cpu}-suse-linux
make LIBNAME=%{_lib}
%install
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/etc
-install -d -m 755 $RPM_BUILD_ROOT/%{_mandir}/man1
-make "DESTDIR=$RPM_BUILD_ROOT" install
-install -d -m 755 $RPM_BUILD_ROOT%{apache_serverroot}/htdocs/webalizer
-install -d -m 755 $RPM_BUILD_ROOT/var/lib/webalizer
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/webalizer.conf.sample $RPM_BUILD_ROOT/%{_sysconfdir}/webalizer.conf
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_prefix}/bin
+install -d -m 755 %{buildroot}/etc
+install -d -m 755 %{buildroot}/%{_mandir}/man1
+make "DESTDIR=%{buildroot}" install
+install -d -m 755 %{buildroot}%{apache_serverroot}/htdocs/webalizer
+install -d -m 755 %{buildroot}%{_localstatedir}/lib/webalizer
+mv %{buildroot}/%{_sysconfdir}/webalizer.conf.sample %{buildroot}/%{_sysconfdir}/webalizer.conf
%preun
-rm -f var/lib/webalizer/*
+#rm -f var/lib/webalizer/*
+
+%clean
+rm -rf %{buildroot}
%files
%defattr(-,root,root)
-%config /etc/webalizer.conf
-%dir %{apache_serverroot}/htdocs/webalizer
-%doc %{_mandir}/man?/*
%doc CHANGES COPYING Copyright README README.FIRST country-codes.txt
-/usr/bin/*
-/var/lib/webalizer
+%doc %{_mandir}/man?/*
+%config(noreplace) %{_sysconfdir}/webalizer.conf
+%dir %{apache_serverroot}/htdocs/webalizer
+%{_bindir}/*
+%{_localstatedir}/lib/webalizer
%changelog
++++++ webalizer-2.23-04-Makefile.patch ++++++
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@
BINDIR = @bindir@
-MANDIR = ${datadir}/man/man1
+MANDIR = @mandir@
ETCDIR = @sysconfdir@
GEODB = @GEODB_LOC@
CC = @CC@
@@ -92,25 +92,25 @@
install: all
mkdir -p ${DESTDIR}${BINDIR}
- mkdir -p ${DESTDIR}${MANDIR}
+ mkdir -p ${DESTDIR}${MANDIR}/man1
mkdir -p ${DESTDIR}${ETCDIR}
$(INSTALL_PROGRAM) webalizer ${DESTDIR}${BINDIR}/webalizer
$(INSTALL_PROGRAM) wcmgr ${DESTDIR}${BINDIR}/wcmgr
rm -f ${DESTDIR}${BINDIR}/webazolver
@LN_S@ webalizer ${DESTDIR}${BINDIR}/webazolver
- $(INSTALL_DATA) webalizer.1 ${DESTDIR}${MANDIR}/webalizer.1
- $(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/wcmgr.1
- rm -f ${DESTDIR}${MANDIR}/webazolver.1
- @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/webazolver.1
+ $(INSTALL_DATA) webalizer.1 ${DESTDIR}${MANDIR}/man1/webalizer.1
+ $(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/man1/wcmgr.1
+ rm -f ${DESTDIR}${MANDIR}/man1/webazolver.1
+ @LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/man1/webazolver.1
$(INSTALL_DATA) sample.conf ${DESTDIR}${ETCDIR}/webalizer.conf.sample
uninstall:
rm -f ${DESTDIR}${BINDIR}/webalizer
rm -f ${DESTDIR}${BINDIR}/webazolver
rm -f ${DESTDIR}${BINDIR}/wcmgr
- rm -f ${DESTDIR}${MANDIR}/webalizer.1
- rm -f ${DESTDIR}${MANDIR}/webazolver.1
- rm -f ${DESTDIR}${MANDIR}/wcmgr.1
+ rm -f ${DESTDIR}${MANDIR}/man1/webalizer.1
+ rm -f ${DESTDIR}${MANDIR}/man1/webazolver.1
+ rm -f ${DESTDIR}${MANDIR}/man1/wcmgr.1
rm -f ${DESTDIR}${ETCDIR}/webalizer.conf.sample
rm -f webalizer_lang.h
@LN_S@ lang/webalizer_lang.${DEFLANG} webalizer_lang.h
++++++ webalizer-2.21-02-src.tar.bz2 -> webalizer-2.23-04-src.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/CHANGES new/webalizer-2.23-04/CHANGES
--- old/webalizer-2.21-02/CHANGES 2009-01-08 06:38:59.000000000 +0100
+++ new/webalizer-2.23-04/CHANGES 2010-10-06 09:33:24.000000000 +0200
@@ -1,5 +1,17 @@
--------------------------------------------------------------------
-2.21-xx changes from 2.20-xx (brad@mrunix.net)
+2.23-xx changes from 2.21-xx
+--------------------------------------------------------------------
+
+Fixes:
+ o Fix sporadic eol problem with some IIS/W3C logs
+
+ o Fix compiler directive syntax error (broke some 64 bit systems)
+
+Changes/Additions:
+ o Modest speed improvements in hash table code
+
+--------------------------------------------------------------------
+2.21-xx changes from 2.20-xx
--------------------------------------------------------------------
Fixes:
@@ -10,8 +22,11 @@
Changes/Additions:
o Added "YearTotals" config option for main index page totals
+ o Rename local stricmp() function to ouricmp() to prevent name
+ confilict on systems that happen to provide it already.
+
--------------------------------------------------------------------
-2.20-xx changes from 2.01-xx (brad@mrunix.net)
+2.20-xx changes from 2.01-xx
--------------------------------------------------------------------
Fixes:
@@ -142,7 +157,7 @@
package builds.
--------------------------------------------------------------------
-2.01-xx changes from 1.30-04 (brad@mrunix.net)
+2.01-xx changes from 1.30-04
--------------------------------------------------------------------
Fixes:
@@ -297,7 +312,7 @@
o Usual documentation updates for new features/functions.
--------------------------------------------------------------------
-1.30-xx changes from 1.22-06 (brad@mrunix.net)
+1.30-xx changes from 1.22-06
--------------------------------------------------------------------
Fixes:
@@ -379,7 +394,7 @@
o Language files and documentation updated for new functions.
--------------------------------------------------------------------
-1.22-xx changes from 1.20-11 (brad@mrunix.net)
+1.22-xx changes from 1.20-11
--------------------------------------------------------------------
Fixes:
@@ -442,7 +457,7 @@
o Updated documentation for new functions/features.
--------------------------------------------------------------------
-1.20-xx changes from 1.12-10 (brad@mrunix.net)
+1.20-xx changes from 1.12-10
--------------------------------------------------------------------
Fixes:
@@ -467,7 +482,7 @@
"Incremental" configuration file keyword).
--------------------------------------------------------------------
-1.1x-xx changes from 1.00-05 (brad@mrunix.net)
+1.1x-xx changes from 1.00-05
--------------------------------------------------------------------
Fixes:
@@ -509,7 +524,7 @@
o Usual README and CHANGES documentation updates.
--------------------------------------------------------------------
-1.00-xx changes from 0.99-06 (brad@mrunix.net)
+1.00-xx changes from 0.99-06
--------------------------------------------------------------------
Fixes:
@@ -532,7 +547,7 @@
languages will be distributed as I receive them.
--------------------------------------------------------------------
-0.99-xx changes from 0.98-16 (brad@mrunix.net)
+0.99-xx changes from 0.98-16
--------------------------------------------------------------------
0.99 is mostly a bug-fix release, with a few added extra goodies.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/Copyright new/webalizer-2.23-04/Copyright
--- old/webalizer-2.21-02/Copyright 2009-01-13 05:47:39.000000000 +0100
+++ new/webalizer-2.23-04/Copyright 2011-01-03 05:53:07.000000000 +0100
@@ -1,6 +1,6 @@
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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.21-02/Makefile.in new/webalizer-2.23-04/Makefile.in
--- old/webalizer-2.21-02/Makefile.in 2009-01-13 05:44:21.000000000 +0100
+++ new/webalizer-2.23-04/Makefile.in 2011-01-03 05:54:32.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile for webalizer - a web server log analysis program
#
-# Copyright (C) 1997-2009 Bradford L. Barrett
+# Copyright (C) 1997-2011 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.21-02/Makefile.std new/webalizer-2.23-04/Makefile.std
--- old/webalizer-2.21-02/Makefile.std 2009-01-13 05:46:50.000000000 +0100
+++ new/webalizer-2.23-04/Makefile.std 2011-01-03 05:55:05.000000000 +0100
@@ -1,7 +1,7 @@
#
# Makefile for webalizer - a web server logfile analysis thingie
#
-# (c)1997-2009 by Bradford L. Barrett
+# (c)1997-2011 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.21-02/README new/webalizer-2.23-04/README
--- old/webalizer-2.21-02/README 2009-01-13 05:44:49.000000000 +0100
+++ new/webalizer-2.23-04/README 2011-01-03 05:55:25.000000000 +0100
@@ -1,5 +1,5 @@
The Webalizer - A web server log file analysis tool
-Copyright 1997-2009 by Bradford L. Barrett
+Copyright 1997-2011 by Bradford L. Barrett
Distributed under the GNU GPL. See the files "COPYING" and
"Copyright" supplied with the distribution for additional info.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/README.FIRST new/webalizer-2.23-04/README.FIRST
--- old/webalizer-2.21-02/README.FIRST 2008-06-16 08:27:11.000000000 +0200
+++ new/webalizer-2.23-04/README.FIRST 2010-10-09 07:44:13.000000000 +0200
@@ -1,4 +1,4 @@
-Upgrade information for the Webalizer Version 2.20
+Upgrade information for the Webalizer Version 2.2x
This release is, for the most part, a drop-in replacement for all
installations currently running 2.01, and all users are encouraged
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/configure new/webalizer-2.23-04/configure
--- old/webalizer-2.21-02/configure 2009-01-13 05:48:53.000000000 +0100
+++ new/webalizer-2.23-04/configure 2011-01-03 05:54:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for webalizer 2.20.
+# Generated by GNU Autoconf 2.61 for webalizer V2.23.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='webalizer'
PACKAGE_TARNAME='webalizer'
-PACKAGE_VERSION='2.20'
-PACKAGE_STRING='webalizer 2.20'
+PACKAGE_VERSION='V2.23'
+PACKAGE_STRING='webalizer V2.23'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures webalizer 2.20 to adapt to many kinds of systems.
+\`configure' configures webalizer V2.23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1242,7 +1242,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of webalizer 2.20:";;
+ short | recursive ) echo "Configuration of webalizer V2.23:";;
esac
cat <<\_ACEOF
@@ -1255,6 +1255,7 @@
--enable-dns Enable DNS/GeoDB lookup code [default=yes]
--enable-bz2 Enable BZip2 decompression code [default=no]
--enable-geoip Enable GeoIP geolocation code [default=no]
+ --enable-oldhash Use old hash function (slower) [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1347,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-webalizer configure 2.20
+webalizer configure V2.23
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1361,7 +1362,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by webalizer $as_me 2.20, which was
+It was created by webalizer $as_me V2.23, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -6386,6 +6387,15 @@
+# Check whether --enable-oldhash was given.
+if test "${enable_oldhash+set}" = set; then
+ enableval=$enable_oldhash; OLDHASH=${enableval}
+else
+ OLDHASH="no"
+fi
+
+ if test "$OLDHASH" = "yes"; then OPTS="-DUSE_OLDHASH"; fi
+
LANG_CACHE=yes
@@ -6869,7 +6879,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by webalizer $as_me 2.20, which was
+This file was extended by webalizer $as_me V2.23, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6916,7 +6926,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-webalizer config.status 2.20
+webalizer config.status V2.23
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/configure.in new/webalizer-2.23-04/configure.in
--- old/webalizer-2.21-02/configure.in 2009-01-13 05:45:04.000000000 +0100
+++ new/webalizer-2.23-04/configure.in 2011-01-03 05:53:44.000000000 +0100
@@ -1,12 +1,12 @@
dnl
dnl The Webalizer - A web server log file analysis program
-dnl Copyright (C) 1997-2009 by Bradford L. Barrett
+dnl Copyright (C) 1997-2011 by Bradford L. Barrett
dnl
-dnl configure.in template for The Webalizer Version 2.20
+dnl configure.in template for The Webalizer Version 2.23
dnl Process this file with autoconf to produce a configure script.
dnl
-AC_INIT(webalizer,2.20)
+AC_INIT(webalizer,V2.23)
OPTS=${DEFS}
LIBS=${LIBS}
@@ -268,6 +268,14 @@
AC_SUBST(GEODB_LOC)
dnl ------------------------------------------
+dnl check which hash function to use
+dnl ------------------------------------------
+AC_ARG_ENABLE(oldhash,
+ [ --enable-oldhash Use old hash function (slower) [[default=no]]],
+ OLDHASH=${enableval}, OLDHASH="no")
+ if test "$OLDHASH" = "yes"; then OPTS="-DUSE_OLDHASH"; fi
+
+dnl ------------------------------------------
dnl check language to use (default is english)
dnl ------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/dns_resolv.c new/webalizer-2.23-04/dns_resolv.c
--- old/webalizer-2.21-02/dns_resolv.c 2009-01-13 05:42:46.000000000 +0100
+++ new/webalizer-2.23-04/dns_resolv.c 2011-01-03 05:51:00.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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.21-02/graphs.c new/webalizer-2.23-04/graphs.c
--- old/webalizer-2.21-02/graphs.c 2009-01-13 05:42:53.000000000 +0100
+++ new/webalizer-2.23-04/graphs.c 2011-01-03 05:51:06.000000000 +0100
@@ -1,7 +1,7 @@
/*
graphs.c - produces graphs used by the Webalizer
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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.21-02/hashtab.c new/webalizer-2.23-04/hashtab.c
--- old/webalizer-2.21-02/hashtab.c 2009-01-13 05:42:57.000000000 +0100
+++ new/webalizer-2.23-04/hashtab.c 2011-01-03 05:51:12.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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
@@ -38,6 +38,11 @@
#include
#endif
+/* some need for uint* */
+#ifdef HAVE_STDINT_H
+#include
+#endif
+
/* need socket header? */
#ifdef HAVE_SYS_SOCKET_H
#include
@@ -68,7 +73,7 @@
void update_entry(char *); /* update entry/exit */
void update_exit(char *); /* page totals */
-u_int64_t hash(char *); /* hash function */
+unsigned int hash(char *); /* hash function */
/* local data */
@@ -83,6 +88,10 @@
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 */
@@ -153,19 +162,23 @@
HNODEPTR *htab) /* ptr>next */
{
HNODEPTR cptr,nptr;
+ unsigned int hval;
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ hval=hash(str);
+ if ( (cptr = htab[hval]) == NULL)
{
/* 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;
nptr->xfer = xfer;
nptr->next = NULL;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
if (visit)
@@ -189,7 +202,16 @@
}
else
{
- /* hashed */
+ /* 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)
@@ -215,6 +237,8 @@
cptr->lasturl=find_url(log_rec.url);
cptr->tstamp=tstamp;
}
+ if (htab==sm_htab) lm_hnode=cptr;
+ else ld_hnode=cptr;
return 0;
}
}
@@ -223,12 +247,14 @@
/* 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;
nptr->xfer = xfer;
- nptr->next = htab[hash(str)];
- htab[hash(str)]=nptr;
+ nptr->next = htab[hval];
+ htab[hval]=nptr;
if (type!=OBJ_GRP) (*ctr)++;
if (visit)
@@ -260,6 +286,8 @@
/* 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;
@@ -290,6 +318,8 @@
htab[i]=NULL;
}
}
+ lm_hnode=NULL;
+ ld_hnode=NULL;
}
/*********************************************/
@@ -334,11 +364,13 @@
u_int64_t *ctr, u_int64_t entry, u_int64_t exit, UNODEPTR *htab)
{
UNODEPTR cptr,nptr;
+ unsigned int hval;
if (str[0]=='-') return 0;
+ hval = hash(str);
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ if ( (cptr = htab[hval]) == NULL)
{
/* not hashed */
if ( (nptr=new_unode(str)) != NULL)
@@ -349,7 +381,7 @@
nptr->next = NULL;
nptr->entry= entry;
nptr->exit = exit;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
}
}
@@ -376,17 +408,17 @@
nptr->flag = type;
nptr->count= count;
nptr->xfer = xfer;
- nptr->next = htab[hash(str)];
+ nptr->next = htab[hval];
nptr->entry= entry;
nptr->exit = exit;
- htab[hash(str)]=nptr;
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
}
}
if (nptr!=NULL)
{
if (type==OBJ_GRP) nptr->flag=OBJ_GRP;
- else if (isinlist(hidden_urls,nptr->string)!=NULL)
+ else if (isinglist(hidden_urls,nptr->string)!=NULL)
nptr->flag=OBJ_HIDE;
}
return nptr==NULL;
@@ -461,11 +493,13 @@
u_int64_t *ctr, RNODEPTR *htab)
{
RNODEPTR cptr,nptr;
+ unsigned int hval;
if (str[0]=='-') strcpy(str,"- (Direct Request)");
+ hval = hash(str);
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ if ( (cptr = htab[hval]) == NULL)
{
/* not hashed */
if ( (nptr=new_rnode(str)) != NULL)
@@ -473,13 +507,15 @@
nptr->flag = type;
nptr->count = count;
nptr->next = NULL;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
}
}
else
{
- /* hashed */
+ /* hashed (SPEEDUP) */
+ if (l_rnode!=NULL && strcmp(l_rnode->string,str)==0) cptr=l_rnode;
+
while (cptr != NULL)
{
if (strcmp(cptr->string,str)==0)
@@ -498,8 +534,8 @@
{
nptr->flag = type;
nptr->count = count;
- nptr->next = htab[hash(str)];
- htab[hash(str)]=nptr;
+ nptr->next = htab[hval];
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
}
}
@@ -508,6 +544,7 @@
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;
}
@@ -537,6 +574,7 @@
htab[i]=NULL;
}
}
+ l_rnode=NULL;
}
/*********************************************/
@@ -581,11 +619,13 @@
u_int64_t *ctr, ANODEPTR *htab)
{
ANODEPTR cptr,nptr;
+ unsigned int hval;
if (str[0]=='-') return 0; /* skip bad user agents */
+ hval = hash(str);
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ if ( (cptr = htab[hval]) == NULL)
{
/* not hashed */
if ( (nptr=new_anode(str)) != NULL)
@@ -593,7 +633,7 @@
nptr->flag = type;
nptr->count= count;
nptr->next = NULL;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
}
}
@@ -618,8 +658,8 @@
{
nptr->flag = type;
nptr->count = count;
- nptr->next = htab[hash(str)];
- htab[hash(str)]=nptr;
+ nptr->next = htab[hval];
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
}
}
@@ -696,18 +736,20 @@
int put_snode(char *str, u_int64_t count, SNODEPTR *htab)
{
SNODEPTR cptr,nptr;
+ unsigned int hval;
if (str[0]==0 || str[0]==' ') return 0; /* skip bad search strs */
+ hval=hash(str);
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ if ( (cptr = htab[hval]) == NULL)
{
/* not hashed */
if ( (nptr=new_snode(str)) != NULL)
{
nptr->count = count;
nptr->next = NULL;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
}
}
else
@@ -727,8 +769,8 @@
if ( (nptr = new_snode(str)) != NULL)
{
nptr->count = count;
- nptr->next = htab[hash(str)];
- htab[hash(str)]=nptr;
+ nptr->next = htab[hval];
+ htab[hval] = nptr;
}
}
return nptr==NULL;
@@ -810,11 +852,13 @@
INODEPTR *htab) /* hashtable */
{
INODEPTR cptr,nptr;
+ unsigned int hval;
if ((str[0]=='-') || (str[0]==0)) return 0; /* skip if no username */
+ hval = hash(str);
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ if ( (cptr = htab[hval]) == NULL)
{
/* not hashed */
if ( (nptr=new_inode(str)) != NULL)
@@ -824,7 +868,7 @@
nptr->files = file;
nptr->xfer = xfer;
nptr->next = NULL;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
if (visit)
@@ -871,8 +915,8 @@
nptr->count = count;
nptr->files = file;
nptr->xfer = xfer;
- nptr->next = htab[hash(str)];
- htab[hash(str)]=nptr;
+ nptr->next = htab[hval];
+ htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
if (visit)
@@ -970,11 +1014,13 @@
int put_dnode(char *str, void *addr, int len, DNODEPTR *htab)
{
DNODEPTR cptr,nptr;
+ unsigned int hval;
if (str[0]==0 || str[0]==' ') return 0; /* skip bad hostnames */
+ hval = hash(str);
/* check if hashed */
- if ( (cptr = htab[hash(str)]) == NULL)
+ if ( (cptr = htab[hval]) == NULL)
{
/* not hashed */
if ( (nptr=new_dnode(str)) != NULL)
@@ -983,7 +1029,7 @@
else memset(&nptr->addr, 0, sizeof(struct sockaddr_storage));
nptr->addrlen = len;
nptr->next = NULL;
- htab[hash(str)] = nptr;
+ htab[hval] = nptr;
}
}
else
@@ -1000,8 +1046,8 @@
if (addr) memcpy(&nptr->addr, addr, len);
else memset(&nptr->addr, 0, sizeof(struct sockaddr_storage));
nptr->addrlen = len;
- nptr->next = htab[hash(str)];
- htab[hash(str)]=nptr;
+ nptr->next = htab[hval];
+ htab[hval] = nptr;
}
}
return nptr==NULL;
@@ -1037,18 +1083,6 @@
#endif /* USE_DNS */
/*********************************************/
-/* HASH - return hash value for string */
-/*********************************************/
-
-u_int64_t hash(char *str)
-{
- u_int64_t hashval;
- for (hashval = 0; *str != '\0'; str++)
- hashval = *str + 31 * hashval;
- return hashval % MAXHASH;
-}
-
-/*********************************************/
/* FIND_URL - Find URL in hash table */
/*********************************************/
@@ -1167,3 +1201,84 @@
}
return tot;
}
+
+#ifdef USE_OLDHASH
+/*********************************************/
+/* HASH - return hash value for string */
+/*********************************************/
+
+unsigned int hash(char *str)
+{
+ uint32_t hashval=0;
+
+ for (hashval = 0; *str != '\0'; str++)
+ hashval = *str + (hashval << 5) - hashval;
+
+ return hashval % MAXHASH;
+}
+
+#else /* USE_OLDHASH */
+/*********************************************/
+/* HASH (SuperFastHash by Paul Hsieh) */
+/*********************************************/
+
+#undef get16bits
+#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
+ || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
+#define get16bits(d) (*((const uint16_t *) (d)))
+#endif
+
+#if !defined (get16bits)
+#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+ +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+
+unsigned int hash(char *str)
+{
+ int len=strlen(str);
+ uint32_t hash = len, tmp;
+ int rem;
+
+ if (len <= 0 || str == NULL) return 0;
+
+ rem = len & 3;
+ len >>= 2;
+
+ /* Main loop */
+ for (;len > 0; len--)
+ {
+ hash += get16bits (str);
+ tmp = (get16bits (str+2) << 11) ^ hash;
+ hash = (hash << 16) ^ tmp;
+ str += 2*sizeof (uint16_t);
+ hash += hash >> 11;
+ }
+
+ /* Handle end cases */
+ switch (rem)
+ {
+ case 3: hash += get16bits (str);
+ hash ^= hash << 16;
+ hash ^= str[sizeof (uint16_t)] << 18;
+ hash += hash >> 11;
+ break;
+ case 2: hash += get16bits (str);
+ hash ^= hash << 11;
+ hash += hash >> 17;
+ break;
+ case 1: hash += *str;
+ hash ^= hash << 10;
+ hash += hash >> 1;
+ }
+
+ /* Force "avalanching" of final 127 bits */
+ hash ^= hash << 3;
+ hash += hash >> 5;
+ hash ^= hash << 4;
+ hash += hash >> 17;
+ hash ^= hash << 25;
+ hash += hash >> 6;
+
+ return hash % MAXHASH;
+}
+#endif /* USE_OLDHASH */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/lang/webalizer_lang.czech new/webalizer-2.23-04/lang/webalizer_lang.czech
--- old/webalizer-2.21-02/lang/webalizer_lang.czech 2008-07-02 00:24:12.000000000 +0200
+++ new/webalizer-2.23-04/lang/webalizer_lang.czech 2009-04-30 09:04:36.000000000 +0200
@@ -13,6 +13,7 @@
28-Mar-2002 Fixes/corrections by Pavel Kolesnikov (k@les.cz)
26-Mar-2008 Updated to current IANA TLDs (brad@mrunix.net)
26-May-2008 Modified for level 2.2 support (brad@mrunix.net)
+ 30-Mar-2009 translations/fixes by Vitezslav Samel (vita@samel.cz)
Language files are named using the following convention:
@@ -85,17 +86,17 @@
/* DNS Stuff */
char *msg_dns_nocf= "Nejsou specifikovany zadne cache soubory, koncim...";
-char *msg_dns_nodb= "Chyba: Namohu odevrit soubory DNS cache";
+char *msg_dns_nodb= "Chyba: Nemohu otevrit soubory DNS cache";
char *msg_dns_nolk= "Chyba: Nemohu zamknout soubory DNS cache";
char *msg_dns_usec= "Pouzivam soubory DNS cache";
char *msg_dns_rslv= "DNS Kontrola";
char *msg_dns_none= "Neni co zpracovat";
-char *msg_dns_abrt= "DNS support not present, aborting...";
+char *msg_dns_abrt= "Neni podpora pro DNS, koncim...";
/* Geolocation stuff */
-char *msg_geo_open= "Error opening file";
-char *msg_geo_use = "Using";
-char *msg_geo_nolu= "lookups disabled";
+char *msg_geo_open= "Nemohu otevrit soubor";
+char *msg_geo_use = "Pouzivam";
+char *msg_geo_nolu= "vyhledavani vypnuto";
char *msg_geo_dflt= "default";
/* memory allocation errors */
@@ -132,7 +133,7 @@
char *h_msg[]= {
"-h = vypis tento help" ,
"-V = vypis informaci o verzi" ,
- "-v = be verbose" ,
+ "-v = bud upovidany" ,
"-d = vypis dalsi ladici informace" ,
"-F type = typ logu. type= (clf | ftp | squid | w3c)",
"-f = chyby v prekladu stranek" ,
@@ -156,31 +157,31 @@
"-r name = skryj odkazovac 'name'" ,
"-s name = skryj misto 'name'" ,
"-u name = skryj URL 'name'" ,
- "-x name = Use filename extension 'name'" ,
- "-O name = Omit page 'name'" ,
- "-P name = Page type extension 'name'" ,
+ "-x name = pouzij priponu souboru 'name'" ,
+ "-O name = vynechej stranku 'name'" ,
+ "-P name = stranky maji priponu 'name'" ,
"-I name = nazev Index(u) 'name'" ,
- "-K poc = 'poc' months in summary table" ,
- "-k poc = 'poc' months in summary graph" ,
- "-A poc = Zobraz 'poc' Nej prohlizecu" ,
- "-C poc = Zobraz 'poc' Nej zemi" ,
- "-R poc = Zobraz 'poc' Nej odkazovacu" ,
- "-S poc = Zobraz 'poc' Nej mist" ,
- "-U poc = Zobraz 'poc' Nej URL" ,
- "-e poc = Zobraz 'poc' vstupnich stranek" ,
- "-E poc = Zobraz 'poc' odchozich stranek" ,
- "-g poc = Seskup domeny do 'poc' urovni" ,
- "-X = Skryt jednotlive site" ,
- "-z dir = Use country flags in 'dir'" ,
+ "-K poc = zobraz 'poc' mesicu v prehledu" ,
+ "-k poc = zobraz 'poc' mesicu v prehledovem grafu",
+ "-A poc = zobraz 'poc' Nej prohlizecu" ,
+ "-C poc = zobraz 'poc' Nej zemi" ,
+ "-R poc = zobraz 'poc' Nej odkazovacu" ,
+ "-S poc = zobraz 'poc' Nej mist" ,
+ "-U poc = zobraz 'poc' Nej URL" ,
+ "-e poc = zobraz 'poc' vstupnich stranek" ,
+ "-E poc = zobraz 'poc' odchozich stranek" ,
+ "-g poc = seskup domeny do 'poc' urovni" ,
+ "-X = skryt jednotlive site" ,
+ "-z dir = vlajky zemi jsou v adresari 'dir'" ,
#ifdef USE_DNS
- "-D name = Pouzi DNS Cache 'name'" ,
- "-N poc = Pocet DNS procesu (0=zakazat)" ,
- "-j = Enable native GeoDB lookups" ,
- "-J name = Use GeoIP database 'name'" ,
+ "-D name = pouzij DNS Cache 'name'" ,
+ "-N poc = pocet DNS procesu (0=zakazat)" ,
+ "-j = pouzij vestavene vyhledavani v GeoDB" ,
+ "-J name = pouzij GeoDB databazi 'name'" ,
#endif
#ifdef USE_GEOIP
- "-w = Enable GeoIP lookups" ,
- "-W name = Use GeoIP database 'name'" ,
+ "-w = pouzij vyhledavani pomoci GeoIP" ,
+ "-W name = pouzij GeoIP databazi 'name'" ,
#endif
NULL};
@@ -263,7 +264,7 @@
char *msg_mtot_mpd= "Str�nek za den";
char *msg_mtot_msd= "M�st za den";
char *msg_mtot_mvd= "N�v�t�v za den";
-char *msg_mtot_mkd= "KByt� za den";
+char *msg_mtot_mkd= "KByt� za den";
char *msg_mtot_rc = "N�v�t�vy podle k�du odpov�di";
/* daily total table */
@@ -364,23 +365,23 @@
{ IDX_3C('m','i','l'), "US vojensk� (mil)", 0,0,0 },
{ IDX_3C('n','e','t'), "S�� (net)", 0,0,0 },
{ IDX_3C('o','r','g'), "Neziskov� organizace (org)", 0,0,0 },
-{ IDX_3C('b','i','z'), "Generic Business (biz)", 0,0,0 },
-{ IDX_3C('c','a','t'), "Catalan Community (cat)", 0,0,0 },
+{ IDX_3C('b','i','z'), "Obchodn� spole�nosti (biz)", 0,0,0 },
+{ IDX_3C('c','a','t'), "Katal�nsk� komunita (cat)", 0,0,0 },
{ IDX_3C('p','r','o'), "Professional (pro)", 0,0,0 },
-{ IDX_3C('t','e','l'), "Ind. Contact Data (tel)", 0,0,0 },
-{ IDX_4C('a','e','r','o'),"Air Transport Industry (aero)", 0,0,0 },
-{ IDX_4C('a','s','i','a'),"Asia Pacific Community (asia)", 0,0,0 },
-{ IDX_4C('c','o','o','p'),"Cooperative Association (coop)", 0,0,0 },
-{ IDX_4C('i','n','f','o'),"Generic TLD (info)", 0,0,0 },
-{ IDX_4C('j','o','b','s'),"Human Resources (jobs)", 0,0,0 },
-{ IDX_4C('m','o','b','i'),"Generic Mobile TLD (mobi)", 0,0,0 },
-{ IDX_4C('n','a','m','e'),"Individual (name)", 0,0,0 },
+{ IDX_3C('t','e','l'), "Glob�ln� adres�� kontakt� (tel)", 0,0,0 },
+{ IDX_4C('a','e','r','o'),"Leteck� pr�mysl (aero)", 0,0,0 },
+{ IDX_4C('a','s','i','a'),"Asijsko/pacifick� komunita (asia)",0,0,0 },
+{ IDX_4C('c','o','o','p'),"Dru�stva (coop)", 0,0,0 },
+{ IDX_4C('i','n','f','o'),"Obecn� TLD (info)", 0,0,0 },
+{ IDX_4C('j','o','b','s'),"Lidsk� zdroje (jobs)", 0,0,0 },
+{ IDX_4C('m','o','b','i'),"Obecn� mobiln� TLD (mobi)", 0,0,0 },
+{ IDX_4C('n','a','m','e'),"Osobn� (name)", 0,0,0 },
{ IDX_4C('a','r','p','a'),"P�vodn� Arpanet (arpa)", 0,0,0 },
{ IDX_4C('n','a','t','o'),"NATO (nato)", 0,0,0 },
-{ IDX_6C('m','u','s','e','u','m'), "Museums (museum)", 0,0,0 },
-{ IDX_6C('t','r','a','v','e','l'), "Travel Ind. (travel)", 0,0,0 },
-{ IDX_2C('a','c'), "Ascension Island", 0,0,0 },
-{ IDX_2C('a','d'), "Andora", 0,0,0 },
+{ IDX_6C('m','u','s','e','u','m'), "Muzea (museum)", 0,0,0 },
+{ IDX_6C('t','r','a','v','e','l'), "Cestovn� ruch (travel)", 0,0,0 },
+{ IDX_2C('a','c'), "Ostrov Ascension", 0,0,0 },
+{ IDX_2C('a','d'), "Andorra", 0,0,0 },
{ IDX_2C('a','e'), "Spojen� arabsk� emir�ty", 0,0,0 },
{ IDX_2C('a','f'), "Afgh�nist�n", 0,0,0 },
{ IDX_2C('a','g'), "Antigua a Barbuda", 0,0,0 },
@@ -395,7 +396,7 @@
{ IDX_2C('a','t'), "Rakousko", 0,0,0 },
{ IDX_2C('a','u'), "Austr�lie", 0,0,0 },
{ IDX_2C('a','w'), "Aruba", 0,0,0 },
-{ IDX_2C('a','x'), "Aland Islands", 0,0,0 },
+{ IDX_2C('a','x'), "Alandy", 0,0,0 },
{ IDX_2C('a','z'), "Azerbajd��n", 0,0,0 },
{ IDX_2C('b','a'), "Bosna a Hercegovina", 0,0,0 },
{ IDX_2C('b','b'), "Barbados", 0,0,0 },
@@ -406,9 +407,9 @@
{ IDX_2C('b','h'), "Bahrajn", 0,0,0 },
{ IDX_2C('b','i'), "Burundi", 0,0,0 },
{ IDX_2C('b','j'), "Benin", 0,0,0 },
-{ IDX_2C('b','l'), "Saint Barthelemy", 0,0,0 },
-{ IDX_2C('b','m'), "Bermuda", 0,0,0 },
-{ IDX_2C('b','n'), "Brunei Darussalam", 0,0,0 },
+{ IDX_2C('b','l'), "Svat� Bartolom�j", 0,0,0 },
+{ IDX_2C('b','m'), "Bermudy", 0,0,0 },
+{ IDX_2C('b','n'), "Brunej", 0,0,0 },
{ IDX_2C('b','o'), "Bol�vie", 0,0,0 },
{ IDX_2C('b','r'), "Braz�lie", 0,0,0 },
{ IDX_2C('b','s'), "Bahamy", 0,0,0 },
@@ -419,7 +420,7 @@
{ IDX_2C('b','z'), "Belize", 0,0,0 },
{ IDX_2C('c','a'), "Kanada", 0,0,0 },
{ IDX_2C('c','c'), "Kokosov� (Keelingovy) ostrovy", 0,0,0 },
-{ IDX_2C('c','d'), "Congo, Democratic Republic", 0,0,0 },
+{ IDX_2C('c','d'), "Kongo", 0,0,0 },
{ IDX_2C('c','f'), "St�edoafrick� republika", 0,0,0 },
{ IDX_2C('c','g'), "Kongo", 0,0,0 },
{ IDX_2C('c','h'), "�v�carsko", 0,0,0 },
@@ -427,7 +428,7 @@
{ IDX_2C('c','k'), "Cookovy ostrovy", 0,0,0 },
{ IDX_2C('c','l'), "Chile", 0,0,0 },
{ IDX_2C('c','m'), "Kamerun", 0,0,0 },
-{ IDX_2C('c','n'), "Cina", 0,0,0 },
+{ IDX_2C('c','n'), "��na", 0,0,0 },
{ IDX_2C('c','o'), "Kolumbie", 0,0,0 },
{ IDX_2C('c','r'), "Kostarika", 0,0,0 },
{ IDX_2C('c','u'), "Kuba", 0,0,0 },
@@ -448,7 +449,7 @@
{ IDX_2C('e','r'), "Eritrea", 0,0,0 },
{ IDX_2C('e','s'), "�pan�lsko", 0,0,0 },
{ IDX_2C('e','t'), "Etiopie", 0,0,0 },
-{ IDX_2C('e','u'), "European Union", 0,0,0 },
+{ IDX_2C('e','u'), "Evropsk� unie", 0,0,0 },
{ IDX_2C('f','i'), "Finsko", 0,0,0 },
{ IDX_2C('f','j'), "Fid�i", 0,0,0 },
{ IDX_2C('f','k'), "Falklandsk� ostrovy (Malv�ny)", 0,0,0 },
@@ -469,7 +470,7 @@
{ IDX_2C('g','p'), "Guadeloupe", 0,0,0 },
{ IDX_2C('g','q'), "Rovn�kov� Guinea", 0,0,0 },
{ IDX_2C('g','r'), "�ecko", 0,0,0 },
-{ IDX_2C('g','s'), "Sv. Georgia a Sv. Sandwich ostr.", 0,0,0 },
+{ IDX_2C('g','s'), "Ji�n� Georgia a Ji�n� Sandwichovy ostrovy", 0,0,0 },
{ IDX_2C('g','t'), "Guatemala", 0,0,0 },
{ IDX_2C('g','u'), "Guam", 0,0,0 },
{ IDX_2C('g','w'), "Guinea-Bissau", 0,0,0 },
@@ -483,11 +484,11 @@
{ IDX_2C('i','d'), "Indon�sie", 0,0,0 },
{ IDX_2C('i','e'), "Irsko", 0,0,0 },
{ IDX_2C('i','l'), "Izrael", 0,0,0 },
-{ IDX_2C('i','m'), "Isle of Man", 0,0,0 },
+{ IDX_2C('i','m'), "Ostrov Man", 0,0,0 },
{ IDX_2C('i','n'), "Indie", 0,0,0 },
-{ IDX_2C('i','o'), "British Indian Ocean Territory", 0,0,0 },
+{ IDX_2C('i','o'), "Britsk� indickooce�nsk� �zem�", 0,0,0 },
{ IDX_2C('i','q'), "Ir�k", 0,0,0 },
-{ IDX_2C('i','r'), "Ir�n", 0,0,0 },
+{ IDX_2C('i','r'), "�r�n", 0,0,0 },
{ IDX_2C('i','s'), "Island", 0,0,0 },
{ IDX_2C('i','t'), "It�lie", 0,0,0 },
{ IDX_2C('j','e'), "Jersey", 0,0,0 },
@@ -495,19 +496,19 @@
{ IDX_2C('j','o'), "Jord�nsko", 0,0,0 },
{ IDX_2C('j','p'), "Japonsko", 0,0,0 },
{ IDX_2C('k','e'), "Ke�a", 0,0,0 },
-{ IDX_2C('k','g'), "Kyrgyzstan", 0,0,0 },
+{ IDX_2C('k','g'), "Kyrgyzst�n", 0,0,0 },
{ IDX_2C('k','h'), "Kambod�a", 0,0,0 },
{ IDX_2C('k','i'), "Kiribati", 0,0,0 },
{ IDX_2C('k','m'), "Komory", 0,0,0 },
-{ IDX_2C('k','n'), "Svat� Kitts a Nevis", 0,0,0 },
-{ IDX_2C('k','p'), "Korea (Severn�)", 0,0,0 },
-{ IDX_2C('k','r'), "Korea (Ji�n�)", 0,0,0 },
+{ IDX_2C('k','n'), "Svat� Kry�tof a Nevis", 0,0,0 },
+{ IDX_2C('k','p'), "Severn� Korea", 0,0,0 },
+{ IDX_2C('k','r'), "Ji�n� Korea", 0,0,0 },
{ IDX_2C('k','w'), "Kuvajt", 0,0,0 },
{ IDX_2C('k','y'), "Kajmansk� ostrovy", 0,0,0 },
-{ IDX_2C('k','z'), "Kazachstan", 0,0,0 },
+{ IDX_2C('k','z'), "Kazachst�n", 0,0,0 },
{ IDX_2C('l','a'), "Laos", 0,0,0 },
{ IDX_2C('l','b'), "Libanon", 0,0,0 },
-{ IDX_2C('l','c'), "Santa Lucia", 0,0,0 },
+{ IDX_2C('l','c'), "Svat� Lucie", 0,0,0 },
{ IDX_2C('l','i'), "Lichten�tejnsko", 0,0,0 },
{ IDX_2C('l','k'), "Sr� Lanka", 0,0,0 },
{ IDX_2C('l','r'), "Lib�rie", 0,0,0 },
@@ -515,12 +516,12 @@
{ IDX_2C('l','t'), "Litva", 0,0,0 },
{ IDX_2C('l','u'), "Lucembursko", 0,0,0 },
{ IDX_2C('l','v'), "Loty�sko", 0,0,0 },
-{ IDX_2C('l','y'), "Libie", 0,0,0 },
+{ IDX_2C('l','y'), "Libye", 0,0,0 },
{ IDX_2C('m','a'), "Maroko", 0,0,0 },
{ IDX_2C('m','c'), "Monako", 0,0,0 },
-{ IDX_2C('m','d'), "Mold�vie", 0,0,0 },
-{ IDX_2C('m','e'), "Montenegro", 0,0,0 },
-{ IDX_2C('m','f'), "Saint Martin (French part)", 0,0,0 },
+{ IDX_2C('m','d'), "Moldavsko", 0,0,0 },
+{ IDX_2C('m','e'), "�ern� hora", 0,0,0 },
+{ IDX_2C('m','f'), "Svat� Martin (francouzsk� ��st)", 0,0,0 },
{ IDX_2C('m','g'), "Madagaskar", 0,0,0 },
{ IDX_2C('m','h'), "Marshallovy ostrovy", 0,0,0 },
{ IDX_2C('m','k'), "Makedonie", 0,0,0 },
@@ -528,7 +529,7 @@
{ IDX_2C('m','m'), "Myanmar", 0,0,0 },
{ IDX_2C('m','n'), "Mongolsko", 0,0,0 },
{ IDX_2C('m','o'), "Macao", 0,0,0 },
-{ IDX_2C('m','p'), "Northern Mariana Islands", 0,0,0 },
+{ IDX_2C('m','p'), "Severn� Mariany", 0,0,0 },
{ IDX_2C('m','q'), "Martinik", 0,0,0 },
{ IDX_2C('m','r'), "Mauret�nie", 0,0,0 },
{ IDX_2C('m','s'), "Montserrat", 0,0,0 },
@@ -539,11 +540,11 @@
{ IDX_2C('m','x'), "Mexiko", 0,0,0 },
{ IDX_2C('m','y'), "Malajsie", 0,0,0 },
{ IDX_2C('m','z'), "Mozambik", 0,0,0 },
-{ IDX_2C('n','a'), "Nam�bie", 0,0,0 },
+{ IDX_2C('n','a'), "Namibie", 0,0,0 },
{ IDX_2C('n','c'), "Nov� Kaledonie", 0,0,0 },
{ IDX_2C('n','e'), "Niger", 0,0,0 },
-{ IDX_2C('n','f'), "Norfolk Island", 0,0,0 },
-{ IDX_2C('n','g'), "Nigerie", 0,0,0 },
+{ IDX_2C('n','f'), "Norfolk", 0,0,0 },
+{ IDX_2C('n','g'), "Nig�rie", 0,0,0 },
{ IDX_2C('n','i'), "Nikaragua", 0,0,0 },
{ IDX_2C('n','l'), "Nizozemsko", 0,0,0 },
{ IDX_2C('n','o'), "Norsko", 0,0,0 },
@@ -555,55 +556,55 @@
{ IDX_2C('p','a'), "Panama", 0,0,0 },
{ IDX_2C('p','e'), "Peru", 0,0,0 },
{ IDX_2C('p','f'), "Francouzsk� Polyn�sie", 0,0,0 },
-{ IDX_2C('p','g'), "Papua Nov� Guinea", 0,0,0 },
+{ IDX_2C('p','g'), "Papua-Nov� Guinea", 0,0,0 },
{ IDX_2C('p','h'), "Filip�ny", 0,0,0 },
-{ IDX_2C('p','k'), "Pakist�n", 0,0,0 },
+{ IDX_2C('p','k'), "P�kist�n", 0,0,0 },
{ IDX_2C('p','l'), "Polsko", 0,0,0 },
-{ IDX_2C('p','m'), "St. Pierre and Miquelon", 0,0,0 },
-{ IDX_2C('p','n'), "Pitcairn", 0,0,0 },
+{ IDX_2C('p','m'), "Saint-Pierre a Miquelon", 0,0,0 },
+{ IDX_2C('p','n'), "Pitcairnovy ostrovy", 0,0,0 },
{ IDX_2C('p','r'), "Portoriko", 0,0,0 },
-{ IDX_2C('p','s'), "Palestinian Territory, Occupied", 0,0,0 },
+{ IDX_2C('p','s'), "Palestinsk� autonomie", 0,0,0 },
{ IDX_2C('p','t'), "Portugalsko", 0,0,0 },
{ IDX_2C('p','w'), "Palau", 0,0,0 },
-{ IDX_2C('p','y'), "Paraguaj", 0,0,0 },
+{ IDX_2C('p','y'), "Paraguay", 0,0,0 },
{ IDX_2C('q','a'), "Katar", 0,0,0 },
-{ IDX_2C('r','e'), "Reunion", 0,0,0 },
+{ IDX_2C('r','e'), "R�union", 0,0,0 },
{ IDX_2C('r','o'), "Rumunsko", 0,0,0 },
-{ IDX_2C('r','s'), "Serbia", 0,0,0 },
+{ IDX_2C('r','s'), "Srbsko", 0,0,0 },
{ IDX_2C('r','u'), "Rusk� federace", 0,0,0 },
{ IDX_2C('r','w'), "Rwanda", 0,0,0 },
-{ IDX_2C('s','a'), "Saudsk� Ar�bie", 0,0,0 },
+{ IDX_2C('s','a'), "Sa�dsk� Ar�bie", 0,0,0 },
{ IDX_2C('s','b'), "�alamounovy ostrovy", 0,0,0 },
{ IDX_2C('s','c'), "Seychely", 0,0,0 },
-{ IDX_2C('s','d'), "S�d�n", 0,0,0 },
+{ IDX_2C('s','d'), "S�d�n", 0,0,0 },
{ IDX_2C('s','e'), "�v�dsko", 0,0,0 },
{ IDX_2C('s','g'), "Singapur", 0,0,0 },
{ IDX_2C('s','h'), "Sv. Helena", 0,0,0 },
{ IDX_2C('s','i'), "Slovinsko", 0,0,0 },
-{ IDX_2C('s','j'), "Svalbard and Jan Mayen Islands", 0,0,0 },
+{ IDX_2C('s','j'), "�picberky a ostrov Jan Mayen", 0,0,0 },
{ IDX_2C('s','k'), "Slovensk� republika", 0,0,0 },
{ IDX_2C('s','l'), "Sierra Leone", 0,0,0 },
{ IDX_2C('s','m'), "San Marino", 0,0,0 },
{ IDX_2C('s','n'), "Senegal", 0,0,0 },
{ IDX_2C('s','o'), "Som�lsko", 0,0,0 },
{ IDX_2C('s','r'), "Surinam", 0,0,0 },
-{ IDX_2C('s','t'), "Sao Tome and Principe", 0,0,0 },
-{ IDX_2C('s','u'), "SSSR", 0,0,0 },
+{ IDX_2C('s','t'), "Svat� Tom� a Princ�v ostrov", 0,0,0 },
+{ IDX_2C('s','u'), "Sov�tsk� svaz", 0,0,0 },
{ IDX_2C('s','v'), "Salv�dor", 0,0,0 },
{ IDX_2C('s','y'), "S�rie", 0,0,0 },
{ IDX_2C('s','z'), "Svazijsko", 0,0,0 },
-{ IDX_2C('t','c'), "Turks and Caicos Islands", 0,0,0 },
+{ IDX_2C('t','c'), "Turks a Caicos", 0,0,0 },
{ IDX_2C('t','d'), "�ad", 0,0,0 },
-{ IDX_2C('t','f'), "Francouzsk� ji�n� teritoria", 0,0,0 },
+{ IDX_2C('t','f'), "Francouzsk� ji�n� teritoria-Antarktida", 0,0,0 },
{ IDX_2C('t','g'), "Togo", 0,0,0 },
{ IDX_2C('t','h'), "Thajsko", 0,0,0 },
-{ IDX_2C('t','j'), "Tad�ikistan", 0,0,0 },
+{ IDX_2C('t','j'), "T�d�ikist�n", 0,0,0 },
{ IDX_2C('t','k'), "Tokelau", 0,0,0 },
-{ IDX_2C('t','l'), "Timor-Leste", 0,0,0 },
-{ IDX_2C('t','m'), "Turkmenistan", 0,0,0 },
+{ IDX_2C('t','l'), "V�chodn� Timor", 0,0,0 },
+{ IDX_2C('t','m'), "Turkmenist�n", 0,0,0 },
{ IDX_2C('t','n'), "Tunisko", 0,0,0 },
{ IDX_2C('t','o'), "Tongo", 0,0,0 },
-{ IDX_2C('t','p'), "V�chodn� Timur", 0,0,0 },
+{ IDX_2C('t','p'), "V�chodn� Timor", 0,0,0 },
{ IDX_2C('t','r'), "Turecko", 0,0,0 },
{ IDX_2C('t','t'), "Trinidad a Tobago", 0,0,0 },
{ IDX_2C('t','v'), "Tuvalu", 0,0,0 },
@@ -612,18 +613,18 @@
{ IDX_2C('u','a'), "Ukrajina", 0,0,0 },
{ IDX_2C('u','g'), "Uganda", 0,0,0 },
{ IDX_2C('u','k'), "Velk� Brit�nie (UK)", 0,0,0 },
-{ IDX_2C('u','m'), "US Minor Outlying Islands", 0,0,0 },
+{ IDX_2C('u','m'), "Men�� odlehl� ostrovy USA", 0,0,0 },
{ IDX_2C('u','s'), "USA (US)", 0,0,0 },
{ IDX_2C('u','y'), "Uruguay", 0,0,0 },
-{ IDX_2C('u','z'), "Uzbekistan", 0,0,0 },
+{ IDX_2C('u','z'), "Uzbekist�n", 0,0,0 },
{ IDX_2C('v','a'), "Vatik�n", 0,0,0 },
-{ IDX_2C('v','c'), "Saint Vincent and the Grenadines", 0,0,0 },
+{ IDX_2C('v','c'), "Svat� Vincenc a Grenadiny", 0,0,0 },
{ IDX_2C('v','e'), "Venezuela", 0,0,0 },
-{ IDX_2C('v','g'), "Panensk� ostrovy (Britsk�)", 0,0,0 },
-{ IDX_2C('v','i'), "Panenske ostrovy (US)", 0,0,0 },
+{ IDX_2C('v','g'), "Britsk� Panensk� ostrovy", 0,0,0 },
+{ IDX_2C('v','i'), "Americk� Panensk� ostrovy", 0,0,0 },
{ IDX_2C('v','n'), "Vietnam", 0,0,0 },
{ IDX_2C('v','u'), "Vanuatu", 0,0,0 },
-{ IDX_2C('w','f'), "Wallis and Futuna Islands", 0,0,0 },
+{ IDX_2C('w','f'), "Wallis a Futuna", 0,0,0 },
{ IDX_2C('w','s'), "Samoa", 0,0,0 },
{ IDX_2C('y','e'), "Jemen", 0,0,0 },
{ IDX_2C('y','t'), "Mayotte", 0,0,0 },
@@ -631,9 +632,9 @@
{ IDX_2C('z','a'), "Jihoafrick� republika", 0,0,0 },
{ IDX_2C('z','m'), "Zambie", 0,0,0 },
{ IDX_2C('z','w'), "Zimbabwe", 0,0,0 },
-{ IDX_2C('a','1'), "Anonymous Proxy", 0,0,0 },
-{ IDX_2C('a','2'), "Satellite Provider", 0,0,0 },
-{ IDX_2C('o','1'), "Other", 0,0,0 },
-{ IDX_2C('a','p'), "Asia/Pacific Region", 0,0,0 },
-{ IDX_3C('l','a','n'), "Local Network (lan)", 0,0,0 },
+{ IDX_2C('a','1'), "Anonymn� proxy", 0,0,0 },
+{ IDX_2C('a','2'), "Satelitn� poskytovatel�", 0,0,0 },
+{ IDX_2C('o','1'), "Ostatn�", 0,0,0 },
+{ IDX_2C('a','p'), "Asijskopacifick� region", 0,0,0 },
+{ IDX_3C('l','a','n'), "Lok�ln� s�� (lan)", 0,0,0 },
{ 0, NULL, 0,0,0 }};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/linklist.c new/webalizer-2.23-04/linklist.c
--- old/webalizer-2.21-02/linklist.c 2009-01-13 05:43:00.000000000 +0100
+++ new/webalizer-2.23-04/linklist.c 2011-01-03 05:51:20.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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.21-02/output.c new/webalizer-2.23-04/output.c
--- old/webalizer-2.21-02/output.c 2009-01-13 06:34:04.000000000 +0100
+++ new/webalizer-2.23-04/output.c 2011-01-03 05:52:05.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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-2009 Bradford L. Barrett -->\n");
+ fprintf(out_fp,"<!-- Copyright 1997-2011 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.21-02/parser.c new/webalizer-2.23-04/parser.c
--- old/webalizer-2.21-02/parser.c 2009-01-13 05:43:08.000000000 +0100
+++ new/webalizer-2.23-04/parser.c 2011-01-03 05:51:34.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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
@@ -556,6 +556,21 @@
memset(&gm_time, 0, sizeof(struct tm));
size = strlen(buffer); /* get length of buffer */
eob = buffer + size; /* calculate end of buffer */
+
+ /* remove line end markers, reduce eob accordingly */
+ cp = eob;
+ while(cp>buffer)
+ {
+ cp--;
+ if (*cp == '\r' || *cp=='\n')
+ {
+ *cp = '\0';
+ eob--;
+ }
+ else
+ break;
+ }
+
fmt_logrec(buffer); /* seperate fields with \0's */
cp = buffer;
@@ -575,7 +590,7 @@
while (*cp) cp++;
cp++;
index = 1;
- while ((cp < eob) && (*cp != '\r') && (*cp != '\n'))
+ while (cp < eob)
{
/* Set the field index */
if (!strcmp(cp, "date")) field_index.date = index;
@@ -607,7 +622,7 @@
/* Check if the number of entries in this line are conform to the
format specified in the header */
index = 1;
- while ((cp < eob) && (*cp != '\r') && (*cp != '\n'))
+ while (cp < eob)
{
while (*cp) cp++;
cp++;
@@ -621,7 +636,7 @@
/* Reset the field pointers and begin parsing the data line */
memset(&fields, 0, sizeof(struct fields_struct));
index = 1;
- while ((cp < eob) && (*cp != '\r') && (*cp != '\n'))
+ while (cp < eob)
{
/* Set the field pointers */
if (index == field_index.date) fields.date = cp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/preserve.c new/webalizer-2.23-04/preserve.c
--- old/webalizer-2.21-02/preserve.c 2009-01-13 05:43:12.000000000 +0100
+++ new/webalizer-2.23-04/preserve.c 2011-01-03 05:51:40.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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.21-02/sample.conf new/webalizer-2.23-04/sample.conf
--- old/webalizer-2.21-02/sample.conf 2009-01-13 05:46:19.000000000 +0100
+++ new/webalizer-2.23-04/sample.conf 2011-01-03 05:53:33.000000000 +0100
@@ -1,6 +1,6 @@
#
# Sample Webalizer configuration file
-# Copyright 1997-2009 by Bradford L. Barrett
+# Copyright 1997-2011 by Bradford L. Barrett
#
# Distributed under the GNU General Public License. See the
# files "Copyright" and "COPYING" provided with the webalizer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/wcmgr.1 new/webalizer-2.23-04/wcmgr.1
--- old/webalizer-2.21-02/wcmgr.1 2009-01-13 05:45:27.000000000 +0100
+++ new/webalizer-2.23-04/wcmgr.1 2011-01-03 05:54:43.000000000 +0100
@@ -103,7 +103,7 @@
.SH BUGS
Please report bugs to the author.
.SH COPYRIGHT
-Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under
+Copyright (C) 1997-2011 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.21-02/wcmgr.c new/webalizer-2.23-04/wcmgr.c
--- old/webalizer-2.21-02/wcmgr.c 2009-01-13 05:45:49.000000000 +0100
+++ new/webalizer-2.23-04/wcmgr.c 2011-01-03 05:52:38.000000000 +0100
@@ -3,7 +3,7 @@
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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
@@ -96,7 +96,7 @@
char *version = "1.00"; /* program version */
char *editlvl = "03"; /* edit level */
char *moddate = "12-Jul-2008"; /* modification date */
-char *copyright = "Copyright 2007-2009 by Bradford L. Barrett";
+char *copyright = "Copyright 2007-2011 by Bradford L. Barrett";
int action = 'l'; /* action flag (default=list) */
int create = 0; /* cache creation flag */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/webalizer-2.21-02/webalizer.1 new/webalizer-2.23-04/webalizer.1
--- old/webalizer-2.21-02/webalizer.1 2009-01-13 05:51:37.000000000 +0100
+++ new/webalizer-2.23-04/webalizer.1 2011-01-03 05:54:51.000000000 +0100
@@ -898,7 +898,7 @@
.SH BUGS
Please report bugs to the author.
.SH COPYRIGHT
-Copyright (C) 1997-2009 by Bradford L. Barrett. Distributed under
+Copyright (C) 1997-2011 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.21-02/webalizer.c new/webalizer-2.23-04/webalizer.c
--- old/webalizer-2.21-02/webalizer.c 2009-01-13 06:35:54.000000000 +0100
+++ new/webalizer-2.23-04/webalizer.c 2011-01-03 05:52:28.000000000 +0100
@@ -1,7 +1,7 @@
/*
webalizer - a web server log analysis program
- Copyright (C) 1997-2009 Bradford L. Barrett
+ Copyright (C) 1997-2011 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
@@ -28,7 +28,7 @@
/* Fix broken Zlib 64 bitness */
#if _FILE_OFFSET_BITS == 64
#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE = 1
+#define _LARGEFILE64_SOURCE 1
#endif
#endif
@@ -104,17 +104,17 @@
char *get_domain(char *); /* return domain name */
void agent_mangle(char *); /* reformat user agent */
char *our_gzgets(void *, char *, int); /* our gzgets */
-int stricmp(char *, char *); /* case ins. compare */
+int ouricmp(char *, char *); /* case ins. compare */
int isipaddr(char *); /* is IP address test */
/*********************************************/
/* GLOBAL VARIABLES */
/*********************************************/
-char *version = "2.21"; /* program version */
-char *editlvl = "02"; /* edit level */
-char *moddate = "13-Jan-2009"; /* modification date */
-char *copyright = "Copyright 1997-2009 by Bradford L. Barrett";
+char *version = "2.23"; /* program version */
+char *editlvl = "04"; /* edit level */
+char *moddate = "19-Nov-2010"; /* modification date */
+char *copyright = "Copyright 1997-2011 by Bradford L. Barrett";
int verbose = 2; /* 2=verbose,1=err, 0=none */
int debug_mode = 0; /* debug mode flag */
@@ -1670,7 +1670,7 @@
key=0;
for (i=0;i (b) ? (a) : (b))
#endif
-#define MAXHASH 2048 /* Size of our hash tables */
+#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 MAXURL 4096 /* Max HTTP request/URL field size */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org