From 57fd8f5b4620c88e8376126e9d856f0af71cd2e8 Mon Sep 17 00:00:00 2001 From: Randy McCaskill Date: Sun, 31 May 2020 16:45:59 -0400 Subject: [PATCH] libu2f-server: rebuild against json-c 0.14 --- .../patches/lowercase-boolean.patch | 82 +++++++++++++++++++ srcpkgs/libu2f-server/template | 2 +- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libu2f-server/patches/lowercase-boolean.patch diff --git a/srcpkgs/libu2f-server/patches/lowercase-boolean.patch b/srcpkgs/libu2f-server/patches/lowercase-boolean.patch new file mode 100644 index 00000000000..cfa7584633e --- /dev/null +++ b/srcpkgs/libu2f-server/patches/lowercase-boolean.patch @@ -0,0 +1,82 @@ +--- u2f-server/core.c 2018-01-04 09:21:38.000000000 -0500 ++++ u2f-server/core.c 2020-05-31 11:24:48.986906605 -0400 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include "crypto.h" + #include "b64/cencode.h" + #include "b64/cdecode.h" +@@ -41,7 +42,7 @@ + #define u2fs_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) + #else + typedef int json_bool; +-#define u2fs_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE ++#define u2fs_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)false : (json_bool)true + #endif + + static u2fs_rc encode_b64u(const char *data, size_t data_len, char *output) +@@ -477,7 +478,7 @@ + if (jo == NULL) + return U2FS_JSON_ERROR; + +- if (u2fs_json_object_object_get(jo, "challenge", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "challenge", k) == false) + return U2FS_JSON_ERROR; + + p = json_object_get_string(k); +@@ -488,7 +489,7 @@ + if (*challenge == NULL) + return U2FS_MEMORY_ERROR; + +- if (u2fs_json_object_object_get(jo, "origin", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "origin", k) == false) + return U2FS_JSON_ERROR; + + p = json_object_get_string(k); +@@ -520,7 +521,7 @@ + if (jo == NULL) + return U2FS_JSON_ERROR; + +- if (u2fs_json_object_object_get(jo, "registrationData", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "registrationData", k) == false) + return U2FS_JSON_ERROR; + p = json_object_get_string(k); + if (p == NULL) +@@ -529,7 +530,7 @@ + if (*registrationData == NULL) + return U2FS_MEMORY_ERROR; + +- if (u2fs_json_object_object_get(jo, "clientData", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "clientData", k) == false) + return U2FS_JSON_ERROR; + p = json_object_get_string(k); + if (p == NULL) +@@ -1125,7 +1126,7 @@ + if (jo == NULL) + return U2FS_JSON_ERROR; + +- if (u2fs_json_object_object_get(jo, "signatureData", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "signatureData", k) == false) + return U2FS_JSON_ERROR; + p = json_object_get_string(k); + if (p == NULL) +@@ -1134,7 +1135,7 @@ + if (*signatureData == NULL) + return U2FS_MEMORY_ERROR; + +- if (u2fs_json_object_object_get(jo, "clientData", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "clientData", k) == false) + return U2FS_JSON_ERROR; + p = json_object_get_string(k); + if (p == NULL) +@@ -1143,7 +1144,7 @@ + if (*clientData == NULL) + return U2FS_MEMORY_ERROR; + +- if (u2fs_json_object_object_get(jo, "keyHandle", k) == FALSE) ++ if (u2fs_json_object_object_get(jo, "keyHandle", k) == false) + return U2FS_JSON_ERROR; + p = json_object_get_string(k); + if (p == NULL) diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 952b080fca5..e352a5773d8 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-server' pkgname=libu2f-server version=1.1.0 -revision=6 +revision=7 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config gengetopt check"