force rev bump and disable python support to address security risk (CVE-2009-0367)

Package-Manager: portage-2.1.6.7/cvs/Linux i686
RepoMan-Options: --force

5 files changed, 48 insertions, 23 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 84206fc752b8..ecb79d61b85b 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.137 2009/01/25 22:27:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.138 2009/02/23 20:35:55 mr_bones_ Exp $
+
+*wesnoth-1.4.7-r1 (23 Feb 2009)
+*wesnoth-1.4.4-r1 (23 Feb 2009)
+
+  23 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/03_A_Haunting_in_Winter.cfg, -wesnoth-1.4.4.ebuild,
+  +wesnoth-1.4.4-r1.ebuild, -wesnoth-1.4.7.ebuild, +wesnoth-1.4.7-r1.ebuild:
+  force rev bump and disable python support to address security risk
+  (CVE-2009-0367)
 
   25 Jan 2009; Markus Meier <maekke@gentoo.org> wesnoth-1.4.7.ebuild:
   amd64/x86 stable, bug #255394
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 654cc111e0ea..a4df72922060 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX no-python.patch 770 RMD160 9fe2785748a54c54a05699ce6686bf3b9c25ab39 SHA1 dd025bf9a0c85c78dd128aa3b18dcdce34a93d4b SHA256 4e5254615565151cdd15a93c0a4aaa79a708cdf2d47eb39057f22f877db9e8ff
 AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad055ea943485c0a1cf324e39a340c89b00 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065
 DIST wesnoth-1.4.4.tar.bz2 152425432 RMD160 d32161d67002dc12197a6a8667dfb734bb208157 SHA1 c903160cdf1ecbfef6e668772ad5fe15f599ac7d SHA256 77cff07ed8e5cef314c347381e8a2b4bfd7e8b1c22a609d0b1035e48583a9eb4
 DIST wesnoth-1.4.7.tar.bz2 155052245 RMD160 8a515aca790424a550505512eb42b101860e87b2 SHA1 f8eb17e7a7aaff5d8fff1e18a1479efcf932fd27 SHA256 63c85889ef8c08e6dd5ea977edd057d64ce65a4934e661e222d2b0dd89e26847
-EBUILD wesnoth-1.4.4.ebuild 3235 RMD160 33902c1fcedc933c7268dfba065544cb285ff75b SHA1 6a7beb3a217ed28711aa3f939ecff53a1c163485 SHA256 e75b4babb391e52d469907ef313b231c8c7654b7b96bacff463cd5ea9d8ebb2c
-EBUILD wesnoth-1.4.7.ebuild 3127 RMD160 6a06698490c55fa6acff8a8822bfe83030e2a63f SHA1 f8d26ef36e82579f535c30942b306c25ef5f1b82 SHA256 3fc2b3feff1a1e110a28afe474e327b6c620767ef131dcff01fd5e1cdf09763e
-MISC ChangeLog 17859 RMD160 a8e9cf973ba1b9ca379ee79557bcfc5229511fae SHA1 b6484554c20c2a10096e0235bf383b57173e3551 SHA256 e48b0b28ad5a629a7cc1a3b643448a0b66010dbb3395fa33653be169c330db3c
+EBUILD wesnoth-1.4.4-r1.ebuild 3356 RMD160 62ac6e52b1036fdb5531b140997de3c82ca8f09d SHA1 61556b233c4b2713ff1e342a15a612805a92de84 SHA256 457b41dc8f6e8f553b0cdb209468eba45d55d7921f74a5323131b61a7ae90b12
+EBUILD wesnoth-1.4.7-r1.ebuild 3238 RMD160 1945de1d5d2922ea6b075415d0d8477ffe4a2f38 SHA1 96e34d0420739a826511b31db0537dcd524bee9d SHA256 e601f071c66442d76d16a475f145b90d0cca6a6a235170ba80ad5f83ee216549
+MISC ChangeLog 18208 RMD160 ca6109bddd05f7367e5a28d775d1dfa78e84d444 SHA1 e4a45503af0af95d7404376edf80e6ea52c30369 SHA256 36125a59d4b8b38908bf987b29b95a6ac6dc45afae810d70fe71dfbb44c3f993
 MISC metadata.xml 612 RMD160 f14f4748e1c611b41864ee5e1bdaa9e56de55d4a SHA1 f77e1b84262e73a7ab77b13666e6e00a0cbe593c SHA256 0c38c6a5c0cd5fee19c6c57c52f50c4e383581af23098aabbe4bbf43c9f5f2f7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkl8530ACgkQkKaRLQcq0GIb6gCgmQkq1FXuUHRY3x3RdGY7PPw/
