summaryrefslogtreecommitdiff
path: root/wm/fvwm-devel
diff options
context:
space:
mode:
authoradrianp <adrianp@pkgsrc.org>2006-11-26 13:32:22 +0000
committeradrianp <adrianp@pkgsrc.org>2006-11-26 13:32:22 +0000
commit3f5ba8746cf9347dab1f69a7fe628fb7ea63c19b (patch)
tree6801302f1309e32f17ca0733200575e435ea18f3 /wm/fvwm-devel
parent1bffa7c9992687471a93e6b94b86ef2a0b73131b (diff)
downloadpkgsrc-3f5ba8746cf9347dab1f69a7fe628fb7ea63c19b.tar.gz
Fix for CVE-2006-5969
PKGREVISION bump
Diffstat (limited to 'wm/fvwm-devel')
-rw-r--r--wm/fvwm-devel/Makefile4
-rw-r--r--wm/fvwm-devel/distinfo3
-rw-r--r--wm/fvwm-devel/patches/patch-ac13
3 files changed, 17 insertions, 3 deletions
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 22dec73947e..0859fc18ec8 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/09/12 05:27:50 martti Exp $
+# $NetBSD: Makefile,v 1.17 2006/11/26 13:32:22 adrianp Exp $
DISTNAME= fvwm-${FVWM_VER}
-#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= x11 wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 880a5443b12..724acb03d6e 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/09/12 05:27:50 martti Exp $
+$NetBSD: distinfo,v 1.10 2006/11/26 13:32:22 adrianp Exp $
SHA1 (fvwm-2.5.18.tar.bz2) = b7ef45dfe3975deab38dd9ae306c5fd280f307c6
RMD160 (fvwm-2.5.18.tar.bz2) = 68bd7a5d3e1c5fb3776de0fbda75414d9e7ad54b
Size (fvwm-2.5.18.tar.bz2) = 2034340 bytes
SHA1 (patch-aa) = 2f9c40c201fb041e71c7553118595f6af1c05030
SHA1 (patch-ab) = 71282c66036746dcb4a3905a56f7bf1a75fbd497
+SHA1 (patch-ac) = e1c9450bc83510f2ae0dec98ff62ffc350dbbf4e
diff --git a/wm/fvwm-devel/patches/patch-ac b/wm/fvwm-devel/patches/patch-ac
new file mode 100644
index 00000000000..8978424acb2
--- /dev/null
+++ b/wm/fvwm-devel/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/11/26 13:32:22 adrianp Exp $
+
+--- bin/fvwm-menu-directory.in.orig 2005-07-08 21:59:00.000000000 +0100
++++ bin/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);