Fix previous commit.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

4 files changed, 106 insertions, 6 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index 31faedc4170b..9b5523b94b0f 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,8 +1,9 @@
 # ChangeLog for www-misc/awstats
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.1 2009/04/09 19:00:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.2 2009/04/09 19:18:04 ulm Exp $
 
-  09 Apr 2009; Ulrich Mueller <ulm@gentoo.org> +metadata.xml,
+  09 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/awstats-6.3-gentoo.diff, +files/postinst-en-r1.txt, +metadata.xml,
   +awstats-6.9-r1.ebuild:
   Package moved from net-www to www-misc, bug 265569.
 
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 8c8caccbcdd5..92950c6cee7f 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -5,12 +5,12 @@ AUX awstats-6.3-gentoo.diff 1219 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930
 AUX postinst-en-r1.txt 2412 RMD160 6f4b9705b36ab0968d82f94915d8d6526f52fbe8 SHA1 953ec2765fd8322035c4b5dbc92741343814ffee SHA256 ae1c4d318867c444583af0b34b057955cc10f45fc6fa5457f06261d8ba5b3884
 DIST awstats-6.9.tar.gz 1125906 RMD160 339af2df9c44713d632b4d1ae3d733132f7b0bab SHA1 5ad8485eab04147b20adf5e8a7bdd5b6d3e2468b SHA256 c5e288d05c71c5692c59625aa4bcf4c9b41ee0c46cb9b83e7dcac6510bb8b04f
 EBUILD awstats-6.9-r1.ebuild 3976 RMD160 4bdeab7768da19d9a0b09285217601a9feccd03f SHA1 017f3152a7cf3e6b6327000b6563a2bd5e5c5fa9 SHA256 1e319cdcbbafe1e293711e21abd269894a25c0cfff6aca45417f5a7d1767df5b
-MISC ChangeLog 10279 RMD160 e452c4d3533c205a53a72bb65f83bbc5fe487427 SHA1 a01abecbdf1a47f4cfe557f2758d83e6dc523fea SHA256 aea6c2d27197479a72e0b377e0b8955eee3c699a375bc6c936599d3cb45b5b26
+MISC ChangeLog 10340 RMD160 6609bcc307a1cbff3de0d42cfd23960b3c762f6c SHA1 19bd470b54f70c423c5ef15ca5124efea739b405 SHA256 44ae9ee3b3a7b1e4e1e3542425e294577c9a5784a1ca95c9cb13735d0c812f0c
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkneRj8ACgkQOeoy/oIi7uy7iQCg7CJg7Wglf5Aiql41+zjqRj98
-5dMAoNo/CI8cpqU8tpWvX/iJ+qnF2G1W
-=gify
+iEYEARECAAYFAkneSkgACgkQOeoy/oIi7uxrngCdGI2gReQtNzeRCvLkdnyW9j/h
+wgoAoLjfzI78Jc0y3UhMbioftdltOgNN
+=huFi
 -----END PGP SIGNATURE-----
diff --git a/www-misc/awstats/files/awstats-6.3-gentoo.diff b/www-misc/awstats/files/awstats-6.3-gentoo.diff
new file mode 100644
index 000000000000..ec3b115afa4f
--- /dev/null
+++ b/www-misc/awstats/files/awstats-6.3-gentoo.diff
@@ -0,0 +1,32 @@
+diff -urN awstats-6.3.orig/tools/awstats_configure.pl awstats-6.3/tools/awstats_configure.pl
+--- awstats-6.3.orig/tools/awstats_configure.pl	2005-01-24 09:28:43.980923725 -0500
++++ awstats-6.3/tools/awstats_configure.pl	2005-01-24 09:28:52.034571769 -0500
+@@ -658,13 +658,27 @@
+     		print "\n-----> Restart Web server with '$command'\n";
+ 	 	    my $ret=`$command`;
+ 	 	    print "$ret";
++	} elsif (-f "/etc/gentoo-release") {
++	    my $command;
++	    if (-x "/usr/sbin/apache2ctl") {
++		$command="/usr/sbin/apache2ctl graceful";
++	    } elsif (-x "/usr/sbin/apachectl") {
++		$command="/usr/sbin/apachectl graceful";
++	    } else {
++       		print "\n-----> Don't forget to restart manually your web server\n";
++	    }
++	    if ($command != "") {
++		print "\n-----> Restart Web server with '$command'\n";
++		my $ret=`$command`;
++		print "$ret";
++	    }
+         } elsif (-x "/sbin/service") {
+             # We are not on debian
+        	 	my $command="/sbin/service httpd restart";
+     		print "\n-----> Restart Web server with '$command'\n";
+ 	 	    my $ret=`$command`;
+ 	 	    print "$ret";
+-   	 	} else {
++		} else {
+        		print "\n-----> Don't forget to restart manually your web server\n";
+         }
+ 	}
diff --git a/www-misc/awstats/files/postinst-en-r1.txt b/www-misc/awstats/files/postinst-en-r1.txt
new file mode 100644
index 000000000000..94a36aa10e05
--- /dev/null
+++ b/www-misc/awstats/files/postinst-en-r1.txt
@@ -0,0 +1,67 @@
+###
+# INSTRUCTIONS:
+#
+# If you would like to require authentication to access AWStats, then use ONE
+# of the example configurations below. There are many other modules and
+# options for authentication which will not be discussed here.
+#
+# 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 (apache 2.0) or mod_auth_basic
+# (apache 2.2) to work. Make sure you have installed and enabled it in
+# /etc/apache2/httpd.conf
+#
+# 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...
+###
+
+#<Location "/cgi-bin/awstats.pl">
+#    AuthType Basic
+#    AuthName "AWStats authenticated zone"
+#    AuthUserFile /etc/awstats/.htpasswd
+#    Require valid-user
+#</Location>
+
+###
+# SECTION II - Digest Authentication
+#
+# The following example requires mod_auth_digest to work.  Make sure you have
+# installed and enabled it in /etc/apache2/httpd.conf
+#
+# 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...
+###
+
+#<Location "/cgi-bin/awstats.pl">
+#    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>