From 9a5c958c0c6ed83ee8a6fe3c3e327cbee148705e Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Thu, 21 Jun 2018 13:08:58 +0200 Subject: [PATCH] d/p/kFreeBSD_FTBFS_add_ETIME_definition.patch: Updated --- debian/changelog | 3 +- .../kFreeBSD_FTBFS_add_ETIME_definition.patch | 35 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7828b810..453adbbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,11 @@ libfprint (1:0.8.1-1) UNRELEASED; urgency=medium * New upstream release - Fix security hole by zero out memory when allocated (Closes: #890827) + - d/p/kFreeBSD_FTBFS_add_ETIME_definition.patch: Updated * debian/watch: Update the watch file to point to the freedesktop gitlab release page - -- Laurent Bigonville Thu, 21 Jun 2018 12:55:52 +0200 + -- Laurent Bigonville Thu, 21 Jun 2018 13:08:28 +0200 libfprint (1:0.7.0-1) unstable; urgency=medium diff --git a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch index bf8aefde..4cd3a14d 100644 --- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch +++ b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch @@ -8,9 +8,9 @@ Last-Update: 2013-03-03 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/libfprint/drivers/uru4000.c +++ b/libfprint/drivers/uru4000.c -@@ -32,6 +32,10 @@ +@@ -25,6 +25,10 @@ - #include "driver_ids.h" + #include "drivers_api.h" +#ifndef ETIME +#define ETIME ETIMEDOUT /* For kFreeBSD */ @@ -21,9 +21,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #define USB_RQ 0x04 --- a/libfprint/drivers/vfs101.c +++ b/libfprint/drivers/vfs101.c -@@ -27,6 +27,10 @@ +@@ -21,6 +21,10 @@ - #include "driver_ids.h" + #include "drivers_api.h" +#ifndef ETIME +#define ETIME ETIMEDOUT /* For kFreeBSD */ @@ -34,17 +34,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #define EP_OUT(n) (n | LIBUSB_ENDPOINT_OUT) --- a/libfprint/drivers/vfs301.c +++ b/libfprint/drivers/vfs301.c -@@ -21,6 +21,7 @@ - - #define FP_COMPONENT "vfs301" - -+ - #include - #include - #include -@@ -36,6 +37,10 @@ - - #include "driver_ids.h" +@@ -24,6 +24,10 @@ + #include "drivers_api.h" + #include "vfs301_proto.h" +#ifndef ETIME +#define ETIME ETIMEDOUT /* For kFreeBSD */ @@ -53,3 +45,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ /************************** GENERIC STUFF *************************************/ /* Callback of asynchronous sleep */ +--- a/libfprint/drivers/elan.c ++++ b/libfprint/drivers/elan.c +@@ -23,6 +23,10 @@ + #include "drivers_api.h" + #include "elan.h" + ++#ifndef ETIME ++#define ETIME ETIMEDOUT /* For kFreeBSD */ ++#endif ++ + unsigned char elan_get_pixel(struct fpi_frame_asmbl_ctx *ctx, + struct fpi_frame *frame, unsigned int x, + unsigned int y)