Version bump; cleaned up sed and apachever stuff for bug 83978. Added enhanced postinst-en.txt written by Jakub Moc in bug 81978.

Package-Manager: portage-2.0.51.19

6 files changed, 293 insertions, 18 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index cf3a5633b5c4..f7e082255874 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.15 2005/02/24 00:26:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.16 2005/03/21 13:36:21 ka0ttic Exp $
+
+*awstats-6.4 (21 Mar 2005)
+
+  21 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinst-en.txt,
+  awstats-6.3-r2.ebuild, +awstats-6.4.ebuild:
+  Version bump; cleaned up sed and apachever stuff for bug 83978. Added
+  enhanced postinst-en.txt written by Jakub Moc in bug 81978.
 
   23 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> awstats-6.3-r2.ebuild:
   Upstream strikes again. Fix digest for bug 83085.
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 85f6e3d625d9..9bcded7b80dd 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f61bd3e42607bdff08a9592c71744941 awstats-6.3-r2.ebuild 4074
-MD5 8fd62577d73c02d079795d4a03aa4029 ChangeLog 2650
+MD5 0b56bf509337f3f5697eaa6924d40fb0 awstats-6.3-r2.ebuild 4038
+MD5 a926d8a37500e2131e0a3050df2efe1e awstats-6.4.ebuild 3868
+MD5 909458a3a391925ee458600c9d958ac9 ChangeLog 2931
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
+MD5 803faa3640a7aadd2fadbbd05968a45e files/digest-awstats-6.4 60
 MD5 70a086a2f452243a500aa67b1df7f26f files/digest-awstats-6.3-r2 135
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
-MD5 182b67a3023a0807ce19f8876d48c81d files/postinst-en.txt 657
+MD5 f881494a979cdea82d58e31b589d9a97 files/postinst-en.txt 5049
 MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0363.diff 1243
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCJQipEZCkKN40op4RAhZtAJ9LqyRB5Y4tXW6t90cg44qhHQOUOQCgjANC
-kaOoKXMO4chYzziFYNvYDIs=
-=O6Q+
+iD8DBQFCPs3wEZCkKN40op4RAgPQAJ9/UvyL1/TM7yyb1gII8S4/nKdWGgCfRNQm
+BkdA48T0cOmV2ACjLwbRyDg=
+=ODGP
 -----END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.3-r2.ebuild b/net-www/awstats/awstats-6.3-r2.ebuild
index 44247d35d6dd..381215ac5029 100644
--- a/net-www/awstats/awstats-6.3-r2.ebuild
+++ b/net-www/awstats/awstats-6.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3-r2.ebuild,v 1.2 2005/02/24 00:26:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3-r2.ebuild,v 1.3 2005/03/21 13:36:21 ka0ttic Exp $
 
-inherit eutils webapp
+inherit eutils webapp versionator
 
 DESCRIPTION="AWStats is a short for Advanced Web Statistics."
 HOMEPAGE="http://awstats.sourceforge.net/"
