fix #125779, #195098

Package-Manager: portage-2.1.4_rc8

5 files changed, 244 insertions, 9 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 87860aea40a0..3be042988bd9 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.50 2007/09/08 11:58:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.51 2007/12/15 09:43:26 hollow Exp $
+
+*awstats-6.7-r1 (15 Dec 2007)
+
+  15 Dec 2007; Benedikt Böhm <hollow@gentoo.org> +files/postinst-en-r1.txt,
+  +awstats-6.7-r1.ebuild:
+  fix #125779, #195098
 
   08 Sep 2007; Benedikt Böhm <hollow@gentoo.org> -awstats-6.5-r2.ebuild,
   awstats-6.7.ebuild:
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index a2651d7c2cda..e9cd9bc22e9c 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -9,6 +9,10 @@ AUX awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5601 RMD160 3482785b35e2ae26517
 MD5 f03114958a5db660548ae07a4384a655 files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5601
 RMD160 3482785b35e2ae26517220f8c9710821ba53f141 files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5601
 SHA256 b09c586b092d995a517ef7f132d96ff8c23f41863a36a3c3cdb9ba2127d592e8 files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5601
+AUX postinst-en-r1.txt 2412 RMD160 6f4b9705b36ab0968d82f94915d8d6526f52fbe8 SHA1 953ec2765fd8322035c4b5dbc92741343814ffee SHA256 ae1c4d318867c444583af0b34b057955cc10f45fc6fa5457f06261d8ba5b3884
+MD5 0f07e151318866da2d4239e4c004e7e4 files/postinst-en-r1.txt 2412
+RMD160 6f4b9705b36ab0968d82f94915d8d6526f52fbe8 files/postinst-en-r1.txt 2412
+SHA256 ae1c4d318867c444583af0b34b057955cc10f45fc6fa5457f06261d8ba5b3884 files/postinst-en-r1.txt 2412
 AUX postinst-en.txt 5049 RMD160 e95456f3254699bb14a27d20ae766fbd46147507 SHA1 fcce691131df0316a2ad1dc4c33e30a2dd82bfd7 SHA256 95bbc8d3ef9d7376fe743de4d8cb7aae3206550811a9ea4ea47513f34d578c1f
 MD5 f881494a979cdea82d58e31b589d9a97 files/postinst-en.txt 5049
 RMD160 e95456f3254699bb14a27d20ae766fbd46147507 files/postinst-en.txt 5049
@@ -19,14 +23,18 @@ EBUILD awstats-6.5-r1.ebuild 4122 RMD160 1235931bded7bb24a2d8a9c80be4c71cc784eea
 MD5 2e1b3b68834a6019fcc5a501ed733764 awstats-6.5-r1.ebuild 4122
 RMD160 1235931bded7bb24a2d8a9c80be4c71cc784eea0 awstats-6.5-r1.ebuild 4122
 SHA256 802a1e0616ad2104d15c8579c3ef8e8a783d9a417d8cc865271d1330ac74c168 awstats-6.5-r1.ebuild 4122
+EBUILD awstats-6.7-r1.ebuild 3962 RMD160 15791dfdbe32d0e90be8c01f27ee3fbb6acde5f9 SHA1 63e0fddc1bdd3c9f4bdea0b420da94e7bfe0a4b0 SHA256 6bffd7a0264fdc6939ca2cb18fb34a9cca15b561a8838c9898b6381c4636cbbd
+MD5 eabf49889e707d9222f27e1c7c23e9a5 awstats-6.7-r1.ebuild 3962
+RMD160 15791dfdbe32d0e90be8c01f27ee3fbb6acde5f9 awstats-6.7-r1.ebuild 3962
+SHA256 6bffd7a0264fdc6939ca2cb18fb34a9cca15b561a8838c9898b6381c4636cbbd awstats-6.7-r1.ebuild 3962
 EBUILD awstats-6.7.ebuild 3876 RMD160 ce60b6e0fa07ffc76ed23e81c5e6eca55600a049 SHA1 e60f66ecb19556490931f796c54cd1f6a7f5f893 SHA256 13e689a54a20e993b9231a73325253e2332ea89672befdd4e2819c94adc5693e
 MD5 bbb0f5197124ac7a39fcbc87244a24c3 awstats-6.7.ebuild 3876
 RMD160 ce60b6e0fa07ffc76ed23e81c5e6eca55600a049 awstats-6.7.ebuild 3876
 SHA256 13e689a54a20e993b9231a73325253e2332ea89672befdd4e2819c94adc5693e awstats-6.7.ebuild 3876
