This following diff is the fix for bugs 6865652 and 6607629. The fix
will disable restart and kill options in xscreensaver-demo when launched
from non-public trusted zone.
Index: patches/xscreensaver-50-bug-6865652.diff
===================================================================
--- patches/xscreensaver-50-bug-6865652.diff (revision 0)
+++ patches/xscreensaver-50-bug-6865652.diff (revision 0)
@@ -0,0 +1,30 @@
+--- xscreensaver-5.01/driver/demo-Gtk.c.original 2009-11-24
15:56:10.380368000 +0530
++++ xscreensaver-5.01/driver/demo-Gtk.c 2009-11-24
16:01:51.638023000 +0530
+@@ -2859,6 +2859,8 @@
+ if ( ! tsol_hack_initialized && tsol_multi_label_session )
+ {
+ GtkWidget *doc_menu = name_to_widget(s, "doc_menu");
++ GtkWidget *restart_menu = name_to_widget(s,"restart");
++ GtkWidget *kill_menu = name_to_widget(s, "kill_menu");
+ GtkWidget *lock_spinbutton = name_to_widget(s, "lock_spinbutton");
+ GtkWidget *lock_container = name_to_widget(s, "blanking_table");
+ GtkWidget *lock_button_eventbox = name_to_widget(s,
"lock_button_eventbox");
+@@ -2876,6 +2878,8 @@
+ Display *dpy = GDK_DISPLAY();
+
+ gtk_widget_hide(doc_menu);
++ gtk_widget_set_sensitive(restart_menu, FALSE);
++ gtk_widget_set_sensitive(kill_menu, FALSE);
+
+ adj = gtk_spin_button_get_adjustment((GtkSpinButton
*)lock_spinbutton);
+
+@@ -3028,6 +3032,9 @@
+
+ for (i = 0; i < countof(names); i++)
+ {
++ if ( tsol_is_multi_label_session() && 2==i )
++ continue;
++
+ GtkWidget *w = name_to_widget (s, names[i]);
+ gtk_widget_set_sensitive (GTK_WIDGET(w), running_p);
+ }
Index: SUNWxscreensaver.spec
===================================================================
--- SUNWxscreensaver.spec (revision 20329)
+++ SUNWxscreensaver.spec (working copy)
@@ -150,6 +150,8 @@
Patch48: xscreensaver-48-bug-6839026.diff
# date:2009-09-29 owner:au230626 type:bug bugster:6845488
Patch49: xscreensaver-49-bug-6845488.diff
+# date:2009-12-28 owner:ng228438 type:bug bugster:6865652
+Patch50: xscreensaver-50-bug-6865652.diff
# date:2009-12-22 owner:alanc type:bug
Patch51: xscreensaver-51-dpms-headers.diff
@@ -331,6 +333,7 @@
%patch47 -p1
%patch48 -p1
%patch49 -p1
+%patch50 -p1
%patch51 -p1
chmod a+x install-sh configure
