Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at Fri Jan 14 16:45:05 CET 2011. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2010-12-15 12:11:19.000000000 +0100 +++ gnome-keyring/gnome-keyring.changes 2011-01-14 14:02:49.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 29 14:54:55 UTC 2010 - gber@opensuse.org + +- Update gnome-keyring-check-session.patch to add support for Xfce + sessions. +- Add gnome-keyring-autostart-in-xfce.patch to autostart + gnome-keyring in XFCE sessions. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-keyring-autostart-in-xfce.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.FRvNIe/_old 2011-01-14 16:44:06.000000000 +0100 +++ /var/tmp/diff_new_pack.FRvNIe/_new 2011-01-14 16:44:06.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gnome-keyring (Version 2.32.1) +# spec file for package gnome-keyring # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,17 +29,19 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files Version: 2.32.1 -Release: 3 +Release: 4 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPLv2+ ; LGPLv2.1+ Summary: GNOME Keyring Password Manager Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FEATURE-OPENSUSE gnome-keyring-check-session.patch vuntz@novell.com -- Only start gnome-keyring in the pam module if GNOME or LXDE is started +# PATCH-FEATURE-OPENSUSE gnome-keyring-check-session.patch vuntz@novell.com -- Only start gnome-keyring in the pam module if GNOME, Xfce or LXDE is started Patch4: gnome-keyring-check-session.patch # PATCH-FIX-OPENSUSE gnome-keyring-pam-auth-prompt-password.patch bnc466732 bgo560488 vuntz@novell.com -- Make the pam module prompt the password in auth, so we can use pam-config. This is a workaround until bnc#477488 is implemented. Patch5: gnome-keyring-pam-auth-prompt-password.patch +# PATCH-FEATURE-OPENSUSE gnome-keyring-autostart-in-xfce.patch gber@opensuse.org -- Fix desktop files so that gnome keyring is autostarted in XFCE sessions as well. +Patch6: gnome-keyring-autostart-in-xfce.patch Requires: libgp11-modules = %{version} Recommends: %{name}-lang Recommends: %{name}-pam @@ -155,6 +157,7 @@ translation-update-upstream %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %configure\ ++++++ gnome-keyring-autostart-in-xfce.patch ++++++ diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-gpg.desktop.in gnome-keyring-2.32.1/daemon/gnome-keyring-gpg.desktop.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-gpg.desktop.in 2010-10-26 00:47:49.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-gpg.desktop.in 2010-12-29 15:52:30.000000000 +0100 @@ -3,7 +3,7 @@ _Name=GPG Password Agent _Comment=GNOME Keyring: GPG Agent Exec= gnome-keyring-daemon --start --components=gpg -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-gpg.desktop.in.in gnome-keyring-2.32.1/daemon/gnome-keyring-gpg.desktop.in.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-gpg.desktop.in.in 2010-10-19 04:11:38.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-gpg.desktop.in.in 2010-12-29 15:52:40.000000000 +0100 @@ -3,7 +3,7 @@ _Name=GPG Password Agent _Comment=GNOME Keyring: GPG Agent Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=gpg -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-pkcs11.desktop.in gnome-keyring-2.32.1/daemon/gnome-keyring-pkcs11.desktop.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-pkcs11.desktop.in 2010-10-26 00:47:49.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-pkcs11.desktop.in 2010-12-29 15:52:48.000000000 +0100 @@ -3,7 +3,7 @@ _Name=Certificate and Key Storage _Comment=GNOME Keyring: PKCS#11 Component Exec=/usr/bin/gnome-keyring-daemon --start --components=pkcs11 -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in gnome-keyring-2.32.1/daemon/gnome-keyring-pkcs11.desktop.in.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in 2010-10-19 04:11:45.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-pkcs11.desktop.in.in 2010-12-29 15:52:58.000000000 +0100 @@ -3,7 +3,7 @@ _Name=Certificate and Key Storage _Comment=GNOME Keyring: PKCS#11 Component Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=pkcs11 -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-secrets.desktop.in gnome-keyring-2.32.1/daemon/gnome-keyring-secrets.desktop.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-secrets.desktop.in 2010-10-26 00:47:49.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-secrets.desktop.in 2010-12-29 15:53:06.000000000 +0100 @@ -3,7 +3,7 @@ _Name=Secret Storage Service _Comment=GNOME Keyring: Secret Service Exec=/usr/bin/gnome-keyring-daemon --start --components=secrets -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-secrets.desktop.in.in gnome-keyring-2.32.1/daemon/gnome-keyring-secrets.desktop.in.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-secrets.desktop.in.in 2010-10-19 04:11:45.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-secrets.desktop.in.in 2010-12-29 15:53:13.000000000 +0100 @@ -3,7 +3,7 @@ _Name=Secret Storage Service _Comment=GNOME Keyring: Secret Service Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=secrets -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-ssh.desktop.in gnome-keyring-2.32.1/daemon/gnome-keyring-ssh.desktop.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-ssh.desktop.in 2010-10-26 00:47:49.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-ssh.desktop.in 2010-12-29 15:53:20.000000000 +0100 @@ -3,7 +3,7 @@ _Name=SSH Key Agent _Comment=GNOME Keyring: SSH Agent Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true diff -ur gnome-keyring-2.32.1.orig/daemon/gnome-keyring-ssh.desktop.in.in gnome-keyring-2.32.1/daemon/gnome-keyring-ssh.desktop.in.in --- gnome-keyring-2.32.1.orig/daemon/gnome-keyring-ssh.desktop.in.in 2010-10-19 04:11:45.000000000 +0200 +++ gnome-keyring-2.32.1/daemon/gnome-keyring-ssh.desktop.in.in 2010-12-29 15:53:27.000000000 +0100 @@ -3,7 +3,7 @@ _Name=SSH Key Agent _Comment=GNOME Keyring: SSH Agent Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=ssh -OnlyShowIn=GNOME;LXDE; +OnlyShowIn=GNOME;XFCE;LXDE; X-GNOME-Autostart-Phase=Initialization X-GNOME-AutoRestart=false X-GNOME-Autostart-Notify=true ++++++ gnome-keyring-check-session.patch ++++++ --- /var/tmp/diff_new_pack.FRvNIe/_old 2011-01-14 16:44:06.000000000 +0100 +++ /var/tmp/diff_new_pack.FRvNIe/_new 2011-01-14 16:44:06.000000000 +0100 @@ -1,8 +1,7 @@ -Index: gnome-keyring-2.32.0/pam/gkr-pam-module.c -=================================================================== ---- gnome-keyring-2.32.0.orig/pam/gkr-pam-module.c -+++ gnome-keyring-2.32.0/pam/gkr-pam-module.c -@@ -91,10 +91,47 @@ enum { +diff -urp gnome-keyring-2.32.1.orig/pam/gkr-pam-module.c gnome-keyring-2.32.1/pam/gkr-pam-module.c +--- gnome-keyring-2.32.1.orig/pam/gkr-pam-module.c 2010-09-05 23:50:15.000000000 +0200 ++++ gnome-keyring-2.32.1/pam/gkr-pam-module.c 2011-01-14 12:20:37.000000000 +0100 +@@ -91,10 +91,49 @@ enum { #endif #endif @@ -13,7 +12,7 @@ */ - + -+/* We don't want to start the keyring if the session is not GNOME ++/* We don't want to start the keyring if the session is not GNOME, Xfce + * or LXDE. Note that this only works if the service is gdm or lxdm, + * so we return TRUE in all other cases. */ +static int @@ -42,6 +41,8 @@ + return 1; + if (strcmp (session, "smeegol") == 0) + return 1; ++ if (strcmp (session, "xfce") == 0) ++ return 1; + if (strcmp (session, "LXDE") == 0) + return 1; + @@ -51,7 +52,7 @@ static void close_safe (int fd) { -@@ -833,7 +870,7 @@ pam_sm_authenticate (pam_handle_t *ph, i +@@ -833,7 +872,7 @@ pam_sm_authenticate (pam_handle_t *ph, i started_daemon = 0; /* Should we start the daemon? */ @@ -60,7 +61,7 @@ ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon); if (ret != PAM_SUCCESS) return ret; -@@ -905,7 +942,7 @@ pam_sm_open_session (pam_handle_t *ph, i +@@ -905,7 +944,7 @@ pam_sm_open_session (pam_handle_t *ph, i started_daemon = 0; /* Should we start the daemon? */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org