Control: tags 966602 + pending Dear maintainer,
I've prepared an NMU for libu2f-host (versioned as 1.1.10-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru libu2f-host-1.1.10/debian/changelog libu2f-host-1.1.10/debian/changelog --- libu2f-host-1.1.10/debian/changelog 2019-07-13 13:35:42.000000000 +0200 +++ libu2f-host-1.1.10/debian/changelog 2020-08-07 13:09:25.000000000 +0200 @@ -1,3 +1,11 @@ +libu2f-host (1.1.10-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply upstream patch for compatibility with json-c 0.14 and newer (Closes: + #966602) + + -- Sebastian Ramacher <sramac...@debian.org> Fri, 07 Aug 2020 13:09:25 +0200 + libu2f-host (1.1.10-1) unstable; urgency=high (security fix) [ Nicolas Braud-Santoni ] diff -Nru libu2f-host-1.1.10/debian/patches/840f01135d2892f45e71b9e90405de587991bd03.patch libu2f-host-1.1.10/debian/patches/840f01135d2892f45e71b9e90405de587991bd03.patch --- libu2f-host-1.1.10/debian/patches/840f01135d2892f45e71b9e90405de587991bd03.patch 1970-01-01 01:00:00.000000000 +0100 +++ libu2f-host-1.1.10/debian/patches/840f01135d2892f45e71b9e90405de587991bd03.patch 2020-08-07 13:08:56.000000000 +0200 @@ -0,0 +1,34 @@ +From 840f01135d2892f45e71b9e90405de587991bd03 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besse...@fedoraproject.org> +Date: Mon, 13 Apr 2020 14:12:25 +0200 +Subject: [PATCH] Add support for upcoming json-c 0.14.0. + +TRUE/FALSE are not defined anymore. 1 and 0 are used instead. +--- + u2f-host/u2fmisc.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +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) + { diff -Nru libu2f-host-1.1.10/debian/patches/series libu2f-host-1.1.10/debian/patches/series --- libu2f-host-1.1.10/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libu2f-host-1.1.10/debian/patches/series 2020-08-07 13:09:00.000000000 +0200 @@ -0,0 +1 @@ +840f01135d2892f45e71b9e90405de587991bd03.patch
signature.asc
Description: PGP signature
