Hello community, here is the log from the commit of package libu2f-server for openSUSE:Factory checked in at 2020-08-20 22:28:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libu2f-server (Old) and /work/SRC/openSUSE:Factory/.libu2f-server.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libu2f-server" Thu Aug 20 22:28:10 2020 rev:4 rq:827929 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libu2f-server/libu2f-server.changes 2018-10-02 19:49:09.489722818 +0200 +++ /work/SRC/openSUSE:Factory/.libu2f-server.new.3399/libu2f-server.changes 2020-08-20 22:28:18.087966523 +0200 @@ -1,0 +2,5 @@ +Tue Aug 18 10:48:34 UTC 2020 - Malte Kraus <[email protected]> + +- Fix build against json-c 0.14.0 (json-c-update.patch) + +------------------------------------------------------------------- New: ---- json-c-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libu2f-server.spec ++++++ --- /var/tmp/diff_new_pack.TizVmc/_old 2020-08-20 22:28:19.351967114 +0200 +++ /var/tmp/diff_new_pack.TizVmc/_new 2020-08-20 22:28:19.351967114 +0200 @@ -1,7 +1,7 @@ # # spec file for package libu2f-server # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,9 +23,10 @@ Summary: Yubico Universal 2nd Factor (U2F) Server C Library License: BSD-2-Clause Group: Productivity/Networking/Security -Url: https://developers.yubico.com/ +URL: https://developers.yubico.com/ Source0: https://developers.yubico.com/libu2f-server/Releases/%{name}-%{version}.tar.xz Source1: https://developers.yubico.com/libu2f-server/Releases/%{name}-%{version}.tar.xz.sig +Patch0: json-c-update.patch BuildRequires: gengetopt BuildRequires: help2man BuildRequires: libhidapi-devel @@ -71,7 +72,7 @@ Command line tool that implements the server-side of the Universal 2nd Factor (U2F) protocol %prep -%setup -q +%autosetup -p1 %build %configure --disable-static ++++++ json-c-update.patch ++++++ commit f7c4983b31909299c47bf9b2627c84b6bfe225de Author: Björn Esser <[email protected]> Date: Mon Apr 13 14:16:20 2020 +0200 Add support for upcoming json-c 0.14.0. TRUE/FALSE are not defined anymore. 1 and 0 are used instead. diff --git a/u2f-server/core.c b/u2f-server/core.c index 2fb325e..895c004 100644 --- a/u2f-server/core.c +++ b/u2f-server/core.c @@ -44,6 +44,19 @@ 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 #endif +/* json-c 0.13.99 does not define TRUE/FALSE anymore + * the json-c maintainers replaced them with pure 1/0 + * https://github.com/json-c/json-c/commit/0992aac61f8b + */ +#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99) +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 +#endif +#endif + static u2fs_rc encode_b64u(const char *data, size_t data_len, char *output) { base64_encodestate b64;
