Version bump for security bug #102145.

(Portage version: 2.0.51.22-r2)

4 files changed, 143 insertions, 5 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 0701a86b238f..f6ba5aad1b76 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.21 2005/06/17 21:07:09 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.22 2005/08/12 17:04:53 ka0ttic Exp $
+
+*awstats-6.5 (12 Aug 2005)
+
+  12 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> +awstats-6.5.ebuild:
+  Version bump for security bug #102145.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> awstats-6.4.ebuild:
   Stable on ppc.
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index bb687103336b..debb84b187b9 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,9 +1,11 @@
-MD5 11c27ca12bea46405b06a652a5942730 awstats-6.4.ebuild 3896
 MD5 1fbc4e66d7e1abc944d71034654c938d awstats-6.3-r2.ebuild 4042
-MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
+MD5 0f3755c9e009c99120cd295b9e66c909 awstats-6.5.ebuild 3960
+MD5 11c27ca12bea46405b06a652a5942730 awstats-6.4.ebuild 3896
 MD5 888997529087ccecd2284e9356e9b3af ChangeLog 3555
+MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
+MD5 803faa3640a7aadd2fadbbd05968a45e files/digest-awstats-6.4 60
+MD5 b73b3e414a6926b8d2e3975ed5628eff files/digest-awstats-6.5 63
 MD5 70a086a2f452243a500aa67b1df7f26f files/digest-awstats-6.3-r2 135
-MD5 f881494a979cdea82d58e31b589d9a97 files/postinst-en.txt 5049
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
+MD5 f881494a979cdea82d58e31b589d9a97 files/postinst-en.txt 5049
 MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0363.diff 1243
-MD5 803faa3640a7aadd2fadbbd05968a45e files/digest-awstats-6.4 60
diff --git a/net-www/awstats/awstats-6.5.ebuild b/net-www/awstats/awstats-6.5.ebuild
new file mode 100644
index 000000000000..8257327e6e9d
--- /dev/null
+++ b/net-www/awstats/awstats-6.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 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.1 2005/08/12 17:04:53 ka0ttic 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 ~mips ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=media-libs/libpng-1.2
+	perl-core/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.5 b/net-www/awstats/files/digest-awstats-6.5
new file mode 100644
index 000000000000..ec4defd0b146
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.5
@@ -0,0 +1 @@
+MD5 f323e197f78934c66b3bf4cb07422606 awstats-6.5.tar.gz 972275