Changes the default DPMS timeouts for new users to match the Xorg 1.7
defaults (more LCD/laptop friendly) set by:
http://cgit.freedesktop.org/xorg/xserver/commit/?id=d52fddefaeb43f15b677eefbea4a288a9948373b
Also instead of having patch03 change lockTimeout from 0min to 30min,
and patch32 change it back from 30min to 0min, just leave it at 0min
to begin with, and then update patch9 & patch22 to apply cleanly to
the result.
-Alan Coopersmith- alan.coopersmith at sun.com
Sun Microsystems, Inc. - X Window System Engineering
Index: patches/xscreensaver-03-Sun.app-defaults.diff
===================================================================
--- patches/xscreensaver-03-Sun.app-defaults.diff (revision 19673)
+++ patches/xscreensaver-03-Sun.app-defaults.diff (working copy)
@@ -39,6 +39,7 @@
4871833 DPMS settings should be consistent between CDE and Gnome
6368607 increase unlock dialog box timeout to 2 minutes
6526791 xscreensaver and Xorg need to change timeouts for MOU4
+6652454 xscreensaver does not invoke after IDLE time expires from a Sun Ray DTU
diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/driver/XScreenSaver.ad.in
xscreensaver-5.01/driver/XScreenSaver.ad.in
--- xscreensaver-5.01/driver/XScreenSaver.ad.in 2006-09-18
19:36:38.000000000 -0700
@@ -48,24 +49,22 @@
! /* (xrdb prevention kludge: whole file)
-*mode: random
--*timeout: 0:10:00
+! We want the default mode to be just blank the screen
+*mode: blank
-+*timeout: 0:15:00
+ *timeout: 0:10:00
*cycle: 0:10:00
--*lockTimeout: 0:00:00
+ *lockTimeout: 0:00:00
-*passwdTimeout: 0:00:30
-*dpmsEnabled: False
-*dpmsStandby: 2:00:00
-*dpmsSuspend: 2:00:00
-*dpmsOff: 4:00:00
-*grabDesktopImages: True
-+*lockTimeout: 0:30:00
+*passwdTimeout: 0:02:00
+*dpmsEnabled: True
-+*dpmsStandby: 0:15:00
-+*dpmsSuspend: 0:18:00
-+*dpmsOff: 0:21:00
++*dpmsStandby: 0:10:00
++*dpmsSuspend: 0:10:00
++*dpmsOff: 0:10:00
+*grabDesktopImages: False
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
Index: patches/xscreensaver-32-XScr.ad.lockTimeout.diff
===================================================================
--- patches/xscreensaver-32-XScr.ad.lockTimeout.diff (revision 19673)
+++ patches/xscreensaver-32-XScr.ad.lockTimeout.diff (working copy)
@@ -1,44 +0,0 @@
-/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons
- * to whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder
- * shall not be used in advertising or otherwise to promote the sale, use
- * or other dealings in this Software without prior written authorization
- * of the copyright holder.
- *
- */
-
-Fix for: 6652454, P1, gnome/screensaver - xscreensaver does not invoke after
IDLE time expires from a Sun Ray DTU
-
-diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/driver/XScreenSaver.ad.in
xscreensaver-5.01/driver/XScreenSaver.ad.in
---- xscreensaver-5.01/driver/XScreenSaver.ad.in 2009-05-27
17:24:40.143520000 -0700
-+++ xscreensaver-5.01/driver/XScreenSaver.ad.in 2009-05-27
17:25:00.065484000 -0700
-@@ -32,7 +32,7 @@
- *mode: blank
- *timeout: 0:15:00
- *cycle: 0:10:00
--*lockTimeout: 0:30:00
-+*lockTimeout: 0:00:00
- *passwdTimeout: 0:02:00
- *passwdTimeoutEnabled: True
- *allowRoot: False
Index: patches/xscreensaver-22-allowRootByPassFlag.diff
===================================================================
--- patches/xscreensaver-22-allowRootByPassFlag.diff (revision 19673)
+++ patches/xscreensaver-22-allowRootByPassFlag.diff (working copy)
@@ -34,13 +34,13 @@
--- xscreensaver-5.01/driver/XScreenSaver.ad.in 2009-05-27
17:21:39.593353000 -0700
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in 2009-05-27
17:21:58.339459000 -0700
@@ -35,6 +35,7 @@
- *lockTimeout: 0:30:00
+ *lockTimeout: 0:00:00
*passwdTimeout: 0:02:00
*passwdTimeoutEnabled: True
+*allowRoot: False
*dpmsEnabled: True
- *dpmsStandby: 0:15:00
- *dpmsSuspend: 0:18:00
+ *dpmsStandby: 0:10:00
+ *dpmsSuspend: 0:10:00
diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/driver/passwd-pam.c
xscreensaver-5.01/driver/passwd-pam.c
--- xscreensaver-5.01/driver/passwd-pam.c 2009-05-27 17:21:39.565525000
-0700
+++ xscreensaver-5.01/driver/passwd-pam.c 2009-05-27 17:21:58.375722000
-0700
Index: patches/xscreensaver-09-passwdTimeout-pref.diff
===================================================================
--- patches/xscreensaver-09-passwdTimeout-pref.diff (revision 19673)
+++ patches/xscreensaver-09-passwdTimeout-pref.diff (working copy)
@@ -38,12 +38,12 @@
+++ xscreensaver-5.01/driver/XScreenSaver.ad.in 2009-05-27
17:18:06.927404000 -0700
@@ -34,6 +34,7 @@
*cycle: 0:10:00
- *lockTimeout: 0:30:00
+ *lockTimeout: 0:00:00
*passwdTimeout: 0:02:00
+*passwdTimeoutEnabled: True
*dpmsEnabled: True
- *dpmsStandby: 0:15:00
- *dpmsSuspend: 0:18:00
+ *dpmsStandby: 0:10:00
+ *dpmsSuspend: 0:10:00
diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/driver/demo-Gtk.c
xscreensaver-5.01/driver/demo-Gtk.c
--- xscreensaver-5.01/driver/demo-Gtk.c 2009-05-27 17:17:49.447653000
-0700
+++ xscreensaver-5.01/driver/demo-Gtk.c 2009-05-27 17:18:06.939609000
-0700
Index: SUNWxscreensaver.spec
===================================================================
--- SUNWxscreensaver.spec (revision 19673)
+++ SUNWxscreensaver.spec (working copy)
@@ -117,8 +117,6 @@
Patch30: xscreensaver-30-bug-6610282.diff
# date:2008-02-08 owner:uejio type:bug bugster:6475285
Patch31: xscreensaver-31-bug-6475285.diff
-# date:2008-02-14 owner:ma54148 type:bug bugster:6652454
-Patch32: xscreensaver-32-XScr.ad.lockTimeout.diff
# date:2008-02-11 owner:uejio type:bug bugster:6583181
Patch33: xscreensaver-33-bug-6583181.diff
# date:2008-02-27 owner:ma54148 type:bug bugster:6585644
@@ -315,7 +313,6 @@
%patch29 -p1
%patch30 -p1
%patch31 -p1
-%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35 -p1
@@ -668,6 +665,10 @@
%endif
%changelog
+* Mon Oct 19 2009 - alan.coopersmith at sun.com
+- Change default DPMS settings to match Xorg 1.7 defaults (10 minutes)
+- Merge xscreensaver-32-XScr.ad.lockTimeout.diff
+ into xscreensaver-03-Sun.app-defaults.diff
* Wed Sep 23 2009 - alan.coopersmith at sun.com
- Move files from /usr/X11 to /usr (PSARC 2009/482)
* Mon Aug 24 2009 - alan.coopersmith at sun.com
