Version bump to latest beta that seem to fix some security concerns. Take co-maintainership of package.

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

5 files changed, 186 insertions, 14 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index 8cc1d0545ded..55e7ddc01cf8 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-misc/awstats
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.8 2010/03/12 16:45:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.9 2010/09/08 11:55:18 flameeyes Exp $
+
+*awstats-7.0 (08 Sep 2010)
+
+  08 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/awstats-6.3-gentoo.diff, +awstats-7.0.ebuild, metadata.xml:
+  Version bump to latest beta that seem to fix some security concerns. Take
+  co-maintainership of package.
 
   12 Mar 2010; Jeroen Roovers <jer@gentoo.org> awstats-6.95.ebuild:
   Stable for HPPA (bug #293981).
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 19976d709225..ed4c231a4648 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,8 +1,20 @@
-AUX awstats-6.3-gentoo.diff 1219 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 SHA1 8a1971c0e710cec05004a7e94461f83f77b2fd1a SHA256 0de073550f021a93d883c307f999b4b6ead1abf3a587118e2e01578907d15814
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX awstats-6.3-gentoo.diff 984 RMD160 5d49076bfc2a4b0c948d354ad2e0cf6b7703de2f SHA1 a93892f11f8004f9fc11268506637ff223d7c534 SHA256 488224144c66ac410f21a5df2f7d593384a42a1f5b35af709e721931ac3ec37c
 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
 DIST awstats-6.95.tar.gz 1138306 RMD160 62394005828e49d714200f907adf44fbe5cb8834 SHA1 0eba9c3f834b05dbfc3392ce443140008fa12525 SHA256 7cda2f470abae83b10c819aec6511897034e75b73b36b706a98736b5d04d81d3
+DIST awstats-7.0.tar.gz 1228845 RMD160 3ed1e124aecfc0dca6e0b3e23c45d6ddcdefd2a4 SHA1 56389996acb4fce07c820ff03facb0da02d9ab22 SHA256 24bdcbc9222e26d19e87213edb638e2c71346041b542faa641e746d13e074be2
 EBUILD awstats-6.9-r1.ebuild 4041 RMD160 9c09c3789ea7397c067314e6d65dccfef167bb3a SHA1 74dfcaaf34361f1d488ad6ecb69ae47343fedc34 SHA256 01c95468227dea9bc45cffed0ab3c6a5d4756bc4ba97e5c6bf19259043d44af1
 EBUILD awstats-6.95.ebuild 4213 RMD160 95341b6082a1853904f43810da4d70c65b90534f SHA1 c6d097d755418a6e48c6a9ae4530a58f20a06a7a SHA256 dd6491700d6b099f53b02ac278624cef8cf3716ae1f6efc4898deb3694cb7ea4
-MISC ChangeLog 11205 RMD160 7a759ce66e1e118c69fd52efc5fb64dd21b6bd53 SHA1 a081affd5bef0712c393e6f2b7d70ac99c66f010 SHA256 dd73b44cd55fb3c8bba1ee78a153548b6934f7a1991b47d1dab1174461ed8390
-MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
+EBUILD awstats-7.0.ebuild 4330 RMD160 c837f017bc6c23c60e03744de98d2bfd3bd9aae8 SHA1 9a797facfa9d63bd642ef5251f5d55238c20d253 SHA256 25ac08e9cc03b736964253cc35e38e157071fb0a0287ed630b3771c2a5af7e6e
+MISC ChangeLog 11472 RMD160 a8a5e424a6ef55e81d4504ed17964010b97f5924 SHA1 fb06693e0e9918dcef99846cef90fdd38deae63c SHA256 4b5695fb016d67128dd984df664e747513883d2c1bed6c0be4f8ece358f2c56d
+MISC metadata.xml 234 RMD160 4aaa37cfc1520c193a82b7a8d705657642c03217 SHA1 fa45005b308271aa12f4c87237efa3f0ae948019 SHA256 546f04e42ad54ad26e9b3514961516a0286b2d14bdbbd83166d9dd480698945b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyHebYACgkQAiZjviIA2XjwZwCgrrdrbF3LbYIHDJZFfDnP13o+
+9osAoLAur4LG+WYUqg5Qw1uBR9yLqGrm
+=DkhV
+-----END PGP SIGNATURE-----
diff --git a/www-misc/awstats/awstats-7.0.ebuild b/www-misc/awstats/awstats-7.0.ebuild
new file mode 100644
index 000000000000..d7c5a7401a85
--- /dev/null
+++ b/www-misc/awstats/awstats-7.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.0.ebuild,v 1.1 2010/09/08 11:55:18 flameeyes Exp $
+
+inherit eutils webapp versionator depend.apache
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics."
+HOMEPAGE="http://awstats.sourceforge.net/"
+SRC_URI="http://awstats.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=media-libs/libpng-1.2
+	virtual/perl-Time-Local
+	dev-perl/URI
+	geoip? ( dev-perl/Geo-IP )
+	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
+
+	# change default installation directory
+	for file in tools/* wwwroot/cgi-bin/*; do
+		if [[ -f "${file}" ]]; then
+			sed \
+				-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" \
+				-i "${file}" || die "sed ${file} failed"
+		fi
+	done
+
+	# set the logpath
+	if use apache2; then
+		logpath="apache2/access_log"
+	else
+		logpath="awstats_log"
+	fi
+
+	# set default values for directories
+	sed \
+		-e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
+		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+		-e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+	# enable ipv6 plugin
+	if use ipv6; then
+		sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dohtml -r docs/*.html docs/*.xml docs/*.css docs/images || die
+	dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT || die
+	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+	docinto xslt
+	dodoc tools/xslt/* || die
+
+	webapp_postinst_txt en "${FILESDIR}"/postinst-en-r1.txt
+
+	keepdir /var/lib/awstats
+
+	# Copy the app's main files
+	exeinto "${MY_CGIBINDIR}"
+	doexe "${S}"/wwwroot/cgi-bin/*.pl || die
+
+	exeinto "${MY_HTDOCSDIR}"/classes
+	doexe "${S}"/wwwroot/classes/*.jar || die
+
+	# install language files, libraries and plugins
+	dodir "${MY_CGIBINDIR}"
+	for dir in lang lib plugins; do
+		insinto "${MY_CGIBINDIR}"
+		doins -r "${S}"/wwwroot/cgi-bin/${dir} || die
+	done
+
+	# install the app's www files
+	dodir "${MY_HTDOCSDIR}"
+	for dir in icon css js; do
+		insinto "${MY_HTDOCSDIR}"
+		doins -r "${S}"/wwwroot/${dir} || die
+	done
+
+	dodir /usr/share/awstats
+	dosym "${MY_HTDOCSDIR}" /usr/share/awstats/htdocs || die
+
+	for dir in lang lib plugins; do
+		dosym "${MY_CGIBINDIR}"/"${dir}" /usr/share/awstats/"${dir}" || die
+	done
+
+	# copy configuration file
+	insinto /etc/awstats
+	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf || die
+
+	# create the data directory for awstats
+	dodir "${MY_HOSTROOTDIR}"/datadir || die
+
+	# install command line tools
+	cd "${S}"/tools
+	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+		awstats_updateall.pl logresolvemerge.pl \
+		maillogconvert.pl awstats_configure.pl || die
+	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl || die
+	dosym "${MY_CGIBINDIR}"/awstats.pl /usr/bin/awstats.pl || die
+
+	webapp_src_install
+
+	# fix perms
+	for dir in lang lib plugins; do
+		fperms 0755 "${MY_CGIBINDIR}"/"${dir}" || die
+	done
+	for dir in icon css js; do
+		fperms 0755 "${MY_HTDOCSDIR}"/"${dir}" || die
+	done
+}
+
+pkg_postinst() {
+	elog
+	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
+	ewarn "Copy the /etc/awstats/awstats.model.conf to"
+	ewarn "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+
+	if use geoip ; then
+		elog
+		elog "Add the following line to /etc/awstats/awstats.<yourdomain>.conf"
+		elog "to enable GeoIP plugin:"
+		elog "LoadPlugin=\"geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat\" "
+		elog
+	fi
+
+	webapp_pkg_postinst
+}
diff --git a/www-misc/awstats/files/awstats-6.3-gentoo.diff b/www-misc/awstats/files/awstats-6.3-gentoo.diff
index ec3b115afa4f..8b316670ab3c 100644
--- a/www-misc/awstats/files/awstats-6.3-gentoo.diff
+++ b/www-misc/awstats/files/awstats-6.3-gentoo.diff
@@ -1,7 +1,7 @@
 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 @@
+@@ -658,6 +658,20 @@
      		print "\n-----> Restart Web server with '$command'\n";
  	 	    my $ret=`$command`;
  	 	    print "$ret";
@@ -22,11 +22,3 @@ diff -urN awstats-6.3.orig/tools/awstats_configure.pl awstats-6.3/tools/awstats_
          } 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/metadata.xml b/www-misc/awstats/metadata.xml
index 6632069b5aff..4767441ed67c 100644
--- a/www-misc/awstats/metadata.xml
+++ b/www-misc/awstats/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+  <herd>web-apps</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>