oasis

commit: 2f19a0b2c9119113d4935b656706ad811c720014
parent b45c19b8f6802a82335790d0d7b973dae769e422
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 14 Nov 2019 20:10:56 -0800

libfido2: Small tweaks to patches

Diffstat:
M
pkg/libfido2/patch/0001-Rename-log_-symbols-to-prevent-conflict-when-linking.patch
34
++++++++++------------------------
M
pkg/libfido2/patch/0002-hid_linux-Use-sysfs-instead-of-libudev.patch
25
+++++++++++++------------
M
pkg/libfido2/ver
2
+-

3 files changed, 24 insertions(+), 37 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
@@ -1,41 +1,27 @@
-From 448eaf9f2d065bcf76c0c9e253a24f743032ddba Mon Sep 17 00:00:00 2001
+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 | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
+ src/extern.h | 3 +++
+ 1 file changed, 3 insertions(+)
 
 diff --git a/src/extern.h b/src/extern.h
-index 2f69094..a6c757d 100644
+index 2f69094..d42ab87 100644
 --- a/src/extern.h
 +++ b/src/extern.h
-@@ -92,14 +92,17 @@ int rx_cbor_status(fido_dev_t *, int);
+@@ -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
- #ifdef __GNUC__
--void log_init(void);
--void log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
--void log_xxd(const void *, size_t);
-+void fido_log_init(void);
-+void fido_log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
-+void fido_log_xxd(const void *, size_t);
- #else
--void log_init(void);
--void log_debug(const char *, ...);
--void log_xxd(const void *, size_t);
-+void fido_log_init(void);
-+void fido_log_debug(const char *, ...);
-+void fido_log_xxd(const void *, size_t);
- #endif /* __GNUC__ */
 +#define log_init	fido_log_init
 +#define log_debug	fido_log_debug
 +#define log_xxd		fido_log_xxd
- #endif /* FIDO_NO_DIAGNOSTIC */
- 
- /* u2f */
+ #ifdef __GNUC__
+ void log_init(void);
+ void log_debug(const char *, ...) __attribute__((__format__ (printf, 1, 2)));
 -- 
-2.23.0
+2.24.0
 
diff --git a/pkg/libfido2/patch/0002-hid_linux-Use-sysfs-instead-of-libudev.patch b/pkg/libfido2/patch/0002-hid_linux-Use-sysfs-instead-of-libudev.patch
@@ -1,14 +1,14 @@
-From 8cd6f18a9435ced27e765cb8d50991097a00d8c1 Mon Sep 17 00:00:00 2001
+From 2e1668fb21b47ce0805ac39bd31a9e37aee3248f 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
 
 ---
  src/hid_linux.c | 102 ++++++++++++++++++------------------------------
- 1 file changed, 37 insertions(+), 65 deletions(-)
+ 1 file changed, 38 insertions(+), 64 deletions(-)
 
 diff --git a/src/hid_linux.c b/src/hid_linux.c
-index 9d55453..2a888e5 100644
+index 9d55453..3af396e 100644
 --- a/src/hid_linux.c
 +++ b/src/hid_linux.c
 @@ -9,8 +9,8 @@
@@ -52,7 +52,7 @@ index 9d55453..2a888e5 100644
  		if (strncmp(p, "HID_ID=", 7) == 0) {
  			if (sscanf(p + 7, "%*x:%hx:%hx", &x, &y) == 2) {
  				*vendor_id = (int16_t)x;
-@@ -174,50 +171,32 @@ parse_uevent(struct udev_device *dev, int16_t *vendor_id, int16_t *product_id)
+@@ -174,50 +171,34 @@ parse_uevent(struct udev_device *dev, int16_t *vendor_id, int16_t *product_id)
  		}
  	}
  
@@ -85,11 +85,12 @@ index 9d55453..2a888e5 100644
 -	    (dev = udev_device_new_from_syspath(udev, name)) == NULL ||
 -	    (path = udev_device_get_devnode(dev)) == NULL ||
 -	    is_fido(path) == 0)
--		goto fail;
++	r = snprintf(path, sizeof(path), "/dev/%s", name);
++	if (r < 0 || (size_t)r >= sizeof(path))
+ 		goto fail;
 -
 -	if ((hid_parent = udev_device_get_parent_with_subsystem_devtype(dev,
 -	    "hid", NULL)) == NULL)
-+	snprintf(path, sizeof(path), "/dev/%s", name);
 +	if (is_fido(path) == 0)
  		goto fail;
 +	di->path = strdup(path);
@@ -111,12 +112,12 @@ index 9d55453..2a888e5 100644
 -	di->path = strdup(path);
 -	di->manufacturer = strdup(manufacturer);
 -	di->product = strdup(product);
-+	di->manufacturer = strdup("Unknown");
-+	di->product = strdup("Unknown");
++	di->manufacturer = strdup("unknown");
++	di->product = strdup("unknown");
  
  	if (di->path == NULL ||
  	    di->manufacturer == NULL ||
-@@ -226,9 +205,6 @@ copy_info(fido_dev_info_t *di, struct udev *udev,
+@@ -226,9 +207,6 @@ copy_info(fido_dev_info_t *di, struct udev *udev,
  
  	ok = 0;
  fail:
@@ -126,7 +127,7 @@ index 9d55453..2a888e5 100644
  	if (ok < 0) {
  		free(di->path);
  		free(di->manufacturer);
-@@ -239,14 +215,17 @@ fail:
+@@ -239,14 +217,17 @@ fail:
  	return (ok);
  }
  
@@ -149,7 +150,7 @@ index 9d55453..2a888e5 100644
  
  	*olen = 0;
  
-@@ -256,29 +235,22 @@ fido_dev_info_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
+@@ -256,29 +237,22 @@ fido_dev_info_manifest(fido_dev_info_t *devlist, size_t ilen, size_t *olen)
  	if (devlist == NULL)
  		return (FIDO_ERR_INVALID_ARGUMENT);
  
@@ -188,5 +189,5 @@ index 9d55453..2a888e5 100644
  }
  
 -- 
-2.23.0
+2.24.0
 
diff --git a/pkg/libfido2/ver b/pkg/libfido2/ver
@@ -1 +1 @@
-1.2.0-74-g1209917 r0
+1.2.0-74-g1209917 r1