Fix for bug 27503

author: Stuart Herbert <stuart@gentoo.org> 2003-10-04 12:26:19 +0000
committer: Stuart Herbert <stuart@gentoo.org> 2003-10-04 12:26:19 +0000
commit: 1b73c32bde61764d393278484496c24000363452 (patch)
tree: 8225db38d0b693d82492d35e0d6ee6c1043be363 /app-admin/webalizer
parent: Fix for bug 27503 (diff)
download: historical-1b73c32bde61764d393278484496c24000363452.tar.gz
historical-1b73c32bde61764d393278484496c24000363452.tar.bz2
historical-1b73c32bde61764d393278484496c24000363452.zip
3 files changed, 96 insertions, 77 deletions
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index a2f8b7c168fe..1d9ae864cfb1 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,6 +1,7 @@
 MD5 ccf13d9985e24554803d2d716669d2f9 webalizer-2.01.10-r3.ebuild 1797
 MD5 f3b2ef74726177318f4a4631bcd869eb webalizer-2.01.10-r2.ebuild 1561
 MD5 4e4b00b1c06cc55d557edb8789e6f96a ChangeLog 2033
+MD5 cd5669e6c31097d0a6d68c8e9f74f4c3 metadata.xml 397
 MD5 243a553aac1ac7c50842856ce779c0d0 files/apache.webalizer 345
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r2 74
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r3 74
diff --git a/app-admin/webalizer/files/webalizer-2.01.10.conf b/app-admin/webalizer/files/webalizer-2.01.10.conf
index ab96e5042f21..2b050c4d5664 100644
--- a/app-admin/webalizer/files/webalizer-2.01.10.conf
+++ b/app-admin/webalizer/files/webalizer-2.01.10.conf
@@ -1,13 +1,12 @@
 #
 # Sample Webalizer configuration file
-# Copyright 1997-1999 by Bradford L. Barrett (brad@mrunix.net)
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/files/webalizer-2.01.10.conf,v 1.2 2002/05/04 01:22:37 woodchip Exp $
+# 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 1.30)
+# 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
@@ -22,16 +21,19 @@
 
 
 # LogFile defines the web server log file to use.  If not specified
-# here or on on the command line, input will default to STDIN.
+# 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).  Values can be 'web' or 'ftp', with 'web' the default.
+# others), or Squid native logs.  Values can be 'clf', 'ftp' or 'squid',
+# with 'clf' the default.
 
-#LogType	web
+#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.
@@ -101,7 +103,7 @@ OutputDir      /home/httpd/htdocs/webalizer
 # 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).
+# if different for web logs, 'txt' for ftp logs).
 
 PageType	htm*
 PageType	cgi
@@ -124,7 +126,7 @@ PageType	cgi
 # relative to the default output directory.  See the DNS.README file for
 # additional information.
 
-#DNSCache       dns_cache.db
+#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.
@@ -138,12 +140,12 @@ PageType	cgi
 # normal system operations.  Reasonable values should be between 5 and
 # 20.  See the DNS.README file for additional information.
 
-#DNSChildren    0
+#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>
@@ -175,7 +177,7 @@ PageType	cgi
 # 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.gif" ALT="100% Micro$oft free!">
+#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
@@ -234,18 +236,18 @@ PageType	cgi
 # as if they had the same time stamp as the last valid record.
 # Default is to ignore out of sequence log records.
 
-#FoldSeqErr     no
+#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.  The value is formatted
-# as HHMMSS where HH=hours MM=minutes and SS=seconds (use '00').
+# 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	3000
+#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
@@ -265,8 +267,8 @@ PageType	cgi
 # and statistics table to be disabled (not displayed).  Values
 # may be "yes" or "no". Default is "yes".
 
-#DailyGraph     yes
-#DailyStats     yes
+#DailyGraph	yes
+#DailyStats	yes
 
 # HourlyGraph and HourlyStats allows the hourly statistics graph
 # and statistics table to be disabled (not displayed).  Values
@@ -294,10 +296,10 @@ PageType	cgi
 
 # 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=50. TopKSites and TopKURLs (by KByte tables) both default
