diff options
| author | Michael Forney <mforney@mforney.org> | 2019-11-20 13:46:44 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-11-25 20:41:40 -0800 |
| commit | 89637e9bc08dfc3f595a684cb9648521ddf45774 (patch) | |
| tree | 2e03fda4075337526a8f99181321947b1aeaf7ff /pkg/libfido2 | |
| parent | 49c82b4adaa5e773af05aa6fd9172757b3c25d4c (diff) | |
libfido2: Update to latest git
Diffstat (limited to 'pkg/libfido2')
| -rw-r--r-- | pkg/libfido2/patch/0001-Rename-log_-symbols-to-prevent-conflict-when-linking.patch | 27 | ||||
| -rw-r--r-- | pkg/libfido2/patch/0001-hid_linux-Use-sysfs-instead-of-libudev.patch (renamed from pkg/libfido2/patch/0002-hid_linux-Use-sysfs-instead-of-libudev.patch) | 4 | ||||
| m--------- | pkg/libfido2/src | 0 | ||||
| -rw-r--r-- | pkg/libfido2/ver | 2 |
4 files changed, 3 insertions, 30 deletions
diff --git a/pkg/libfido2/patch/0001-Rename-log_-symbols-to-prevent-conflict-when-linking.patch b/pkg/libfido2/patch/0001-Rename-log_-symbols-to-prevent-conflict-when-linking.patch deleted file mode 100644 index 5ec48be2..00000000 --- a/pkg/libfido2/patch/0001-Rename-log_-symbols-to-prevent-conflict-when-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1f79356d6010871a2c4d1818414fa2b21836d865 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sun, 3 Nov 2019 11:37:52 -0800 -Subject: [PATCH] Rename log_* symbols to prevent conflict when linking - statically - ---- - src/extern.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/extern.h b/src/extern.h -index 2f69094..d42ab87 100644 ---- a/src/extern.h -+++ b/src/extern.h -@@ -91,6 +91,9 @@ int rx_cbor_status(fido_dev_t *, int); - #define log_debug(...) do { /* nothing */ } while (0) - #define log_xxd(...) do { /* nothing */ } while (0) - #else -+#define log_init fido_log_init -+#define log_debug fido_log_debug -+#define log_xxd fido_log_xxd - #ifdef __GNUC__ - void log_init(void); - void log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2))); --- -2.24.0 - diff --git a/pkg/libfido2/patch/0002-hid_linux-Use-sysfs-instead-of-libudev.patch b/pkg/libfido2/patch/0001-hid_linux-Use-sysfs-instead-of-libudev.patch index 5021df62..97b00014 100644 --- a/pkg/libfido2/patch/0002-hid_linux-Use-sysfs-instead-of-libudev.patch +++ b/pkg/libfido2/patch/0001-hid_linux-Use-sysfs-instead-of-libudev.patch @@ -1,4 +1,4 @@ -From 2e1668fb21b47ce0805ac39bd31a9e37aee3248f Mon Sep 17 00:00:00 2001 +From 3a6643cacac89dd0c2b6587bb0508b627954c62a Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Fri, 1 Nov 2019 19:39:45 -0700 Subject: [PATCH] hid_linux: Use sysfs instead of libudev @@ -8,7 +8,7 @@ Subject: [PATCH] hid_linux: Use sysfs instead of libudev 1 file changed, 38 insertions(+), 64 deletions(-) diff --git a/src/hid_linux.c b/src/hid_linux.c -index 9d55453..3af396e 100644 +index c7cabc9..4a57e1c 100644 --- a/src/hid_linux.c +++ b/src/hid_linux.c @@ -9,8 +9,8 @@ diff --git a/pkg/libfido2/src b/pkg/libfido2/src -Subproject 12099171ba5ae230aa7d114115a5d1a10cf5975 +Subproject ad22526c42cb5197a714dff29ef4efb20c69ba1 diff --git a/pkg/libfido2/ver b/pkg/libfido2/ver index 89437344..4c98f862 100644 --- a/pkg/libfido2/ver +++ b/pkg/libfido2/ver @@ -1 +1 @@ -1.2.0-74-g1209917 r1 +1.2.0-95-gad22526 r0 |