-MISC ChangeLog 7743 RMD160 7cc40a28e1bcc13e5d5c846dfb3a29caffb6038e SHA1 9d7f6f0935321f26bcb52da058dccf6246eccf7e SHA256 6aa16f28c00e9a4bec731525bafaf6c00b7bdc620b9d9c71d9cc793df2b810ab
-MD5 c55b2692107ec70f0567b4c47dd8fed1 ChangeLog 7743
-RMD160 7cc40a28e1bcc13e5d5c846dfb3a29caffb6038e ChangeLog 7743
-SHA256 6aa16f28c00e9a4bec731525bafaf6c00b7bdc620b9d9c71d9cc793df2b810ab ChangeLog 7743
+MISC ChangeLog 7901 RMD160 a4695110f5e1a83f22abf3fff6f7fbb686b349ec SHA1 b776de322a293764170d4ca3a6a0920c25dbb870 SHA256 b55f278f9c9cb0d7291bd254993a6c3945951cf0ee1a79aeddf0921a15ca47f3
+MD5 cbc01b6095e782172106da3428adca80 ChangeLog 7901
+RMD160 a4695110f5e1a83f22abf3fff6f7fbb686b349ec ChangeLog 7901
+SHA256 b55f278f9c9cb0d7291bd254993a6c3945951cf0ee1a79aeddf0921a15ca47f3 ChangeLog 7901
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
@@ -37,10 +45,13 @@ SHA256 b23dc986b45810b5c172a8b0b501425acb8769133c0d293358bf0d7ac5334429 files/di
 MD5 8e9bd030d560843e00d92c1cbc2c5259 files/digest-awstats-6.7 238
 RMD160 869c53d0179e70d29c3e1901c8cc06253222154e files/digest-awstats-6.7 238
 SHA256 282b6af0e8ed9b83a2b42ecbfdf85337d02e263421613014fe37add7541f2c64 files/digest-awstats-6.7 238
+MD5 8e9bd030d560843e00d92c1cbc2c5259 files/digest-awstats-6.7-r1 238
+RMD160 869c53d0179e70d29c3e1901c8cc06253222154e files/digest-awstats-6.7-r1 238
+SHA256 282b6af0e8ed9b83a2b42ecbfdf85337d02e263421613014fe37add7541f2c64 files/digest-awstats-6.7-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG4o56mPFBzbX68WERAuUaAJ4h0kReJp4QDa4f2mgtGFgzR1C8LgCeLJys
-eTY9YRLHmEEfJzvuM5qGTlk=
-=On+w
+iD8DBQFHY6HHmPFBzbX68WERAgk3AKCLk+O4hu3hi4ylWZOT6HVgfaEPNQCbBGvm
+5tIC3ckwZHm8oR+ebVZ94wk=
+=5z/S
 -----END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.7-r1.ebuild b/net-www/awstats/awstats-6.7-r1.ebuild
new file mode 100644
index 000000000000..2f4bc453ed0b
--- /dev/null
+++ b/net-www/awstats/awstats-6.7-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7-r1.ebuild,v 1.1 2007/12/15 09:43:26 hollow Exp $
+
+inherit eutils webapp versionator depend.apache
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics."
+HOMEPAGE="http://awstats.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="cgi geoip"
+
+RESTRICT="mirror"
+
+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 )"
+
+want_apache
+
+pkg_setup() {
+	if ! use cgi; then
+		ewarn "You have not enabled the cgi USE flag."
+		ewarn "This means you need to generate static"
+		ewarn "HTML statistics instead of using awstats.pl"
+	fi
+}
+
+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"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	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-r1.txt
+
+	keepdir /var/lib/awstats
+
+	# Copy the app's main files
+	if use cgi; then
+		exeinto "${MY_CGIBINDIR}"
+		doexe "${S}"/wwwroot/cgi-bin/*.pl
+	fi
+
+	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}"
+	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}"
+	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
+
+	webapp_src_install
+
+	# fix perms
+	for dir in lang lib plugins; do
+		chmod 0755 "${D}${MY_CGIBINDIR}/${dir}"
+	done
+	for dir in icon css js; do
+		chmod 0755 "${D}${MY_HTDOCSDIR}/${dir}"
+	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
+		einfo
+		einfo "Add the following line to /etc/awstats/awstats.<yourdomain>.conf"
+		einfo "to enable GeoIP plugin:"
+		einfo "LoadPlugin=\"geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat\" "
+		einfo
+	fi
+
+	webapp_pkg_postinst
+}
diff --git a/net-www/awstats/files/digest-awstats-6.7-r1 b/net-www/awstats/files/digest-awstats-6.7-r1
new file mode 100644
index 000000000000..e2671d9817bc
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.7-r1
@@ -0,0 +1,3 @@
+MD5 512cd146247eb178ef023c924f7bb766 awstats-6.7.tar.gz 1089638
+RMD160 5a84327871b65cad5cb6dbaded5c223660806953 awstats-6.7.tar.gz 1089638
+SHA256 36344e7c2271393cf60e9a3818392fbece0ff838c83fcf59fed9818dfac5a081 awstats-6.7.tar.gz 1089638
diff --git a/net-www/awstats/files/postinst-en-r1.txt b/net-www/awstats/files/postinst-en-r1.txt
new file mode 100644
index 000000000000..94a36aa10e05
--- /dev/null
+++ b/net-www/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>