Tidy old vulnerable version.

Package-Manager: portage-2.0.51-r15

6 files changed, 20 insertions, 154 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 47cb39933d07..1e95211ff30c 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2005/01/25 18:30:23 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.11 2005/02/05 10:37:04 ka0ttic Exp $
+
+  05 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> -files/awstats-6.1-r1.diff,
+  -awstats-6.1.ebuild, awstats-6.3.ebuild:
+  Tidy old vulnerable version.
 
   25 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> awstats-6.3.ebuild:
   Stable on ppc.
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 683d4a385ce4..7a87e03a54cd 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,9 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea45c38c832965ad856fa17a84f23b70 awstats-6.3.ebuild 3746
+MD5 025b64965bb3207a5bea607e7d1e2335 ChangeLog 1927
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
-MD5 6130059e1d0ba876b4fb61fcc952f3d4 awstats-6.3.ebuild 3755
-MD5 709ab97918342e78975cf97047ed3106 ChangeLog 1774
-MD5 d8cf86bb9acdebb9b3473e33f9e6b98a awstats-6.1.ebuild 4005
-MD5 102ec928bf01d326931ea260173c1dab files/postinst-en.txt 649
 MD5 6e7773a7ddac4fe0259957c488da02cd files/digest-awstats-6.3 60
-MD5 2e2bdf14564309eeb8366a8b6b65b54c files/digest-awstats-6.1 60
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
-MD5 10127a480be4fd2c2eb40cbe88f10ad0 files/awstats-6.1-r1.diff 564
+MD5 102ec928bf01d326931ea260173c1dab files/postinst-en.txt 649
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCBKJJEZCkKN40op4RAmraAJ9MZgIglahAAsyukfXLXEZz6utFMwCguylR
+0b8B8kFgj32OoXgM+oHQioY=
+=1KHo
+-----END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.1.ebuild b/net-www/awstats/awstats-6.1.ebuild
deleted file mode 100644
index 5d161b3094dc..000000000000
--- a/net-www/awstats/awstats-6.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.1.ebuild,v 1.8 2005/01/25 01:16:10 ka0ttic Exp $
-
-inherit eutils webapp
-
-DESCRIPTION="AWStats is a short for Advanced Web Statistics."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://awstats.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ppc ~mips ~sparc x86 ~amd64"
-DEPEND=">=dev-lang/perl-5.6.1
-	>=media-libs/libpng-1.2
-	dev-perl/Time-Local
-	net-www/apache"
-RDEPEND=""
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/awstats-6.1-r1.diff
-	cd ${S}
-
-	# change AWStats default installation directory to installation directory of Gentoo
-	for file in tools/* wwwroot/cgi-bin/*; do
-	    if [ -f "$file" ]; then
-	        /bin/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
-	    fi
-	done
-
-	# rename http-conf example file
-	mv tools/httpd_conf tools/httpd_conf.example
-
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-
-	# set default values for directories
-	/bin/sed -i -e "s#LogFile=.*#LogFile=\"/var/log/apache${APACHEVER}/access_log\"#" \
-	    -e "s#SiteDomain=.*#SiteDomain=\"localhost\"#" \
-	    -e "s#DirIcons=.*#DirIcons=\"/awstats/icons\"#" \
-	    -e "s#DirCgi=.*#DirCgi=\"/cgi-bin/awstats\"#" \
-	    -e "s#DataDir=.*#DataDir=\"${MY_HOSTROOTDIR}/awstats/datadir\"#" \
-	${S}/wwwroot/cgi-bin/awstats.model.conf
-
-}
-
-
-
-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/*
-
-
-	# copy example http.conf installation file
-	webapp_postinst_txt en tools/httpd_conf.example
-
-	# Copy the app's main files
-	exeinto ${MY_CGIBINDIR}
-	doexe wwwroot/cgi-bin/*.pl
-
-	exeinto ${MY_HTDOCSDIR}/classes
-	doexe wwwroot/classes/*.jar
-
-	# install language files, libraries and plugins
-	mkdir -p ${D}${MY_CGIBINDIR}
-	for dir in lang lib plugins; do
-	    /bin/cp -R ${S}/wwwroot/cgi-bin/${dir} ${D}${MY_CGIBINDIR}
-	    chmod 0644 ${D}${MY_CGIBINDIR}/${dir}
-	done
-
-	# install the app's www files
-	mkdir -p ${D}${MY_HTDOCSDIR}
-	for dir in icon css js; do
-	    /bin/cp -R ${S}/wwwroot/${dir} ${D}${MY_HTDOCSDIR}
-	    chmod 0644 ${D}${MY_HTDOCSDIR}/${dir}
-	done
-
-	# copy configuration file
-	mkdir -p ${D}/etc/awstats
-	cp ${S}/wwwroot/cgi-bin/awstats.model.conf ${D}/etc/awstats/awstats.model.conf
-
-
-	# add the post-installation instructions
-	#webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
-
-	# create the data directory for awstats
-	mkdir -p ${D}/${MY_HOSTROOTDIR}/datadir
-
-
-	# install command line tools
-	dobin tools/awstats_buildstaticpages.pl tools/awstats_exportlib.pl tools/awstats_updateall.pl tools/logresolvemerge.pl \
-	tools/maillogconvert.pl
-	newbin tools/urlaliasbuilder.pl awstats_urlaliasbuilder.pl
-	newbin tools/configure.pl awstats_configure.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.3.ebuild b/net-www/awstats/awstats-6.3.ebuild
index 18be4eedd362..115bc4a3bfb2 100644
--- a/net-www/awstats/awstats-6.3.ebuild
+++ b/net-www/awstats/awstats-6.3.ebuild
@@ -1,12 +1,12 @@
 # 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.3.ebuild,v 1.3 2005/01/25 18:30:23 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3.ebuild,v 1.4 2005/02/05 10:37:04 ka0ttic Exp $
 
 inherit eutils webapp
 
 DESCRIPTION="AWStats is a short for Advanced Web Statistics."
 HOMEPAGE="http://awstats.sourceforge.net/"
-SRC_URI="http://awstats.sourceforge.net/files/${P}.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ppc ~mips ~sparc x86 ~amd64"
diff --git a/net-www/awstats/files/awstats-6.1-r1.diff b/net-www/awstats/files/awstats-6.1-r1.diff
deleted file mode 100644
index 86ca805fb66f..000000000000
--- a/net-www/awstats/files/awstats-6.1-r1.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- awstats-6.1.orig/tools/configure.pl.orig	2004-05-18 14:17:42.000000000 +0200
-+++ awstats-6.1/tools/configure.pl	2004-05-18 14:19:29.000000000 +0200
-@@ -645,8 +645,8 @@
- # ----------------------------------
- if ($WebServerChanged) {
- 	if ($OS eq 'linux') 	{
--		print "\n-----> Restart Web server with '/sbin/service httpd restart'\n";
--	 	my $ret=`/sbin/service httpd restart`;
-+		print "\n-----> Restart Web server graceful with '/usr/sbin/apache2ctl graceful'\n";
-+	 	my $ret=`/usr/sbin/apache2ctl graceful`;
- 	 	print "$ret";
- 	}
- 	elsif ($OS eq 'macosx')	{
diff --git a/net-www/awstats/files/digest-awstats-6.1 b/net-www/awstats/files/digest-awstats-6.1
deleted file mode 100644
index b93ff526b06c..000000000000
--- a/net-www/awstats/files/digest-awstats-6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f02c0fc4f1a0f946fcae3b3768bf113 awstats-6.1.tgz 800275