Fix overflow. Bug #342307

Package-Manager: portage-2.1.9.22/cvs/Linux i686

4 files changed, 33 insertions, 8 deletions

diff --git a/games-strategy/liquidwar/ChangeLog b/games-strategy/liquidwar/ChangeLog
index 7c7af7af240b..2f0af55da6c5 100644
--- a/games-strategy/liquidwar/ChangeLog
+++ b/games-strategy/liquidwar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/liquidwar
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.22 2009/02/13 22:40:21 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/ChangeLog,v 1.23 2010/10/26 12:34:31 tupone Exp $
+
+  26 Oct 2010; Tupone Alfredo <tupone@gentoo.org> liquidwar-5.6.4.ebuild,
+  +files/liquidwar-5.6.4-ovflfix.patch:
+  Fix overflow. Bug #342307 by flameeyes@gentoo.org
 
   13 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
   liquidwar-5.6.4.ebuild:
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index b01f571b5311..6d752860852d 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,8 +1,9 @@
 AUX liquidwar-5.6.3-exec-stack.patch 430 RMD160 979cd0d211211a1864ca237d4af394d04c2e5635 SHA1 e911562d977b4f8f38ef2ed3e9095969918f4d17 SHA256 d661dab2c07f2df8089c618d4ccf6e40032fe3af19704ff9b4273aec21043263
 AUX liquidwar-5.6.4-exec-stack.patch 430 RMD160 979cd0d211211a1864ca237d4af394d04c2e5635 SHA1 e911562d977b4f8f38ef2ed3e9095969918f4d17 SHA256 d661dab2c07f2df8089c618d4ccf6e40032fe3af19704ff9b4273aec21043263
+AUX liquidwar-5.6.4-ovflfix.patch 696 RMD160 73fd1f20ce4ca512c96b45059d2764cd5646ce26 SHA1 e2102792c54a01b7cd14adb6d72404044175ec7e SHA256 3e72162d8ff2a690b1f30736f16867bcab76f031040460d95ec0ef9c41df8452
 DIST liquidwar-5.6.3.tar.gz 3292030 RMD160 678304f624dcff4480b0398c79650ac3625dc86d SHA1 a0126f0370a92e2db0f18d4bf8cf31a7f15081e2 SHA256 33aedf15ac96dc526dc7daed1a6a311e9ca82bd66268e95a1e57ec29501d0c8b
 DIST liquidwar-5.6.4.tar.gz 3268432 RMD160 991da4af05d1a8cf292faf23e9c06c1f7571672c SHA1 a3006c4da9517c3af3b7bf165b2c86fa369a71c6 SHA256 32c52e4588e8e723f907ef43703b4ddf009e8ff1f29555c09bcc1f70bf5b93a3
 EBUILD liquidwar-5.6.3.ebuild 1537 RMD160 640fb4ac7c87ddcb6417bcabc96386cb3c7c2b73 SHA1 2c531bebe1f559229b75fb21e3e8e0fdbd9e8239 SHA256 f37814ce7f6022178b0ad645b5e0f4bfd336ae6cab4794428dda2e27827e79f5
-EBUILD liquidwar-5.6.4.ebuild 1512 RMD160 e80b1d773af1a79414c267aace78cc345ede5660 SHA1 dadca4fd5e52d75068259e64e08bfc0e96c9dd3f SHA256 c8cb2ff3a9d97881fc97137ae8a12eedc105a67260385849fc57e76f484dd5b4
-MISC ChangeLog 3649 RMD160 0b54a26b26f557ccdaf0fc144c75dffa6ac399da SHA1 3e359ea787baec882e95dded4faa056b7a49a605 SHA256 0e48d0eeaf641a47b692baf3a1ce2d3eda5582422ea3602c179ee4f77c718293
+EBUILD liquidwar-5.6.4.ebuild 1567 RMD160 c658a5a77c0497f3568013a3b5882557b438bf97 SHA1 8ab7ff1fd17c7fadf86b4d45163a8e5d345628dc SHA256 5f9b80dd86bbaa2b6c5dbb3b77261cb7e07a2bb33ce34b167d5b20fcde5d69fa
+MISC ChangeLog 3813 RMD160 7b5939bc42ee2f96d91651a90ec0c2f78a967b90 SHA1 a8eb7264ac1169e7c72ee6f3ce62182116fd37af SHA256 48d144dddbd2fb3e8609f468043a89d3f73c731c41e1c9b6e284b17959dda081
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
new file mode 100644
index 000000000000..446385624cfa
--- /dev/null
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
@@ -0,0 +1,18 @@
+--- src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
++++ src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
+@@ -100,12 +100,12 @@
+ 
+   data->privacy = privacy;
+   data->log = log;
+-  strncpy (data->metaserver, metaserver, URL_SIZE);
++  strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
+   data->port = port;
+   data->busy_players = busy_players;
+   data->max_players = max_players;
+-  strncpy (data->password, password, URL_SIZE);
+-  strncpy (data->comment, comment, URL_SIZE);
++  strncpy (data->password, password, sizeof(data->password));
++  strncpy (data->comment, comment, sizeof(data->comment));
+ }
+ 
+ /*------------------------------------------------------------------*/
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4.ebuild
index 4feca9932c98..84538d91ad93 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.4.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.4.ebuild,v 1.5 2009/02/13 22:40:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.4.ebuild,v 1.6 2010/10/26 12:34:31 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -15,10 +15,12 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="nls"
 RESTRICT="test"
 
-DEPEND=">=media-libs/allegro-4.2"
+RDEPEND=">=media-libs/allegro-4.2"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-exec-stack.patch
+	epatch "${FILESDIR}"/${P}-exec-stack.patch \
+		"${FILESDIR}"/${P}-ovflfix.patch
 	sed -i \
 		-e 's:/games::' \
 		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \