Mailinglist Archive: opensuse-commit (1206 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package gnome-session
checked in at Mon May 15 12:48:33 CEST 2006.

--------
--- GNOME/gnome-session/gnome-session.changes	2006-05-09 18:41:15.000000000 +0200
+++ STABLE/gnome-session/gnome-session.changes	2006-05-13 04:16:16.000000000 +0200
@@ -1,0 +2,7 @@
+Sat May 13 04:12:55 CEST 2006 - hpj@xxxxxxx
+
+- Update keyring unlockage patch to try both CASA's
+  Gnome_Keyring_Default and Desktop passwords. Part of fix for
+  Novell bug #174093.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-session.spec ++++++
--- /var/tmp/diff_new_pack.HZPhf0/_old	2006-05-15 12:47:50.000000000 +0200
+++ /var/tmp/diff_new_pack.HZPhf0/_new	2006-05-15 12:47:50.000000000 +0200
@@ -18,7 +18,7 @@
 Group:          System/GUI/GNOME
 Autoreqprov:    on
 Version:        2.12.0
-Release:        106
+Release:        109
 Summary:        Session Tools for the GNOME 2.x Desktop
 Source:         gnome-session-%{version}.tar.bz2
 Source1:        gnome
@@ -150,6 +150,10 @@
 %dir /usr/share/xsessions
 
 %changelog -n gnome-session
+* Sat May 13 2006 - hpj@xxxxxxx
+- Update keyring unlockage patch to try both CASA's
+  Gnome_Keyring_Default and Desktop passwords. Part of fix for
+  Novell bug #174093.
 * Tue May 09 2006 - joeshaw@xxxxxxx
 - Fix a bash arithmetic typo introduced in the March 27 commit.
   (bnc #173808)


++++++ gnome-session-2.12.0-unlock-keyring.patch ++++++
--- /var/tmp/diff_new_pack.HZPhf0/_old	2006-05-15 12:47:51.000000000 +0200
+++ /var/tmp/diff_new_pack.HZPhf0/_new	2006-05-15 12:47:51.000000000 +0200
@@ -1,6 +1,6 @@
 diff -Nurp gnome-session-2.12.0-pre/gnome-session/main.c gnome-session-2.12.0-post/gnome-session/main.c
---- gnome-session-2.12.0-pre/gnome-session/main.c	2006-02-06 12:22:55.000000000 -0600
-+++ gnome-session-2.12.0-post/gnome-session/main.c	2006-02-06 12:45:08.000000000 -0600
+--- gnome-session-2.12.0-pre/gnome-session/main.c	2006-05-11 23:49:45.000000000 -0500
++++ gnome-session-2.12.0-post/gnome-session/main.c	2006-05-12 00:02:58.000000000 -0500
 @@ -29,6 +29,10 @@
  #include <sys/socket.h>  /* For have_ipv6() */
  #include <netdb.h>
@@ -57,7 +57,7 @@
  
 +/* modified for CASA -- start */
 +static gchar *
-+get_casa_password (void)
++get_casa_password (gboolean try_gnome_keyring)
 +{
 +  int rcode = 0;
 +  int32_t credtype = SSCS_CRED_TYPE_BASIC_F;
@@ -84,7 +84,7 @@
 +	{
 +  	p_miCASAGetCredential = (CASA_GetCredential_T)dlsym(casaIDK, "miCASAGetCredential");
 +	    rcode = p_miCASAGetCredential (0,
-+	                               &appSecretId,
++	                               try_gnome_keyring ? &appSecretId : NULL,
 +	                               &sharedSecretId,
 +	                               &credtype,
 +	                               &credential,
@@ -123,24 +123,38 @@
    
    if (getenv ("GSM_VERBOSE_DEBUG"))
      gsm_set_verbose (TRUE);
-@@ -341,6 +421,22 @@ main (int argc, char *argv[])
+@@ -341,6 +421,36 @@ main (int argc, char *argv[])
  
    gsm_remote_desktop_start ();
  
-+  password = get_casa_password ();
++  password = get_casa_password (TRUE);
 +
 +  if (password) {
-+    if (gnome_keyring_get_default_keyring_sync (&default_keyring) != GNOME_KEYRING_RESULT_OK ||
-+        !default_keyring || !strlen (default_keyring))
++    GnomeKeyringResult result;
++
++    result = gnome_keyring_get_default_keyring_sync (&default_keyring);
++
++    if (result != GNOME_KEYRING_RESULT_OK || !default_keyring || !strlen (default_keyring))
 +      create_default_keyring (password);
 +
-+    if (gnome_keyring_unlock_sync (default_keyring, password) == GNOME_KEYRING_RESULT_NO_SUCH_KEYRING) {
++    result = gnome_keyring_unlock_sync (default_keyring, password);
++
++    if (result == GNOME_KEYRING_RESULT_NO_SUCH_KEYRING) {
 +      create_default_keyring (password);
 +      gnome_keyring_unlock_sync (default_keyring, password);
 +    }
 +
-+    memset (password, 0, strlen (password));
-+    g_free (password);
++    if (result != GNOME_KEYRING_RESULT_OK) {
++      password = get_casa_password (FALSE);
++      if (password) {
++        gnome_keyring_unlock_sync (default_keyring, password);
++      }
++    }
++
++    if (password) {
++      memset (password, 0, strlen (password));
++      g_free (password);
++    }
 +  }
 +
    if (splashing)
@@ -148,7 +162,7 @@
  
 diff -Nurp gnome-session-2.12.0-pre/gnome-session/Makefile.am gnome-session-2.12.0-post/gnome-session/Makefile.am
 --- gnome-session-2.12.0-pre/gnome-session/Makefile.am	2005-07-18 03:37:54.000000000 -0500
-+++ gnome-session-2.12.0-post/gnome-session/Makefile.am	2006-02-06 12:21:51.000000000 -0600
++++ gnome-session-2.12.0-post/gnome-session/Makefile.am	2006-05-11 23:49:57.000000000 -0500
 @@ -7,6 +7,7 @@ INCLUDES =						\
  	$(STANDARD_PROPERTIES_CFLAGS)			\
  	$(WARN_CFLAGS)					\



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...