From abee49a3eecc0bea82aa15a5d5356d8cd6ab6777 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 26 Jan 2009 10:42:27 +0000 Subject: [PATCH] - Update to latest git, fixes some run-time warnings --- .cvsignore | 2 +- 0001-More-cleanups.patch | 37 ----------------------------- 0001-Update-D-Bus-config-file.patch | 29 ---------------------- fprintd.spec | 13 +++++----- import.log | 1 - sources | 2 +- 6 files changed, 8 insertions(+), 76 deletions(-) delete mode 100644 0001-More-cleanups.patch delete mode 100644 0001-Update-D-Bus-config-file.patch delete mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 4170f0b..81c9aa9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fprintd-0.1-43fe72a2aa.tar.bz2 +fprintd-0.1-04fd09cfa.tar.bz2 diff --git a/0001-More-cleanups.patch b/0001-More-cleanups.patch deleted file mode 100644 index fcf169d..0000000 --- a/0001-More-cleanups.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 27e794d79d42c0a56808e3252b4f869effc8fa7d Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 17 Dec 2008 14:34:25 +0000 -Subject: [PATCH] More cleanups - -Some objects were leaked when no devices were available. Plug those -leaks. ---- - pam/pam_fprintd.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c -index f24e3a0..133c33e 100644 ---- a/pam/pam_fprintd.c -+++ b/pam/pam_fprintd.c -@@ -370,12 +370,17 @@ static int do_auth(pam_handle_t *pamh, const char *username) - - dev = open_device(pamh, connection, manager, username); - g_object_unref (manager); -- if (!dev) -+ if (!dev) { -+ g_main_loop_unref (loop); -+ dbus_g_connection_unref (connection); - return PAM_AUTHINFO_UNAVAIL; -+ } - ret = do_verify(loop, pamh, dev); -+ - g_main_loop_unref (loop); - release_device(pamh, dev); - g_object_unref (dev); -+ dbus_g_connection_unref (connection); - - return ret; - } --- -1.6.0.5 - diff --git a/0001-Update-D-Bus-config-file.patch b/0001-Update-D-Bus-config-file.patch deleted file mode 100644 index d57c36f..0000000 --- a/0001-Update-D-Bus-config-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dac2801bd2aad9568b75c2d38d86272e29528b0e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 9 Dec 2008 14:18:39 +0000 -Subject: [PATCH] Update D-Bus config file - -Following the recent changes in D-Bus, the configuration file -needs to be a bit more explicit. ---- - data/net.reactivated.Fprint.conf | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/data/net.reactivated.Fprint.conf b/data/net.reactivated.Fprint.conf -index dabefa0..1fd0c06 100644 ---- a/data/net.reactivated.Fprint.conf -+++ b/data/net.reactivated.Fprint.conf -@@ -10,4 +10,10 @@ - - - -+ -+ -+ -+ -+ -+ - --- -1.6.0.4 - diff --git a/fprintd.spec b/fprintd.spec index 4e97342..887cadd 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,9 +1,9 @@ -%define long_hash 43fe72a2aad91576e16b418cf31fcbe886c1de60 -%define short_hash 43fe72a2aa +%define long_hash 04fd09cfa88718838e02f4419befc1a0dd4b5a0e +%define short_hash 04fd09cfa Name: fprintd Version: 0.1 -Release: 5.git%{short_hash}%{?dist} +Release: 6.git%{short_hash}%{?dist} Summary: D-Bus service for Fingerprint reader access Group: System Environment/Daemons @@ -16,8 +16,6 @@ License: GPLv2+ Source0: fprintd-0.1-%{short_hash}.tar.bz2 # FIXME remove when we have a newer libfprint Patch0: old-libfprint.patch -Patch1: 0001-Update-D-Bus-config-file.patch -Patch2: 0001-More-cleanups.patch Url: http://www.reactivated.net/fprint/wiki/Fprintd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -60,8 +58,6 @@ fingerprint readers access. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --libdir=/%{_lib}/ --enable-gtk-doc --enable-pam @@ -96,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/fprintd %changelog +* Mon Jan 26 2009 - Bastien Nocera - 0.1-6.git04fd09cfa +- Update to latest git, fixes some run-time warnings + * Wed Dec 17 2008 - Bastien Nocera - 0.1-5.git43fe72a2aa - Add patch to stop leaking a D-Bus connection on failure diff --git a/import.log b/import.log deleted file mode 100644 index e5a9910..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -fprintd-0_1-3_git43fe72a2aa_fc10:HEAD:fprintd-0.1-3.git43fe72a2aa.fc10.src.rpm:1228470389 diff --git a/sources b/sources index 41aeecc..94522ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac9638a644d35da10a6b327a11ccee2b fprintd-0.1-43fe72a2aa.tar.bz2 +13a47aec00b7e9f42f524fe5e6a2695b fprintd-0.1-04fd09cfa.tar.bz2