diff options
| author |   Tavis Ormandy <taviso@gentoo.org> | 2003-12-11 11:59:28 +0000 |
|---|---|---|
| committer | Tavis Ormandy <taviso@gentoo.org> | 2003-12-11 11:59:28 +0000 |
| commit | e2d051acc18c0ebe792ff3f5eb594c631baa1c0b (patch) | |
| tree | faeddcd07833f660a6b867d6e6a239777fce3cba /x11-wm | |
| parent | stable (diff) | |
| download | historical-e2d051acc18c0ebe792ff3f5eb594c631baa1c0b.tar.gz historical-e2d051acc18c0ebe792ff3f5eb594c631baa1c0b.tar.bz2 historical-e2d051acc18c0ebe792ff3f5eb594c631baa1c0b.zip | |
minor patch
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/fvwm/Manifest | 5 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff | 18 | ||||
| -rw-r--r-- | x11-wm/fvwm/fvwm-2.5.8-r2.ebuild | 5 |
4 files changed, 30 insertions, 4 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 72759209c562..13d4fac313bb 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,10 @@ # 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.50 2003/12/11 10:52:21 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.51 2003/12/11 11:59:24 taviso Exp $ + + 11 Dec 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r2.ebuild, + files/fvwm-2.5.8-fvwm-menu-directory-security.diff: + minor patch for fvwm-menu-directory, newlines confuse it. 11 Dec 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r2.ebuild: stable diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 3cb29724f989..4bbe1da007d6 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,13 +1,14 @@ MD5 e79bd2fa2e46e650aabaa16754e25583 fvwm-2.5.7-r5.ebuild 8757 MD5 b893f78193652b275ce5d276ac38af29 fvwm-2.4.17.ebuild 3961 -MD5 33bcac76a9844284cc521142dd72d67b ChangeLog 9687 +MD5 417bd6d3c665bd0742dfacca52c9db44 ChangeLog 9873 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 -MD5 e789b477eb0b1c160e6a941073fd1df0 fvwm-2.5.8-r2.ebuild 9544 +MD5 e277a2831ac0104d5af9b1aef8ee3403 fvwm-2.5.8-r2.ebuild 9684 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 977c11b7ca7c17cff7a14d1d4a0136f4 files/fvwm-2.5.8-perllib-disconnect.diff 1179 +MD5 fdef981cb94332e5b0ea2a72727336a8 files/fvwm-2.5.8-fvwm-menu-directory-security.diff 378 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419 diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff b/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff new file mode 100644 index 000000000000..fcc1e398becd --- /dev/null +++ b/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff @@ -0,0 +1,18 @@ +--- fvwm-menu-directory.in.old 2003-12-11 11:39:10.000000000 +0000 ++++ fvwm-menu-directory.in 2003-12-11 11:39:55.000000000 +0000 +@@ -259,6 +259,7 @@ + $name =~ s/%/%%/g; + $name =~ s/&/&&/g; + $name =~ s/\*/**/g; ++ $name =~ s/\n/ /g; + $name; + } + +@@ -267,6 +268,7 @@ + $name =~ s/\\/\\\\/g; + $name =~ s/"/\\"/g; + $name =~ s/\$/\\\$\$/g; ++ $name =~ s/\n/\\n/g; + $name; + } + diff --git a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild index 42352c49e422..d9d3bc0f4b7a 100644 --- a/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.8-r2.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-r2.ebuild,v 1.5 2003/12/11 10:52:21 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r2.ebuild,v 1.6 2003/12/11 11:59:24 taviso Exp $ inherit eutils flag-o-matic @@ -81,6 +81,9 @@ src_unpack() { # handler could be invoked. cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-perllib-disconnect.diff + # files with \n in them make fvwm-menu-directory misbehave. + cd ${S}/bin; epatch ${FILESDIR}/fvwm-2.5.8-fvwm-menu-directory-security.diff + # build fails on alpha with certain options without this. use alpha && append-flags -fPIC } |