Update webalizer to version 2.20-01. Other than 2.01-10, this version

actually still exists.

Changes since 2.01-10:
 * Fixed problem with timing totals.
 * Fixed referrer linking to avoid possible xss injection.
 * Fixed month change detection error that caused incorrect report
   dates when logs had a 'gap' longer than a year.
 * Fixed buffer overrun possibility in parsing code and user agent
   mangle logic.
 * Added symbolic link checks for file I/O to prevent possible
   privilege escalation exploits.  Disallows reading from or writing
   to any file that is a symlink.  Thanks to Julien Danjou.
 * Added code to preserve the history and incremental data files in
   the event of a crash before writing to them completely.  Thanks
   to Robert Millan for the idea and initial code.
 * Added native geolocation services, which fully supports both IPv4
   and IPv6 lookups.  Adds the configuration keywords 'GeoDB' and
   'GeoDBDatabase' along with the '-j' and '-J' command line options.
 * Added 'wcmgr', "The Webalizer (DNS) Cache file Manager" to the
   distribution to provide cache file maintenance.  See the supplied
   man page for a description and usage information.
 * Changed history code and main index page to allow for more than
   12 months of reports to be displayed.  Added the config keywords
   'IndexMonths' (-K command line option), 'GraphMonths' (-k command
   line option) and 'YearHeaders' to control how index is displayed.
 * Changed Berkeley DB code to use current 4.x APIs.
 * Added support for bzip2 compressed log files (.bz2) as a compile
   time option (--enable-bz2).  If enabled, bzipped files will be
   decompressed automatically during processing.
 * Added support for W3C formatted logs.  Based on code submitted
   by Klaus Reimer.
 * Added GeoIP support as compile time option (--enable-geoip). Adds
   'GeoIP' and 'GeoIPDatabase' config keywords, '-w' and '-W'
   command line options. (http://www.maxmind.com/)
 * Added IPv6 support.  Based on initial code by Jose Carlos Meneiros
   and modified to support Solaris and other problematic platforms.
 * Added 'CacheIPs' config option to allow saving unresolved addresses
   in the DNS cache.
 * Added 'CacheTTL' config option which allows the DNS cache time to
   live (TTL) value to be specified at run-time.
 * Added 'SearchCaseI' config option to specify if search strings
   should be treated as case insensitive or not.  The default value,
   'yes', causes search strings to be treated as case insensitive.
 * Added 'HTAccess' config option.  Allows writing a default .htaccess
   file to the output directory.
 * Added ability to display flags in the top country table.  Adds the
   config keywords 'CountryFlags' and 'FlagDir', and -z command line
   option.
 * Added 'StripCGI' config option to configure how CGI variables on
   the end of URLs are treated (can now be stripped or left in place).
 * Added 'DefaultIndex' config option to enable/disable the use of
   "index." as a default index name to be stripped from the end of URLs.
 * Added 'TrimSquidURL' config option to allow squid log URLs to be
   reduced in granularity by a user definable amount.  Thanks to code
   submitted by Stuart Gall.
 * Added 'OmitPage' config option (and the '-O' command line switch)
   to prevent specified URLs from being counted as pages even if they
   otherwise would be.  Thanks to code submitted by Adam Morton.
 * Added 'IgnoreState' config option (and the -b command line switch)
   to allow ignoring any existing incremental data file (similar to
   the IgnoreHist/-i option).
 * Changed logic to always generate summary report (index.html),
   even if no records were processed.
 * Added color support to allow changing graph colors.  Based on the
   Webalizer-usecolor code submitted by Benoit Rouits.  Adds 11 new
   config options, see the README file for complete descriptions.
 * Added language 'lang=' specification in generated HTML files.
 * Added 'LinkReferrer' config option to allow/disallow links in the
   top referrers table.
 * Added 'PagePrefix' config option to allow URL prefix matches to
   be counted as pages, regardless of file extension or type.  Thanks
   to code submitted by Remco Van de Meent.
 * Enabled large file support (LFS) to support logs greater than 2Gb
   in size on systems that support LFS.  Also increased the size of
   most internal counters to handle larger sites.
 * Minor changes to generated HTML output
 * Updated language files country codes for current IANA TLDs
 * Changed the meaning of the -v command line switch.  It now
   causes verbose information to be displayed at run-time
   (Informational and Debug messages).
 * Changed Group* config options to allow a quoted string for
   the match string.  This allows spaces to be embedded in the
   string.
 * Changed log record parsing logic to allow spaces in URLs.
 * Made configuration keywords, boolean configuration values
   (yes/no), and log file types case insensitive.  Also fixed
   defaults for invalid values to reflect documented defaults.
 * Changed configure script to use --sysconfdir to specify the
   location of the default webalizer.conf configuration file.
   Also added support for DESTDIR during install to aid binary
   package builds.

5 files changed, 37 insertions, 57 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index f7b815b1cf0..160f8fb69a8 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2007/11/16 11:50:48 martin Exp $
+# $NetBSD: Makefile,v 1.44 2008/12/01 09:45:55 tonnerre Exp $
 #
 
-DISTNAME=	webalizer-2.01-10-src
-PKGNAME=	webalizer-2.1.10
-PKGREVISION=	7
+DISTNAME=	webalizer-2.20-01-src
+PKGNAME=	webalizer-2.20.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		http://gd.tuwien.ac.at/infosys/logeval/webalizer/
diff --git a/www/webalizer/PLIST b/www/webalizer/PLIST
index e4dc30fe086..6c97ec633bb 100644
--- a/www/webalizer/PLIST
+++ b/www/webalizer/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/01 15:08:02 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/12/01 09:45:55 tonnerre Exp $
+bin/wcmgr
 bin/webalizer
 bin/webazolver
+man/man1/wcmgr.1
 man/man1/webalizer.1
+man/man1/webazolver.1
 share/examples/webalizer.conf.sample
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index a6ece17961e..1d226e88689 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.11 2008/04/07 09:43:52 martin Exp $
+$NetBSD: distinfo,v 1.12 2008/12/01 09:45:55 tonnerre Exp $
 
-SHA1 (geolizer_2.01-10-patch.20050520.tar.gz) = d297ff4ff42220e1aec648f1f1580111255c0366
-RMD160 (geolizer_2.01-10-patch.20050520.tar.gz) = 0a492c4268e4437569cf16ff2f5c88fdc04de0ca
-Size (geolizer_2.01-10-patch.20050520.tar.gz) = 39552 bytes
-SHA1 (webalizer-2.01-10-src.tar.bz2) = fbf6ad78fc2b0189d065e661dc02a781e858b31a
-RMD160 (webalizer-2.01-10-src.tar.bz2) = 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20
-Size (webalizer-2.01-10-src.tar.bz2) = 252664 bytes
+SHA1 (webalizer-2.20-01-src.tar.bz2) = f8b646b4e097e4c2784377648602e315f23e8a70
+RMD160 (webalizer-2.20-01-src.tar.bz2) = fab671a54d8e2c3d8b4d310264f6f77bc0baa558
+Size (webalizer-2.20-01-src.tar.bz2) = 302017 bytes
 SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f
-SHA1 (patch-ad) = 4ff72d4b620f64cec68bff826b84d183858c0da9
+SHA1 (patch-ad) = fea9708c791e436345cf90a5f36c003dd1b936cd
 SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e
-SHA1 (patch-af) = c6981b7b141e812a8b1684c4a597b375a538c597
diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad
index 83f0977a1fa..23153864328 100644
--- a/www/webalizer/patches/patch-ad
+++ b/www/webalizer/patches/patch-ad
@@ -1,22 +1,28 @@
-$NetBSD: patch-ad,v 1.8 2003/07/01 14:33:00 jwise Exp $
+$NetBSD: patch-ad,v 1.9 2008/12/01 09:45:55 tonnerre Exp $
 
---- Makefile.in.orig	Tue Oct 17 00:15:53 2000
+--- Makefile.in.orig	2008-07-01 00:04:39.000000000 +0200
 +++ Makefile.in
-@@ -24,7 +24,7 @@
- ETCDIR = @ETCDIR@
- CC     = @CC@
- CFLAGS = @CFLAGS@
--LIBS   = @LIBS@
-+LIBS   = @LIBS@ -lpng -ljpeg -lz -lfreetype -lintl
- DEFS   = -DETCDIR=\"@ETCDIR@\" @DEFS@ @OPTS@
- LDFLAGS= @LDFLAGS@
- INSTALL= @INSTALL@
-@@ -86,7 +86,7 @@
- install: all
- 	$(INSTALL_PROGRAM) webalizer ${BINDIR}/webalizer
- 	$(INSTALL_DATA) webalizer.1 ${MANDIR}/webalizer.1
--	$(INSTALL_DATA) sample.conf ${ETCDIR}/webalizer.conf.sample
-+	$(INSTALL_DATA) sample.conf ${PREFIX}/share/examples/webalizer.conf.sample
- 	rm -f ${BINDIR}/webazolver
- 	@LN_S@ ${BINDIR}/webalizer ${BINDIR}/webazolver
+@@ -21,12 +21,12 @@ exec_prefix     = @exec_prefix@
+ datadir         = @datarootdir@
  
+ BINDIR          = @bindir@
+-MANDIR          = ${datadir}/man/man1
++MANDIR          = ${prefix}/man/man1
+ ETCDIR          = @sysconfdir@
+ GEODB           = @GEODB_LOC@
+ CC              = @CC@
+ CFLAGS          = @CFLAGS@ @CPPFLAGS@
+-LIBS            = @LIBS@
++LIBS            = @LIBS@ -lpng -ljpeg -lz -lfreetype -lintl
+ WCMGR_LIBS      = @WCMGR_LIBS@
+ DEFS            = -DETCDIR=\"${ETCDIR}\" -DGEODB_LOC=\"${GEODB}\" @DEFS@ @OPTS@
+ LDFLAGS         = @LDFLAGS@
+@@ -102,7 +102,7 @@ install: all
+ 	$(INSTALL_DATA) wcmgr.1 ${DESTDIR}${MANDIR}/wcmgr.1
+ 	rm -f ${DESTDIR}${MANDIR}/webazolver.1
+ 	@LN_S@ webalizer.1 ${DESTDIR}${MANDIR}/webazolver.1
+-	$(INSTALL_DATA) sample.conf ${DESTDIR}${ETCDIR}/webalizer.conf.sample
++	$(INSTALL_DATA) sample.conf ${DESTDIR}${PREFIX}/share/examples/webalizer.conf.sample
+ 
+ uninstall:
+ 	rm -f ${DESTDIR}${BINDIR}/webalizer
diff --git a/www/webalizer/patches/patch-af b/www/webalizer/patches/patch-af
deleted file mode 100644
index e64bc658365..00000000000
--- a/www/webalizer/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.2 2007/11/22 15:26:15 martti Exp $
-
---- configure.orig	2000-10-06 10:51:48.000000000 +0300
-+++ configure	2007-11-22 10:52:18.000000000 +0200
-@@ -1216,8 +1216,8 @@
-   cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--test "$ac_cv_search_dbopen" = "no" && for i in db db1; do
--LIBS="-l$i  $ac_func_search_save_LIBS"
-+if test "$ac_cv_search_dbopen" = "no"; then
-+LIBS="${BDB_LIBS} $ac_func_search_save_LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1223 "configure"
- #include "confdefs.h"
-@@ -1239,7 +1239,7 @@
-   cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--done
-+fi
- LIBS="$ac_func_search_save_LIBS"
- fi
-