Hello community, here is the log from the commit of package libu2f-host for openSUSE:Factory checked in at 2020-08-24 15:12:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libu2f-host (Old) and /work/SRC/openSUSE:Factory/.libu2f-host.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libu2f-host" Mon Aug 24 15:12:45 2020 rev:14 rq:828708 version:1.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/libu2f-host/libu2f-host.changes 2019-06-18 14:56:10.201409954 +0200 +++ /work/SRC/openSUSE:Factory/.libu2f-host.new.3399/libu2f-host.changes 2020-08-24 15:13:27.722696935 +0200 @@ -1,0 +2,5 @@ +Fri Aug 21 13:54:14 UTC 2020 - Malte Kraus <[email protected]> + +- Add support for json-c 0.14.0 (json-c-update.patch) + +------------------------------------------------------------------- New: ---- json-c-update.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libu2f-host.spec ++++++ --- /var/tmp/diff_new_pack.gpvtO3/_old 2020-08-24 15:13:28.370697250 +0200 +++ /var/tmp/diff_new_pack.gpvtO3/_new 2020-08-24 15:13:28.374697253 +0200 @@ -1,7 +1,7 @@ # # spec file for package libu2f-host # -# Copyright (c) 2019 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 @@ -26,6 +26,7 @@ URL: https://developers.yubico.com/ Source0: https://developers.yubico.com/libu2f-host/Releases/%{name}-%{version}.tar.xz Source1: https://developers.yubico.com/libu2f-host/Releases/%{name}-%{version}.tar.xz.sig +Patch0: json-c-update.patch BuildRequires: libhidapi-devel BuildRequires: libtool BuildRequires: libzip @@ -74,7 +75,7 @@ Documentation files for the host side of the U2F protocol. %prep -%setup -q +%autosetup -p1 %build %configure --disable-static --with-openssl --with-udevrulesdir=%{_udevrulesdir} ++++++ json-c-update.patch ++++++ commit 840f01135d2892f45e71b9e90405de587991bd03 Author: Björn Esser <[email protected]> Date: Mon Apr 13 14:12:25 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-host/u2fmisc.c b/u2f-host/u2fmisc.c index e40ca3d..5a032ce 100644 --- a/u2f-host/u2fmisc.c +++ b/u2f-host/u2fmisc.c @@ -33,6 +33,19 @@ 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 #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 void dumpHex (unsigned char *data, int offs, int len) {
