mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-11 18:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

d/p/kFreeBSD_FTBFS_add_ETIME_definition.patch: Updated

Browse Source
This commit is contained in:
Laurent Bigonville
2018-06-21 13:08:58 +02:00
parent f24d71f1ec
commit 9a5c958c0c
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+2 -1
View File
@@ -2,10 +2,11 @@ libfprint (1:0.8.1-1) UNRELEASED; urgency=medium
* New upstream release * New upstream release
- Fix security hole by zero out memory when allocated (Closes: #890827) - 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 * debian/watch: Update the watch file to point to the freedesktop gitlab
release page release page
-- Laurent Bigonville <bigon@debian.org> Thu, 21 Jun 2018 12:55:52 +0200 -- Laurent Bigonville <bigon@debian.org> Thu, 21 Jun 2018 13:08:28 +0200
libfprint (1:0.7.0-1) unstable; urgency=medium libfprint (1:0.7.0-1) unstable; urgency=medium
debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch
Vendored
+20 -15
View File
@@ -8,9 +8,9 @@ Last-Update: 2013-03-03
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/libfprint/drivers/uru4000.c --- a/libfprint/drivers/uru4000.c
+++ b/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 +#ifndef ETIME
+#define ETIME ETIMEDOUT /* For kFreeBSD */ +#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 #define USB_RQ 0x04
--- a/libfprint/drivers/vfs101.c --- a/libfprint/drivers/vfs101.c
+++ b/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 +#ifndef ETIME
+#define ETIME ETIMEDOUT /* For kFreeBSD */ +#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) #define EP_OUT(n) (n | LIBUSB_ENDPOINT_OUT)
--- a/libfprint/drivers/vfs301.c --- a/libfprint/drivers/vfs301.c
+++ b/libfprint/drivers/vfs301.c +++ b/libfprint/drivers/vfs301.c
@@ -21,6 +21,7 @@ @@ -24,6 +24,10 @@
#include "drivers_api.h"
#define FP_COMPONENT "vfs301" #include "vfs301_proto.h"
+
#include <errno.h>
#include <signal.h>
#include <string.h>
@@ -36,6 +37,10 @@
#include "driver_ids.h"
+#ifndef ETIME +#ifndef ETIME
+#define ETIME ETIMEDOUT /* For kFreeBSD */ +#define ETIME ETIMEDOUT /* For kFreeBSD */
@@ -53,3 +45,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
/************************** GENERIC STUFF *************************************/ /************************** GENERIC STUFF *************************************/
/* Callback of asynchronous sleep */ /* 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)