Moved a few large files to mirrors wrt bug #123634.

Package-Manager: portage-2.1_pre4-r1

10 files changed, 63 insertions, 1449 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 5fe5ba99a702..699663f1f550 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.46 2006/02/22 16:30:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.47 2006/02/23 15:39:49 rl03 Exp $
+
+  23 Feb 2006; Renat Lumpau <rl03@gentoo.org> -files/2.01.10/webalizer.conf,
+  -files/webalizer-search.patch, webalizer-2.01.10-r4.ebuild,
+  webalizer-2.01.10-r5.ebuild, webalizer-2.01.10-r12.ebuild:
+  Moved a few large files to mirrors wrt bug #123634.
 
   22 Feb 2006; Renat Lumpau <rl03@gentoo.org>
   -files/webalizer-db4-with-geoip.patch, -files/webalizer-db4.patch,
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 0acbc909dd83..94de7010f7c7 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 57cf047567f9495c8f6d23bdceca8a60 ChangeLog 6863
-RMD160 7957f465ea2e09d2bb9d19cc2a19c2dcd4efc557 ChangeLog 6863
-SHA256 d93fa6441f628c238b5d2140cbc3aeccccd479c5416c81ae19d7fe95fed65f22 ChangeLog 6863
+MD5 4f765ca4c8b7360c52be9afee6168d1c ChangeLog 7118
+RMD160 38719b5a5c6f47b8a39a6291b4e529e163bd7c9a ChangeLog 7118
+SHA256 d7971082802f99c0e38681218d786a4569b7f4bad88bc79608c1a34c305bb3ff ChangeLog 7118
 MD5 f04ad397866d35f9ede71fc6da2392ed files/2.01.10/apache.webalizer 306
 RMD160 cc7e820da4aef6fa5f4078558407b7fe00e6146c files/2.01.10/apache.webalizer 306
 SHA256 3b6107aaa3898b875bc0af0f9addf9b3e077570a210908179e0257562bf52353 files/2.01.10/apache.webalizer 306
 MD5 45d6e8c8bd9f76c0e22d80acc0603aff files/2.01.10/reconfig 394
 RMD160 b7a23197c01db50f3dde83fc137944adaa642c28 files/2.01.10/reconfig 394
 SHA256 768fe5472a89d1338785948416fd4e1d9f3de60bfd5c09a27a3816f093c99d9f files/2.01.10/reconfig 394
-MD5 7a71200318400e9c4a33e23bfc65904d files/2.01.10/webalizer.conf 23927
-RMD160 d056e384b3388da7703a037e8d626e3e9ebb381c files/2.01.10/webalizer.conf 23927
-SHA256 e87f7ab29007834fc21f79bbc4a5cc06b335122775a5a88a45a59f975dd1f706 files/2.01.10/webalizer.conf 23927
-MD5 ff891ce8686805d073f411c1446ee410 files/digest-webalizer-2.01.10-r12 843
-RMD160 15e0a87ed579b6cbaaeb26dbb023bcf0f496ac06 files/digest-webalizer-2.01.10-r12 843
-SHA256 7c3ac6546a3f41c993a0571d7eb677b24352b690bdd2dcfffa7a8bf1b4d17bb0 files/digest-webalizer-2.01.10-r12 843
-MD5 bc64ced59f4249b87c566b5d34a6fe1f files/digest-webalizer-2.01.10-r4 268
-RMD160 98c61492ea4aa3d860f6e6b8b9fb01d81a962feb files/digest-webalizer-2.01.10-r4 268
-SHA256 6533c2b211395e8f9c19aa415a0356a205dff73c79f20db1e623daf05ba8c4c1 files/digest-webalizer-2.01.10-r4 268
-MD5 c283fc0fd5687666b15e6da9f4b3cc2c files/digest-webalizer-2.01.10-r5 563
-RMD160 0b1a55408c8e73592239d8430efdf500da2140c5 files/digest-webalizer-2.01.10-r5 563
-SHA256 09892b71209d881a2b79658dabcc586d794aeef8b879f8f2e225c815dabd4ea5 files/digest-webalizer-2.01.10-r5 563
+MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r12 1319
+RMD160 7ca1db406fcdee6d97f2c2301b726beaf854fe9a files/digest-webalizer-2.01.10-r12 1319
+SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/digest-webalizer-2.01.10-r12 1319
+MD5 556575fd11faab14758f71662b90b6b1 files/digest-webalizer-2.01.10-r4 494
+RMD160 2b32b82dd4ec281f9b232fde987d923fbf9a140b files/digest-webalizer-2.01.10-r4 494
+SHA256 4fb4bcfa97512dd4d7ed1e63e8445ace85ff968b02752ae4ece374dbc885f1ec files/digest-webalizer-2.01.10-r4 494
+MD5 c54a5157d05d808505a6fe4f899578a3 files/digest-webalizer-2.01.10-r5 789
+RMD160 50decb154d3b5ab2b42250ad5d48756ccf371a60 files/digest-webalizer-2.01.10-r5 789
+SHA256 5c117144e88175861bf2f8d99bf28f51cd282c80aedf357de866b0781e3c8414 files/digest-webalizer-2.01.10-r5 789
 MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
 RMD160 afcfdc0eb34269f693267e19dde2ed6119789b7a files/output.c.patch 8088
 SHA256 002285d333af4d04fa1591a72d320ed3104b95ca3856389f53d9992cb1cd9da7 files/output.c.patch 8088
@@ -34,25 +31,22 @@ SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 files/we
 MD5 766a26ff1600e3ea5359278a9dcd1025 files/webalizer-readability.patch 8345
 RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 files/webalizer-readability.patch 8345
 SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 files/webalizer-readability.patch 8345
-MD5 e02bdabb67987423cb53ecadc6f70cf3 files/webalizer-search.patch 30559
-RMD160 0d2149290265df652b131c29bb496f442d9af6b0 files/webalizer-search.patch 30559
-SHA256 c608e8992de56e85c0136279abc54319bab9597d5285f468a0cb50460a2c1973 files/webalizer-search.patch 30559
 MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223
 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 metadata.xml 223
 SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 metadata.xml 223
