Version bump wrt security bug #130487 ; primary maintainer unavailable.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 155 insertions, 12 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 779c951c7f3a..72e4a7c6cc71 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.28 2006/04/23 21:33:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.29 2006/05/19 12:53:48 rl03 Exp $
+
+*awstats-6.6 (19 May 2006)
+
+  19 May 2006; Renat Lumpau <rl03@gentoo.org> +awstats-6.6.ebuild:
+  Version bump wrt security bug #130487 ; primary maintainer unavailable.
 
   23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> awstats-6.5.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 31a5d1637660..7497a266217b 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -17,6 +17,7 @@ DIST awstats-6.3-6.4-bugfixes.diff.gz 6321 size 6321
 DIST awstats-6.3.tgz 938794 size 938794
 DIST awstats-6.4.tgz 918435 size 918435
 DIST awstats-6.5.tar.gz 972275 RMD160 f5bac64fe43a0629474203f4846a863a439416cf SHA256 2d536fac86e97b4ba22fc811753536a0081823136b3a337f5833a6ad04b6f7f1 size 972275
+DIST awstats-6.6.tar.gz 1059148 RMD160 0b5e4e2ff718943065cdff81577ae9ca4f50a74d SHA256 34776a2f487049e2909a399fb03b79ca10e720623fc24ec9051904315efad8ca size 1059148
 EBUILD awstats-6.3-r2.ebuild 4045 RMD160 fb6d43f1ee8ea2f771c896bcc92a658245a27d2a SHA1 69a9540362c4609ac0f5e0975087c6cd85394fe2 SHA256 caa8332ab8c5adc65da772e2d7b4588d69128e05867c1459b39aa408f80ae4eb size 4045
 MD5 502c1c8521002d68b51c0f284f502004 awstats-6.3-r2.ebuild 4045
 RMD160 fb6d43f1ee8ea2f771c896bcc92a658245a27d2a awstats-6.3-r2.ebuild 4045
@@ -29,10 +30,14 @@ EBUILD awstats-6.5.ebuild 3979 RMD160 33fd9c204264a9f8a888de252a7da2bdc9d3c3c0 S
 MD5 100af87d4d2dc28d585f1a44561d6df6 awstats-6.5.ebuild 3979
 RMD160 33fd9c204264a9f8a888de252a7da2bdc9d3c3c0 awstats-6.5.ebuild 3979
 SHA256 6debe2aa768cb90b16d5c55afa54675032c9bd1543076430427fdfa45861b330 awstats-6.5.ebuild 3979
-MISC ChangeLog 4231 RMD160 7fd1663d8c41156b5dd11b44576592948ff7824f SHA1 f0628beddcd57c1f7ca299f4868ded154b0de08b SHA256 e02b9cb6b986ba61e8084915fabb8e2fe8b34e754a035355c595571175463db8 size 4231
-MD5 11a1f49d964d6c41642980ac6a3462a0 ChangeLog 4231
-RMD160 7fd1663d8c41156b5dd11b44576592948ff7824f ChangeLog 4231
-SHA256 e02b9cb6b986ba61e8084915fabb8e2fe8b34e754a035355c595571175463db8 ChangeLog 4231
+EBUILD awstats-6.6.ebuild 3978 RMD160 4c65989a7e413fe2986f383a6ab66fc0d11188bd SHA1 096674abb0f5567bcf6db853e06869ad88c1d881 SHA256 d9ba653ea00c848023b4da476582545936fe951328bb34fd200722c6a61a777f size 3978
+MD5 c16a7931f1edbb99d0ff047c6685665a awstats-6.6.ebuild 3978
+RMD160 4c65989a7e413fe2986f383a6ab66fc0d11188bd awstats-6.6.ebuild 3978
+SHA256 d9ba653ea00c848023b4da476582545936fe951328bb34fd200722c6a61a777f awstats-6.6.ebuild 3978
+MISC ChangeLog 4396 RMD160 82bdd88dc67c4fe1e700ed947e5fc4272a877fda SHA1 fba643211632e62e3b0b29b2124c43102e166a4e SHA256 3716cec80f0972a74df2309447f19f70790739ece84dc8113aed7582e0fa35de size 4396
+MD5 25d5b2580ac425d86b9e468f6284a1a8 ChangeLog 4396
+RMD160 82bdd88dc67c4fe1e700ed947e5fc4272a877fda ChangeLog 4396
+SHA256 3716cec80f0972a74df2309447f19f70790739ece84dc8113aed7582e0fa35de ChangeLog 4396
 MISC metadata.xml 255 RMD160 2110d243ad1031f4c62dd2693795205158d8aaf0 SHA1 906a9beb4201080eeb68c4663c55a48a2476c8a9 SHA256 fa1e1d64d93dcf37a9b736a9df5e8055e35229ef40a6be62d7e4ece99693b204 size 255
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
 RMD160 2110d243ad1031f4c62dd2693795205158d8aaf0 metadata.xml 255
@@ -40,19 +45,19 @@ SHA256 fa1e1d64d93dcf37a9b736a9df5e8055e35229ef40a6be62d7e4ece99693b204 metadata
 MD5 70a086a2f452243a500aa67b1df7f26f files/digest-awstats-6.3-r2 135
 RMD160 0bb0707adf20821608361ca89dbc7c3a70e5003a files/digest-awstats-6.3-r2 135
 SHA256 0c1a3b6e0a7358c0f730819ff91e6cc897148813455930c8dd82fe86f233a749 files/digest-awstats-6.3-r2 135
-size 135 files/digest-awstats-6.3-r2 135
 MD5 803faa3640a7aadd2fadbbd05968a45e files/digest-awstats-6.4 60
 RMD160 a5cb4431c5c6f6f162bee73832be0102a936af6e files/digest-awstats-6.4 60
 SHA256 a8b23337999b69851c96884afb2bc0b1037d17d2577bef0d7f385bb107a6f70e files/digest-awstats-6.4 60
-size 60 files/digest-awstats-6.4 60
 MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5 235
 RMD160 90bdedc189c5aed52a424d277f85e6d233ac1082 files/digest-awstats-6.5 235
 SHA256 1439cd174fa0bd63e3aa15cb6dc5e88beb6d126707730253d4dee65d948898dc files/digest-awstats-6.5 235
-size 235 files/digest-awstats-6.5 235
+MD5 b633ea6035ee897e203aa48f2e167fba files/digest-awstats-6.6 238
+RMD160 deaa6887542a8d0af85315176f2ab676a2e76813 files/digest-awstats-6.6 238
+SHA256 02336412b5abcd4d831be5e2d6e580fb491f015f862ab5ad3f31c616fc08560b files/digest-awstats-6.6 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFES/KqAiZjviIA2XgRAtFaAJ4yLGVvdJxDj0RXI3WhV+W33KOzhACglKgo
-VEOZCmgp0Rv8b8ybC+gkgEk=
-=8AoW
+iD8DBQFEbb/oEzitwsaoONoRAmohAJ9RRTN50Zo+dx2kyoFbUuco5Eie4ACfQ9/R
+sexlDfNCFO2sH5IsK/xLRMY=
+=Gbsr
 -----END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.6.ebuild b/net-www/awstats/awstats-6.6.ebuild
new file mode 100644
index 000000000000..7d0e2dc530d6
--- /dev/null
+++ b/net-www/awstats/awstats-6.6.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.6.ebuild,v 1.1 2006/05/19 12:53:48 rl03 Exp $
+
+inherit eutils webapp versionator
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics."
+HOMEPAGE="http://awstats.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://awstats.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=media-libs/libpng-1.2
+	virtual/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
+
+	# find apache major version
+	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.6 b/net-www/awstats/files/digest-awstats-6.6
new file mode 100644
index 000000000000..62d478259b51
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.6
@@ -0,0 +1,3 @@
+MD5 c9b65c5a58011fdb4ec611feec17eee4 awstats-6.6.tar.gz 1059148
+RMD160 0b5e4e2ff718943065cdff81577ae9ca4f50a74d awstats-6.6.tar.gz 1059148
+SHA256 34776a2f487049e2909a399fb03b79ca10e720623fc24ec9051904315efad8ca awstats-6.6.tar.gz 1059148