--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/xscreensaver/patches/0018-verbose-messages.patch Tue Mar 08 09:00:31 2016 -0800
@@ -0,0 +1,51 @@
+From 178bbcab5659a1090e323cf8bf7468098fa153a1 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sat, 2 Jan 2016 23:12:27 -0800
+Subject: [PATCH] verbose messages
+
+Bug 16559 - xscreensaver shows extra messages
+https://defect.opensolaris.org/bz/show_bug.cgi?id=16559
+
+Make messages that annoy users only appear when verbose is set.
+(Upstream wasn't showing these until we started capturing stderr.)
+---
+ driver/passwd.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/driver/passwd.c b/driver/passwd.c
+index 350dc4d..765741d 100644
+--- a/driver/passwd.c
++++ b/driver/passwd.c
+@@ -285,8 +285,11 @@ xss_authenticate(saver_info *si, Bool verbose_p)
+ si->cached_passwd &&
+ !*si->cached_passwd)
+ {
+- fprintf (stderr, "%s: assuming null password means cancel.\n",
+- blurb());
++ if (verbose_p)
++ {
++ fprintf (stderr, "%s: assuming null password means cancel.\n",
++ blurb());
++ }
+ si->unlock_state = ul_cancel;
+ }
+
+@@ -315,11 +318,14 @@ xss_authenticate(saver_info *si, Bool verbose_p)
+ {
+ /* If any auth method gets a cancel or timeout, don't try the
+ next auth method! We're done! */
+- fprintf (stderr,
++ if (verbose_p)
++ {
++ fprintf (stderr,
+ "%s: authentication via %s %s.\n",
+ blurb(), methods[i].name,
+ (si->unlock_state == ul_cancel
+ ? "cancelled" : "timed out"));
++ }
+ goto DONE;
+ }
+ }
+--
+2.6.1
+