Fix bug #131027, fix var quotation, and remove old vulnerable versions.

(Portage version: 2.1)
 (Unsigned Manifest commit)

5 files changed, 39 insertions, 274 deletions

diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 73b2de89c724..42cd67e22f31 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,13 +1,43 @@
-MD5 c6d6b2408619520dc4363949c188de10 ChangeLog 5793
-MD5 20f62215bbd9198ebf2a2cf3e51f2b19 awstats-6.4.ebuild 3902
-MD5 f23b54443ae1f18c0c01e9c4763d63af awstats-6.5-r1.ebuild 4119
-MD5 100af87d4d2dc28d585f1a44561d6df6 awstats-6.5.ebuild 3979
-MD5 1002fdc26c89d456b8a18c40f7560286 awstats-6.6.ebuild 4029
+AUX awstats-6.3-gentoo.diff 1219 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 SHA1 8a1971c0e710cec05004a7e94461f83f77b2fd1a SHA256 0de073550f021a93d883c307f999b4b6ead1abf3a587118e2e01578907d15814
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
+RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 files/awstats-6.3-gentoo.diff 1219
+SHA256 0de073550f021a93d883c307f999b4b6ead1abf3a587118e2e01578907d15814 files/awstats-6.3-gentoo.diff 1219
+AUX awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5768 RMD160 caabac08750825dc78c74a2977aa13673d17b691 SHA1 ed5e5cd94c8aa75335e8eb408c8dc4be0e57ae3e SHA256 5e05aa52338a56068f781c695b3d40c85853a44ef60f2f895f680103a31e26a6
 MD5 0adb6df6c9805ff727f95e68b9ecb35f files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5768
