Hello community, here is the log from the commit of package gnome-keyring for openSUSE:Factory checked in at Thu Aug 4 14:56:53 CEST 2011. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2011-05-26 23:45:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2011-07-28 00:23:07.000000000 +0200 @@ -1,0 +2,35 @@ +Tue Jul 26 08:01:30 UTC 2011 - gber@opensuse.org + +- Add LightDM support for the pam module: + + Update gnome-keyring-check-session.patch: add support for + LightDM. + + Change pam-config call in %post to add lightdm in + --gnome_keyring-only_if option. + +------------------------------------------------------------------- +Mon Jul 25 14:54:39 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.4: + + New GcrListSelector class for selecting multiple keys. + + Add icons for key and key pair. + + Gcr now has support for loading of GnuPG keys from gpg, + including photos. + + New gcr dependency on p11-kit for loading PKCS#11 modules. + + Remove support for GTK+ 2.x. + + Implement calculation of fingerprints in gcr for keys. + + Fix problems in daemon if IPC lock or FS capabilities are not + available. + + Bug fixes and build fixes. + + Code cleanup and refactoring. +- Drop gnome-keyring-keep-only-ipc_lock.patch and + gnome-keyring-accept-no-ipc_lock.patch: fixed upstream. +- Add pkgconfig(p11-kit-1) BuildRequires, for new dependency. +- Add libselinux-devel BuildRequires, to build SELinux support. +- Remove --with-gtk=3.0 from configure, as GTK+ 2.x support was + removed. +- Rename libgck0 to libgck-1-0, following soname change. +- Rename libgcr-3-1 back to libgcr-3-0, following soversion revert. +- Call %icon_theme_cache_post/%icon_theme_cache_postun in + libgcr-3-0 scriptlets, since the package now comes with icons. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-keyring-3.1.1.tar.bz2 gnome-keyring-accept-no-ipc_lock.patch gnome-keyring-keep-only-ipc_lock.patch New: ---- gnome-keyring-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.fJl8v3/_old 2011-08-04 14:55:20.000000000 +0200 +++ /var/tmp/diff_new_pack.fJl8v3/_new 2011-08-04 14:55:20.000000000 +0200 @@ -19,11 +19,25 @@ Name: gnome-keyring +Version: 3.1.4 +Release: 1 +Url: http://www.gnome.org/ +Group: System/GUI/GNOME +License: GPLv2+ ; LGPLv2.1+ +Summary: GNOME Keyring Password Manager +Source: http://download.gnome.org/sources/gnome-keyring/3.1/%{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, 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 +BuildRequires: ca-certificates BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: intltool BuildRequires: libcap-ng-devel BuildRequires: libgcrypt-devel +BuildRequires: libselinux-devel BuildRequires: pam-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -31,29 +45,13 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libtasn1) -BuildRequires: ca-certificates +BuildRequires: pkgconfig(p11-kit-1) # needed by patch7 BuildRequires: gtk-doc %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common BuildRequires: gtk-doc %endif -Version: 3.1.1 -Release: 1 -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, 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-FIX-UPSTREAM gnome-keyring-keep-only-ipc_lock.patch bnc#682244 bgo#649560 vuntz@opensuse.org -- Drop fs-based caps other than ipc_lock -Patch8: gnome-keyring-keep-only-ipc_lock.patch -# PATCH-FIX-UPSTREAM gnome-keyring-accept-no-ipc_lock.patch bnc#682244 bgo#649560 vuntz@opensuse.org -- Accept to run if we don't have the ipc_lock cap. Note that this might result in unencrypted sensitive data (like passwords) being written to the disk (in the swap) if we use too much memory. -Patch9: gnome-keyring-accept-no-ipc_lock.patch PreReq: permissions Requires: libgck-modules = %{version} Recommends: %{name}-lang @@ -75,20 +73,20 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. -%package -n libgcr-3-1 +%package -n libgcr-3-0 License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Summary: Library for Crypto UI related task Recommends: %{name} = %{version} -%description -n libgcr-3-1 +%description -n libgcr-3-0 GCR is a library for crypto UI and related tasks. %package -n libgcr-devel License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/GNOME Summary: Library for Crypto UI related task - Development Files -Requires: libgcr-3-1 = %{version} +Requires: libgcr-3-0 = %{version} %description -n libgcr-devel The GNOME Keyring is a daemon in the session, similar to ssh-agent, @@ -99,13 +97,13 @@ password, and there is also a session keyring which is never stored to disk, but forgotten when the session ends. -%package -n libgck0 +%package -n libgck-1-0 License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Summary: GObject bindings for PKCS#11 Recommends: libgck-modules = %{version} -%description -n libgck0 +%description -n libgck-1-0 GCK is a wrapper based on GLib implementing the PKCS#11 (Cryptoki) interface. @@ -113,7 +111,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: Development/Libraries/GNOME Summary: GObject bindings for PKCS#11 - Development Files -Requires: libgck0 = %{version} +Requires: libgck-1-0 = %{version} %description -n libgck-devel The GNOME Keyring is a daemon in the session, similar to ssh-agent, @@ -128,7 +126,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: System/GUI/GNOME Summary: Glib wrapper library for PKCS#11 - Modules -Requires: libgck0 = %{version} +Requires: libgck-1-0 = %{version} # libgp11 used to be the library providing all this. It turns out the # modules are, as of 2.91.3, installed in the same place Obsoletes: libgp11-modules < %{version} @@ -168,8 +166,6 @@ translation-update-upstream %patch4 -p1 %patch5 -p1 -%patch8 -p1 -%patch9 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh @@ -182,11 +178,10 @@ %configure\ --enable-pam \ --with-pam-dir=/%{_lib}/security \ - --with-root-certs=%{_sysconfdir}/ssl/certs \ %if 0%{?BUILD_FROM_VCS} --enable-gtk-doc \ %endif - --with-gtk=3.0 + --with-root-certs=%{_sysconfdir}/ssl/certs make %{?jobs:-j%jobs} V=1 %install @@ -219,16 +214,20 @@ %postun %glib2_gsettings_schema_postun -%post -n libgcr-3-1 -p /sbin/ldconfig +%post -n libgcr-3-0 +/sbin/ldconfig +%icon_theme_cache_post -%postun -n libgcr-3-1 -p /sbin/ldconfig +%postun -n libgcr-3-0 +/sbin/ldconfig +%icon_theme_cache_postun -%post -n libgck0 -p /sbin/ldconfig +%post -n libgck-1-0 -p /sbin/ldconfig -%postun -n libgck0 -p /sbin/ldconfig +%postun -n libgck-1-0 -p /sbin/ldconfig %post pam -%{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start --gnome_keyring-only_if=gdm,lxdm || true +%{_sbindir}/pam-config -a --gnome_keyring --gnome_keyring-auto_start --gnome_keyring-only_if=gdm,lxdm,lightdm || true # Remove leftover from the old way, before we used pam-config. We start # cleaning up in 11.2, so this can be removed in 12.2. # Note: this can safely be done after pam-config, since pam-config doesn't @@ -252,6 +251,7 @@ %{_bindir}/gnome-keyring-daemon %{_libexecdir}/gnome-keyring-prompt %{_libexecdir}/gnome-keyring-prompt-3 +%{_sysconfdir}/pkcs11/modules/gnome-keyring-module %dir %{_libdir}/pkcs11 %{_libdir}/pkcs11/gnome-keyring-pkcs11.so %{_datadir}/dbus-1/services/org.freedesktop.secrets.service @@ -271,9 +271,11 @@ %files lang -f %{name}.lang -%files -n libgcr-3-1 +%files -n libgcr-3-0 %defattr (-, root, root) %{_libdir}/libgcr-3.so.* +%{_datadir}/icons/hicolor/*/apps/gcr-key.png +%{_datadir}/icons/hicolor/*/apps/gcr-key-pair.png %{_datadir}/gcr-3/ %files -n libgcr-devel @@ -285,17 +287,17 @@ %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/gcr-3/ -%files -n libgck0 +%files -n libgck-1-0 %defattr (-, root, root) -%{_libdir}/libgck.so.* +%{_libdir}/libgck-1.so.* %dir %{_libdir}/gnome-keyring %dir %{_libdir}/gnome-keyring/devel %files -n libgck-devel %defattr (-, root, root) -%{_libdir}/libgck.so -%{_libdir}/pkgconfig/gck-0.pc -%{_includedir}/gck/ +%{_libdir}/libgck-1.so +%{_libdir}/pkgconfig/gck-1.pc +%{_includedir}/gck-1/ %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/gck/ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.fJl8v3/_old 2011-08-04 14:55:20.000000000 +0200 +++ /var/tmp/diff_new_pack.fJl8v3/_new 2011-08-04 14:55:20.000000000 +0200 @@ -1,5 +1,5 @@ -libgcr-3-1 -libgck0 +libgcr-3-0 +libgck-1-0 gnome-keyring-pam requires "gnome-keyring-pam = <version>" supplements "packageand(gnome-keyring-pam:pam-<targettype>)" ++++++ gnome-keyring-3.1.1.tar.bz2 -> gnome-keyring-3.1.4.tar.bz2 ++++++ ++++ 67212 lines of diff (skipped) ++++++ gnome-keyring-check-session.patch ++++++ --- /var/tmp/diff_new_pack.fJl8v3/_old 2011-08-04 14:55:21.000000000 +0200 +++ /var/tmp/diff_new_pack.fJl8v3/_new 2011-08-04 14:55:21.000000000 +0200 @@ -1,7 +1,7 @@ -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 { +diff -urNp gnome-keyring-3.1.4.orig/pam/gkr-pam-module.c gnome-keyring-3.1.4/pam/gkr-pam-module.c +--- gnome-keyring-3.1.4.orig/pam/gkr-pam-module.c 2011-06-07 19:55:39.000000000 +0200 ++++ gnome-keyring-3.1.4/pam/gkr-pam-module.c 2011-07-26 09:59:39.458000029 +0200 +@@ -91,10 +91,50 @@ enum { #endif #endif @@ -13,8 +13,8 @@ - + +/* 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. */ ++ * or LXDE. Note that this only works if the service is gdm, lxdm or ++ * lightdm, so we return TRUE in all other cases. */ +static int +starting_supported_desktop (pam_handle_t *ph) +{ @@ -28,7 +28,8 @@ + return 1; + + if (strcmp (service, "gdm") != 0 && -+ strcmp (service, "lxdm") != 0) ++ strcmp (service, "lxdm") != 0 && ++ strcmp (service, "lightdm") != 0) + return 1; + + session = get_any_env (ph, "DESKTOP_SESSION"); @@ -52,7 +53,7 @@ static void close_safe (int fd) { -@@ -833,7 +872,7 @@ pam_sm_authenticate (pam_handle_t *ph, i +@@ -867,7 +907,7 @@ pam_sm_authenticate (pam_handle_t *ph, i started_daemon = 0; /* Should we start the daemon? */ @@ -61,7 +62,7 @@ ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon); if (ret != PAM_SUCCESS) return ret; -@@ -905,7 +944,7 @@ pam_sm_open_session (pam_handle_t *ph, i +@@ -939,7 +979,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