Fix possible overflows (bug #337527)

Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64

4 files changed, 46 insertions, 14 deletions

diff --git a/net-misc/shout/ChangeLog b/net-misc/shout/ChangeLog
index b7826b5d20d5..cb726bff210c 100644
--- a/net-misc/shout/ChangeLog
+++ b/net-misc/shout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/shout
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.16 2008/12/19 19:04:16 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/ChangeLog,v 1.17 2011/05/07 17:12:16 angelos Exp $
+
+  07 May 2011; Christoph Mende <angelos@gentoo.org> shout-0.8.0-r2.ebuild,
+  +files/shout-0.8.0-overflow.patch:
+  Fix possible overflows (bug #337527)
 
   19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
   +files/implicitdecls.patch, +files/ldflags.patch, shout-0.8.0-r2.ebuild:
diff --git a/net-misc/shout/Manifest b/net-misc/shout/Manifest
index 84b523aba8b4..779eb6d423ff 100644
--- a/net-misc/shout/Manifest
+++ b/net-misc/shout/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX implicitdecls.patch 294 RMD160 affeddab38578ea6a593f20f7992992e94f81e6b SHA1 86dd0b9810d0b5664ad8a431ccc13cbc2df892f0 SHA256 d6682eb4eae810502736dc56d5bd6f9eb1d12a1eada0bd8ae1ef25c2ae268e35
 AUX ldflags.patch 653 RMD160 7fb78d7985ce5bd3c24d17d846eb625b2fc8374a SHA1 f5a61610c682efcb49c03523355760f9abecd56b SHA256 9318a544d3606c07107f30edbe44409aac9e0f8a7038aa024cd95b021882f34f
+AUX shout-0.8.0-overflow.patch 705 RMD160 4cc13c86a00e9fb90cddce6a5fb14a2ea4c78aa9 SHA1 bc95919cbcfb3ed6f1cd5faa894ee382b92df3c7 SHA256 87d74ca4f7bf82e3110a087f2111002afe23796ed60736db8c7ea40f1f1e45ef
 AUX variables.diff 1142 RMD160 71d58c6d31b30910dfdaea33378cf6dbac849beb SHA1 a1397b00e45680de64746c67845ba6d758bc7a0d SHA256 45b05676eb7f85040111d0f4778e15648ba0b54b6812482a8336eab84707536d
 DIST shout-0.8.0.tar.gz 66394 RMD160 3fd2173eff61954b183f0f80191808bdfdea7ae4 SHA1 6df3755e7292daa3133e6fff7ba74711ec06bf16 SHA256 7b36712730c370f7d25271ca93291f9055bb90ee3052e7aec33b5dae205d8227
-EBUILD shout-0.8.0-r2.ebuild 1084 RMD160 4d34c6246551b491fc4e69d892614047bb72e749 SHA1 6dfab209db486bce8cdc2b896cbbc96be647cda0 SHA256 20463e16f7d15bcdf5d61e6f63184ecc883259a81cef52189e3e0d65722a4b23
-MISC ChangeLog 2524 RMD160 a11ee522583d7d18fd551ad1cc9105c9de0ffdc8 SHA1 19b6702b60e03afe803de55ee14433b94a013d90 SHA256 ce8cef9ade24613b382bd2af747f8147437ec3e6338888d0ccf4eadabf9c7961
+EBUILD shout-0.8.0-r2.ebuild 1113 RMD160 1924ffd4714c73e39d12f072fc3a6f01aea26837 SHA1 aac4d98122ec39e6a6918b8fa0c46dff310d63fe SHA256 99562729e9addf8f37cf538e304747bdc467b3e2ced8040b008d94fc6417cbc3
+MISC ChangeLog 2675 RMD160 e9c8ddb71b0a0a16a080ecc814c25a7a7da2a252 SHA1 29c1f310397a2358c3612ce9033ed5e1ee5f9476 SHA256 e9ec1f6db89472c2b043c125be11e747454a83f055cf34f4fe62b723398cb6ce
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAklL8DYACgkQvFcC4BYPU0ogHACbBYZpdF7tkpBwWr0qBLMjsj8z
-z/kAn0ZVmfG12lCFw1GM7jL6yjKBEMRD
-=LeXH
+iF4EAREIAAYFAk3FfXUACgkQmWq1bYTyC0Oy/AEAp+OEGquMGa9nl6EPu2BMt/nO
+vWRiVaZmDQNUXdbL+QIBAMbpNlhzy79eAK7Y98UL/S9wd5yPUxA5H4cHSWdlNNqp
+=dHQO
 -----END PGP SIGNATURE-----
diff --git a/net-misc/shout/files/shout-0.8.0-overflow.patch b/net-misc/shout/files/shout-0.8.0-overflow.patch
new file mode 100644
index 000000000000..a1292423ce4b
--- /dev/null
+++ b/net-misc/shout/files/shout-0.8.0-overflow.patch
@@ -0,0 +1,26 @@
+diff --git a/shout.c b/shout.c
+index 0a1bded..00bae8d 100644
+--- a/shout.c
++++ b/shout.c
+@@ -441,7 +441,7 @@ post_config ()
+ 			perror ("fopen");
+ 			px_shutdown (44);
+ 		}
+-		my_snprintf (pid, BUFSIZE, "%d\n", (int) getpid ());
++		my_snprintf (pid, 30, "%d\n", (int) getpid ());
+ 		fputs (pid, fp);
+ 		fclose (fp);
+ 	}
+diff --git a/sock.c b/sock.c
+index 4a67c00..3b4e539 100644
+--- a/sock.c
++++ b/sock.c
+@@ -81,7 +81,7 @@ sock_connect (char *hostname, int port)
+ 			sock_close (sockfd);
+ 			return -1;
+ 		}
+-		memcpy (&server.sin_addr, &sin.sin_addr, sizeof (sin));
++		memcpy (&server.sin_addr, &sin.sin_addr, sizeof (sin.sin_addr));
+ 	} else {
+ 		host = gethostbyname (hostname);
+ 		if (host == NULL) {
diff --git a/net-misc/shout/shout-0.8.0-r2.ebuild b/net-misc/shout/shout-0.8.0-r2.ebuild
index 36c2cf937b9d..4fec267f96e8 100644
--- a/net-misc/shout/shout-0.8.0-r2.ebuild
+++ b/net-misc/shout/shout-0.8.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.7 2008/12/19 19:04:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shout/shout-0.8.0-r2.ebuild,v 1.8 2011/05/07 17:12:16 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -16,9 +16,10 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/variables.diff
-	epatch "${FILESDIR}"/ldflags.patch
-	epatch "${FILESDIR}"/implicitdecls.patch
+	epatch "${FILESDIR}"/variables.diff \
+		"${FILESDIR}"/ldflags.patch \
+		"${FILESDIR}"/implicitdecls.patch \
+		"${FILESDIR}"/${P}-overflow.patch
 	rm -f sock.o
 	sed -i -e "s/-ansi//" configure
 }