-MD5 6c5c669daafc4ed45b8e2f8590c8693e files/digest-awstats-6.4 226
-MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5 235
-MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5-r1 235
-MD5 b633ea6035ee897e203aa48f2e167fba files/digest-awstats-6.6 238
+RMD160 caabac08750825dc78c74a2977aa13673d17b691 files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5768
+SHA256 5e05aa52338a56068f781c695b3d40c85853a44ef60f2f895f680103a31e26a6 files/awstats-6.5-CVE-2006-2237-CVE-2006-1945.diff 5768
+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
+SHA256 95bbc8d3ef9d7376fe743de4d8cb7aae3206550811a9ea4ea47513f34d578c1f files/postinst-en.txt 5049
+DIST awstats-6.5.tar.gz 972275 RMD160 f5bac64fe43a0629474203f4846a863a439416cf SHA1 24ef0caf9ed47d8e30880721d2ce5a6d5c8e199d SHA256 2d536fac86e97b4ba22fc811753536a0081823136b3a337f5833a6ad04b6f7f1
+DIST awstats-6.6.tar.gz 1059148 RMD160 0b5e4e2ff718943065cdff81577ae9ca4f50a74d SHA1 bc873ca91ee82905fdb37e83349e4007f1042c81 SHA256 34776a2f487049e2909a399fb03b79ca10e720623fc24ec9051904315efad8ca
+EBUILD awstats-6.5-r1.ebuild 4119 RMD160 c66c8d3aa25fa41f21bf55d5849b3aa6d2d266d8 SHA1 00f5bc7d7a0470748136c459160936ece990d078 SHA256 c554099abf2c1fe9e8cdd68968943b66db29645bd5dab712084d85fdf7e3172c
+MD5 f23b54443ae1f18c0c01e9c4763d63af awstats-6.5-r1.ebuild 4119
+RMD160 c66c8d3aa25fa41f21bf55d5849b3aa6d2d266d8 awstats-6.5-r1.ebuild 4119
+SHA256 c554099abf2c1fe9e8cdd68968943b66db29645bd5dab712084d85fdf7e3172c awstats-6.5-r1.ebuild 4119
+EBUILD awstats-6.5-r2.ebuild 4132 RMD160 f06737105479e1146d6690402be4b139827a883d SHA1 f4fe3214834c59734b0ba40fe61d5599c796bf72 SHA256 78bdf904795f1590d8be16ff120cad5165e32cf2bd98fc4cd1b91b5df2f09960
+MD5 21998cc166edf6377852f9aee04ad87f awstats-6.5-r2.ebuild 4132
+RMD160 f06737105479e1146d6690402be4b139827a883d awstats-6.5-r2.ebuild 4132
+SHA256 78bdf904795f1590d8be16ff120cad5165e32cf2bd98fc4cd1b91b5df2f09960 awstats-6.5-r2.ebuild 4132
+EBUILD awstats-6.6.ebuild 4035 RMD160 8f8ed2eb99a72eae89024ef8cb3ac6a3499eec2e SHA1 1098c65ac9a8b3f1b04e4942e725fa512ac286c2 SHA256 d486ad59b43a9de4a3fd5acc782ab9c178f9327890fefd346a2d1b58c90089fa
+MD5 401728ba79d70e46573524a6e701a790 awstats-6.6.ebuild 4035
+RMD160 8f8ed2eb99a72eae89024ef8cb3ac6a3499eec2e awstats-6.6.ebuild 4035
+SHA256 d486ad59b43a9de4a3fd5acc782ab9c178f9327890fefd346a2d1b58c90089fa awstats-6.6.ebuild 4035
+MISC ChangeLog 6291 RMD160 ce2210bb690f906389eabe5d1794dd853708a311 SHA1 fda7df826d163d87ab735a32a1363909704790ca SHA256 7e09b11413247c2f6777713f930d7f064bacf0ebc424160ef39787ebb3610d38
+MD5 d911c80be315078c0e3d944721ba0c3c ChangeLog 6291
+RMD160 ce2210bb690f906389eabe5d1794dd853708a311 ChangeLog 6291
+SHA256 7e09b11413247c2f6777713f930d7f064bacf0ebc424160ef39787ebb3610d38 ChangeLog 6291
+MISC metadata.xml 255 RMD160 2110d243ad1031f4c62dd2693795205158d8aaf0 SHA1 906a9beb4201080eeb68c4663c55a48a2476c8a9 SHA256 fa1e1d64d93dcf37a9b736a9df5e8055e35229ef40a6be62d7e4ece99693b204
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
+RMD160 2110d243ad1031f4c62dd2693795205158d8aaf0 metadata.xml 255
+SHA256 fa1e1d64d93dcf37a9b736a9df5e8055e35229ef40a6be62d7e4ece99693b204 metadata.xml 255
+MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5-r1 235
+RMD160 90bdedc189c5aed52a424d277f85e6d233ac1082 files/digest-awstats-6.5-r1 235
+SHA256 1439cd174fa0bd63e3aa15cb6dc5e88beb6d126707730253d4dee65d948898dc files/digest-awstats-6.5-r1 235
+MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5-r2 235
+RMD160 90bdedc189c5aed52a424d277f85e6d233ac1082 files/digest-awstats-6.5-r2 235
+SHA256 1439cd174fa0bd63e3aa15cb6dc5e88beb6d126707730253d4dee65d948898dc files/digest-awstats-6.5-r2 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
diff --git a/net-www/awstats/awstats-6.4.ebuild b/net-www/awstats/awstats-6.4.ebuild
deleted file mode 100644
index 7f8477503bd3..000000000000
--- a/net-www/awstats/awstats-6.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.4.ebuild,v 1.6 2006/02/13 15:03:17 mcummings Exp $
-
-inherit eutils webapp versionator
-
-DESCRIPTION="AWStats is short for Advanced Web Statistics."
-HOMEPAGE="http://awstats.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~mips ppc ~sparc x86"
-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/awstats-6.5.ebuild b/net-www/awstats/awstats-6.5.ebuild
deleted file mode 100644
index f09619c01d46..000000000000
--- a/net-www/awstats/awstats-6.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.5.ebuild,v 1.7 2006/04/23 21:33:23 flameeyes 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.4 b/net-www/awstats/files/digest-awstats-6.4
deleted file mode 100644
index 499e03865edb..000000000000
--- a/net-www/awstats/files/digest-awstats-6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 056e6fb0c7351b17fe5bbbe0aa1297b1 awstats-6.4.tgz 918435
-RMD160 318b34afcb7f7e8a4d26d46344e37bcbe3a8460a awstats-6.4.tgz 918435
-SHA256 94ec0963dd88a4995ae63be675936da9d3dfaed0c0b0155c5c0400c989b6d294 awstats-6.4.tgz 918435
diff --git a/net-www/awstats/files/digest-awstats-6.5 b/net-www/awstats/files/digest-awstats-6.5
deleted file mode 100644
index b326ee291e86..000000000000
--- a/net-www/awstats/files/digest-awstats-6.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f323e197f78934c66b3bf4cb07422606 awstats-6.5.tar.gz 972275
-RMD160 f5bac64fe43a0629474203f4846a863a439416cf awstats-6.5.tar.gz 972275
-SHA256 2d536fac86e97b4ba22fc811753536a0081823136b3a337f5833a6ad04b6f7f1 awstats-6.5.tar.gz 972275