Fix buffer overflows wrt bug 338180. Thanks to Diego for the report. Fix implicit function declarations, drop uredundant die messages. Drop old.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

3 files changed, 34 insertions, 13 deletions

diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index 6d857ad0c312..ef7df583da2b 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/ctwm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.22 2010/09/16 15:06:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.23 2010/10/22 16:13:05 xarthisius Exp $
+
+*ctwm-3.8a-r1 (22 Oct 2010)
+
+  22 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> -ctwm-3.8a.ebuild,
+  +ctwm-3.8a-r1.ebuild:
+  Fix buffer overflows wrt bug 338180. Thanks to Diego for the report. Fix
+  implicit function declarations, drop uredundant die messages. Drop old.
 
   16 Sep 2010; Jeroen Roovers <jer@gentoo.org> ctwm-3.8a.ebuild:
   Remove unused USE flag.
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index b6f499a4ef67..9bbf7e67d1e8 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ctwm-3.6-r1-gentoo.diff 1329 RMD160 4f99f36e7c96e70be2efa6da7a5916e1925de4b3 SHA1 cfe4819b37427472c58bd89f7df123ae86967cf9 SHA256 e263f47c575b556ed4a4f6f58b00d02c000f05f880337a92328d5071e07d4aa6
 DIST ctwm-3.7.tar.gz 1139461 RMD160 9809df2555b3eb2bf0c46c041df8c1c089b67255 SHA1 6140e82ec23499146eaab5bf3bd592f92e95683e SHA256 fa16dbaef6992cdbcdbe05a9dc12c2c16910f5e51a2df54607aeb74f9b4a5171
 DIST ctwm-3.8a.tar.gz 738226 RMD160 cc1c3c862c3cfb1d66593d9a95d28ec0bbbbaf3c SHA1 c3a31d669bef7dd5ec78d89950c0e575d6c51c77 SHA256 39322cc6b0d12dc286af0944f9a10d3a099a5f04c5d9c47b75742cdf65dbd4a4
 EBUILD ctwm-3.7.ebuild 1314 RMD160 5d5d53b38b18c267a597e57690b2a5f47d946d04 SHA1 d09cbb22a0d1e2981ca9fb6f2b61f64a5785371e SHA256 3354a8a4fe64427f5baa8679f966b4bca4d7f06cee19fc58e12931562009fc9c
-EBUILD ctwm-3.8a.ebuild 1559 RMD160 2a30ed59760487cd7278188ae30f4846230f8cd7 SHA1 1efb62ba0b0e2d827db1e938d71182e40aabc5c2 SHA256 1dbc343ab1a7ff645aa1c68cfb8ff1d8754fc060caccbe11f35535a109c09546
-MISC ChangeLog 3166 RMD160 2affd019e8519733c7699854411b2902e8b0ab42 SHA1 4eac2de01aea840778ac55d009d867b335ee0835 SHA256 71b3587050598d6c5f152864bfa4b6a7ea733e8b0c9e424fbb9b0601fe3caf7b
+EBUILD ctwm-3.8a-r1.ebuild 1624 RMD160 cd634a7161c969fc6dd4a1e8c7fee3d59ae2f48b SHA1 d352e96090c41270eac538d3185229a558ff02a1 SHA256 dcf7455eb73fee075232b02f13d8dca935bc09e4590d46fb6cc281e5807b154c
+MISC ChangeLog 3449 RMD160 8f306de5defe86f7e9f9e8854ea9eeac8106d01a SHA1 423132b2c843f1da4361d41ffc27217f7e317376 SHA256 41de5d6b6d923fc50dbc85a15387f941c74552630d2717a03be83e47e8b1ced7
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkzBuB0ACgkQIiMqcbOVdxTZowP+PF3iwp/v4qe3yzldVLqCa+jC
+ubpw7WRHsQkfBe3JuNOy+UGatUUIPenxmR8cIQDrxkqJnZXRMDCzGI8+rq9SATWm
+eoxujakSZU7p0RK0XtYRnQXuYYwFwzh4BFievVObbc0482HW7yz4YKmk1I610RvQ
+josEppC7n27OrsrNqYg=
+=AtT4
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/ctwm/ctwm-3.8a.ebuild b/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
index ada9377ad79c..413ae4efe0e7 100644
--- a/x11-wm/ctwm/ctwm-3.8a.ebuild
+++ b/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.8a.ebuild,v 1.2 2010/09/16 15:06:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.8a-r1.ebuild,v 1.1 2010/10/22 16:13:05 xarthisius Exp $
 
 EAPI="2"
 
@@ -28,44 +28,46 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
 src_prepare() {
+	sed -e "/char modStr/ s/5/6/" -i menus.c || die #overflow bug 338180
+	sed -e "/<stdio.h>/ a#include <ctype.h>" -i parse.c || die #implicit 'isspace'
 	sed -i Imakefile \
 		-e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" \
-		|| die "sed Imakefile"
+		|| die
 
 	cp Imakefile.local-template Imakefile.local
 
 	# TODO: Add GNOME support
 	sed -i Imakefile.local \
 		-e '/^#define GNOME/d' \
-		|| die "sed Imakefile.local"
+		|| die
 }
 
 src_compile() {
-	xmkmf || die "xmkmf failed"
+	xmkmf || die
 	emake \
 		CC=$(tc-getCC) \
 		CFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}" \
 		TWMDIR=/usr/share/${PN} \
-		|| die "emake failed"
+		|| die
 }
 
 src_install() {
 	make BINDIR=/usr/bin \
 		MANPATH=/usr/share/man \
 		TWMDIR=/usr/share/${PN} \
-		DESTDIR="${D}" install || die "make install failed"
+		DESTDIR="${D}" install || die
 
 	make MANPATH=/usr/share/man \
 		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR="${D}" install.man || die "make install.man failed"
+		DESTDIR="${D}" install.man || die
 
 	echo "#!/bin/sh" > ${T}/ctwm
 	echo "/usr/bin/ctwm" >> ${T}/ctwm
 
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/ctwm
+	doexe "${T}"/ctwm || die
 
-	dodoc CHANGES README* TODO* PROBLEMS
-	dodoc *.ctwmrc*
+	dodoc CHANGES README* TODO* PROBLEMS || die
+	dodoc *.ctwmrc* || die
 }