-MD5 5f28c01a9aa19c26a42f8697ccf90741 webalizer-2.01.10-r12.ebuild 4289
-RMD160 7940a3493f0504abdf6440c8399f76022bc920f7 webalizer-2.01.10-r12.ebuild 4289
-SHA256 0fe771b8c7f9e569de12a1d6c64adffbd43de43a2046cb2c1671180be1f39f5a webalizer-2.01.10-r12.ebuild 4289
-MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
-RMD160 93a8c75cba85a1a5a8a0944a11d4a2580529ee59 webalizer-2.01.10-r4.ebuild 2056
-SHA256 d93dd2fed0c7f1eb1b34fe86d7f9a6e5990a2dcc420d6210bdd011cc107c1517 webalizer-2.01.10-r4.ebuild 2056
-MD5 e7883822bb2a1bcd2b8409ba709a964e webalizer-2.01.10-r5.ebuild 2550
-RMD160 d43659606a2a07f14b7a8cf7e68f40f2ede441c7 webalizer-2.01.10-r5.ebuild 2550
-SHA256 681815ed96b90494361145ecee5dfa8cfc2c5316a6f5e5886a2bbaed93992ed2 webalizer-2.01.10-r5.ebuild 2550
+MD5 b39b3c38f9b0967dfda860ac4aff5eb9 webalizer-2.01.10-r12.ebuild 4348
+RMD160 66bc80f2fbfb6cab54a48b1bc7bd7ea7fce31166 webalizer-2.01.10-r12.ebuild 4348
+SHA256 9f6a5bfcb77d669131e31d6418fd6863912869330df8a9ea48b07ccb57b72e80 webalizer-2.01.10-r12.ebuild 4348
+MD5 4b6414b221213a91af1cbe2553f6f458 webalizer-2.01.10-r4.ebuild 2044
+RMD160 e9373d85bea2783e8e240d575bdc751988cc6a11 webalizer-2.01.10-r4.ebuild 2044
+SHA256 af23eb6246902ced256d3c05c2c397e9e1587e717e37a6432dc8e986d6d0a08e webalizer-2.01.10-r4.ebuild 2044
+MD5 4b576ff9d757d7b0ed639fb340f39e5f webalizer-2.01.10-r5.ebuild 2540
+RMD160 4e09763f45acf5f490cc99d06aa34ce0456ab2b8 webalizer-2.01.10-r5.ebuild 2540
+SHA256 6bacab1421a42f16f0441e26c6b65d45dba70c1543a3f166e0cc6f0a3987e796 webalizer-2.01.10-r5.ebuild 2540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD/JG5EzitwsaoONoRAiPRAKCzDaDgm+em6QHEPkq2klnTks8lggCfQw4W
-fhjEKqa3ExdiHSIDSm8gbK0=
-=JpS1
+iD8DBQFD/ddWEzitwsaoONoRAoVTAJ4qJVuadZ8LWF5lYJsfTDt+8VKtDwCgxzt7
+x4ySvL89SLhFNAlgwP1DCiw=
+=xgWq
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/files/2.01.10/webalizer.conf b/app-admin/webalizer/files/2.01.10/webalizer.conf
deleted file mode 100644
index af0a07e8643c..000000000000
--- a/app-admin/webalizer/files/2.01.10/webalizer.conf
+++ /dev/null
@@ -1,571 +0,0 @@
-#
-# Sample Webalizer configuration file
-# Copyright 1997-2000 by Bradford L. Barrett (brad@mrunix.net)
-#
-# 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.01)
-# 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
-# ConfigOption is a valid configuration keyword, and Value is the value
-# to assign that configuration option.  Invalid keyword/values are
-# ignored, with appropriate warnings being displayed.  There must be
-# at least one space or tab between the keyword and its value.
-#
-# As of version 0.98, The Webalizer will look for a 'default' configuration
-# file named "webalizer.conf" in the current directory, and if not found
-# there, will look for "/etc/webalizer.conf".
-
-
-# LogFile defines the web server log file to use.  If not specified
-# here or on on the command line, input will default to STDIN.  If
-# the log filename ends in '.gz' (ie: a gzip compressed file), it will
-# be decompressed on the fly as it is being read.
-
-LogFile        /var/log/apache/access_log
-
-# LogType defines the log type being processed.  Normally, the Webalizer
-# expects a CLF or Combined web server log as input.  Using this option,
-# you can process ftp logs as well (xferlog as produced by wu-ftp and
-# others), or Squid native logs.  Values can be 'clf', 'ftp' or 'squid',
-# with 'clf' the default.
-
-#LogType	clf
-
-# OutputDir is where you want to put the output files.  This should
-# should be a full path name, however relative ones might work as well.
-# If no output directory is specified, the current directory will be used.
-
-OutputDir      /var/www/localhost/htdocs/webalizer
-
-# HistoryName allows you to specify the name of the history file produced
-# by the Webalizer.  The history file keeps the data for up to 12 months
-# worth of logs, used for generating the main HTML page (index.html).
-# The default is a file named "webalizer.hist", stored in the specified
-# output directory.  If you specify just the filename (without a path),
-# it will be kept in the specified output directory.  Otherwise, the path
-# is relative to the output directory, unless absolute (leading /).
-
-#HistoryName	webalizer.hist
-
-# Incremental processing allows multiple partial log files to be used
-# instead of one huge one.  Useful for large sites that have to rotate
-# their log files more than once a month.  The Webalizer will save its
-# internal state before exiting, and restore it the next time run, in
-# order to continue processing where it left off.  This mode also causes
-# The Webalizer to scan for and ignore duplicate records (records already
-# processed by a previous run).  See the README file for additional
-# information.  The value may be 'yes' or 'no', with a default of 'no'.
-# The file 'webalizer.current' is used to store the current state data,
-# and is located in the output directory of the program (unless changed
-# with the IncrementalName option below).  Please read at least the section
-# on Incremental processing in the README file before you enable this option.
-
-#Incremental	no
-
-# IncrementalName allows you to specify the filename for saving the
-# incremental data in.  It is similar to the HistoryName option where the
-# name is relative to the specified output directory, unless an absolute
-# filename is specified.  The default is a file named "webalizer.current"
-# kept in the normal output directory.  If you don't specify "Incremental"
-# as 'yes' then this option has no meaning.
-
-#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
-# a space) to generate the final full title string.
-# Default is (for english) "Usage Statistics for".
-
-#ReportTitle    Usage Statistics for
-
-# HostName defines the hostname for the report.  This is used in
-# the title, and is prepended to the URL table items.  This allows
-# clicking on URL's in the report to go to the proper location in
-# the event you are running the report on a 'virtual' web server,
-# or for a server different than the one the report resides on.
-# If not specified here, or on the command line, webalizer will
-# try to get the hostname via a uname system call.  If that fails,
-# it will default to "localhost".
-
-#HostName       localhost
-
-# HTMLExtension allows you to specify the filename extension to use
-# for generated HTML pages.  Normally, this defaults to "html", but
-# can be changed for sites who need it (like for PHP embeded pages).
-
-#HTMLExtension  html
-
-# PageType lets you tell the Webalizer what types of URL's you
-# consider a 'page'.  Most people consider html and cgi documents
-# as pages, while not images and audio files.  If no types are
-# specified, defaults will be used ('htm*', 'cgi' and HTMLExtension
-# if different for web logs, 'txt' for ftp logs).
-
-PageType	htm*
-PageType	cgi
-#PageType	phtml
-#PageType	php3
-#PageType	pl
-
-# UseHTTPS should be used if the analysis is being run on a
-# secure server, and links to urls should use 'https://' instead
-# of the default 'http://'.  If you need this, set it to 'yes'.
-# Default is 'no'.  This only changes the behaviour of the 'Top
-# URL's' table.
-
-#UseHTTPS       no
-
-# DNSCache specifies the DNS cache filename to use for reverse DNS lookups.
-# This file must be specified if you wish to perform name lookups on any IP
-# addresses found in the log file.  If an absolute path is not given as
-# part of the filename (ie: starts with a leading '/'), then the name is
-# relative to the default output directory.  See the DNS.README file for
-# additional information.
-
-#DNSCache	dns_cache.db
-
-# DNSChildren allows you to specify how many "children" processes are
-# run to perform DNS lookups to create or update the DNS cache file.
-# If a number is specified, the DNS cache file will be created/updated
-# each time the Webalizer is run, immediately prior to normal processing,
-# by running the specified number of "children" processes to perform
-# 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
-# normal system operations.  Reasonable values should be between 5 and
-# 20.  See the DNS.README file for additional information.
-
-#DNSChildren	0
-
-# HTMLPre defines HTML code to insert at the very beginning of the
-# file.  Default is the DOCTYPE line shown below.  Max line length
-# is 80 characters, so use multiple HTMLPre lines if you need more.
-
-#HTMLPre <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-# HTMLHead defines HTML code to insert within the <HEAD></HEAD>
-# block, immediately after the <TITLE> line.  Maximum line length
-# is 80 characters, so use multiple lines if needed.
-
-#HTMLHead <META NAME="author" CONTENT="The Webalizer">
-
-# HTMLBody defined the HTML code to be inserted, starting with the
-# <BODY> tag.  If not specified, the default is shown below.  If
-# used, you MUST include your own <BODY> tag as the first line.
-# Maximum line length is 80 char, use multiple lines if needed.
-
-#HTMLBody <BODY BGCOLOR="#E8E8E8" TEXT="#000000" LINK="#0000FF" VLINK="#FF0000">
-
-# HTMLPost defines the HTML code to insert immediately before the
-# first <HR> on the document, which is just after the title and
-# "summary period"-"Generated on:" lines.  If anything, this should
-# be used to clean up in case an image was inserted with HTMLBody.
-# As with HTMLHead, you can define as many of these as you want and
-# they will be inserted in the output stream in order of apperance.
-# Max string size is 80 characters.  Use multiple lines if you need to.
-
-#HTMLPost 	<BR CLEAR="all">
-
-# HTMLTail defines the HTML code to insert at the bottom of each
-# HTML document, usually to include a link back to your home
-# page or insert a small graphic.  It is inserted as a table
-# data element (ie: <TD> your code here </TD>) and is right
-# alligned with the page.  Max string size is 80 characters.
-
-#HTMLTail <IMG SRC="msfree.png" ALT="100% Micro$oft free!">
-
-# HTMLEnd defines the HTML code to add at the very end of the
-# generated files.  It defaults to what is shown below.  If
-# used, you MUST specify the </BODY> and </HTML> closing tags
-# as the last lines.  Max string length is 80 characters.
-
-#HTMLEnd </BODY></HTML>
-
-# The Quiet option suppresses output messages... Useful when run
-# as a cron job to prevent bogus e-mails.  Values can be either
-# "yes" or "no".  Default is "no".  Note: this does not suppress
-# warnings and errors (which are printed to stderr).
-
-#Quiet		no
-
-# ReallyQuiet will supress all messages including errors and
-# warnings.  Values can be 'yes' or 'no' with 'no' being the
-# default.  If 'yes' is used here, it cannot be overriden from
-# the command line, so use with caution.  A value of 'no' has
-# no effect.
-
-#ReallyQuiet	no
-
-# TimeMe allows you to force the display of timing information
-# at the end of processing.  A value of 'yes' will force the
-# timing information to be displayed.  A value of 'no' has no
-# effect.
-
-#TimeMe		no
-
-# GMTTime allows reports to show GMT (UTC) time instead of local
-# time.  Default is to display the time the report was generated
-# in the timezone of the local machine, such as EDT or PST.  This
-# keyword allows you to have times displayed in UTC instead.  Use
-# only if you really have a good reason, since it will probably
-# screw up the reporting periods by however many hours your local
-# time zone is off of GMT.
-
-#GMTTime		no
-
-# Debug prints additional information for error messages.  This
-# will cause webalizer to dump bad records/fields instead of just
-# telling you it found a bad one.   As usual, the value can be
-# either "yes" or "no".  The default is "no".  It shouldn't be
-# needed unless you start getting a lot of Warning or Error
-# messages and want to see why.  (Note: warning and error messages
-# are printed to stderr, not stdout like normal messages).
-
-#Debug		no
-
-# FoldSeqErr forces the Webalizer to ignore sequence errors.
-# This is useful for Netscape and other web servers that cache
-# the writing of log records and do not guarentee that they
-# will be in chronological order.  The use of the FoldSeqErr
-# option will cause out of sequence log records to be treated
-# as if they had the same time stamp as the last valid record.
-# Default is to ignore out of sequence log records.
-
-#FoldSeqErr	no
-
-# VisitTimeout allows you to set the default timeout for a visit
-# (sometimes called a 'session').  The default is 30 minutes,
-# which should be fine for most sites.
-# Visits are determined by looking at the time of the current
-# request, and the time of the last request from the site.  If
-# the time difference is greater than the VisitTimeout value, it
-# is considered a new visit, and visit totals are incremented.
-# Value is the number of seconds to timeout (default=1800=30min)
-
-#VisitTimeout	1800
-
-# IgnoreHist shouldn't be used in a config file, but it is here
-# just because it might be usefull in certain situations.  If the
-# history file is ignored, the main "index.html" file will only
-# report on the current log files contents.  Usefull only when you
-# want to reproduce the reports from scratch.  USE WITH CAUTION!
-# Valid values are "yes" or "no".  Default is "no".
-
-#IgnoreHist	no
-
-# Country Graph allows the usage by country graph to be disabled.
-# Values can be 'yes' or 'no', default is 'yes'.
-
-#CountryGraph	yes
-
-# DailyGraph and DailyStats allows the daily statistics graph
-# and statistics table to be disabled (not displayed).  Values
-# may be "yes" or "no". Default is "yes".
-
-#DailyGraph	yes
-#DailyStats	yes
-
-# HourlyGraph and HourlyStats allows the hourly statistics graph
-# and statistics table to be disabled (not displayed).  Values
-# may be "yes" or "no". Default is "yes".
-
-#HourlyGraph	yes
-#HourlyStats	yes
-
-# GraphLegend allows the color coded legends to be turned on or off
-# in the graphs.  The default is for them to be displayed.  This only
-# toggles the color coded legends, the other legends are not changed.
-# If you think they are hideous and ugly, say 'no' here :)
-
-#GraphLegend	yes
-
-# GraphLines allows you to have index lines drawn behind the graphs.
-# I personally am not crazy about them, but a lot of people requested
-# them and they weren't a big deal to add.  The number represents the
-# number of lines you want displayed.  Default is 2, you can disable
-# the lines by using a value of zero ('0').  [max is 20]
-# Note, due to rounding errors, some values don't work quite right.
-# The lower the better, with 1,2,3,4,6 and 10 producing nice results.
-
-#GraphLines	2
-
-# The "Top" options below define the number of entries for each table.
-# Defaults are Sites=30, URL's=30, Referrers=30 and Agents=15, and
-# Countries=30. TopKSites and TopKURLs (by KByte tables) both default
-# to 10, as do the top entry/exit tables (TopEntry/TopExit).  The top
-# search strings and usernames default to 20.  Tables may be disabled
-# by using zero (0) for the value.
-
-#TopSites        30
-#TopKSites       10
-#TopURLs         30
-#TopKURLs        10
-#TopReferrers    30
-#TopAgents       15
-#TopCountries    30
-#TopEntry        10
-#TopExit         10
-#TopSearch       20
-#TopUsers        20
-
-# The All* keywords allow the display of all URL's, Sites, Referrers
-# User Agents, Search Strings and Usernames.  If enabled, a seperate
-# 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
-# in the "Top" table (otherwise it would just be duplicating what is
-# already displayed).  Second, the listing will only show those items
-# that are normally visable, which means it will not show any hidden
-# 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
-# pages are generated for each month, which can consume quite a lot
-# of disk space depending on the traffic to your site.
-
-#AllSites	no
-#AllURLs	no
-#AllReferrers	no
-#AllAgents	no
-#AllSearchStr	no
-#AllUsers       no
-
-# The Webalizer normally strips the string 'index.' off the end of
-# URL's in order to consolidate URL totals.  For example, the URL
-# /somedir/index.html is turned into /somedir/ which is really the
-# same URL.  This option allows you to specify additional strings
-# to treat in the same way.  You don't need to specify 'index.' as
-# it is always scanned for by The Webalizer, this option is just to
-# specify _additional_ strings if needed.  If you don't need any,
-# don't specify any as each string will be scanned for in EVERY
-# log record... A bunch of them will degrade performance.  Also,
-# the string is scanned for anywhere in the URL, so a string of
-# 'home' would turn the URL /somedir/homepages/brad/home.html into
-# just /somedir/ which is probably not what was intended.
-
-#IndexAlias     home.htm
-#IndexAlias	homepage.htm
-
-# The Hide*, Group* and Ignore* and Include* keywords allow you to
-# change the way Sites, URL's, Referrers, User Agents and Usernames
-# are manipulated.  The Ignore* keywords will cause The Webalizer to
-# completely ignore records as if they didn't exist (and thus not
-# counted in the main site totals).  The Hide* keywords will prevent
-# things from being displayed in the 'Top' tables, but will still be
-# counted in the main totals.  The Group* keywords allow grouping
-# similar objects as if they were one.  Grouped records are displayed
-# in the 'Top' tables and can optionally be displayed in BOLD and/or
-# shaded. Groups cannot be hidden, and are not counted in the main
-# totals. The Group* options do not, by default, hide all the items
-# that it matches.  If you want to hide the records that match (so just
-# 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
-# the value by at least one 'white-space' character, such as a space
-# or tab.
-#
-# The value can have either a leading or trailing '*' wildcard
-# character.  If no wildcard is found, a match can occur anywhere
-# in the string. Given a string "www.yourmama.com", the values "your",
-# "*mama.com" and "www.your*" will all match.
-
-# Your own site should be hidden
-#HideSite	*mrunix.net
-#HideSite	localhost
-
-# Your own site gives most referrals
-#HideReferrer	mrunix.net/
-
-# This one hides non-referrers ("-" Direct requests)
-#HideReferrer	Direct Request
-
-# Usually you want to hide these
-HideURL		*.gif
-HideURL		*.GIF
-HideURL		*.jpg
-HideURL		*.JPG
-HideURL		*.png
-HideURL		*.PNG
-HideURL		*.ra
-
-# Hiding agents is kind of futile
-#HideAgent	RealPlayer
-
-# You can also hide based on authenticated username
-#HideUser	root
-#HideUser	admin
-
-# Grouping options
-#GroupURL	/cgi-bin/*	CGI Scripts
-#GroupURL	/images/*	Images
-
-#GroupSite	*.aol.com
-#GroupSite	*.compuserve.com
-
-#GroupReferrer	yahoo.com/	Yahoo!
-#GroupReferrer	excite.com/     Excite
-#GroupReferrer	infoseek.com/   InfoSeek
-#GroupReferrer	webcrawler.com/ WebCrawler
-
-#GroupUser      root            Admin users
-#GroupUser      admin           Admin users
-#GroupUser      wheel           Admin users
-
-# The following is a great way to get an overall total
-# for browsers, and not display all the detail records.
-# (You should use MangleAgent to refine further...)
-
-#GroupAgent	MSIE		Micro$oft Internet Exploder
-#HideAgent	MSIE
-#GroupAgent	Mozilla		Netscape
-#HideAgent	Mozilla
-#GroupAgent	Lynx*		Lynx
-#HideAgent	Lynx*
-
-# HideAllSites allows forcing individual sites to be hidden in the
-# report.  This is particularly useful when used in conjunction
-# with the "GroupDomain" feature, but could be useful in other
-# situations as well, such as when you only want to display grouped
-# sites (with the GroupSite keywords...).  The value for this
-# keyword can be either 'yes' or 'no', with 'no' the default,
-# allowing individual sites to be displayed.
-
-#HideAllSites	no
-
-# The GroupDomains keyword allows you to group individual hostnames
-# into their respective domains.  The value specifies the level of
-# grouping to perform, and can be thought of as 'the number of dots'
-# that will be displayed.  For example, if a visiting host is named
-# cust1.tnt.mia.uu.net, a domain grouping of 1 will result in just
-# "uu.net" being displayed, while a 2 will result in "mia.uu.net".
-# The default value of zero disable this feature.  Domains will only
-# be grouped if they do not match any existing "GroupSite" records,
-# which allows overriding this feature with your own if desired.
-
-#GroupDomains	0
-
-# The GroupShading allows grouped rows to be shaded in the report.
-# Useful if you have lots of groups and individual records that
-# intermingle in the report, and you want to diferentiate the group
-# records a little more.  Value can be 'yes' or 'no', with 'yes'
-# being the default.
-
-#GroupShading	yes
-
-# GroupHighlight allows the group record to be displayed in BOLD.
-# Can be either 'yes' or 'no' with the default 'yes'.
-
-#GroupHighlight	yes
-
-# The Ignore* keywords allow you to completely ignore log records based
-# on hostname, URL, user agent, referrer or username.  I hessitated in
-# adding these, since the Webalizer was designed to generate _accurate_
-# statistics about a web servers performance.  By choosing to ignore
-# records, the accuracy of reports become skewed, negating why I wrote
-# this program in the first place.  However, due to popular demand, here
-# they are.  Use the same as the Hide* keywords, where the value can have
-# a leading or trailing wildcard '*'.  Use at your own risk ;)
-
-#IgnoreSite	bad.site.net
-#IgnoreURL	/test*
-#IgnoreReferrer	file:/*
-#IgnoreAgent	RealPlayer
-#IgnoreUser     root
-
-# The Include* keywords allow you to force the inclusion of log records
-# based on hostname, URL, user agent, referrer or username.  They take
-# 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).
-
-# Example: Only show stats on Joe User's pages...
-#IgnoreURL	*
-#IncludeURL	~joeuser*
-
-# Or based on an authenticated username
-#IgnoreUser     *
-#IncludeUser    someuser
-
-# The MangleAgents allows you to specify how much, if any, The Webalizer
-# should mangle user agent names.  This allows several levels of detail
-# to be produced when reporting user agent statistics.  There are six
-# levels that can be specified, which define different levels of detail
-# supression.  Level 5 shows only the browser name (MSIE or Mozilla)
-# and the major version number.  Level 4 adds the minor version number
-# (single decimal place).  Level 3 displays the minor version to two
-# decimal places.  Level 2 will add any sub-level designation (such
-# as Mozilla/3.01Gold or MSIE 3.0b).  Level 1 will attempt to also add
-# the system type if it is specified.  The default Level 0 displays the
-# full user agent field without modification and produces the greatest
-# amount of detail.  User agent names that can't be mangled will be
-# left unmodified.
-
-#MangleAgents    0
-
-# The SearchEngine keywords allow specification of search engines and
-# their query strings on the URL.  These are used to locate and report
-# 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.
-
-SearchEngine	yahoo.com	p=
-SearchEngine	altavista.com	q=
-SearchEngine	google.com	q=
-SearchEngine	eureka.com	q=
-SearchEngine	lycos.com	query=
-SearchEngine	hotbot.com	MT=
-SearchEngine	msn.com		MT=
-SearchEngine	infoseek.com	qt=
-SearchEngine	webcrawler	searchText=
-SearchEngine	excite		search=
-SearchEngine	netscape.com	search=
-SearchEngine	mamma.com	query=
-SearchEngine	alltheweb.com	query=
-SearchEngine	northernlight.com  qr=
-
-# The Dump* keywords allow the dumping of Sites, URL's, Referrers
-# User Agents, Usernames and Search strings to seperate tab delimited
-# text files, suitable for import into most database or spreadsheet
-# programs.
-
-# DumpPath specifies the path to dump the files.  If not specified,
-# it will default to the current output directory.  Do not use a
-# trailing slash ('/').
-
-DumpPath	/var/log/apache
-
-# The DumpHeader keyword specifies if a header record should be
-# written to the file.  A header record is the first record of the
-# file, and contains the labels for each field written.  Normally,
-# files that are intended to be imported into a database system
-# will not need a header record, while spreadsheets usually do.
-# Value can be either 'yes' or 'no', with 'no' being the default.
-
-#DumpHeader	no
-
-# DumpExtension allow you to specify the dump filename extension
-# to use.  The default is "tab", but some programs are pickey about
-# the filenames they use, so you may change it here (for example,
-# some people may prefer to use "csv").
-
-#DumpExtension	tab
-
-# These control the dumping of each individual table.  The value
-# can be either 'yes' or 'no'.. the default is 'no'.
-
-#DumpSites	no
-#DumpURLs	no
-#DumpReferrers	no
-#DumpAgents	no
-#DumpUsers	no
-#DumpSearchStr  no
-
-# End of configuration file...  Have a nice day!
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r12 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r12
index 35da029145c3..dfe4e4eb9c16 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r12
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r12
@@ -7,3 +7,9 @@ SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0 webalize
 MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664
 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664
+MD5 194f592d3c6c8d492165ba73a1541e90 webalizer-search.patch.gz 6424
+RMD160 1db8210754f7b7f4fe49d99d51f01b5e7fbb3d13 webalizer-search.patch.gz 6424
+SHA256 0d9bd3adb4c3e571a9231f0f1a6d689851ff53ffdad9c0e6e3e4e495ff709360 webalizer-search.patch.gz 6424
+MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986
+RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986
+SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r4 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r4
index 445cebf86e52..e8defe98f54e 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r4
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r4
@@ -1,3 +1,6 @@
 MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664
 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664
+MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986
+RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986
+SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
index 3ff8f6ffc5c3..a5ec6e652b26 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
@@ -4,3 +4,6 @@ SHA256 b4580b7c4be990b2caa9696690edef3f3e7cfd235f6c46b20b520bd606692601 geolizer
 MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664
 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664
+MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986
+RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986
+SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986
diff --git a/app-admin/webalizer/files/webalizer-search.patch b/app-admin/webalizer/files/webalizer-search.patch
deleted file mode 100644
index a0a0d781dc25..000000000000
--- a/app-admin/webalizer/files/webalizer-search.patch
+++ /dev/null
@@ -1,833 +0,0 @@
-diff -uNr webalizer-2.01-10/hashtab.c webalizer-2.01-10-mbm/hashtab.c
---- webalizer-2.01-10/hashtab.c	Fri Sep 29 04:51:42 2000
-+++ webalizer-2.01-10-mbm/hashtab.c	Mon Oct 15 11:16:41 2001
-@@ -70,7 +70,7 @@
- UNODEPTR new_unode(char *);                   /* new url node             */
- RNODEPTR new_rnode(char *);                   /* new referrer node        */
- ANODEPTR new_anode(char *);                   /* new user agent node      */
--SNODEPTR new_snode(char *);                   /* new search string..      */
-+SNODEPTR new_snode(char *, char *);           /* new search string..      */
- INODEPTR new_inode(char *);                   /* new ident node           */
- #ifdef USE_DNS
- DNODEPTR new_dnode(char *);                   /* new DNS node             */
-@@ -669,10 +669,10 @@
- /* NEW_SNODE - Search str node creation      */
- /*********************************************/
- 
--SNODEPTR new_snode(char *str)
-+SNODEPTR new_snode(char *str, char *site)
- {
-    SNODEPTR newptr;
--   char     *sptr;
-+   char     *sptr, *sptr2;
- 
-    if (strlen(str) >= MAXSRCHH)
-    {
-@@ -686,15 +686,39 @@
-       str[MAXSRCHH-1]=0;
-    }
- 
-+   if (strlen(site) >= MAXSRCHH)
-+   {
-+      if (verbose)
-+      {
-+         fprintf(stderr,"[new_snode] %s (%d)",msg_big_one,strlen(site));
-+         if (debug_mode)
-+            fprintf(stderr,":\n--> %s",site);
-+         fprintf(stderr,"\n");
-+      }
-+      site[MAXSRCHH-1]=0;
-+   }
-+
-    if ( (sptr=malloc(strlen(str)+1))==NULL ) return (SNODEPTR)NULL;
-    strcpy(sptr,str);
- 
-+   if ( (sptr2=malloc(strlen(site)+1))==NULL )
-+   {
-+       free(sptr);
-+       return (SNODEPTR)NULL;
-+   }
-+   strcpy(sptr2,site);
-+
-    if (( newptr = malloc(sizeof(struct snode))) != NULL)
-    {
-       newptr->string= sptr;
-+      newptr->site= sptr2;
-       newptr->count = 1;
-    }
--   else free(sptr);
-+   else
-+   {
-+   free(sptr);
-+   free(sptr2);
-+   }
-    return newptr;
- }
- 
-@@ -702,17 +726,18 @@
- /* PUT_SNODE - insert/update search str node */
- /*********************************************/
- 
--int put_snode(char *str, u_long count, SNODEPTR *htab)
-+int put_snode(char *str, char *site, u_long count, SNODEPTR *htab)
- {
-    SNODEPTR cptr,nptr;
- 
--   if (str[0]==0 || str[0]==' ') return 0;     /* skip bad search strs */
-+   if (str[0]==' ') return 0;     /* skip bad search strs */
-+   if (site[0]==' ') return 0;     /* skip bad search strs */
- 
-    /* check if hashed */
-    if ( (cptr = htab[hash(str)]) == NULL)
-    {
-       /* not hashed */
--      if ( (nptr=new_snode(str)) != NULL)
-+      if ( (nptr=new_snode(str,site)) != NULL)
-       {
-          nptr->count = count;
-          nptr->next = NULL;
-@@ -724,7 +749,7 @@
-       /* hashed */
-       while (cptr != NULL)
-       {
--         if (strcmp(cptr->string,str)==0)
-+         if (strcmp(cptr->string,str)==0 && strcmp(cptr->site,site)==0)
-          {
-             /* found... bump counter */
-             cptr->count+=count;
-@@ -733,7 +758,7 @@
-          cptr = cptr->next;
-       }
-       /* not found... */
--      if ( (nptr = new_snode(str)) != NULL)
-+      if ( (nptr = new_snode(str,site)) != NULL)
-       {
-          nptr->count = count;
-          nptr->next  = htab[hash(str)];
-@@ -762,6 +787,7 @@
-          {
-             temp = aptr->next;
-             free (aptr->string);
-+            free (aptr->site);
-             free (aptr);
-             aptr = temp;
-          }
-diff -uNr webalizer-2.01-10/hashtab.h webalizer-2.01-10-mbm/hashtab.h
---- webalizer-2.01-10/hashtab.h	Fri Sep 29 04:50:30 2000
-+++ webalizer-2.01-10-mbm/hashtab.h	Fri Oct 12 15:37:18 2001
-@@ -53,6 +53,7 @@
-               struct anode *next; };
- 
- struct snode {  char *string;                 /* search string struct      */
-+                char *site;
-               u_long count;
-               struct snode *next; };
- 
-@@ -84,7 +85,7 @@
-                         u_long, u_long, INODEPTR *);
- extern int    put_rnode(char *, int, u_long, u_long *, RNODEPTR *);
- extern int    put_anode(char *, int, u_long, u_long *, ANODEPTR *);
--extern int    put_snode(char *, u_long, SNODEPTR *);
-+extern int    put_snode(char *, char *, u_long, SNODEPTR *);
- 
- #ifdef USE_DNS
- extern int    put_dnode(char *, struct in_addr *, DNODEPTR *);
-diff -uNr webalizer-2.01-10/lang/webalizer_lang.english webalizer-2.01-10-mbm/lang/webalizer_lang.english
---- webalizer-2.01-10/lang/webalizer_lang.english	Fri Oct  6 06:27:48 2000
-+++ webalizer-2.01-10-mbm/lang/webalizer_lang.english	Mon Oct 15 12:24:15 2001
-@@ -201,6 +201,8 @@
- char *msg_h_ref   = "Referrer";
- char *msg_h_ctry  = "Country";
- char *msg_h_search= "Search String";
-+char *msg_h_seasit= "Search Site";
-+char *msg_h_seabot= "Search Site/String";
- char *msg_h_uname = "Username";
- 
- /* links along top of page */
-@@ -213,7 +215,9 @@
- char *msg_hlnk_r  = "Referrers";
- char *msg_hlnk_en = "Entry";
- char *msg_hlnk_ex = "Exit";
--char *msg_hlnk_sr = "Search";
-+char *msg_hlnk_sr = "Search Strings";
-+char *msg_hlnk_srs= "Search Sites";
-+char *msg_hlnk_srb= "Search Site/Strings";
- char *msg_hlnk_i  = "Users";
- 
- /* monthly total table */
-@@ -255,12 +259,16 @@
- char *msg_top_en  = "Total Entry Pages";
- char *msg_top_ex  = "Total Exit Pages";
- char *msg_top_sr  = "Total Search Strings";
-+char *msg_top_srs = "Total Search Sites";
-+char *msg_top_srb = "Total Search Site/String Pairs";
- char *msg_top_i   = "Total Usernames";
- char *msg_v_sites = "View All Sites";
- char *msg_v_urls  = "View All URLs";
- char *msg_v_refs  = "View All Referrers";
- char *msg_v_agents= "View All User Agents";
- char *msg_v_search= "View All Search Strings";
-+char *msg_v_seasit= "View All Search Sites";
-+char *msg_v_seabot= "View All Search Site/String Pairs";
- char *msg_v_users = "View All Usernames";
- 
- /* short month names MUST BE 3 CHARS in size... pad if needed*/
-diff -uNr webalizer-2.01-10/lang.h webalizer-2.01-10-mbm/lang.h
---- webalizer-2.01-10/lang.h	Fri Sep 29 04:50:30 2000
-+++ webalizer-2.01-10-mbm/lang.h	Mon Oct 15 12:23:16 2001
-@@ -107,6 +107,8 @@
- extern char *msg_h_ref   ;
- extern char *msg_h_ctry  ;
- extern char *msg_h_search;
-+extern char *msg_h_seasit;
-+extern char *msg_h_seabot;
- extern char *msg_h_uname ;
- 
- extern char *msg_hlnk_ds ;
-@@ -119,6 +121,8 @@
- extern char *msg_hlnk_en ;
- extern char *msg_hlnk_ex ;
- extern char *msg_hlnk_sr ;
-+extern char *msg_hlnk_srs;
-+extern char *msg_hlnk_srb;
- extern char *msg_hlnk_i  ;
- 
- extern char *msg_mtot_ms ;
-@@ -154,12 +158,16 @@
- extern char *msg_top_en  ;
- extern char *msg_top_ex  ;
- extern char *msg_top_sr  ;
-+extern char *msg_top_srs ;
-+extern char *msg_top_srb ;
- extern char *msg_top_i   ;
- extern char *msg_v_sites ;
- extern char *msg_v_urls  ;
- extern char *msg_v_refs  ;
- extern char *msg_v_agents;
- extern char *msg_v_search;
-+extern char *msg_v_seasit;
-+extern char *msg_v_seabot;
- extern char *msg_v_users ;
- 
- extern char *msg_title   ;
-diff -uNr webalizer-2.01-10/linklist.c webalizer-2.01-10-mbm/linklist.c
---- webalizer-2.01-10/linklist.c	Fri Sep 29 04:51:02 2000
-+++ webalizer-2.01-10-mbm/linklist.c	Fri Oct 12 18:08:46 2001
-@@ -71,7 +71,7 @@
- GLISTPTR new_glist(char *, char *);                 /* new group list node */
- void     del_glist(GLISTPTR *);                     /* del group list      */
- 
--int      isinstr(char *, char *);
-+int      isinstr(const char *, const char *);
- 
- /* Linkded list pointers */
- GLISTPTR group_sites   = NULL;                /* "group" lists            */
-@@ -240,7 +240,7 @@
- /* ISINLIST - Test if string is in list      */
- /*********************************************/
- 
--char *isinlist(NLISTPTR list, char *str)
-+char *isinlist(NLISTPTR list, const char *str)
- {
-    NLISTPTR lptr;
- 
-@@ -257,14 +257,35 @@
- /* ISINGLIST - Test if string is in list     */
- /*********************************************/
- 
--char *isinglist(GLISTPTR list, char *str)
-+char *isinglist(GLISTPTR list, const char *str)
- {
-    GLISTPTR lptr;
- 
-    lptr=list;
-    while (lptr!=NULL)
-    {
--      if (isinstr(str,lptr->string)) return lptr->name;
-+      if (isinstr((const char *)str,(const char *)lptr->string)) return lptr->name;
-+      lptr=lptr->next;
-+   }
-+   return NULL;
-+}
-+
-+/*********************************************/
-+/* NAMEINGLIST - Test if string is in list   */
-+/*********************************************/
-+
-+char *nameinglist(GLISTPTR list, const char *str, char **string)
-+{
-+   GLISTPTR lptr;
-+
-+   lptr=list;
-+   while (lptr!=NULL)
-+   {
-+      if (isinstr(str,lptr->string))
-+      {
-+         if(string != NULL) *string=lptr->string;
-+         return lptr->name;
-+      }
-       lptr=lptr->next;
-    }
-    return NULL;
-@@ -274,9 +295,9 @@
- /* ISINSTR - Scan for string in string       */
- /*********************************************/
- 
--int isinstr(char *str, char *cp)
-+int isinstr(const char *str, const char *cp)
- {
--   char *cp1,*cp2;
-+   const char *cp1,*cp2;
- 
-    cp1=(cp+strlen(cp))-1;
-    if (*cp=='*')
-@@ -303,6 +324,6 @@
-          if (*cp1++!=*cp2++) return 0;
-       }
-       if (*cp1=='*') return 1;
--         else return 0;
-+	 else return 0;
-    }
- }
-diff -uNr webalizer-2.01-10/linklist.h webalizer-2.01-10-mbm/linklist.h
---- webalizer-2.01-10/linklist.h	Fri Sep 29 04:50:30 2000
-+++ webalizer-2.01-10-mbm/linklist.h	Fri Oct 12 18:01:50 2001
-@@ -40,8 +40,10 @@
- extern NLISTPTR page_type     ;               /* page view types           */
- extern GLISTPTR search_list   ;               /* Search engine list        */
- 
--extern char     *isinlist(NLISTPTR, char *);        /* scan list for str   */
--extern char     *isinglist(GLISTPTR, char *);       /* scan glist for str  */
-+extern char     *isinlist(NLISTPTR, const char *);  /* scan list for str   */
-+extern char     *isinglist(GLISTPTR, const char *); /* scan glist for str  */
-+extern char     *nameinglist(GLISTPTR, const char *,
-+                             char **);              /* scan glist for str  */
- extern int      add_nlist(char *, NLISTPTR *);      /* add list item       */
- extern int      add_glist(char *, GLISTPTR *);      /* add group list item */
- 
-diff -uNr webalizer-2.01-10/output.c webalizer-2.01-10-mbm/output.c
---- webalizer-2.01-10/output.c	Fri Sep 29 04:51:42 2000
-+++ webalizer-2.01-10-mbm/output.c	Mon Oct 15 12:35:25 2001
-@@ -81,6 +81,8 @@
- void    top_agents_table();                         /* top n u-agents  ""  */
- void    top_ctry_table();                           /* top n countries ""  */
- void    top_search_table();                         /* top n search strs   */
-+void    top_searchsite_table();                     /* top n search strs   */
-+void    top_searchboth_table();                     /* top n search strs   */
- void    top_users_table();                          /* top n ident table   */
- u_long  load_url_array(  UNODEPTR *);               /* load URL array      */
- u_long  load_site_array( HNODEPTR *);               /* load Site array     */
-@@ -105,6 +107,8 @@
- int     all_refs_page(u_long, u_long);              /* output refs page    */
- int     all_agents_page(u_long, u_long);            /* output agents page  */
- int     all_search_page(u_long, u_long);            /* output search page  */
-+int     all_searchsite_page(u_long, u_long);            /* output search page  */
-+int     all_searchboth_page(u_long, u_long);        /* output search page  */
- int     all_users_page(u_long, u_long);             /* output ident page   */
- void    dump_all_sites();                           /* dump sites tab file */
- void    dump_all_urls();                            /* dump urls tab file  */
-@@ -417,10 +421,12 @@
-     if ( (s_array=malloc(sizeof(SNODEPTR)*(a_ctr))) != NULL)
-     {
-      a_ctr=load_srch_array(s_array);
--     if (ntop_search || dump_search)
-+     if (ntop_search || ntop_searchsite || ntop_searchboth || dump_search)
-      {
-        qsort(s_array,a_ctr,sizeof(SNODEPTR),qs_srch_cmph);
-        if (ntop_search) top_search_table(); /* top search strings table     */
-+       if (ntop_searchsite) top_searchsite_table(); /* top search strings table     */
-+       if (ntop_searchboth) top_searchboth_table(); /* top search strings table     */
-        if (dump_search) dump_all_search();  /* dump search string tab file  */
-      }
-      free(s_array);
-@@ -492,6 +498,10 @@
-       fprintf(out_fp,"<A HREF=\"#TOPREFS\">[%s]</A>\n",msg_hlnk_r);
-    if (ntop_search && t_ref)
-       fprintf(out_fp,"<A HREF=\"#TOPSEARCH\">[%s]</A>\n",msg_hlnk_sr);
-+   if (ntop_searchsite && t_ref)
-+      fprintf(out_fp,"<A HREF=\"#TOPSEARCHSITE\">[%s]</A>\n",msg_hlnk_srs);
-+   if (ntop_searchboth && t_ref)
-+      fprintf(out_fp,"<A HREF=\"#TOPSEARCHBOTH\">[%s]</A>\n",msg_hlnk_srb);
-    if (ntop_users && t_user)
-       fprintf(out_fp,"<A HREF=\"#TOPUSERS\">[%s]</A>\n",msg_hlnk_i);
-    if (ntop_agents && t_agent)
-@@ -1628,13 +1638,20 @@
- 
-    if ( (t_ref==0)||(a_ctr==0)) return;   /* don't bother if none to do    */
- 
--   cnt=tot_num=a_ctr; pointer=s_array;
-+   cnt=a_ctr; pointer=s_array;
-+   tot_num=0;
-    while(cnt--)
-    {
-+      if(strlen((char *)((SNODEPTR)(*pointer)->site)))
-+      {
-+         pointer++; continue;
-+      }
-       t_val+=(u_long)((SNODEPTR)(*pointer)->count);
-+      tot_num++;
-       pointer++;
-    }
- 
-+   cnt=tot_num;
-    if ( tot_num > ntop_search) tot_num=ntop_search;
- 
-    fprintf(out_fp,"<A NAME=\"TOPSEARCH\"></A>\n");
-@@ -1642,7 +1659,7 @@
-    fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-    fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" ALIGN=CENTER COLSPAN=4>"        \
-           "%s %lu %s %lu %s</TH></TR>\n",
--          GREY, msg_top_top, tot_num, msg_top_of, a_ctr, msg_top_sr);
-+          GREY, msg_top_top, tot_num, msg_top_of, cnt, msg_top_sr);
-    fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-    fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" ALIGN=center>"                  \
-           "<FONT SIZE=\"-1\">#</FONT></TH>\n",
-@@ -1659,6 +1676,7 @@
-    while(tot_num)
-    {
-       sptr=*pointer++;
-+      if(strlen(sptr->site)) continue;
-       fprintf(out_fp,
-          "<TR>\n"                                                     \
-          "<TD ALIGN=center><FONT SIZE=\"-1\"><B>%d</B></FONT></TD>\n" \
-@@ -1674,7 +1692,7 @@
-    fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-    if ( (all_search) && (a_ctr>ntop_search) )
-    {
--      if (all_search_page(a_ctr, t_val))
-+      if (all_search_page(cnt, t_val))
-       {
-          fprintf(out_fp,"<TR BGCOLOR=\"%s\">",GRPCOLOR);
-          fprintf(out_fp,"<TD COLSPAN=4 ALIGN=\"center\">\n");
-@@ -1687,6 +1705,164 @@
-    fprintf(out_fp,"</TABLE>\n<P>\n");
- }
- 
-+/***********************************************/
-+/* TOP_SEARCHSITE_TABLE - generate top n table */
-+/***********************************************/
-+
-+void top_searchsite_table()
-+{
-+   u_long   cnt,t_val=0, tot_num;
-+   int      i;
-+   SNODEPTR sptr, *pointer;
-+
-+   if ( (t_ref==0)||(a_ctr==0)) return;   /* don't bother if none to do    */
-+
-+   cnt=a_ctr; pointer=s_array;
-+   tot_num=0;
-+   while(cnt--)
-+   {
-+      if(strlen((char *)((SNODEPTR)(*pointer)->string)))
-+      {
-+         pointer++; continue;
-+      }
-+      t_val+=(u_long)((SNODEPTR)(*pointer)->count);
-+      tot_num++;
-+      pointer++;
-+   }
-+
-+   cnt=tot_num;
-+   if ( tot_num > ntop_searchsite) tot_num=ntop_searchsite;
-+
-+   fprintf(out_fp,"<A NAME=\"TOPSEARCHSITE\"></A>\n");
-+   fprintf(out_fp,"<TABLE WIDTH=510 BORDER=2 CELLSPACING=1 CELLPADDING=1>\n");
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+   fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" ALIGN=CENTER COLSPAN=4>"        \
-+          "%s %lu %s %lu %s</TH></TR>\n",
-+          GREY, msg_top_top, tot_num, msg_top_of, cnt, msg_top_srs);
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+   fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" ALIGN=center>"                  \
-+          "<FONT SIZE=\"-1\">#</FONT></TH>\n",
-+          GREY);
-+   fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=center COLSPAN=2>"            \
-+          "<FONT SIZE=\"-1\">%s</FONT></TH>\n",
-+          DKGREEN,msg_h_hits);
-+   fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=center>"                      \
-+          "<FONT SIZE=\"-1\">%s</FONT></TH></TR>\n",
-+          CYAN,msg_h_seasit);
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+
-+   pointer=s_array; i=0;
-+   while(tot_num)
-+   {
-+      sptr=*pointer++;
-+      if(strlen(sptr->string)) continue;
-+      fprintf(out_fp,
-+         "<TR>\n"                                                     \
-+         "<TD ALIGN=center><FONT SIZE=\"-1\"><B>%d</B></FONT></TD>\n" \
-+         "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%lu</B></FONT></TD>\n" \
-+         "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n"   \
-+         "<TD ALIGN=left NOWRAP><FONT SIZE=\"-1\">",
-+         i+1,sptr->count,
-+         (t_val==0)?0:((float)sptr->count/t_val)*100.0);
-+      fprintf(out_fp,"%s</FONT></TD></TR>\n",sptr->site);
-+      tot_num--;
-+      i++;
-+   }
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+   if ( (all_searchsites) && (cnt>ntop_searchsite) )
-+   {
-+      if (all_searchsite_page(a_ctr, t_val))
-+      {
-+         fprintf(out_fp,"<TR BGCOLOR=\"%s\">",GRPCOLOR);
-+         fprintf(out_fp,"<TD COLSPAN=4 ALIGN=\"center\">\n");
-+         fprintf(out_fp,"<FONT SIZE=\"-1\">");
-+         fprintf(out_fp,"<A HREF=\"./searchsite_%04d%02d.%s\">",
-+                 cur_year,cur_month,html_ext);
-+         fprintf(out_fp,"%s</A></TD></TR>\n",msg_v_seasit);
-+      }
-+   }
-+   fprintf(out_fp,"</TABLE>\n<P>\n");
-+}
-+
-+/***********************************************/
-+/* TOP_SEARCHBOTH_TABLE - generate top n table */
-+/***********************************************/
-+
-+void top_searchboth_table()
-+{
-+   u_long   cnt,t_val=0, tot_num;
-+   int      i;
-+   SNODEPTR sptr, *pointer;
-+
-+   if ( (t_ref==0)||(a_ctr==0)) return;   /* don't bother if none to do    */
-+
-+   cnt=a_ctr; pointer=s_array;
-+   tot_num=0;
-+   while(cnt--)
-+   {
-+      if(!strlen((char *)((SNODEPTR)(*pointer)->string))||!strlen((char *)((SNODEPTR)(*pointer)->site)))
-+      {
-+         pointer++; continue;
-+      }
-+      t_val+=(u_long)((SNODEPTR)(*pointer)->count);
-+      tot_num++;
-+      pointer++;
-+   }
-+
-+   cnt=tot_num;
-+   if ( tot_num > ntop_searchboth) tot_num=ntop_searchboth;
-+
-+   fprintf(out_fp,"<A NAME=\"TOPSEARCHBOTH\"></A>\n");
-+   fprintf(out_fp,"<TABLE WIDTH=510 BORDER=2 CELLSPACING=1 CELLPADDING=1>\n");
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+   fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" ALIGN=CENTER COLSPAN=4>"        \
-+          "%s %lu %s %lu %s</TH></TR>\n",
-+          GREY, msg_top_top, tot_num, msg_top_of, cnt, msg_top_srb);
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+   fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" ALIGN=center>"                  \
-+          "<FONT SIZE=\"-1\">#</FONT></TH>\n",
-+          GREY);
-+   fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=center COLSPAN=2>"            \
-+          "<FONT SIZE=\"-1\">%s</FONT></TH>\n",
-+          DKGREEN,msg_h_hits);
-+   fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=center>"                      \
-+          "<FONT SIZE=\"-1\">%s</FONT></TH></TR>\n",
-+          CYAN,msg_h_seabot);
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+
-+   pointer=s_array; i=0;
-+   while(tot_num)
-+   {
-+      sptr=*pointer++;
-+      if(!strlen(sptr->string) || !strlen(sptr->site)) continue;
-+      fprintf(out_fp,
-+         "<TR>\n"                                                     \
-+         "<TD ALIGN=center><FONT SIZE=\"-1\"><B>%d</B></FONT></TD>\n" \
-+         "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%lu</B></FONT></TD>\n" \
-+         "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n"   \
-+         "<TD ALIGN=left NOWRAP><FONT SIZE=\"-1\">",
-+         i+1,sptr->count,
-+         (t_val==0)?0:((float)sptr->count/t_val)*100.0);
-+      fprintf(out_fp,"%s -&gt; %s</FONT></TD></TR>\n",sptr->site,sptr->string);
-+      tot_num--;
-+      i++;
-+   }
-+   fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n");
-+   if ( (all_searchboth) && (cnt>ntop_searchboth) )
-+   {
-+      if (all_searchboth_page(a_ctr, t_val))
-+      {
-+         fprintf(out_fp,"<TR BGCOLOR=\"%s\">",GRPCOLOR);
-+         fprintf(out_fp,"<TD COLSPAN=4 ALIGN=\"center\">\n");
-+         fprintf(out_fp,"<FONT SIZE=\"-1\">");
-+         fprintf(out_fp,"<A HREF=\"./searchboth_%04d%02d.%s\">",
-+                 cur_year,cur_month,html_ext);
-+         fprintf(out_fp,"%s</A></TD></TR>\n",msg_v_seabot);
-+      }
-+   }
-+   fprintf(out_fp,"</TABLE>\n<P>\n");
-+}
-+
- /*********************************************/
- /* ALL_SEARCH_PAGE - HTML for search strings */
- /*********************************************/
-@@ -1717,6 +1893,94 @@
-    while(tot_num)
-    {
-       sptr=*pointer++;
-+      if(strlen(sptr->site)) continue;
-+      fprintf(out_fp,"%-8lu %6.02f%%  %s\n",
-+         sptr->count,
-+         (t_val==0)?0:((float)sptr->count/t_val)*100.0,
-+         sptr->string);
-+      tot_num--;
-+   }
-+   fprintf(out_fp,"</PRE></FONT>\n");
-+   write_html_tail(out_fp);
-+   fclose(out_fp);
-+   return 1;
-+}
-+
-+/*************************************************/
-+/* ALL_SEARCHSITE_PAGE - HTML for search strings */
-+/*************************************************/
-+
-+int all_searchsite_page(u_long tot_num, u_long t_val)
-+{
-+   SNODEPTR sptr, *pointer;
-+   char     search_fname[256], buffer[256];
-+   FILE     *out_fp;
-+
-+   if (!tot_num) return 0;
-+
-+   /* generate file name */
-+   sprintf(search_fname,"searchsite_%04d%02d.%s",cur_year,cur_month,html_ext);
-+
-+   /* open file */
-+   if ( (out_fp=open_out_file(search_fname))==NULL ) return 0;
-+
-+   sprintf(buffer,"%s %d - %s",l_month[cur_month-1],cur_year,msg_h_seasit);
-+   write_html_head(buffer, out_fp);
-+
-+   fprintf(out_fp,"<FONT SIZE=\"-1\"></CENTER><PRE>\n");
-+
-+   fprintf(out_fp," %12s      %s\n",msg_h_hits,msg_h_seasit);
-+   fprintf(out_fp,"----------------  ----------------------\n\n");
-+
-+   pointer=s_array;
-+   while(tot_num)
-+   {
-+      sptr=*pointer++;
-+      if(strlen(sptr->string)) continue;
-+      fprintf(out_fp,"%-8lu %6.02f%%  %s\n",
-+         sptr->count,
-+         (t_val==0)?0:((float)sptr->count/t_val)*100.0,
-+         sptr->string);
-+      tot_num--;
-+   }
-+   fprintf(out_fp,"</PRE></FONT>\n");
-+   write_html_tail(out_fp);
-+   fclose(out_fp);
-+   return 1;
-+}
-+
-+
-+/*************************************************/
-+/* ALL_SEARCHSITE_PAGE - HTML for search strings */
-+/*************************************************/
-+
-+int all_searchboth_page(u_long tot_num, u_long t_val)
-+{
-+   SNODEPTR sptr, *pointer;
-+   char     search_fname[256], buffer[256];
-+   FILE     *out_fp;
-+
-+   if (!tot_num) return 0;
-+
-+   /* generate file name */
-+   sprintf(search_fname,"searchsite_%04d%02d.%s",cur_year,cur_month,html_ext);
-+
-+   /* open file */
-+   if ( (out_fp=open_out_file(search_fname))==NULL ) return 0;
-+
-+   sprintf(buffer,"%s %d - %s",l_month[cur_month-1],cur_year,msg_h_seabot);
-+   write_html_head(buffer, out_fp);
-+
-+   fprintf(out_fp,"<FONT SIZE=\"-1\"></CENTER><PRE>\n");
-+
-+   fprintf(out_fp," %12s      %s\n",msg_h_hits,msg_h_seabot);
-+   fprintf(out_fp,"----------------  ----------------------\n\n");
-+
-+   pointer=s_array;
-+   while(tot_num)
-+   {
-+      sptr=*pointer++;
-+      if(!strlen(sptr->string) || !strlen(sptr->site)) continue;
-       fprintf(out_fp,"%-8lu %6.02f%%  %s\n",
-          sptr->count,
-          (t_val==0)?0:((float)sptr->count/t_val)*100.0,
-@@ -2284,7 +2548,8 @@
-    while(cnt)
-    {
-       sptr=*pointer++;
--      fprintf(out_fp,"%lu\t%s\n",sptr->count,sptr->string);
-+      if(!strlen(sptr->site) || !strlen(sptr->string)) continue;
-+      fprintf(out_fp,"%lu\t%s\t%s\n",sptr->count,sptr->string,sptr->site);
-       cnt--;
-    }
-    fclose(out_fp);
-diff -uNr webalizer-2.01-10/preserve.c webalizer-2.01-10-mbm/preserve.c
---- webalizer-2.01-10/preserve.c	Fri Sep 29 04:51:32 2000
-+++ webalizer-2.01-10-mbm/preserve.c	Fri Oct 12 16:36:22 2001
-@@ -352,7 +352,7 @@
-       sptr=sr_htab[i];
-       while (sptr!=NULL)
-       {
--         sprintf(buffer,"%s\n%lu\n", sptr->string,sptr->count);
-+         sprintf(buffer,"%s\n%s\n%lu\n", sptr->string,sptr->site,sptr->count);
-          if (fputs(buffer,fp)==EOF) return 1;  /* error exit */
-          sptr=sptr->next;
-       }
-@@ -402,6 +402,7 @@
- 
-    char   buffer[BUFSIZE];
-    char   tmp_buf[BUFSIZE];
-+   char   tmp_buf2[BUFSIZE];
- 
-    u_long ul_bogus=0;
- 
-@@ -657,13 +658,17 @@
-       tmp_buf[strlen(buffer)-1]=0;
-       
-       if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 13;  /* error exit */
-+      strncpy(tmp_buf2,buffer,MAXSRCH);
-+      tmp_buf2[strlen(buffer)-1]=0;
-+
-+      if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 13;  /* error exit */
-       if (!isdigit((int)buffer[0])) return 13;  /* error exit */
- 
-       /* load temporary node data */
-       sscanf(buffer,"%lu",&t_snode.count);
- 
-       /* insert node */
--      if (put_snode(tmp_buf,t_snode.count,sr_htab))
-+      if (put_snode(tmp_buf,tmp_buf2,t_snode.count,sr_htab))
-       {
-          if (verbose) fprintf(stderr,"%s %s\n", msg_nomem_sc, t_snode.string);
-       }
-diff -uNr webalizer-2.01-10/sample.conf webalizer-2.01-10-mbm/sample.conf
---- webalizer-2.01-10/sample.conf	Fri Sep 29 04:51:42 2000
-+++ webalizer-2.01-10-mbm/sample.conf	Mon Oct 15 13:36:14 2001
-@@ -311,6 +311,8 @@
- #TopEntry        10
- #TopExit         10
- #TopSearch       20
-+#TopSearchSites  10
-+#TopSearchSiteStrs 30
- #TopUsers        20
- 
- # The All* keywords allow the display of all URL's, Sites, Referrers
-@@ -333,6 +335,8 @@
- #AllReferrers	no
- #AllAgents	no
- #AllSearchStr	no
-+#AllSearchSites no
-+#AllSearchSiteStrs no
- #AllUsers       no
- 
- # The Webalizer normally strips the string 'index.' off the end of
-diff -uNr webalizer-2.01-10/webalizer.c webalizer-2.01-10-mbm/webalizer.c
---- webalizer-2.01-10/webalizer.c	Tue Oct 17 05:15:53 2000
-+++ webalizer-2.01-10-mbm/webalizer.c	Mon Oct 15 13:32:49 2001
-@@ -149,6 +149,8 @@
- int     ntop_agents  = 15;                    /* top n user agents ""     */
- int     ntop_ctrys   = 30;                    /* top n countries   ""     */
- int     ntop_search  = 20;                    /* top n search strings     */
-+int     ntop_searchsite = 10;                 /* top n search sites       */
-+int     ntop_searchboth = 30;                 /* top n search site/string */
- int     ntop_users   = 20;                    /* top n users to display   */
- 
- int     all_sites    = 0;                     /* List All sites (0=no)    */
-@@ -156,6 +158,8 @@
- int     all_refs     = 0;                     /* List All Referrers       */
- int     all_agents   = 0;                     /* List All User Agents     */
- int     all_search   = 0;                     /* List All Search Strings  */
-+int     all_searchsites = 0;                  /* List All Search Sites    */
-+int     all_searchboth  = 0;                  /* List All Search String/Sites */
- int     all_users    = 0;                     /* List All Usernames       */
- 
- int     dump_sites   = 0;                     /* Dump tab delimited sites */
-@@ -1518,7 +1522,11 @@
- #ifdef USE_GEOIP
-                      "GeoIP",             /* Use GeoIP library (0=no)   88  */
-                      "GeoIPDatabase",     /* GeoIP database             89  */
- #endif	/* USE_GEOIP */
-+                     "TopSearchSites",    /* Top Search Sites           90  */
-+                     "TopSearchSiteStrs", /* Top Search Site/String Pair91  */
-+                     "AllSearchSites",    /* List all Search Sites      92  */
-+                     "AllSearchSiteStrs", /* List all Search Site/String93  */
-                    };
- 
-    FILE *fp;
-@@ -1668,4 +1678,8 @@
- #endif	/* USE_GEOIP */
-+        case 90: ntop_searchsite = atoi(value);        break; /* Top Search pgs */
-+        case 91: ntop_searchboth = atoi(value);        break; /* Top Search pgs */
-+        case 92: all_searchsites=(value[0]=='y')?1:0;  break; /* All Srch str   */
-+        case 93: all_searchboth=(value[0]=='y')?1:0;   break; /* All Srch str   */
-       }
-    }
-    fclose(fp);
-@@ -1888,11 +1904,11 @@
-    /* ptr should point to unescaped query string */
-    char tmpbuf[BUFSIZE];
-    char srch[80]="";
--   unsigned char *cp1, *cp2, *cps;
-+   unsigned char *cp1, *cp2, *cps, *cpsite;
-    int  sp_flg=0;
- 
-    /* Check if search engine referrer or return  */
--   if ( (cps=isinglist(search_list,log_rec.refer))==NULL) return; 
-+   if ( (cps=nameinglist(search_list,log_rec.refer,(char **)&cpsite))==NULL) return; 
- 
-    /* Try to find query variable */
-    srch[0]='?'; strcpy(&srch[1],cps);              /* First, try "?..."      */
-@@ -1928,10 +1943,22 @@
-    /* strip invalid chars */
-    cp1=cp2; while (*cp1!=0) { if ((*cp1<32)||(*cp1==127)) *cp1='_'; cp1++; }
- 
--   if (put_snode(cp2,(u_long)1,sr_htab))
-+   if (put_snode(cp2,cpsite,(u_long)1,sr_htab))
-    {
-       if (verbose)
--      /* Error adding search string node, skipping .... */
-+      /* Error adding search sitestring node, skipping .... */
-+      fprintf(stderr,"%s %s\n", msg_nomem_sc, tmpbuf);
-+   }
-+   if (put_snode("",cpsite,(u_long)1,sr_htab))
-+   {
-+      if (verbose)
-+      /* Error adding search site node, skipping .... */
-+      fprintf(stderr,"%s %s\n", msg_nomem_sc, tmpbuf);
-+   }
-+   if (put_snode(cp2,"",(u_long)1,sr_htab))
-+   {
-+      if (verbose)
-+      /* Error adding search site node, skipping .... */
-       fprintf(stderr,"%s %s\n", msg_nomem_sc, tmpbuf);
-    }
-    return;
-diff -uNr webalizer-2.01-10/webalizer.h webalizer-2.01-10-mbm/webalizer.h
---- webalizer-2.01-10/webalizer.h	Tue Oct 17 05:15:53 2000
-+++ webalizer-2.01-10-mbm/webalizer.h	Mon Oct 15 12:29:44 2001
-@@ -201,6 +201,8 @@
- extern int     ntop_agents  ;                 /* top n user agents ""     */
- extern int     ntop_ctrys   ;                 /* top n countries   ""     */
- extern int     ntop_search  ;                 /* top n search strings     */
-+extern int     ntop_searchsite;               /* top n search sites       */
-+extern int     ntop_searchboth;               /* top n search site/strings*/
- extern int     ntop_users   ;                 /* top n users to display   */
- 
- extern int     all_sites    ;                 /* List All sites (0=no)    */
-@@ -208,6 +210,8 @@
- extern int     all_refs     ;                 /* List All Referrers       */
- extern int     all_agents   ;                 /* List All User Agents     */
- extern int     all_search   ;                 /* List All Search Strings  */
-+extern int     all_searchsites;               /* List All Search Sites    */
-+extern int     all_searchboth;                /* List All Search Site/Strings*/
- extern int     all_users    ;                 /* List All Usernames       */
- 
- extern int     dump_sites   ;                 /* Dump tab delimited sites */
diff --git a/app-admin/webalizer/webalizer-2.01.10-r12.ebuild b/app-admin/webalizer/webalizer-2.01.10-r12.ebuild
index 53b158e2ef90..99aac658e8b5 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r12.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r12.ebuild,v 1.4 2006/02/22 16:30:38 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r12.ebuild,v 1.5 2006/02/23 15:39:49 rl03 Exp $
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -16,7 +16,10 @@ DESCRIPTION="Webserver log file analyzer"
 HOMEPAGE="http://www.mrunix.net/webalizer/"
 SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
 	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20050520.tar.bz2 )
