Revision bump (again). More security fixes.

Package-Manager: portage-2.0.51.16

6 files changed, 25 insertions, 13 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index c1ab69a09c0a..3a9652a27730 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2005/02/13 01:51:26 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.14 2005/02/13 19:32:50 ka0ttic Exp $
+
+*awstats-6.3-r2 (13 Feb 2005)
+
+  13 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/awstats-6.3-CAN-2005-0016.diff,
+  +files/awstats-6.3-CAN-2005-0363.diff, -awstats-6.3-r1.ebuild,
+  +awstats-6.3-r2.ebuild:
+  Revision bump (again). More security fixes.
 
   12 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinst-en.txt,
   awstats-6.3-r1.ebuild:
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 624382a3cbf4..a5e3518ac378 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1f24a9aa08ec744e20662ec89b3f2f99 awstats-6.3-r1.ebuild 3968
-MD5 dff8871f02e8d33a6499085ab776089e ChangeLog 2266
+MD5 6dd3a240cedeb1841d65091cadb8db44 awstats-6.3-r2.ebuild 4054
+MD5 42b6b3f9312852f9418995790b82ff0f ChangeLog 2525
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
-MD5 6e7773a7ddac4fe0259957c488da02cd files/digest-awstats-6.3-r1 60
-MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0016.diff 1243
+MD5 49d813ee8f340107d35ef3f62df2387a files/digest-awstats-6.3-r2 135
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
 MD5 182b67a3023a0807ce19f8876d48c81d files/postinst-en.txt 657
+MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0363.diff 1243
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCDrKnEZCkKN40op4RAmpWAJ97ZIPOwmjYUzR69YrokMwHoTfxPwCfcMss
-5Ahxm5i/qCvbWdeoEXT6YmM=
-=US2M
+iD8DBQFCD6trEZCkKN40op4RAvTqAKC2VDHFDNMpp0Xo92LZcYLWGePbfACcCxEB
+nAPw6k2aUi7BxD7QwaKOgIQ=
+=Jqfm
 -----END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.3-r1.ebuild b/net-www/awstats/awstats-6.3-r2.ebuild
index e72d055d7ee1..2519e1a36974 100644
--- a/net-www/awstats/awstats-6.3-r1.ebuild
+++ b/net-www/awstats/awstats-6.3-r2.ebuild
@@ -1,12 +1,13 @@
 # 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-r1.ebuild,v 1.2 2005/02/13 01:51:26 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3-r2.ebuild,v 1.1 2005/02/13 19:32:50 ka0ttic Exp $
 
 inherit eutils webapp
 
 DESCRIPTION="AWStats is a short for Advanced Web Statistics."
 HOMEPAGE="http://awstats.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+	mirror://gentoo/${P}-6.4-bugfixes.diff.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ppc ~mips ~sparc x86 ~amd64"
@@ -22,10 +23,12 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	# security bug 81775
-	epatch ${FILESDIR}/${P}-CAN-2005-0016.diff
+	epatch ${FILESDIR}/${P}-CAN-2005-0363.diff
+	epatch ${WORKDIR}/${P}-6.4-bugfixes.diff
+
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	# change AWStats default installation directory to installation directory of Gentoo
 	for file in tools/* wwwroot/cgi-bin/*; do
diff --git a/net-www/awstats/files/awstats-6.3-CAN-2005-0016.diff b/net-www/awstats/files/awstats-6.3-CAN-2005-0363.diff
index 9d00f6beb342..9d00f6beb342 100644
--- a/net-www/awstats/files/awstats-6.3-CAN-2005-0016.diff
+++ b/net-www/awstats/files/awstats-6.3-CAN-2005-0363.diff
diff --git a/net-www/awstats/files/digest-awstats-6.3-r1 b/net-www/awstats/files/digest-awstats-6.3-r1
deleted file mode 100644
index bf5ecfb2f5f1..000000000000
--- a/net-www/awstats/files/digest-awstats-6.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz 936817
diff --git a/net-www/awstats/files/digest-awstats-6.3-r2 b/net-www/awstats/files/digest-awstats-6.3-r2
new file mode 100644
index 000000000000..41d5dee3b395
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.3-r2
@@ -0,0 +1,2 @@
+MD5 4335067362c3033ca2c03e08abc67d73 awstats-6.3.tgz 936817
+MD5 0ca57aa572818f59b5809c43c4df56f5 awstats-6.3-6.4-bugfixes.diff.gz 6321