From ce66381b8643e01c60cd299484268b2f467055dd Mon Sep 17 00:00:00 2001 From: Randy McCaskill Date: Sun, 31 May 2020 16:45:11 -0400 Subject: [PATCH] libu2f-host: rebuild against json-c 0.14 --- .../patches/lowercase-boolean.patch | 37 +++++++++++++++++++ srcpkgs/libu2f-host/template | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libu2f-host/patches/lowercase-boolean.patch diff --git a/srcpkgs/libu2f-host/patches/lowercase-boolean.patch b/srcpkgs/libu2f-host/patches/lowercase-boolean.patch new file mode 100644 index 00000000000..aa3b8deed85 --- /dev/null +++ b/srcpkgs/libu2f-host/patches/lowercase-boolean.patch @@ -0,0 +1,37 @@ +--- u2f-host/u2fmisc.c 2019-05-15 07:54:11.000000000 -0400 ++++ u2f-host/u2fmisc.c 2020-05-31 11:19:24.305252337 -0400 +@@ -19,6 +19,7 @@ + #include "internal.h" + + #include ++#include + + #include "sha256.h" + +@@ -30,7 +31,7 @@ + #define u2fh_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) + #else + typedef int json_bool; +-#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE ++#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)false : (json_bool)true + #endif + + static void +@@ -114,7 +115,7 @@ + if (debug) + fprintf (stderr, "JSON: %s\n", json_object_to_json_string (jo)); + +- if (u2fh_json_object_object_get (jo, "appId", k) == FALSE) ++ if (u2fh_json_object_object_get (jo, "appId", k) == false) + return U2FH_JSON_ERROR; + + app_id = json_object_get_string (k); +@@ -390,7 +391,7 @@ + if (debug) + fprintf (stderr, "JSON: %s\n", json_object_to_json_string (jo)); + +- if (u2fh_json_object_object_get (jo, key, k) == FALSE) ++ if (u2fh_json_object_object_get (jo, key, k) == false) + return U2FH_JSON_ERROR; + + urlb64 = json_object_get_string (k); diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index 0942b9d03d8..ae1a50577a2 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-host' pkgname=libu2f-host version=1.1.10 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d"