-	xtended? ( http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/${PN}-${MY_PV}-RB07-patch.tar.gz )"
+	xtended? ( http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/${PN}-${MY_PV}-RB07-patch.tar.gz )
+	mirror://gentoo/${PN}-search.patch.gz
+	mirror://gentoo/${PN}.conf.gz
+"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
@@ -56,7 +59,7 @@ src_unpack() {
 	if use geoip; then
 		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
 		if use search; then
-			epatch ${FILESDIR}/${PN}-search.patch || die
+			epatch ${WORKDIR}/${PN}-search.patch || die
 		fi
 		use xtended && einfo "Xtended doesn't work with geolizer, skipping"
 	else
@@ -103,7 +106,7 @@ src_install() {
 	doman webalizer.1
 
 	insinto /etc
-	doins ${FILESDIR}/${PV}/webalizer.conf
+	doins ${WORKDIR}/${PN}.conf
 	use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
 
 	dodoc README* CHANGES Copyright sample.conf ${FILESDIR}/${PV}/apache.webalizer
diff --git a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
index 30d719dd082b..6c142308fd87 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r4.ebuild,v 1.17 2005/01/01 11:35:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r4.ebuild,v 1.18 2006/02/23 15:39:49 rl03 Exp $
 
 MY_P=${P/.10/-10}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Webserver log file analyzer"
 HOMEPAGE="http://www.mrunix.net/webalizer/"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+	mirror://gentoo/${PN}.conf.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,7 +41,7 @@ src_install() {
 	doman webalizer.1
 
 	insinto /etc
-	newins ${FILESDIR}/${PV}/webalizer.conf webalizer.conf
+	doins ${WORKDIR}/${PN}.conf
 
 	if use apache2; then
 		# patch for apache2
@@ -49,7 +51,7 @@ src_install() {
 		insinto /etc/apache/conf
 	fi
 
-	doins ${FILESDIR}/${PV}/webalizer.conf
+	doins ${WORKDIR}/${PN}.conf
 
 	use apache2 || insinto /etc/apache/conf/addon-modules
 	use apache2 || newins ${FILESDIR}/${PV}/apache.webalizer webalizer.conf
diff --git a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
index d6943ad82362..455ecaab9ecd 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r5.ebuild,v 1.14 2005/09/10 14:10:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r5.ebuild,v 1.15 2006/02/23 15:39:49 rl03 Exp $
 
 inherit eutils
 
@@ -10,7 +10,9 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="Webserver log file analyzer"
 HOMEPAGE="http://www.mrunix.net/webalizer/"
 SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
-	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
+	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )
+	mirror://gentoo/${PN}.conf.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -59,7 +61,7 @@ src_install() {
 	doman webalizer.1
 
 	insinto /etc
-	newins ${FILESDIR}/${PV}/webalizer.conf webalizer.conf
+	doins ${WORKDIR}/${PN}.conf
 
 	if use apache2; then
 		# patch for apache2
@@ -69,7 +71,7 @@ src_install() {
 		insinto /etc/apache/conf
 	fi
 
-	doins ${FILESDIR}/${PV}/webalizer.conf
+	doins ${WORKDIR}/${PN}.conf
 
 	use apache2 || insinto /etc/apache/conf/addon-modules
 	use apache2 || newins ${FILESDIR}/${PV}/apache.webalizer webalizer.conf