diff options
author | pawel <pawel@FreeBSD.org> | 2015-03-30 22:45:53 +0000 |
---|---|---|
committer | pawel <pawel@FreeBSD.org> | 2015-03-30 22:45:53 +0000 |
commit | b4ec19543ae21ef247db78120035a8f3d882d8da (patch) | |
tree | d068ce5d756d85d03cdbaae0f3ec8ecace485a31 | |
parent | 4a41502b195393ceaafb9b47a4a8d4fd67f1ee53 (diff) | |
download | FreeBSD-ports-b4ec19543ae21ef247db78120035a8f3d882d8da.zip FreeBSD-ports-b4ec19543ae21ef247db78120035a8f3d882d8da.tar.gz |
- Update security/libfprint to version 0.6.0 [1]
- Update security/fprintd to version 0.6.0 [1]
- Fix mispelled word in fprintd pkg-descr
- Cleanup pkg-plist in libfprint
PR: 198930 [1]
Submitted by: Martin Birgmeier <la5lbtyi@aon.at> (maintainer of fprintd) [1]
Approved by: lichray@gmail.com (security/libfprint part)
-rw-r--r-- | security/fprintd/Makefile | 2 | ||||
-rw-r--r-- | security/fprintd/distinfo | 4 | ||||
-rw-r--r-- | security/fprintd/files/patch-data__fprintd.pod | 8 | ||||
-rw-r--r-- | security/fprintd/files/patch-pam-pam_fprintd.c | 51 | ||||
-rw-r--r-- | security/fprintd/pkg-descr | 2 | ||||
-rw-r--r-- | security/libfprint/Makefile | 3 | ||||
-rw-r--r-- | security/libfprint/distinfo | 4 | ||||
-rw-r--r-- | security/libfprint/pkg-plist | 1 |
8 files changed, 7 insertions, 68 deletions
diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile index d9b7a15..aaf641f 100644 --- a/security/fprintd/Makefile +++ b/security/fprintd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= fprintd -PORTVERSION= 0.5.1 +PORTVERSION= 0.6.0 CATEGORIES= security MASTER_SITES= http://people.freedesktop.org/~hadess/ diff --git a/security/fprintd/distinfo b/security/fprintd/distinfo index 6ed441c..b3759e5 100644 --- a/security/fprintd/distinfo +++ b/security/fprintd/distinfo @@ -1,2 +1,2 @@ -SHA256 (fprintd-0.5.1.tar.xz) = 9256970fe30cb0332c1932fc0dad3c8d83570eb8e153305e9430e3cd90806e58 -SIZE (fprintd-0.5.1.tar.xz) = 285336 +SHA256 (fprintd-0.6.0.tar.xz) = 3f5462eeb4917d2f74925b904ceb2668c011b732d84fb1c5679f4f9ce9b6c6af +SIZE (fprintd-0.6.0.tar.xz) = 287964 diff --git a/security/fprintd/files/patch-data__fprintd.pod b/security/fprintd/files/patch-data__fprintd.pod deleted file mode 100644 index 714cf32..0000000 --- a/security/fprintd/files/patch-data__fprintd.pod +++ /dev/null @@ -1,8 +0,0 @@ ---- ./data/fprintd.pod.orig 2014-09-20 01:55:30.860796233 +0400 -+++ ./data/fprintd.pod 2014-09-20 01:55:49.300794976 +0400 -@@ -100,3 +100,5 @@ - =over 8 - - =item B<dbus-daemon>, B<gnome-about-me> -+ -+=back diff --git a/security/fprintd/files/patch-pam-pam_fprintd.c b/security/fprintd/files/patch-pam-pam_fprintd.c deleted file mode 100644 index 49d1952..0000000 --- a/security/fprintd/files/patch-pam-pam_fprintd.c +++ /dev/null @@ -1,51 +0,0 @@ -From 7e4630ced2be4b7ecdfb9d60cfe0e0d3de594411 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Mon, 27 Jan 2014 12:24:14 +0100 -Subject: pam: Fix eventfd leak - -When we create our own GMainContext, we need to be the ones -disposing of it as well, as GMainLoop won't take ownership of it. - -From https://bugzilla.redhat.com/show_bug.cgi?id=1050827 - -diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c -index 0f5e5a4..07302a1 100644 ---- pam/pam_fprintd.c -+++ pam/pam_fprintd.c -@@ -170,6 +170,17 @@ static void close_and_unref (DBusGConnection *connection) - dbus_g_connection_unref (connection); - } - -+static void unref_loop (GMainLoop *loop) -+{ -+ GMainContext *ctx; -+ -+ /* The main context was created separately, so -+ * we'll need to unref it ourselves */ -+ ctx = g_main_loop_get_context (loop); -+ g_main_loop_unref (loop); -+ g_main_context_unref (ctx); -+} -+ - #define DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH)) - - static DBusGProxy *open_device(pam_handle_t *pamh, DBusGConnection *connection, DBusGProxy *manager, const char *username, gboolean *has_multiple_devices) -@@ -397,13 +408,13 @@ static int do_auth(pam_handle_t *pamh, const char *username) - dev = open_device(pamh, connection, manager, username, &has_multiple_devices); - g_object_unref (manager); - if (!dev) { -- g_main_loop_unref (loop); -+ unref_loop (loop); - close_and_unref (connection); - return PAM_AUTHINFO_UNAVAIL; - } - ret = do_verify(loop, pamh, dev, has_multiple_devices); - -- g_main_loop_unref (loop); -+ unref_loop (loop); - release_device(pamh, dev); - g_object_unref (dev); - close_and_unref (connection); --- -cgit v0.10.2 - diff --git a/security/fprintd/pkg-descr b/security/fprintd/pkg-descr index 47fe531..4e4525e 100644 --- a/security/fprintd/pkg-descr +++ b/security/fprintd/pkg-descr @@ -1,7 +1,7 @@ Fprintd is a D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus. By adding this daemon layer above libfprint, we solve various problems related to multiple -applications simulatenously competing for fingerprint readers. +applications simultaneously competing for fingerprint readers. While it is not very nice to think of a daemon being necessary in this scenario, fprintd will be launched by D-Bus through the diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile index 4a6105f..b409e1b 100644 --- a/security/libfprint/Makefile +++ b/security/libfprint/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libfprint -PORTVERSION= 0.5.1 -PORTREVISION= 1 +PORTVERSION= 0.6.0 CATEGORIES= security MASTER_SITES= http://people.freedesktop.org/~hadess/ diff --git a/security/libfprint/distinfo b/security/libfprint/distinfo index 830dae8..0ef4967 100644 --- a/security/libfprint/distinfo +++ b/security/libfprint/distinfo @@ -1,2 +1,2 @@ -SHA256 (libfprint-0.5.1.tar.xz) = 6d12563b91888b84b71eee6d2e113d8e9e9940c6a28a0915656b6f86b9568fb3 -SIZE (libfprint-0.5.1.tar.xz) = 494020 +SHA256 (libfprint-0.6.0.tar.xz) = 2583fcb7d542a918c023776f188067fcedec614e65494dd52bc4d661be803cbe +SIZE (libfprint-0.6.0.tar.xz) = 531572 diff --git a/security/libfprint/pkg-plist b/security/libfprint/pkg-plist index 02530fe6..80f34b3 100644 --- a/security/libfprint/pkg-plist +++ b/security/libfprint/pkg-plist @@ -4,4 +4,3 @@ lib/libfprint.so lib/libfprint.so.0 lib/libfprint.so.0.0.0 libdata/pkgconfig/libfprint.pc -@dirrm include/libfprint |