-K+IAoJkeoC/V2qnm6218+snG7VPYMVZD
-=sUhj
------END PGP SIGNATURE-----
diff --git a/games-strategy/wesnoth/files/no-python.patch b/games-strategy/wesnoth/files/no-python.patch
new file mode 100644
index 000000000000..f40ebaf5b84e
--- /dev/null
+++ b/games-strategy/wesnoth/files/no-python.patch
@@ -0,0 +1,22 @@
+--- data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg	2009/02/22 14:24:56	33012
++++ data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg	2009/02/22 14:52:51	33013
+@@ -92,10 +92,16 @@
+         no_leader=yes
+         fog=no
+         shroud=no
+-        # kamikaze.py heads straight for the leader of side 1 and attacks
+         [ai]
+-            ai_algorithm=python_ai
+-            python_script="../campaigns/Descent_Into_Darkness/ais/kamikaze.py"
++            aggression=4.0
++            caution=0.0
++            grouping=no
++            simple_targetting=yes
++            village_value=0
++            [target]
++                id=Malin Keshar
++                value=100
++            [/target]
+         [/ai]
+     [/side]
+ 
diff --git a/games-strategy/wesnoth/wesnoth-1.4.4.ebuild b/games-strategy/wesnoth/wesnoth-1.4.4-r1.ebuild
index f86d420ce978..afe9ea45a3c5 100644
--- a/games-strategy/wesnoth/wesnoth-1.4.4.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.4.4.ebuild,v 1.6 2008/08/24 13:06:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.4.4-r1.ebuild,v 1.1 2009/02/23 20:35:55 mr_bones_ Exp $
 
 inherit eutils toolchain-funcs flag-o-matic games
 
@@ -21,8 +21,8 @@ RDEPEND=">=media-libs/libsdl-1.2.7
 		x11-libs/libX11
 		>=media-libs/sdl-mixer-1.2
 		>=media-libs/sdl-image-1.2
-		dev-lang/python
 		>=media-libs/freetype-2 )
+		dev-lang/python
 	nls? ( virtual/libintl )"
 # the configure script is broken and checks for freetype even if
 # it won't be used.  until it's either patched out or upstream fixes
@@ -53,6 +53,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	if use dedicated || use server ; then
 		sed \
 			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
@@ -63,12 +64,12 @@ src_unpack() {
 			|| die "sed failed"
 	fi
 	if ! use nls ; then
-		cd "${S}"
 		sed -i \
 			-e '/^MAN_LANG/d' \
 			doc/man/Makefile.in \
 			|| die "sed failed"
 	fi
+	epatch "${FILESDIR}"/no-python.patch
 }
 
 src_compile() {
@@ -92,7 +93,7 @@ src_compile() {
 		--with-icondir=/usr/share/icons \
 		--with-desktopdir=/usr/share/applications \
 		--docdir=/usr/share/doc/${PF} \
-		--enable-python-install \
+		--disable-python \
 		$(use_enable lite) \
 		$(use_enable static) \
 		$(use_enable editor) \
@@ -107,6 +108,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -fr "${D}${GAMES_DATADIR}"/wesnoth/data/{ais,campaigns/Descent_Into_Darkness/ais}
 	dodoc changelog
 	if use dedicated || use server; then
 		keepdir "${GAMES_STATEDIR}/run/wesnothd"
diff --git a/games-strategy/wesnoth/wesnoth-1.4.7.ebuild b/games-strategy/wesnoth/wesnoth-1.4.7-r1.ebuild
index d2a5a38ca09f..c6674c195e75 100644
--- a/games-strategy/wesnoth/wesnoth-1.4.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.4.7.ebuild,v 1.6 2009/01/25 22:27:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.4.7-r1.ebuild,v 1.1 2009/02/23 20:35:55 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs flag-o-matic games
@@ -22,8 +22,8 @@ RDEPEND=">=media-libs/libsdl-1.2.7[X]
 		x11-libs/libX11
 		>=media-libs/sdl-mixer-1.2[vorbis]
 		>=media-libs/sdl-image-1.2[png,jpeg]
-		dev-lang/python
 		>=media-libs/freetype-2 )
+		dev-lang/python
 	nls? ( virtual/libintl )"
 # the configure script is broken and checks for freetype even if
 # it won't be used.  until it's either patched out or upstream fixes
@@ -62,12 +62,12 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 	if ! use nls ; then
-		cd "${S}"
 		sed -i \
 			-e '/^MAN_LANG/d' \
 			doc/man/Makefile.in \
 			|| die "sed failed"
 	fi
+	epatch "${FILESDIR}"/no-python.patch
 }
 
 src_configure() {
@@ -91,7 +91,7 @@ src_configure() {
 		--with-icondir=/usr/share/icons \
 		--with-desktopdir=/usr/share/applications \
 		--docdir=/usr/share/doc/${PF} \
-		--enable-python-install \
+		--disable-python \
 		$(use_enable smallgui) \
 		$(use_enable tinygui) \
 		$(use_enable lite) \
@@ -106,6 +106,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -fr "${D}${GAMES_DATADIR}"/wesnoth/data/{ais,campaigns/Descent_Into_Darkness/ais}
 	dodoc changelog
 	if use dedicated || use server; then
 		keepdir "${GAMES_STATEDIR}/run/wesnothd"