Control: tags 966604 + pending
Dear maintainer, I've prepared an NMU for libu2f-server (versioned as 1.1.0-3.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-server-1.1.0/debian/changelog libu2f-server-1.1.0/debian/changelog --- libu2f-server-1.1.0/debian/changelog 2020-03-05 02:41:30.000000000 +0100 +++ libu2f-server-1.1.0/debian/changelog 2020-08-07 13:15:15.000000000 +0200 @@ -1,3 +1,11 @@ +libu2f-server (1.1.0-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply upstream patch to fix build with json-c 0.14 and newer (Closes: + #966604) + + -- Sebastian Ramacher <sramac...@debian.org> Fri, 07 Aug 2020 13:15:15 +0200 + libu2f-server (1.1.0-3) unstable; urgency=low [ nicoo ] diff -Nru libu2f-server-1.1.0/debian/patches/f7c4983b31909299c47bf9b2627c84b6bfe225de.patch libu2f-server-1.1.0/debian/patches/f7c4983b31909299c47bf9b2627c84b6bfe225de.patch --- libu2f-server-1.1.0/debian/patches/f7c4983b31909299c47bf9b2627c84b6bfe225de.patch 1970-01-01 01:00:00.000000000 +0100 +++ libu2f-server-1.1.0/debian/patches/f7c4983b31909299c47bf9b2627c84b6bfe225de.patch 2020-08-07 13:14:36.000000000 +0200 @@ -0,0 +1,34 @@ +From f7c4983b31909299c47bf9b2627c84b6bfe225de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besse...@fedoraproject.org> +Date: Mon, 13 Apr 2020 14:16:20 +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-server/core.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +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; diff -Nru libu2f-server-1.1.0/debian/patches/series libu2f-server-1.1.0/debian/patches/series --- libu2f-server-1.1.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libu2f-server-1.1.0/debian/patches/series 2020-08-07 13:14:39.000000000 +0200 @@ -0,0 +1 @@ +f7c4983b31909299c47bf9b2627c84b6bfe225de.patch
signature.asc
Description: PGP signature