@@ -43,16 +43,16 @@ src_unpack() {
 	    fi
 	done
 
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
+	local apachever=$(best_version net-www/apache)
+	apachever="$(get_major_version ${apachever##*-})"
+	[[ ${apachever} == "1" ]] && apachever=""
 
 	# set default values for directories
-	sed -i -e "s#LogFile=.*#LogFile=\"/var/log/apache${APACHEVER}/access_log\"#" \
-	    -e "s#SiteDomain=.*#SiteDomain=\"localhost\"#" \
-	    -e "s#DirIcons=.*#DirIcons=\"/awstats/icons\"#" \
-	    -e "s#DirCgi=.*#DirCgi=\"/cgi-bin/awstats\"#" \
-	    -e "s#DataDir=.*#DataDir=\"${MY_HOSTROOTDIR}/awstats/datadir\"#" \
-	${S}/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	sed -i -e "s|^\(LogFile=\).*$|\1\"/var/log/apache${apachever}/access_log\"|" \
+	    -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+	    -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
+	    -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
+		${S}/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
 
 	# set version in postinst-en.txt
 	sed -e "s/PVR/${PVR}/g" \
diff --git a/net-www/awstats/awstats-6.4.ebuild b/net-www/awstats/awstats-6.4.ebuild
new file mode 100644
index 000000000000..78dc90e2c15b
--- /dev/null
+++ b/net-www/awstats/awstats-6.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.4.ebuild,v 1.1 2005/03/21 13:36:21 ka0ttic Exp $
+
+inherit eutils webapp versionator
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics."
+HOMEPAGE="http://awstats.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~ppc ~mips ~sparc ~x86 ~amd64"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=media-libs/libpng-1.2
+	dev-perl/Time-Local
+	net-www/apache"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-6.3-gentoo.diff
+
+	# change AWStats default installation directory to installation directory of Gentoo
+	for file in tools/* wwwroot/cgi-bin/*; do
+	    if [[ -f "$file" ]]; then
+	        sed -i -e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \
+	           -e "s#/usr/local/awstats/wwwroot/icon#${MY_HTDOCSDIR}/icon#g" \
+	           -e "s#/usr/local/awstats/wwwroot/plugins#${MY_HOSTROOTDIR}/plugins#g" \
+	           -e "s#/usr/local/awstats/wwwroot/classes#${MY_HTDOCSDIR}/classes#g" \
+	           -e "s#/usr/local/awstats/wwwroot#${MY_HTDOCSDIR}#g" \
+			   $file || die "sed $file failed"
+	    fi
+	done
+
+	local apachever=$(best_version net-www/apache)
+	apachever="$(get_major_version ${apachever##*-})"
+	[[ ${apachever} == "1" ]] && apachever=""
+
+	# set default values for directories
+	sed -i -e "s|^\(LogFile=\).*$|\1\"/var/log/apache${apachever}/access_log\"|" \
+	    -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+	    -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
+	    -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
+		${S}/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+	# set version in postinst-en.txt
+	sed -e "s/PVR/${PVR}/g" \
+		${FILESDIR}/postinst-en.txt > ${WORKDIR}/postinst-en.txt || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# handle documentation files
+	#
+	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
+	# get installed per vhost!
+
+	dohtml -r docs/*.html docs/*.xml docs/*.css docs/*.js docs/images
+	dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT
+	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+	docinto xslt
+	dodoc tools/xslt/*
+
+	webapp_postinst_txt en ${WORKDIR}/postinst-en.txt
+
+	keepdir /var/lib/awstats
+
+	# Copy the app's main files
+	exeinto ${MY_CGIBINDIR}
+	doexe ${S}/wwwroot/cgi-bin/*.pl
+
+	exeinto ${MY_HTDOCSDIR}/classes
+	doexe ${S}/wwwroot/classes/*.jar
+
+	# install language files, libraries and plugins
+	mkdir -p ${D}${MY_CGIBINDIR}
+	for dir in lang lib plugins; do
+		cp -R ${S}/wwwroot/cgi-bin/${dir} ${D}${MY_CGIBINDIR}
+		chmod 0755 ${D}${MY_CGIBINDIR}/${dir}
+	done
+
+	# install the app's www files
+	mkdir -p ${D}${MY_HTDOCSDIR}
+	for dir in icon css js; do
+		cp -R ${S}/wwwroot/${dir} ${D}${MY_HTDOCSDIR}
+		chmod 0755 ${D}${MY_HTDOCSDIR}/${dir}
+	done
+
+	# copy configuration file
+	insinto /etc/awstats
+	doins ${S}/wwwroot/cgi-bin/awstats.model.conf
+
+	# create the data directory for awstats
+	mkdir -p ${D}/${MY_HOSTROOTDIR}/datadir
+
+	# install command line tools
+	cd ${S}/tools
+	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+		awstats_updateall.pl logresolvemerge.pl \
+		maillogconvert.pl awstats_configure.pl
+	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+
+	# all done
+	#
+	# now we let the eclass strut its stuff ;-)
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The AWStats-Manual is available either inside"
+	einfo " the /usr/share/doc/${PF} - folder, or at"
+	einfo " http://awstats.sourceforge.net/docs/index.html ."
+	einfo
+	ewarn "Copy the /etc/awstats/awstats.model.conf to"
+	ewarn "/etc/awstats/awstats.<yourdomain>.conf and edit."
+	ewarn "use the command"
+	ewarn "     webapp-config"
+	ewarn "to install awstats for each virtual host. See proper man page."
+}
+
diff --git a/net-www/awstats/files/digest-awstats-6.4 b/net-www/awstats/files/digest-awstats-6.4
new file mode 100644
index 000000000000..828cff76dc65
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.4
@@ -0,0 +1 @@
+MD5 056e6fb0c7351b17fe5bbbe0aa1297b1 awstats-6.4.tgz 918435
diff --git a/net-www/awstats/files/postinst-en.txt b/net-www/awstats/files/postinst-en.txt
index 2b289c6be30a..f95caeaf28f0 100644
--- a/net-www/awstats/files/postinst-en.txt
+++ b/net-www/awstats/files/postinst-en.txt
@@ -2,6 +2,8 @@ Alias /awstats/classes "/usr/share/webapps/awstats/PVR/htdocs/classes/"
 Alias /awstats/css "/usr/share/webapps/awstats/PVR/htdocs/css/"
 Alias /awstats/icons "/usr/share/webapps/awstats/PVR/htdocs/icon/"
 ScriptAlias /awstats/ "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/"
+ScriptAlias /awstats "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/awstats.pl"
+ScriptAlias /awstats.pl "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/awstats.pl"
 
 <Directory "/usr/share/webapps/awstats/PVR/htdocs">
     Options None
@@ -20,3 +22,138 @@ ScriptAlias /awstats/ "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/"
 	Allow from all
     </IfModule>
 </Directory>
+
+###
+# NOTE: The following sections are strictly optional. Please read
+# and follow carefully all the instructions before uncommenting
+# any lines. Examples shown below are for Apache 2.0.x ONLY.
+###
+
+###
+# INSTRUCTIONS:
+#
+# If you would like to require authentication to access AWStats,
+# then uncomment ONE of the example Directory sections below.
+#
+# NOTE: Related AWStats configuration directives are:
+#
+# AllowAccessFromWebToAuthenticatedUsersOnly=1
+# AllowAccessFromWebToFollowingAuthenticatedUsers="user1 [user2 ...]"
+#
+# You can use these to set a per-domain user access when needed 
+# for virtual hosting. That means: only the selected user(s) will have
+# access to stats for the particular domain. All other users
+# will not be allowed to see the domain stats even though they
+# have authenticated successfully.
+###
+
+###
+# SECTION I - Basic Authentication
+#
+# The following example requires mod_auth to work.
+# You need to uncomment the following line in apache2.conf 
+# and restart Apache to get the module loaded:
+#
+# LoadModule auth_module                   modules/mod_auth.so
+#
+# Add your AWStats users to /etc/awstats/.htpasswd file.
+# Please see 'man htpasswd2' for more details if you need.
+#
+# htpasswd2 -c /etc/awstats/.htpasswd username1
+# htpasswd2 /etc/awstats/.htpasswd username2
+# etc...
+###
+
+#<IfModule mod_auth.c>
+#<Directory "/usr/share/webapps/awstats/PVR/hostroot">
+#    Options None
+#    AllowOverride None
+#    Order allow,deny
+#    Allow from all
+#
+#    AuthType Basic
+#    AuthName "AWStats authenticated zone"
+#    AuthUserFile /etc/awstats/.htpasswd
+#    Require valid-user
+#
+#</Directory>
+#</IfModule>
+
+###
+# SECTION II - Digest Authentication
+#
+# The following example requires mod_auth_digest to work.
+# You need to uncomment the following line in apache2.conf
+# and restart Apache to get the module loaded:
+#
+# LoadModule auth_digest_module            modules/mod_auth_digest.so
+#
+# Do not forget to replace www.example.com as appropriate. You can also add
+# as many domains as you need to this line.
+#
+# Add your AWStats users to /etc/awstats/.htdigest file. Please see 
+# 'man htdigest2' and http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html
+# for more details if you need.
+#
+# htdigest2 -c /etc/awstats/.htdigest "AWStats authenticated zone" username1
+# htdigest2 /etc/awstats/.htdigest "AWStats authenticated zone" username2
+# etc...
+###
+
+#<IfModule mod_auth_digest.c>
+#<Directory "/usr/share/webapps/awstats/PVR/hostroot">
+#    Options None
+#    AllowOverride None
+#    Order allow,deny
+#    Allow from all
+
+#    AuthType Digest
+#    AuthName "AWStats authenticated zone"
+#    AuthDigestFile /etc/awstats/.htdigest
+#    AuthDigestDomain http://www.example.com https://www.example.com
+#    require valid-user
+#    # The following line is REQUIRED to work around a bug in MSIE.
+#    # See http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html
+#    BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
+#</Directory>
+#</IfModule>
+
+###
+# SECTION III - MySQL Authentication
+#
+# The following example requires mod_auth_mysql to work.
+# Emerge mod_auth_mysql and follow the instructions in
+# 12_mod_auth_mysql.conf to create MySQL database required
+# for authentication. After you finished adding users, add
+# '-D AUTH_MYSQL' to your /etc/conf.d/apache2 APACHE2_OPTS
+# setting and restart Apache to get the module loaded.
+###
+
+#<IfModule mod_auth_mysql.c>
+#<Directory "/usr/share/webapps/awstats/PVR/hostroot">
+#    Options None
+#    AllowOverride None
+#    Order allow,deny
+#    Allow from all
+
+#    AuthName "AWStats MySQL authenticated zone"
+#    AuthType Basic
+#    AuthMySQLUser authuser
+#    AuthMySQLPassword PaSsW0Rd
+#    AuthMySQLDB auth
+#    AuthMySQLUserTable users
+#    AuthMySQLNameField user_name
+#    AuthMySQLPasswordField user_passwd
+#    # Uncomment the two lines below ONLY if you have
+#    # the required table for group-based MySQL authentication
+#    # in your MySQL database.
+#    #AuthMySQLGroupTable groups
+#    #AuthMySQLGroupField user_group
+#
+#    # Uncomment one of the following directives according
+#    # to the database structure you have chosen.
+#    #require valid-user
+#    #require group your_group_name_here
+
+#</Directory>
+#</IfModule>