diff options
-rw-r--r-- | x11-wm/fvwm/ChangeLog | 7 | ||||
-rw-r--r-- | x11-wm/fvwm/Manifest | 5 | ||||
-rw-r--r-- | x11-wm/fvwm/files/fvwmtabs-insecure-tmp-handling.diff | 35 | ||||
-rw-r--r-- | x11-wm/fvwm/fvwm-2.5.8.ebuild | 9 |
4 files changed, 52 insertions, 4 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 17b97446084b..c7205eaeaf0d 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/fvwm # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.43 2003/11/07 13:52:19 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.44 2003/11/11 12:01:42 taviso Exp $ + + 11 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild, + files/fvwmtabs-insecure-tmp-handling.diff: + make fvwmtabs save state files to home directory, rather than /tmp. + see ebuild comments. 07 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild: append-flags -fPIC on alpha. diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index cacf587a5b17..ca31f335d069 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,10 +1,11 @@ MD5 e79bd2fa2e46e650aabaa16754e25583 fvwm-2.5.7-r5.ebuild 8757 -MD5 5221ab78811ec4c54ec378be9a2fa805 fvwm-2.5.8.ebuild 8565 +MD5 02d01544ae8400b6aed6963ddbdca5b2 fvwm-2.5.8.ebuild 8986 MD5 b893f78193652b275ce5d276ac38af29 fvwm-2.4.17.ebuild 3961 MD5 8fa93269e89c39d61e797e46a91b2872 fvwm-2.5.7-r3.ebuild 8726 -MD5 0c6772b4b20e7d18d236e821536844fe ChangeLog 8749 +MD5 b7c5988b6f57dbad230983acd9e19e4f ChangeLog 8956 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788 +MD5 e5701841190ad529d5577c8da69d5006 files/fvwmtabs-insecure-tmp-handling.diff 2350 MD5 b2af3c1c8fe4f142e2b8debbb5c59a94 files/digest-fvwm-2.4.17 65 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423 diff --git a/x11-wm/fvwm/files/fvwmtabs-insecure-tmp-handling.diff b/x11-wm/fvwm/files/fvwmtabs-insecure-tmp-handling.diff new file mode 100644 index 000000000000..5ac140b58189 --- /dev/null +++ b/x11-wm/fvwm/files/fvwmtabs-insecure-tmp-handling.diff @@ -0,0 +1,35 @@ +--- FvwmTabs.orig 2003-11-11 10:37:10.000000000 +0000 ++++ FvwmTabs 2003-11-11 11:40:30.000000000 +0000 +@@ -64,7 +64,7 @@ + balloonBG => '#C0C080', + balloonMsg => 'Tab %tabNo:\n%iconText\n%title', + autoResize => 'false', +- stateFile => '/tmp/.fvwmtabs.state', ++ stateFile => <~/.fvwmtabs.state>, # / + fixedSizeTabs => 'false', + showTitlebar => 'true', + useTMTitlebar => 'true', +--- FvwmTabs.1.orig 2003-11-11 11:23:59.000000000 +0000 ++++ FvwmTabs.1 2003-11-11 11:24:06.000000000 +0000 +@@ -225,7 +225,7 @@ + \&\fIbool\fR can be either \fItrue\fR or \fIfalse\fR. If true, windows in the tab-manager automatically resize to the dimensions of the largest window in the tab-manager. The default value is \fIfalse\fR. + .Ip "*FvwmTabs: stateFile \fIfile\fR" 4 + .IX Item "*FvwmTabs: stateFile file" +-\&\fBFvwmTabs\fR has the ability to preserve its state (ie. remember the windows it has swallowed as tabs) b/w \s-1FVWM\s0 restarts. \fIfile\fR specifies the name of a temporary file to record the state in, so it can be reconstructed when \fBFvwmTabs\fR restarts. The default file is \f(CW\*(C`/tmp/.fvwmtabs.state\*(C'\fR. ++\&\fBFvwmTabs\fR has the ability to preserve its state (ie. remember the windows it has swallowed as tabs) b/w \s-1FVWM\s0 restarts. \fIfile\fR specifies the name of a temporary file to record the state in, so it can be reconstructed when \fBFvwmTabs\fR restarts. + .Ip "*FvwmTabs: fixedSizeTabs \fIbool\fR" 4 + .IX Item "*FvwmTabs: fixedSizeTabs bool" + \&\fIbool\fR can be either \fItrue\fR or \fIfalse\fR. If true, the tab-manager will ensure each tab-button has the same dimensions. If false, the selected tab is expanded so that it is fully visible. The default value is \fIfalse\fR. +--- fvwmtabrc.orig 2003-11-11 11:00:57.000000000 +0000 ++++ fvwmtabrc 2003-11-11 11:39:41.000000000 +0000 +@@ -216,8 +216,8 @@ + # stateFile - specifies the name of a temporary file to use to record the + # state (ie. remember the windows it has swallowed as tabs) b/w FVWM + # restarts. +-# default: /tmp/.fvwmtabs.state +-*FvwmTabs: stateFile /tmp/.fvwmtabs.state ++# default: /home/user/.fvwmtabs.state ++#*FvwmTabs: stateFile /home/user/.fvwmtabs.state + + # fixedSizeTabs - ensure each tab-button has the same dimensions. If false, + # the selected tab is expanded so that it is fully visible. diff --git a/x11-wm/fvwm/fvwm-2.5.8.ebuild b/x11-wm/fvwm/fvwm-2.5.8.ebuild index c8c2e0bfea8d..b67ad1b3bb6b 100644 --- a/x11-wm/fvwm/fvwm-2.5.8.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8.ebuild,v 1.8 2003/11/07 13:52:19 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8.ebuild,v 1.9 2003/11/11 12:01:42 taviso Exp $ inherit eutils flag-o-matic @@ -60,6 +60,13 @@ src_unpack() { # never got around to it. cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff + # FvwmTabs uses /tmp/.fvwmtabs.state for storing state files by default, + # this probably isnt a good idea security wise, allowing someone to do + # damage with symlinks. It will also break if multiple users try using + # the same location simultaneously...probably should use File::Temp, but + # moving it into ~/.fvwmtabs.state will do for now. + cd ${WORKDIR}; epatch ${FILESDIR}/fvwmtabs-insecure-tmp-handling.diff + # build fails on alpha with certain options without this. use alpha && append-flags -fPIC } |