diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-10-22 16:13:05 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-10-22 16:13:05 +0000 |
| commit | 2e4def1d55e71be7e4fddf264186427c636c014c (patch) | |
| tree | 5b5a647acadd16c57bc688dd84a87c6c244184ac /x11-wm/ctwm | |
| parent | Stable for HPPA PPC (bug #341669). (diff) | |
| download | gentoo-2-2e4def1d55e71be7e4fddf264186427c636c014c.tar.gz gentoo-2-2e4def1d55e71be7e4fddf264186427c636c014c.tar.bz2 gentoo-2-2e4def1d55e71be7e4fddf264186427c636c014c.zip | |
Fix buffer overflows wrt bug 338180. Thanks to Diego for the report. Fix implicit function declarations, drop uredundant die messages. Drop old.
(Portage version: 2.2_rc98/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/ctwm')
| -rw-r--r-- | x11-wm/ctwm/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-wm/ctwm/ctwm-3.8a-r1.ebuild (renamed from x11-wm/ctwm/ctwm-3.8a.ebuild) | 22 |
2 files changed, 20 insertions, 11 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/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 } |