Hello community, here is the log from the commit of package gnome-keyring checked in at Sat Dec 22 19:33:15 CET 2007. -------- --- GNOME/gnome-keyring/gnome-keyring.changes 2007-10-25 13:30:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-keyring/gnome-keyring.changes 2007-12-20 20:45:25.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Dec 20 13:40:10 CST 2007 - maw@suse.de + +- Update to version 2.21.4: + + Build fixes for various platforms and against various libraries + + Print few useless warning messages + + Simpler API for accessing and storing passwords + + PAM module now works with SELinux + + Includes an SSH agent + + Added basic x.509 certificate and key store + + PKCS#11 module + + ASN.1 support +- Don't package license files. + +------------------------------------------------------------------- Old: ---- gnome-keyring-2.20.tar.bz2 New: ---- gnome-keyring-2.21.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-keyring.spec ++++++ --- /var/tmp/diff_new_pack.gm5210/_old 2007-12-22 19:33:05.000000000 +0100 +++ /var/tmp/diff_new_pack.gm5210/_new 2007-12-22 19:33:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-keyring (Version 2.20) +# spec file for package gnome-keyring (Version 2.21.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: gnome-keyring #BuildRequires: CASA-devel -BuildRequires: fdupes gtk-doc gtk2-devel intltool libgcrypt-devel pam-devel update-desktop-files -Version: 2.20 -Release: 13 +BuildRequires: fdupes gtk-doc gtk2-devel intltool libgcrypt-devel libtasn1-devel pam-devel update-desktop-files +Version: 2.21.4 +Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME -License: GPL v2 or later; LGPL v2 or later +License: GPL v2 or later; LGPL v2.1 or later Summary: GNOME Keyring Password Manager Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.bz2 Patch1: gnome-keyring-use-markup-correctly.patch @@ -44,6 +44,7 @@ Group: System/GUI/GNOME Summary: GNOME Keyring Password Manager Requires: %{name} = %{version} +PreReq: sed # Package was present in OpenSUSE 10.2 and 10.3: Obsoletes: pam_keyring <= 0.0.8 Provides: pam_keyring <= 0.0.8 @@ -101,7 +102,7 @@ %setup -q %patch1 ### %patch3 -p1 -%patch4 -p1 +%patch4 %build autoreconf -f -i @@ -116,6 +117,7 @@ make DESTDIR=$RPM_BUILD_ROOT install install-pam %find_lang %{name} %fdupes $RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_lib}/security/*.la %clean # rm -rf $RPM_BUILD_ROOT @@ -151,10 +153,11 @@ %files %defattr (-, root, root) -%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README TODO +%doc AUTHORS ChangeLog NEWS README TODO %{_bindir}/* %{_libdir}/*.so.* %{_prefix}/lib/gnome-keyring-1 +%{_libdir}/gnome-keyring %files lang -f %{name}.lang @@ -172,7 +175,19 @@ %files doc %defattr (-, root, root) %{_datadir}/gtk-doc/html/gnome-keyring + %changelog +* Thu Dec 20 2007 - maw@suse.de +- Update to version 2.21.4: + + Build fixes for various platforms and against various libraries + + Print few useless warning messages + + Simpler API for accessing and storing passwords + + PAM module now works with SELinux + + Includes an SSH agent + + Added basic x.509 certificate and key store + + PKCS#11 module + + ASN.1 support +- Don't package license files. * Wed Oct 10 2007 - sbrabec@suse.cz - Replace old pam_keyring. * Mon Sep 17 2007 - mauro@suse.de ++++++ gnome-keyring-2.20.tar.bz2 -> gnome-keyring-2.21.4.tar.bz2 ++++++ ++++ 63970 lines of diff (skipped) ++++++ gnome-keyring-check-session.patch ++++++ --- /var/tmp/diff_new_pack.gm5210/_old 2007-12-22 19:33:07.000000000 +0100 +++ /var/tmp/diff_new_pack.gm5210/_new 2007-12-22 19:33:07.000000000 +0100 @@ -1,17 +1,24 @@ -diff -ur /usr/src/packages/BUILD/gnome-keyring-2.19.91/pam/gkr-pam-module.c ./pam/gkr-pam-module.c ---- /usr/src/packages/BUILD/gnome-keyring-2.19.91/pam/gkr-pam-module.c 2007-08-24 16:29:53.000000000 -0400 -+++ ./pam/gkr-pam-module.c 2007-09-10 12:07:04.000000000 -0400 -@@ -727,9 +727,12 @@ - } - } +=== modified file 'pam/gkr-pam-module.c' +--- pam/gkr-pam-module.c 2007-12-20 17:59:15 +0000 ++++ pam/gkr-pam-module.c 2007-12-20 18:05:43 +0000 +@@ -795,6 +795,9 @@ -- /* Should we start the daemon? */ if (args & ARG_AUTO_START) { -+ /* we don't start the keyring if we're not starting a gnome-session */ -+ if (strncmp (getenv ("WINDOWMANAGER"), "/usr/bin/gnome", 14)) -+ return PAM_SUCCESS; -+ - ret = start_daemon_if_necessary (ph, pwd); ++ /* we don't start the keyring if we're not starting a gnome-session */ ++ if (strncmp (getenv ("WINDOWMANAGER"), "/usr/bin/gnome", 14)) ++ return PAM_SUCCESS; + ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon); if (ret != PAM_SUCCESS) return ret; +@@ -862,6 +865,9 @@ + + /* Should we start the daemon? */ + if (args & ARG_AUTO_START) { ++ /* we don't start the keyring if we're not starting a gnome-session */ ++ if (strncmp (getenv ("WINDOWMANAGER"), "/usr/bin/gnome", 14)) ++ return PAM_SUCCESS; + ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon); + if (ret != PAM_SUCCESS) + return ret; + ++++++ gnome-keyring-use-markup-correctly.patch ++++++ --- /var/tmp/diff_new_pack.gm5210/_old 2007-12-22 19:33:07.000000000 +0100 +++ /var/tmp/diff_new_pack.gm5210/_new 2007-12-22 19:33:07.000000000 +0100 @@ -1,9 +1,7 @@ -? gnome-keyring-use-markup-correctly.patch -Index: ui/gkr-ask-tool.c -=================================================================== ---- ui/gkr-ask-tool.c.orig -+++ ui/gkr-ask-tool.c -@@ -45,8 +45,9 @@ static gchar* +=== modified file 'ui/gkr-ask-tool.c' +--- ui/gkr-ask-tool.c 2007-12-20 17:59:15 +0000 ++++ ui/gkr-ask-tool.c 2007-12-20 17:59:37 +0000 +@@ -56,8 +56,9 @@ create_markup (const gchar *primary, const gchar *secondary) { /* We're passed markup for both of these */ @@ -15,18 +13,19 @@ } static gchar* -@@ -271,9 +272,12 @@ run_dialog (gboolean include_password, +@@ -282,9 +283,12 @@ g_free (value); g_free (value2); - message_widget = GTK_LABEL (gtk_label_new (message)); -- g_free (message); + /* message_widget = GTK_LABEL (gtk_label_new (message)); */ + message_widget = GTK_LABEL (gtk_label_new (NULL)); - gtk_label_set_use_markup (message_widget, TRUE); ++ gtk_label_set_use_markup (message_widget, TRUE); + gtk_label_set_markup (message_widget, message); -+ g_free (message); + g_free (message); +- gtk_label_set_use_markup (message_widget, TRUE); + /* gtk_label_set_use_markup (message_widget, TRUE); */ gtk_misc_set_alignment (GTK_MISC (message_widget), 0.0, 0.5); gtk_label_set_line_wrap (message_widget, TRUE); gtk_label_set_justify (message_widget, + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de