Version bump with security patch, bug #173518

Package-Manager: portage-2.1.2.3

6 files changed, 50 insertions, 24 deletions

diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index a0d1e8afc1fc..e3e0340a1808 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.13 2007/01/14 08:36:24 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.14 2007/04/06 21:45:05 nyhm Exp $
+
+*warzone2100-2.0.6 (06 Apr 2007)
+
+  06 Apr 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/warzone2100-2.0.6-buffer-overflow.patch, +warzone2100-2.0.6.ebuild:
+  Version bump with security patch, bug #173518
 
   14 Jan 2007; Joseph Jezak <josejx@gentoo.org> warzone2100-2.0.5.ebuild:
   Marked ~ppc for bug #161017.
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 4733f0300824..2acd3623b71c 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST warzone2100-2.0.5.tar.bz2 19779896 RMD160 24e9adc9a48b8bb5d47bc7d3a3f408c5ae2e62e6 SHA1 a4fa6cffac842a675efdd79a2f3db915d974f932 SHA256 0220556d9487604853e7cb1e33740cf86d8649bbb2efb1f5f8e421c044f3bd6f
-EBUILD warzone2100-2.0.5.ebuild 1293 RMD160 13a8463a358c32708f442d3006eee1fe3341360a SHA1 c3effafda6ef5d2dd8b61330f99503dee1838301 SHA256 5949effc31517cd22bd32f20397880da06c38d389eb9cceeebd0dcd6c73998ca
-MD5 d6094ed5c49ddb9ea37c397bc475cfa4 warzone2100-2.0.5.ebuild 1293
-RMD160 13a8463a358c32708f442d3006eee1fe3341360a warzone2100-2.0.5.ebuild 1293
-SHA256 5949effc31517cd22bd32f20397880da06c38d389eb9cceeebd0dcd6c73998ca warzone2100-2.0.5.ebuild 1293
-MISC ChangeLog 2472 RMD160 27de6b288971a6b8851d212c2f40f9df9714a055 SHA1 eadb67183c3aa912902d4b96c4019299175f5b9f SHA256 214376662b150bc493044fb2378a8e05d52cf9b1961c308a2555d70ea2dbde29
-MD5 e9802da3130d4f5b30c407c230b2509a ChangeLog 2472
-RMD160 27de6b288971a6b8851d212c2f40f9df9714a055 ChangeLog 2472
-SHA256 214376662b150bc493044fb2378a8e05d52cf9b1961c308a2555d70ea2dbde29 ChangeLog 2472
+AUX warzone2100-2.0.6-buffer-overflow.patch 573 RMD160 9157300c8562d697dc91317a232465bdab7422b4 SHA1 01f772728112f5191dc85aadb60d65a2016b36fb SHA256 8f9a8b3135a9b85e72d1aafb98659d013b0653efc79ec22b9f635685edf6794e
+MD5 b94afde03c79fc6eea7b309f04bf8d96 files/warzone2100-2.0.6-buffer-overflow.patch 573
+RMD160 9157300c8562d697dc91317a232465bdab7422b4 files/warzone2100-2.0.6-buffer-overflow.patch 573
+SHA256 8f9a8b3135a9b85e72d1aafb98659d013b0653efc79ec22b9f635685edf6794e files/warzone2100-2.0.6-buffer-overflow.patch 573
+DIST warzone2100-2.0.6.tar.bz2 20009086 RMD160 d4822aad461c6733c8f821c125b10a8288e7021c SHA1 95d02857bafa700a3fb30ccda8d6c8d9eac35c4a SHA256 2f10634a736b7af720ad477e08ba2a36bd2b68dd79e2ba1940f4a82962102ae9
+EBUILD warzone2100-2.0.6.ebuild 1422 RMD160 7c8b3f2fb59a50a06c22ec5c3ee7c67edd3745f9 SHA1 3181ef8780ce88425756e084fd0759d70f839873 SHA256 002728d52e54b28be80e45d560aff6ccfc96257b5ef8ebb471d39d764b2942fc
+MD5 df533b5efafae35f35e19b1c4e1395f7 warzone2100-2.0.6.ebuild 1422
+RMD160 7c8b3f2fb59a50a06c22ec5c3ee7c67edd3745f9 warzone2100-2.0.6.ebuild 1422
+SHA256 002728d52e54b28be80e45d560aff6ccfc96257b5ef8ebb471d39d764b2942fc warzone2100-2.0.6.ebuild 1422
+MISC ChangeLog 2678 RMD160 87584ed81264efea3982899cff642ac7ced2c108 SHA1 cc9cdb27cc5465e5df455cc73a11e692c7bf4344 SHA256 b031824bfb5f83544fd6458f193bf2e0ad7741fef69634ca830719ea1de7572f
+MD5 5d3f97b16a94bf59f6a14bc609f6ebf9 ChangeLog 2678
+RMD160 87584ed81264efea3982899cff642ac7ced2c108 ChangeLog 2678
+SHA256 b031824bfb5f83544fd6458f193bf2e0ad7741fef69634ca830719ea1de7572f ChangeLog 2678
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 bd8eb99aa9863d9adefed8d9a6d1831e files/digest-warzone2100-2.0.5 262
-RMD160 767909816fceadc957be78d4d40cf712d258e09b files/digest-warzone2100-2.0.5 262
-SHA256 94b70325c5e84caa5647f5dbb9fb2ce47925d07d3351040934e1d90d3977064e files/digest-warzone2100-2.0.5 262
+MD5 6681915b30a7b0324c562e06da3a772b files/digest-warzone2100-2.0.6 262
+RMD160 e78c8005bc0e53a9f06bcc52955b1b1692a64a7b files/digest-warzone2100-2.0.6 262
+SHA256 88214ed2dc6a9b5faf8193a9037044b0823bf5c5d0749ec103f6ebf4f9bec5f5 files/digest-warzone2100-2.0.6 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9b73dz7hIScOURERArvHAJ9Fzd2QAMvR134Wvs5dFGfg5A8fDgCeOO6b
-2d6E2NC3SG4tWVYe1g99cWc=
-=EIWv
+iD8DBQFGFr9pdz7hIScOURERAk81AJ4qvXQLvThQDPJljPK8vnt7nzKhWwCgtCUg
+4WV6qlSXlSkoPsxW75F03so=
+=7RvV
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/warzone2100/files/digest-warzone2100-2.0.5 b/games-strategy/warzone2100/files/digest-warzone2100-2.0.5
deleted file mode 100644
index c0e952cc040e..000000000000
--- a/games-strategy/warzone2100/files/digest-warzone2100-2.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56e83a64d5b7aa60ced3d7ac7281bb42 warzone2100-2.0.5.tar.bz2 19779896
-RMD160 24e9adc9a48b8bb5d47bc7d3a3f408c5ae2e62e6 warzone2100-2.0.5.tar.bz2 19779896
-SHA256 0220556d9487604853e7cb1e33740cf86d8649bbb2efb1f5f8e421c044f3bd6f warzone2100-2.0.5.tar.bz2 19779896
diff --git a/games-strategy/warzone2100/files/digest-warzone2100-2.0.6 b/games-strategy/warzone2100/files/digest-warzone2100-2.0.6
new file mode 100644
index 000000000000..2797e04f7d7e
--- /dev/null
+++ b/games-strategy/warzone2100/files/digest-warzone2100-2.0.6
@@ -0,0 +1,3 @@
+MD5 f831dcbc1961c6d3fe8a354439f063a2 warzone2100-2.0.6.tar.bz2 20009086
+RMD160 d4822aad461c6733c8f821c125b10a8288e7021c warzone2100-2.0.6.tar.bz2 20009086
+SHA256 2f10634a736b7af720ad477e08ba2a36bd2b68dd79e2ba1940f4a82962102ae9 warzone2100-2.0.6.tar.bz2 20009086
diff --git a/games-strategy/warzone2100/files/warzone2100-2.0.6-buffer-overflow.patch b/games-strategy/warzone2100/files/warzone2100-2.0.6-buffer-overflow.patch
new file mode 100644
index 000000000000..97569117bb08
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-2.0.6-buffer-overflow.patch
@@ -0,0 +1,13 @@
+Index: src/multiplay.c
+===================================================================
+--- src/multiplay.c	(revision 1021)
++++ src/multiplay.c	(working copy)
+@@ -1340,7 +1340,7 @@
+ 	strcpy(msg,NetPlay.players[i].name);
+ 	strcat(msg," : ");								// seperator
+ 	//strcat(msg, &(pMsg->body[4]));					// add message
+-	strncat(msg, &(pMsg->body[4]), MAX_CONSOLE_STRING_LENGTH);					// add message
++	strncat(msg, &(pMsg->body[4]), MAX_CONSOLE_STRING_LENGTH-strlen(msg)-1);// add message
+ 	addConsoleMessage((char *)&msg,DEFAULT_JUSTIFY);
+ 
+ 	//multiplayer message callback
diff --git a/games-strategy/warzone2100/warzone2100-2.0.5.ebuild b/games-strategy/warzone2100/warzone2100-2.0.6.ebuild
index f86154e5a8b7..e48596bf391e 100644
--- a/games-strategy/warzone2100/warzone2100-2.0.5.ebuild
+++ b/games-strategy/warzone2100/warzone2100-2.0.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.0.5.ebuild,v 1.4 2007/03/12 20:58:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.0.6.ebuild,v 1.1 2007/04/06 21:45:05 nyhm Exp $
 
-inherit autotools versionator games
+inherit eutils versionator games
 
 MY_PV=$(get_version_component_range -2)
 DESCRIPTION="3D real-time strategy game"
@@ -32,13 +32,16 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -i 's:$(datadir):/usr/share:' Makefile.am || die "sed failed"
-	AT_M4DIR=m4 eautoreconf
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+	sed -i '/^dist_doc_DATA/s:COPYING.*$:TODO:' Makefile.in || die "sed failed"
 }
 
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
+		--docdir=/usr/share/doc/${PF} \
+		--with-icondir=/usr/share/pixmaps \
+		--with-applicationdir=/usr/share/applications \
 		--with-ogg=/usr \
 		--with-vorbis=/usr \
 		--enable-ogg \
@@ -50,6 +53,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
+	prepalldocs
 	prepgamesdirs
 }