rpms/gnome-screensaver/F-7 gnome-screensaver-2.18.2-clear-clipboard.patch, NONE, 1.1 gnome-screensaver.spec, 1.154, 1.155

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-screensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21982

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-2.18.2-clear-clipboard.patch 
Log Message:
- Address CVE-2007-6389 (bug 426169)


gnome-screensaver-2.18.2-clear-clipboard.patch:

--- NEW FILE gnome-screensaver-2.18.2-clear-clipboard.patch ---
diff -up gnome-screensaver-2.18.2/src/gs-lock-plug.c.clear-clipboard gnome-screensaver-2.18.2/src/gs-lock-plug.c
--- gnome-screensaver-2.18.2/src/gs-lock-plug.c.clear-clipboard	2007-04-23 15:09:48.000000000 -0400
+++ gnome-screensaver-2.18.2/src/gs-lock-plug.c	2008-03-28 10:27:10.000000000 -0400
@@ -1439,6 +1439,19 @@ delete_handler (GSLockPlug  *plug,
         return TRUE; /* Do not destroy */
 }
 
+static void
+clear_clipboards (GSLockPlug *plug)
+{
+        GtkClipboard *clipboard;
+
+        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (plug), GDK_SELECTION_PRIMARY);
+        gtk_clipboard_clear (clipboard);
+        gtk_clipboard_set_text (clipboard, "", -1);
+        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (plug), GDK_SELECTION_CLIPBOARD);
+        gtk_clipboard_clear (clipboard);
+        gtk_clipboard_set_text (clipboard, "", -1);
+}
+
 #define INVISIBLE_CHAR_DEFAULT       '*'
 #define INVISIBLE_CHAR_BLACK_CIRCLE  0x25cf
 #define INVISIBLE_CHAR_WHITE_BULLET  0x25e6
@@ -1454,6 +1467,8 @@ gs_lock_plug_init (GSLockPlug *plug)
 
         plug->priv = GS_LOCK_PLUG_GET_PRIVATE (plug);
 
+        clear_clipboards (plug);
+
         if (! load_theme (plug)) {
                 gs_debug ("Unable to load theme!");
 


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/F-7/gnome-screensaver.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- gnome-screensaver.spec	9 Jul 2007 16:16:43 -0000	1.154
+++ gnome-screensaver.spec	28 Mar 2008 14:27:59 -0000	1.155
@@ -13,7 +13,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.18.2
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 License: GPL
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@
 Patch3: gnome-screensaver-2.18.0-user-dirs.patch
 
 Patch7: gnome-screensaver-2.18.0-handle-overlapping-heads.patch
+Patch8: gnome-screensaver-2.18.2-clear-clipboard.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 URL: http://www.gnome.org
@@ -71,6 +72,7 @@
 %patch2 -p1 -b .securitytoken
 %patch3 -p1 -b .user-dirs
 %patch7 -p1 -b .handle-overlapping-screens
+%patch8 -p1 -b .clear-clipboard
 
 %build
 autoreconf
@@ -127,6 +129,9 @@
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Fri Mar 28 2008 Ray Strode <rstrode at redhat.com> - 2.18.2-3
+- Address CVE-2007-6389 (bug 426169)
+
 * Mon Jul  9 2007 Ray Strode <rstrode at redhat.com> - 2.18.2-2
 - add build requires to fix fade in animation (bug 247485)