diff options
Diffstat (limited to 'security/libfprint/files')
7 files changed, 57 insertions, 55 deletions
diff --git a/security/libfprint/files/patch-config.h.in b/security/libfprint/files/patch-config.h.in deleted file mode 100644 index 814e89ce9eb1..000000000000 --- a/security/libfprint/files/patch-config.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h.in.orig 2017-05-14 16:27:23 UTC -+++ config.h.in -@@ -140,3 +140,8 @@ - #ifndef __cplusplus - #undef inline - #endif -+ -+/* FreeBSD >=8 */ -+#ifndef ETIME -+#define ETIME ETIMEDOUT -+#endif diff --git a/security/libfprint/files/patch-libfprint-drivers-vfs301.c b/security/libfprint/files/patch-libfprint-drivers-vfs301.c deleted file mode 100644 index 05f356f43001..000000000000 --- a/security/libfprint/files/patch-libfprint-drivers-vfs301.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/drivers/vfs301.c.orig 2017-01-05 17:18:55 UTC -+++ libfprint/drivers/vfs301.c -@@ -27,7 +27,7 @@ - #include <stdio.h> - #include <assert.h> - #include <stdlib.h> --#include <libusb-1.0/libusb.h> -+#include <libusb.h> - - #include "vfs301_proto.h" - #include <unistd.h> diff --git a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c b/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c deleted file mode 100644 index 0191a418eda7..000000000000 --- a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/drivers/vfs301_proto.c.orig 2013-01-12 13:18:37 UTC -+++ libfprint/drivers/vfs301_proto.c -@@ -33,7 +33,7 @@ - #include <stdio.h> - #include <assert.h> - #include <stdlib.h> --#include <libusb-1.0/libusb.h> -+#include <libusb.h> - - #include "vfs301_proto.h" - #include "vfs301_proto_fragments.h" diff --git a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h b/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h deleted file mode 100644 index af027d5be8bb..000000000000 --- a/security/libfprint/files/patch-libfprint-drivers-vfs301_proto.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/drivers/vfs301_proto.h.orig 2013-01-12 13:18:37 UTC -+++ libfprint/drivers/vfs301_proto.h -@@ -18,7 +18,7 @@ - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ --#include <libusb-1.0/libusb.h> -+#include <libusb.h> - - enum { - VFS301_DEFAULT_WAIT_TIMEOUT = 300, diff --git a/security/libfprint/files/patch-libfprint_Makefile.in b/security/libfprint/files/patch-libfprint_Makefile.in deleted file mode 100644 index 1421223d5249..000000000000 --- a/security/libfprint/files/patch-libfprint_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libfprint/Makefile.in.orig 2017-05-14 16:27:17 UTC -+++ libfprint/Makefile.in -@@ -1578,7 +1578,7 @@ info: info-am - - info-am: - --install-data-am: install-pkgincludeHEADERS install-udev_rulesDATA -+install-data-am: install-pkgincludeHEADERS - - install-dvi: install-dvi-am - diff --git a/security/libfprint/files/patch-libfprint_fp-device.c b/security/libfprint/files/patch-libfprint_fp-device.c new file mode 100644 index 000000000000..b3933580fe59 --- /dev/null +++ b/security/libfprint/files/patch-libfprint_fp-device.c @@ -0,0 +1,17 @@ +--- libfprint/fp-device.c.orig 2024-09-06 12:19:55.705243000 +0200 ++++ libfprint/fp-device.c 2024-09-06 12:22:36.396895000 +0200 +@@ -362,12 +362,14 @@ + static void + device_idle_probe_cb (FpDevice *self, gpointer user_data) + { ++#if defined(__linux) + /* This should not be an idle handler, see comment where it is registered. + * + * This effectively disables USB "persist" for us, and possibly turns off + * USB wakeup if it was enabled for some reason. + */ + fpi_device_configure_wakeup (self, FALSE); ++#endif + + if (!FP_DEVICE_GET_CLASS (self)->probe) + fpi_device_probe_complete (self, NULL, NULL, NULL); diff --git a/security/libfprint/files/patch-libfprint_fpi-device.c b/security/libfprint/files/patch-libfprint_fpi-device.c new file mode 100644 index 000000000000..06551b869843 --- /dev/null +++ b/security/libfprint/files/patch-libfprint_fpi-device.c @@ -0,0 +1,40 @@ +--- libfprint/fpi-device.c.orig 2024-09-05 16:24:40.482243000 +0200 ++++ libfprint/fpi-device.c 2024-09-06 12:13:49.123856000 +0200 +@@ -1690,6 +1690,7 @@ + } + } + ++#if defined(__linux) + void + fpi_device_configure_wakeup (FpDevice *device, gboolean enabled) + { +@@ -1757,6 +1758,7 @@ + return; + } + } ++#endif + + static void + fpi_device_suspend_completed (FpDevice *device) +@@ -1764,9 +1766,11 @@ + g_autoptr(GTask) task = NULL; + FpDevicePrivate *priv = fp_device_get_instance_private (device); + ++#if defined(__linux) + /* We have an ongoing operation, allow the device to wake up the machine. */ + if (priv->current_action != FPI_DEVICE_ACTION_NONE) + fpi_device_configure_wakeup (device, TRUE); ++#endif + + if (priv->critical_section) + g_warning ("Driver was in a critical section at suspend time. It likely deadlocked!"); +@@ -1848,7 +1852,9 @@ + g_return_if_fail (priv->suspend_resume_task); + + priv->is_suspended = FALSE; ++#if defined(__linux) + fpi_device_configure_wakeup (device, FALSE); ++#endif + + task = g_steal_pointer (&priv->suspend_resume_task); + |