summaryrefslogtreecommitdiff
path: root/wm/fvwm
diff options
context:
space:
mode:
authoradrianp <adrianp>2006-11-26 13:32:22 +0000
committeradrianp <adrianp>2006-11-26 13:32:22 +0000
commitd64596ca4c90fe15b57f971ef7a871933ebf19a1 (patch)
tree6801302f1309e32f17ca0733200575e435ea18f3 /wm/fvwm
parentc41544f849e7b898e2d7991f8e81c089ca80d07e (diff)
downloadpkgsrc-d64596ca4c90fe15b57f971ef7a871933ebf19a1.tar.gz
Fix for CVE-2006-5969
PKGREVISION bump
Diffstat (limited to 'wm/fvwm')
-rw-r--r--wm/fvwm/Makefile4
-rw-r--r--wm/fvwm/distinfo3
-rw-r--r--wm/fvwm/patches/patch-af13
3 files changed, 17 insertions, 3 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index eeb56377aa0..1619072d31f 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/07/11 09:05:35 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/11/26 13:32:43 adrianp Exp $
DISTNAME= fvwm-${FVWM_VER}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/ \
diff --git a/wm/fvwm/distinfo b/wm/fvwm/distinfo
index 5fe976839fb..d532bf9fd62 100644
--- a/wm/fvwm/distinfo
+++ b/wm/fvwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
+$NetBSD: distinfo,v 1.2 2006/11/26 13:32:43 adrianp Exp $
SHA1 (fvwm-2.4.19.tar.gz) = 6d881473560d6ded360fc47a7cfb1b3d5d30824f
RMD160 (fvwm-2.4.19.tar.gz) = cc6e3ceebccd50ba0404079771faa6babc041ca0
@@ -11,3 +11,4 @@ SHA1 (patch-ab) = 9005c7e38002a44a62d2289a72f4b9ab5b4f5386
SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8
SHA1 (patch-ad) = 95b9fac03006378ce76a89a5116b783e8c88ef0a
SHA1 (patch-ae) = 09460e67c977d261b21e75be9a790841527d4117
+SHA1 (patch-af) = 5481d725ad7e0e7cb0fb882077ccb6b9482099a1
diff --git a/wm/fvwm/patches/patch-af b/wm/fvwm/patches/patch-af
new file mode 100644
index 00000000000..9050e5cab5c
--- /dev/null
+++ b/wm/fvwm/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/11/26 13:32:43 adrianp Exp $
+
+--- utils/fvwm-menu-directory.in.orig 2005-07-08 21:59:00.000000000 +0100
++++ utils/fvwm-menu-directory.in
+@@ -279,7 +279,7 @@ sub evalFolderLine ($$) {
+ my $itemStr = $dir && $itemF_eval? &evalItem($_name, $dir): $_name;
+ $itemStr = escapeItemName($itemStr);
+ my $act = !$dir || $checkSubdirs && !-x $dir? "Nop": !$reuse?
+- qq(Popup ") . escapeFvwmName($dir) . qq("$submenuPos):
++ qq(Popup ") . escapeFileName($dir) . qq("$submenuPos):
+ qq(PipeRead 'echo ") . escapeFileName($dir) . qq(" >$dirFile; )
+ . qq(echo Menu ") . escapeFvwmName($name) . qq(" WarpTitle');
+ return qq(+ "$iconDStr$itemStr" $act\n);