summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authordrochner <drochner>2009-04-17 16:14:56 +0000
committerdrochner <drochner>2009-04-17 16:14:56 +0000
commiteb58873d7465f67efbdd6be4d593dd7084821d68 (patch)
treeef356b6d83181f71d4aa0a8f749ac7bd33ea707d /wm
parent7c76a72b6efd2e2a2b86a36997a2632d15aab89f (diff)
downloadpkgsrc-eb58873d7465f67efbdd6be4d593dd7084821d68.tar.gz
add a patch from upstream CVS to fix a possible bypass of screensaver
lock (CVE-2008-6514), bump PKGREVISION (compile-tested only)
Diffstat (limited to 'wm')
-rw-r--r--wm/compiz-fusion-plugins-main/Makefile4
-rw-r--r--wm/compiz-fusion-plugins-main/distinfo3
-rw-r--r--wm/compiz-fusion-plugins-main/patches/patch-aa43
3 files changed, 47 insertions, 3 deletions
diff --git a/wm/compiz-fusion-plugins-main/Makefile b/wm/compiz-fusion-plugins-main/Makefile
index 65749962c8d..6acb9c68daf 100644
--- a/wm/compiz-fusion-plugins-main/Makefile
+++ b/wm/compiz-fusion-plugins-main/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/17 16:14:56 drochner Exp $
#
DISTNAME= compiz-fusion-plugins-main-0.6.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm x11
MASTER_SITES= http://releases.compiz-fusion.org/0.6.0/
diff --git a/wm/compiz-fusion-plugins-main/distinfo b/wm/compiz-fusion-plugins-main/distinfo
index 1702be6d5f1..7a4fb823bfc 100644
--- a/wm/compiz-fusion-plugins-main/distinfo
+++ b/wm/compiz-fusion-plugins-main/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/05/12 12:47:29 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/04/17 16:14:56 drochner Exp $
SHA1 (compiz-fusion-plugins-main-0.6.0.tar.gz) = 0a2b18b1d4c615153f62665099912c16d2b75c97
RMD160 (compiz-fusion-plugins-main-0.6.0.tar.gz) = 1aed80fbec0b1a015d446aa7dbf35fdf5f9e9d0a
Size (compiz-fusion-plugins-main-0.6.0.tar.gz) = 1182640 bytes
+SHA1 (patch-aa) = 56022a29c546792c73286ae2b47b5ca43d11db42
diff --git a/wm/compiz-fusion-plugins-main/patches/patch-aa b/wm/compiz-fusion-plugins-main/patches/patch-aa
new file mode 100644
index 00000000000..223b034b614
--- /dev/null
+++ b/wm/compiz-fusion-plugins-main/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 2009/04/17 16:14:56 drochner Exp $
+
+--- src/expo/expo.c.orig 2007-10-15 19:43:43.000000000 +0200
++++ src/expo/expo.c
+@@ -1030,10 +1030,6 @@ expoDonePaintScreen (CompScreen * s)
+ continue;
+ }
+
+- if (!(w->type & (CompWindowTypeNormalMask |
+- CompWindowTypeFullscreenMask)))
+- continue;
+-
+ xOffset = s->hsize * s->width;
+ yOffset = s->vsize * s->height;
+
+@@ -1052,6 +1048,18 @@ expoDonePaintScreen (CompScreen * s)
+ if (!inWindow)
+ continue;
+
++ /* make sure we never move windows we're not allowed to move */
++ if (!w->managed)
++ w = NULL;
++ else if (!(w->actions & CompWindowActionMoveMask))
++ w = NULL;
++ else if (w->type & (CompWindowTypeDockMask |
++ CompWindowTypeDesktopMask))
++ w = NULL;
++
++ if (!w)
++ break;
++
+ es->dndState = DnDDuring;
+ es->dndWindow = w;
+
+@@ -1068,7 +1076,7 @@ expoDonePaintScreen (CompScreen * s)
+ }
+ else
+ {
+- /* no window was hovered */
++ /* no (movable) window was hovered */
+ es->dndState = DnDNone;
+ }
+