rpms/gnome-keyring
7
0
Fork 0
Code Issues Pull Requests Releases Activity

backport a fix from svn

Browse Source
This commit is contained in:
Matthias Clasen 2007-07-30 17:43:12 +00:00
parent 426f5bbf93
commit 1612663982
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnome-keyring.spec
View File

@ -3,12 +3,14 @@
Summary: A framework for managing user passwords and other secrets Summary: A framework for managing user passwords and other secrets
Name: gnome-keyring Name: gnome-keyring
Version: 2.19.6 Version: 2.19.6
Release: 1%{?dist} Release: 2%{?dist}
License: GPL/LGPL License: GPL/LGPL
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gnome-keyring/2.19/gnome-keyring-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gnome-keyring/2.19/gnome-keyring-%{version}.tar.bz2
# http://bugzilla.gnome.org/show_bug.cgi?id=461045 # http://bugzilla.gnome.org/show_bug.cgi?id=461045
Patch0: pam.patch Patch0: pam.patch
# fixed in upstream svn
Patch1: init-ret.patch
URL: http://www.gnome.org URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version}
@ -57,6 +59,7 @@ and start the keyring daemon.
%prep %prep
%setup -q -n gnome-keyring-%{version} %setup -q -n gnome-keyring-%{version}
%patch0 -p1 -b .pam %patch0 -p1 -b .pam
%patch1 -p1 -b .init-ret
%build %build
aclocal aclocal
@ -101,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jul 30 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.6-2
- Backport a fix from upstream
* Fri Jul 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.6-1 * Fri Jul 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.6-1
- Update to 2.19.6 - Update to 2.19.6
- Add a pam subpackage - Add a pam subpackage

12
init-ret.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c.init-retval gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c
--- gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c.init-retval 2007-07-30 13:26:41.000000000 -0400
+++ gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c 2007-07-30 13:27:12.000000000 -0400
@@ -1495,7 +1495,7 @@ op_get_item_info (GkrBuffer *packet, Gkr
GkrKeyringItem *item;
GnomeKeyringOpCode opcode;
guint32 item_id, flags;
- gboolean ret;
+ gboolean ret = TRUE;
GnomeKeyringResult res;
if (!gnome_keyring_proto_decode_get_item_info (packet, &opcode, &keyring_name,