adding security fix to 2.5.8

6 files changed, 35 insertions, 7 deletions

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 36b4cc6b3b74..1b7cd8a6d14d 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.63 2004/03/19 18:44:23 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.64 2004/03/20 10:59:48 taviso Exp $
+
+*fvwm-2.5.8-r6 (20 Mar 2004)
+
+  20 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10.ebuild,
+  fvwm-2.5.8-r5.ebuild, fvwm-2.5.8-r6.ebuild,
+  files/fvwm-2.5.8-fvwm-bug-security.diff:
+  adding fvwm-bug security fix to stable fvwm.
 
 *fvwm-2.5.10 (19 Mar 2004)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index d6bded60313b..1f817e40d12a 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,11 +1,11 @@
 MD5 b83bf23f1c96084b79765739613430ac fvwm-2.5.7-r5.ebuild 8757
 MD5 76fde55c6ffece27a13fd976d5fb51b6 fvwm-2.5.8-r4.ebuild 10169
+MD5 2fe250da04e9678631ac0d7f282de875 fvwm-2.5.8-r6.ebuild 10691
 MD5 babbec50812f1dd2af1b76b9afa837af fvwm-2.4.17.ebuild 3961
-MD5 175ef9160684ed93b20ffcfc478b058b fvwm-2.5.8-r5.ebuild 10414
 MD5 60dad7fdef9011540156e68d2ed1f8c4 fvwm-2.5.9.ebuild 9409
-MD5 4700ea234837e6f33ba463c1e7017811 ChangeLog 11906
+MD5 3533175531d7bdce1c1a9c4511c4fd39 ChangeLog 12142
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
-MD5 f1910d8c73bccd43deedc409f7588677 fvwm-2.5.10.ebuild 9410
+MD5 12ef1ce8551fa2c8f989f2b529e29e82 fvwm-2.5.10.ebuild 9433
 MD5 c515838ed1efd6d1f9a60db5b2ff0a5c fvwm-2.4.18.ebuild 3964
 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
 MD5 7e00938e8f20ffaa22e1c5672666c027 files/fvwm-2.5.8-iconfile.diff 791
@@ -23,10 +23,11 @@ MD5 977c11b7ca7c17cff7a14d1d4a0136f4 files/fvwm-2.5.8-perllib-disconnect.diff 11
 MD5 5dc401c9f6a50da0bfa85a025749652a files/fvwm-2.5.8-fvwm-menu-directory-security.diff 382
 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423
+MD5 4f044a8a47c9f8ea61d54dfa4bd79b70 files/fvwm-2.5.8-fvwm-bug-security.diff 327
 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
 MD5 386c07fa21d42bd8cbe743e3632de418 files/digest-fvwm-2.5.9 127
 MD5 e52e1c9212c856d5de29c603678dc52e files/digest-fvwm-2.5.7-r5 127
 MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r4 127
-MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r5 127
+MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r6 127
 MD5 97373a30210df0b93c59e2aac76d17e0 files/fvwm-2.5.8-undermouse.diff 2534
 MD5 933ebc841a6eafebaf9d57b7a99c3b10 files/fvwm-2.5.8-flickeringmoveworkaround.diff 726
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r5 b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r6
index 2859d3f88dfb..2859d3f88dfb 100644
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r5
+++ b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r6
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-bug-security.diff b/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-bug-security.diff
new file mode 100644
index 000000000000..84a639a74de3
--- /dev/null
+++ b/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-bug-security.diff
@@ -0,0 +1,11 @@
+--- fvwm-2.5.8/bin/fvwm-bug.in	2002-11-10 23:24:12.000000000 +0000
++++ fvwm-2.5.10/bin/fvwm-bug.in	2004-03-19 14:45:59.000000000 +0000
+@@ -53,7 +53,7 @@
+ 
+ : ${EDITOR=emacs}
+ 
+-TEMP=/tmp/fvwm-bug.$$
++TEMP=`mktemp -q "/tmp/fvwm-bug.XXXXXX"`
+ 
+ # Figure out how to echo a string without a trailing newline
+ N=`echo 'hi there\c'`
diff --git a/x11-wm/fvwm/fvwm-2.5.10.ebuild b/x11-wm/fvwm/fvwm-2.5.10.ebuild
index 6dfff228e7a3..31f79d703f90 100644
--- a/x11-wm/fvwm/fvwm-2.5.10.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.10.ebuild,v 1.1 2004/03/19 18:44:23 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10.ebuild,v 1.2 2004/03/20 10:59:48 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -34,6 +34,7 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1
 					>=dev-libs/expat-1.95.6-r1 )
 		>=dev-lang/perl-5.6.1-r10
 		>=sys-libs/zlib-1.1.4-r1
+		sys-apps/debianutils
 		virtual/x11"
 # XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild
index 4b92e955dbf6..1ef3fe291126 100644
--- a/x11-wm/fvwm/fvwm-2.5.8-r5.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r5.ebuild,v 1.4 2004/02/28 15:36:28 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild,v 1.1 2004/03/20 10:59:48 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -35,6 +35,7 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1
 		!noxpm? ( >=media-libs/netpbm-9.12-r4 )
 		>=dev-lang/perl-5.6.1-r10
 		>=sys-libs/zlib-1.1.4-r1
+		sys-apps/debianutils
 		virtual/x11"
 # XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
 # XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
@@ -102,6 +103,10 @@ src_unpack() {
 	# FlickeringMoveWorkaround is always ignored, this fix from cvs.
 	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-flickeringmoveworkaround.diff
 
+	# fvwm-bug uses predictable temporary file names (pid based)
+	# this is fixed in >=fvwm-2.5.10.
+	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-fvwm-bug-security.diff
+
 	# build fails on alpha with certain options without this.
 	use alpha && append-flags -fPIC
 }
@@ -302,6 +307,9 @@ src_install() {
 
 	dodoc ${FILESDIR}/README.transluceny.gz
 
+	# make sure FvwmGtk man page is installed
+	use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1
+
 	# fix a couple of symlinks.
 	prepallman
 }