Version bump; new version is beta but solves some security issues.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 146 insertions, 6 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index e92b9c878e04..2e7f40bb13ed 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/awstats
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.21 2011/06/06 12:15:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.22 2011/11/11 11:49:23 flameeyes Exp $
+
+*awstats-7.1 (11 Nov 2011)
+
+  11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> +awstats-7.1.ebuild,
+  +files/awstats-7.1-gentoo.diff:
+  Version bump; new version is beta but solves some security issues.
 
   06 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/postinst-en-r1.txt, -awstats-6.95.ebuild,
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index e6357bc7a2ed..2acad68ef009 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 AUX awstats-6.3-gentoo.diff 984 RMD160 5d49076bfc2a4b0c948d354ad2e0cf6b7703de2f SHA1 a93892f11f8004f9fc11268506637ff223d7c534 SHA256 488224144c66ac410f21a5df2f7d593384a42a1f5b35af709e721931ac3ec37c
 AUX awstats-7.0_p20101205-nofollow.patch 805 RMD160 b5b33ac9e63060cd22ddf4e58e81e303fa7add61 SHA1 5f26c2f7b06a1f791819dc09308dffea25ffdcf6 SHA256 8f4ffd36732aec5cbbc92184a808c532dab93c54548bdccd24bf50bcd1225aaf
+AUX awstats-7.1-gentoo.diff 795 RMD160 feb469547df8e9b1670076e90fead446416c5f0f SHA1 f9ac858e0a76ac19239e4db7ccd955a17204b34a SHA256 528b9c8608824dcadbd5e1f76f6a4e4931186c4dfb87b33820c27d9ca20f6bca
 DIST awstats-7.0_p20101205.tar.gz 1254327 RMD160 0bd46afbd3159cf5f3e517b37a43b7d0852fc2a3 SHA1 733fa7d6a540f4a54f52c69a5f271c789472b0b7 SHA256 e2651d4a5ff40e1d792b37cc13784d444cae479b4f98118aed27f46f5a18ce92
+DIST awstats-7.1.tar.gz 1255868 RMD160 517e5323172a8fa9b3a0c7431238b0331deaec31 SHA1 8b8be15e30be32f94493479580e22acfa1a780cc SHA256 67c8c4d97d85b37d08028cfeec0e1746784b5397042f129c6264891503ce0373
 EBUILD awstats-7.0_p20101205-r3.ebuild 3408 RMD160 e886f4a99d36d2efa403f770a79c7ea41059a933 SHA1 8a91516faa4859ca3cb24790e8cee2a2c1e03f26 SHA256 6a6e25b241da96f5ab12e320519ee6691a6bad60a2f26793270d86bce3d01eac
-MISC ChangeLog 14118 RMD160 fdd93625ca923b03fffe7a31b860fce058edd678 SHA1 4ea1fc05a5ea3662382f1c0acbcd5276c9a5a1d5 SHA256 89022baac9d6b2c04a2c22b9877e5bf6e5c596acffca1c10a96f2ca4dd3ea89d
+EBUILD awstats-7.1.ebuild 3393 RMD160 d055fc2bafb08fe6f87067ba904a4d59a5e40c78 SHA1 f576b181937346ccb1d5d34262c86ddc4fb27cb2 SHA256 3df371f42e4b9132a2d9353e6a58e60c8264ede21c0279df9fb00e109fe87440
+MISC ChangeLog 14327 RMD160 be2851e27007847951ca8a2db98792870bbcb7c9 SHA1 cef0ff108148fe6b46a61112666b45c7b4098f0a SHA256 9e437038dc5cc76f4cd879d6d43fa20aea1e32d1dd74c006c78ed1732a7fc18f
 MISC metadata.xml 234 RMD160 4aaa37cfc1520c193a82b7a8d705657642c03217 SHA1 fa45005b308271aa12f4c87237efa3f0ae948019 SHA256 546f04e42ad54ad26e9b3514961516a0286b2d14bdbbd83166d9dd480698945b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3sxPQACgkQAiZjviIA2Xg7CACg8xAoT6+XJil8VQRTikfGD21k
-2+cAoLYr2G9c8QI5CcG/OKKSBFEyRGY/
-=EVfb
+iEYEARECAAYFAk69C7QACgkQAiZjviIA2Xg35wCgz/xEFrlY6Fwj27Qzjqmi65To
+TKIAoIhPkx1Pv1/twSufCg420NlCOayL
+=ll+c
 -----END PGP SIGNATURE-----
diff --git a/www-misc/awstats/awstats-7.1.ebuild b/www-misc/awstats/awstats-7.1.ebuild
new file mode 100644
index 000000000000..13101d38ad8c
--- /dev/null
+++ b/www-misc/awstats/awstats-7.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.1.ebuild,v 1.1 2011/11/11 11:49:23 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils
+
+MY_P=${PN}-${PV%_p*}
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics."
+HOMEPAGE="http://www.awstats.org/"
+
+if [ ${MY_P} != ${P} ]; then
+	SRC_URI="http://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
+	# The following SRC_URI is useful only when fetching for the first time
+	# after bump; upstream does not bump the version when they change it, so
+	# we rename it to include the date and upload to our mirrors instead.
+	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
+fi
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	virtual/perl-Time-Local
+	dev-perl/URI
+	geoip? ( dev-perl/Geo-IP )
+	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
+
+	# change default installation directory
+	find . -type f -exec sed \
+		-e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
+		-i {} + || die "find/sed failed"
+
+	# set default values for directories; use apache log as an example
+	sed \
+		-e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
+		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+	# enable plugins
+
+	if use ipv6; then
+		sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	fi
+
+	if use geoip; then
+		sed -e '/LoadPlugin="geoip /aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	fi
+
+	find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
+}
+
+src_install() {
+	dohtml -r docs/*
+	dodoc README.TXT
+	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+	dodoc -r tools/xslt
+
+	keepdir /var/lib/awstats
+
+	insinto /etc/awstats
+	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
+
+	# remove extra content that we don't want to install
+	rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
+		"${S}"/wwwroot/classes/src || die
+
+	insinto /usr/share/awstats
+	doins -r wwwroot || die
+	chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
+
+	cd "${S}"/tools
+	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+		awstats_updateall.pl
+	newbin logresolvemerge.pl awstats_logresolvemerge.pl
+	newbin maillogconvert.pl awstats_maillogconvert.pl
+	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+
+	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+}
+
+pkg_postinst() {
+	elog "The AWStats-Manual is available either inside"
+	elog "the /usr/share/doc/${PF} - folder, or at"
+	elog "http://awstats.sourceforge.net/docs/index.html ."
+	elog
+	elog "Copy the /etc/awstats/awstats.model.conf to"
+	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+	elog ""
+	ewarn "This ebuild does no longer use webapp-config to install"
+	ewarn "instead you should point your configuration to the stable"
+	ewarn "directory tree in the following path:"
+	ewarn "    /usr/share/awstats"
+}
diff --git a/www-misc/awstats/files/awstats-7.1-gentoo.diff b/www-misc/awstats/files/awstats-7.1-gentoo.diff
new file mode 100644
index 000000000000..a58ed48bd548
--- /dev/null
+++ b/www-misc/awstats/files/awstats-7.1-gentoo.diff
@@ -0,0 +1,21 @@
+--- 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,6 +658,18 @@
+     		print "\n-----> Restart Web server with '$command'\n";
+ 	 	    my $ret=`$command`;
+ 	 	    print "$ret";
++	} elsif (-f "/etc/gentoo-release") {
++	    my $command;
++	    if (-x "/etc/init.d/apache2") {
++		$command="/etc/init.d/apache2 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";