+# 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 default to 20.  Tables may be disabled by using
-# zero (0) for the value.
+# search strings and usernames default to 20.  Tables may be disabled
+# by using zero (0) for the value.
 
 #TopSites        30
 #TopKSites       10
@@ -305,7 +307,7 @@ PageType	cgi
 #TopKURLs        10
 #TopReferrers    30
 #TopAgents       15
-#TopCountries    50
+#TopCountries    30
 #TopEntry        10
 #TopExit         10
 #TopSearch       20
@@ -326,11 +328,11 @@ PageType	cgi
 # 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
+#AllSites	no
+#AllURLs	no
+#AllReferrers	no
+#AllAgents	no
+#AllSearchStr	no
 #AllUsers       no
 
 # The Webalizer normally strips the string 'index.' off the end of
@@ -349,18 +351,18 @@ PageType	cgi
 #IndexAlias     home.htm
 #IndexAlias	homepage.htm
 
-# The Hide*, Group* and Ignore* and Include* keywords allow you to change
-# the way Sites, URL's, Referrers and User Agents 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 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
@@ -388,16 +390,16 @@ HideURL		*.gif
 HideURL		*.GIF
 HideURL		*.jpg
 HideURL		*.JPG
-HideURL     *.png
-HideURL     *.PNG
+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
+#HideUser	root
+#HideUser	admin
 
 # Grouping options
 #GroupURL	/cgi-bin/*	CGI Scripts
@@ -411,6 +413,10 @@ HideURL		*.ra
 #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...)
@@ -430,7 +436,7 @@ HideURL		*.ra
 # keyword can be either 'yes' or 'no', with 'no' the default,
 # allowing individual sites to be displayed.
 
-#HideAllSites   no
+#HideAllSites	no
 
 # The GroupDomains keyword allows you to group individual hostnames
 # into their respective domains.  The value specifies the level of
@@ -442,7 +448,7 @@ HideURL		*.ra
 # be grouped if they do not match any existing "GroupSite" records,
 # which allows overriding this feature with your own if desired.
 
-#GroupDomains   0
+#GroupDomains	0
 
 # The GroupShading allows grouped rows to be shaded in the report.
 # Useful if you have lots of groups and individual records that
@@ -458,13 +464,13 @@ HideURL		*.ra
 #GroupHighlight	yes
 
 # The Ignore* keywords allow you to completely ignore log records based
-# on hostname, URL, user agent or referrer.  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*/Group* keywords, where the value can have a
-# leading or trailing wildcard '*'.
+# 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*
@@ -473,10 +479,11 @@ HideURL		*.ra
 #IgnoreUser     root
 
 # The Include* keywords allow you to force the inclusion of log records
-# based on hostname, URL, user agent or referrer.  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).
+# 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	*
@@ -509,20 +516,20 @@ HideURL		*.ra
 # 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=
+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
@@ -533,7 +540,7 @@ SearchEngine    northernlight.com  qr=
 # it will default to the current output directory.  Do not use a
 # trailing slash ('/').
 
-DumpPath       /var/log/apache
+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
@@ -542,23 +549,23 @@ DumpPath       /var/log/apache
 # will not need a header record, while spreadsheets usually do.
 # Value can be either 'yes' or 'no', with 'no' being the default.
 
-#DumpHeader     no
+#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
+#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
+#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/metadata.xml b/app-admin/webalizer/metadata.xml
new file mode 100644
index 000000000000..4053c405b5ab
--- /dev/null
+++ b/app-admin/webalizer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+<maintainer>
+  <email>@gentoo.org</email>
+<!--  <name>Full name</name> -->
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<!-- <longdescription>Long description of the package</longdescription> -->
+</pkgmetadata>
author	Stuart Herbert <stuart@gentoo.org>	2003-10-04 12:26:19 +0000
committer	Stuart Herbert <stuart@gentoo.org>	2003-10-04 12:26:19 +0000
commit	1b73c32bde61764d393278484496c24000363452 (patch)
tree	8225db38d0b693d82492d35e0d6ee6c1043be363 /app-admin/webalizer
parent	Fix for bug 27503 (diff)
download	historical-1b73c32bde61764d393278484496c24000363452.tar.gz historical-1b73c32bde61764d393278484496c24000363452.tar.bz2 historical-1b73c32bde61764d393278484496c24000363452.zip