- Update to 2.29.4
This is not intended for building yet, we need to solve
https://bugzilla.redhat.com/show_bug.cgi?id=549709#c1 first. Just
committing my changes.
This commit is contained in:
Tomas Bzatek
parent
f94e404db9
commit
2e46d5b5f7
|
|
@ -1 +1 @@
|
|||
gnome-keyring-2.28.0.tar.bz2
|
||||
gnome-keyring-2.29.4.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c
|
||||
--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass 2009-09-25 21:55:50.000000000 -0400
|
||||
+++ gnome-keyring-2.28.1/pam/gkr-pam-module.c 2009-10-19 11:27:34.000000000 -0400
|
||||
@@ -878,6 +878,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
|
||||
|
||||
started_daemon = 0;
|
||||
|
||||
+
|
||||
/* Should we start the daemon? */
|
||||
if (args & ARG_AUTO_START) {
|
||||
ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
|
||||
@@ -944,8 +945,9 @@ pam_sm_open_session (pam_handle_t *ph, i
|
||||
* different PAM callbacks from different processes.
|
||||
*
|
||||
* No use complaining
|
||||
+ * Do not start gnome-keyring, dbus will start it on login.
|
||||
*/
|
||||
- password = NULL;
|
||||
+ return PAM_SUCCESS;
|
||||
}
|
||||
|
||||
started_daemon = 0;
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
diff -up gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c.bak gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c
|
||||
--- gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c.bak 2009-12-15 04:31:36.000000000 +0100
|
||||
+++ gnome-keyring-2.29.4/daemon/dbus/gkd-dbus-session.c 2009-12-22 14:44:45.000000000 +0100
|
||||
@@ -130,7 +130,11 @@ signal_filter (DBusConnection *conn, DBu
|
||||
unregister_daemon_in_session (conn);
|
||||
gkd_main_quit ();
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
- }
|
||||
+ } else if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
|
||||
+ unregister_daemon_in_session (conn);
|
||||
+ gkd_main_quit ();
|
||||
+ return DBUS_HANDLER_RESULT_HANDLED;
|
||||
+ }
|
||||
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
|
|
@ -1,17 +1,26 @@
|
|||
%define glib2_version 2.16.0
|
||||
%define gtk2_version 2.6.0
|
||||
%define gtk2_version 2.18.0
|
||||
%define dbus_version 1.0
|
||||
%define eggdbus_version 0.4
|
||||
%define hal_version 0.5.7
|
||||
%define gcrypt_version 1.2.2
|
||||
%define libtasn1_version 0.3.4
|
||||
|
||||
Summary: Framework for managing passwords and other secrets
|
||||
Name: gnome-keyring
|
||||
Version: 2.28.0
|
||||
Version: 2.29.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
|
||||
Source: http://download.gnome.org/sources/gnome-keyring/2.29/gnome-keyring-%{version}.tar.bz2
|
||||
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=598494
|
||||
Patch2: gnome-keyring-2.29.4-die-on-session-exit.patch
|
||||
|
||||
# http://bugzilla.redhat.com/529709
|
||||
# http://bugs.gnome.org/598494
|
||||
Patch3: gnome-keyring-2.28.1-nopass.patch
|
||||
|
||||
URL: http://www.gnome.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
|
@ -19,6 +28,7 @@ BuildRequires: glib2-devel >= %{glib2_version}
|
|||
BuildRequires: gtk2-devel >= %{gtk2_version}
|
||||
BuildRequires: GConf2-devel
|
||||
BuildRequires: dbus-devel >= %{dbus_version}
|
||||
BuildRequires: eggdbus-devel >= %{eggdbus_version}
|
||||
BuildRequires: libgcrypt-devel >= %{gcrypt_version}
|
||||
BuildRequires: libtasn1-devel >= %{libtasn1_version}
|
||||
BuildRequires: pam-devel
|
||||
|
|
@ -64,6 +74,8 @@ automatically unlock the "login" keyring when the user logs in.
|
|||
|
||||
%prep
|
||||
%setup -q -n gnome-keyring-%{version}
|
||||
%patch2 -p1 -b .die-on-session-exit
|
||||
%patch3 -p1 -b .no-pass
|
||||
|
||||
%build
|
||||
%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
|
||||
|
|
@ -123,15 +135,15 @@ fi
|
|||
%{_libexecdir}/*
|
||||
%{_datadir}/dbus-1/services/org.gnome.keyring.service
|
||||
%{_datadir}/gcr
|
||||
%{_datadir}/gnome-keyring
|
||||
%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
|
||||
%{_sysconfdir}/xdg/autostart/gnome-keyring-daemon.desktop
|
||||
%{_sysconfdir}/xdg/autostart/*
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_includedir}/*
|
||||
%doc %{_datadir}/gtk-doc/html/gnome-keyring/
|
||||
%doc %{_datadir}/gtk-doc/html/gp11/
|
||||
%doc %{_datadir}/gtk-doc/html/gcr/
|
||||
|
||||
|
|
@ -141,6 +153,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 22 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.29.4-1
|
||||
- Update to 2.29.4
|
||||
|
||||
* Mon Sep 21 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.28.0-1
|
||||
- Update to 2.28.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue