gentoo resync 08.09.2018

3 files changed, 194 insertions, 72 deletions

diff --git a/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch b/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch
deleted file mode 100644
index e82082ab6d6a..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 43eca622cd49b58c87157e1ff1a2fcfdfba0934e Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Sun, 13 Jan 2013 13:42:13 +0000
-Subject: configure.ac: Use AC_CONFIG_HEADERS
-
-AM_CONFIG_HEADER is obsolete, use AC_CONFIG_HEADERS instead of it.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59320
----
-diff --git a/configure.ac b/configure.ac
-index 6737256..978ef0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@ AC_INIT([libfprint], [0.5.0])
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz check-news])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([libfprint/core.c])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- # Enable silent build when available (Automake 1.11)
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch b/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
deleted file mode 100644
index 98f72aed5a0d..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3b3679c900f6739f7067f8d720e15d548bb39be9 Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Sun, 13 Jan 2013 13:43:38 +0000
-Subject: upeke2: Add support for 147e:2020 ID
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59320
----
-diff --git a/libfprint/drivers/upeke2.c b/libfprint/drivers/upeke2.c
-index ed8f43d..a7db54d 100644
---- a/libfprint/drivers/upeke2.c
-+++ b/libfprint/drivers/upeke2.c
-@@ -46,6 +46,11 @@
- #define MSG_READ_BUF_SIZE 0x40
- #define MAX_DATA_IN_READ_BUF (MSG_READ_BUF_SIZE - 9)
- 
-+enum {
-+        UPEKE2_2016,
-+        UPEKE2_2020,
-+};
-+
- struct upeke2_dev {
- 	gboolean enroll_passed;
- 	gboolean first_verify_iteration;
-@@ -848,8 +853,10 @@ static struct fpi_ssm *deinitsm_new(struct fp_dev *dev)
- 
- static int discover(struct libusb_device_descriptor *dsc, uint32_t *devtype)
- {
--	/* Revision 2 is what we're interested in */
--	if (dsc->bcdDevice == 2)
-+	if (dsc->idProduct == 0x2016 && dsc->bcdDevice == 2)
-+		return 1;
-+
-+	if (dsc->idProduct == 0x2020 && dsc->bcdDevice == 1)
- 		return 1;
- 
- 	return 0;
-@@ -1453,7 +1460,8 @@ static int verify_stop(struct fp_dev *dev, gboolean iterating)
- }
- 
- static const struct usb_id id_table[] = {
--	{ .vendor = 0x147e, .product = 0x2016 },
-+	{ .vendor = 0x147e, .product = 0x2016, .driver_data = UPEKE2_2016 },
-+	{ .vendor = 0x147e, .product = 0x2020, .driver_data = UPEKE2_2020 },
- 	{ 0, 0, 0, }, /* terminating entry */
- };
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch b/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
new file mode 100644
index 000000000000..15b49597238c
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
@@ -0,0 +1,194 @@
+From 17cbe376872d8a0f579a0497942a5d2f19facaf5 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Sun, 2 Sep 2018 17:20:03 +0300
+Subject: [PATCH] Fix implicit declaration warnings
+
+---
+ libfprint/drivers/aes1610.c    | 2 ++
+ libfprint/drivers/aes2501.c    | 2 ++
+ libfprint/drivers/aes2550.c    | 2 ++
+ libfprint/drivers/aesx660.c    | 2 ++
+ libfprint/drivers/etes603.c    | 2 ++
+ libfprint/drivers/upeksonly.c  | 2 ++
+ libfprint/drivers/upektc.c     | 2 ++
+ libfprint/drivers/upektc_img.c | 2 ++
+ libfprint/drivers/upekts.c     | 2 ++
+ libfprint/drivers/vfs0050.c    | 2 ++
+ libfprint/drivers/vfs101.c     | 3 +++
+ libfprint/drivers/vfs301.c     | 3 +++
+ libfprint/drivers/vfs5011.c    | 2 ++
+ 13 files changed, 28 insertions(+)
+
+diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
+index f307a3b..9dc3383 100644
+--- a/libfprint/drivers/aes1610.c
++++ b/libfprint/drivers/aes1610.c
+@@ -25,6 +25,8 @@
+ 
+ #define FP_COMPONENT "aes1610"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ 
+diff --git a/libfprint/drivers/aes2501.c b/libfprint/drivers/aes2501.c
+index 87879a4..caaf3ea 100644
+--- a/libfprint/drivers/aes2501.c
++++ b/libfprint/drivers/aes2501.c
+@@ -23,6 +23,8 @@
+ 
+ #define FP_COMPONENT "aes2501"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ #include "aes2501.h"
+diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c
+index ab4acaa..c838e54 100644
+--- a/libfprint/drivers/aes2550.c
++++ b/libfprint/drivers/aes2550.c
+@@ -23,6 +23,8 @@
+ 
+ #define FP_COMPONENT "aes2550"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aes2550.h"
+ #include "aeslib.h"
+diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c
+index e443e21..17c0245 100644
+--- a/libfprint/drivers/aesx660.c
++++ b/libfprint/drivers/aesx660.c
+@@ -23,6 +23,8 @@
+ 
+ #define FP_COMPONENT "aesX660"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ #include "aesx660.h"
+diff --git a/libfprint/drivers/etes603.c b/libfprint/drivers/etes603.c
+index fdaf7f2..0782f9e 100644
+--- a/libfprint/drivers/etes603.c
++++ b/libfprint/drivers/etes603.c
+@@ -35,6 +35,8 @@
+ 
+ #define FP_COMPONENT "etes603"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "driver_ids.h"
+ 
+diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c
+index 9cccb86..e035408 100644
+--- a/libfprint/drivers/upeksonly.c
++++ b/libfprint/drivers/upeksonly.c
+@@ -25,6 +25,8 @@
+ 
+ #define FP_COMPONENT "upeksonly"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "upeksonly.h"
+ 
+diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c
+index ffa31f3..e4d7de5 100644
+--- a/libfprint/drivers/upektc.c
++++ b/libfprint/drivers/upektc.c
+@@ -20,6 +20,8 @@
+ 
+ #define FP_COMPONENT "upektc"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "upektc.h"
+ 
+diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c
+index f0f2f18..a500623 100644
+--- a/libfprint/drivers/upektc_img.c
++++ b/libfprint/drivers/upektc_img.c
+@@ -19,6 +19,8 @@
+ 
+ #define FP_COMPONENT "upektc_img"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "aeslib.h"
+ #include "upektc_img.h"
+diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
+index b448e36..1094e66 100644
+--- a/libfprint/drivers/upekts.c
++++ b/libfprint/drivers/upekts.c
+@@ -27,6 +27,8 @@
+ 
+ #define FP_COMPONENT "upekts"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ 
+ #define EP_IN (1 | LIBUSB_ENDPOINT_IN)
+diff --git a/libfprint/drivers/vfs0050.c b/libfprint/drivers/vfs0050.c
+index dcf5d69..60a720e 100644
+--- a/libfprint/drivers/vfs0050.c
++++ b/libfprint/drivers/vfs0050.c
+@@ -19,6 +19,8 @@
+ 
+ #define FP_COMPONENT "vfs0050"
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "vfs0050.h"
+ 
+diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
+index 3304b1f..473adf2 100644
+--- a/libfprint/drivers/vfs101.c
++++ b/libfprint/drivers/vfs101.c
+@@ -19,6 +19,9 @@
+ 
+ #define FP_COMPONENT "vfs101"
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "drivers_api.h"
+ 
+ /* Input-Output usb endpoint */
+diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c
+index a34ee31..6f52316 100644
+--- a/libfprint/drivers/vfs301.c
++++ b/libfprint/drivers/vfs301.c
+@@ -21,6 +21,9 @@
+ 
+ #define FP_COMPONENT "vfs301"
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "vfs301_proto.h"
+ 
+diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
+index 8b460ac..1355394 100644
+--- a/libfprint/drivers/vfs5011.c
++++ b/libfprint/drivers/vfs5011.c
+@@ -18,6 +18,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#include <string.h>
++
+ #include "drivers_api.h"
+ #include "vfs5011_proto.h"
+ 
+-- 
+2.16.4