Control: tags 958010 + pending Control: tags 966606 + pending Dear maintainer,
I've prepared an NMU for yubikey-personalization (versioned as 1.20.0-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru yubikey-personalization-1.20.0/debian/changelog yubikey-personalization-1.20.0/debian/changelog
--- yubikey-personalization-1.20.0/debian/changelog 2020-01-31 04:05:11.000000000 +0100
+++ yubikey-personalization-1.20.0/debian/changelog 2020-08-07 13:21:24.000000000 +0200
@@ -1,3 +1,11 @@
+yubikey-personalization (1.20.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Apply upstream patches to fix build with GCC 10 and json-c 0.14 and newer
+ (Closes: #958010, #966606)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Fri, 07 Aug 2020 13:21:24 +0200
+
yubikey-personalization (1.20.0-2) unstable; urgency=medium
* Fix install location for AppStream metadata (Closes: #943591)
diff -Nru yubikey-personalization-1.20.0/debian/patches/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch yubikey-personalization-1.20.0/debian/patches/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch
--- yubikey-personalization-1.20.0/debian/patches/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch 1970-01-01 01:00:00.000000000 +0100
+++ yubikey-personalization-1.20.0/debian/patches/09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch 2020-08-07 13:19:48.000000000 +0200
@@ -0,0 +1,25 @@
+From 09ea16d9e2030e4da6ad00c1e5147e962aa7ff84 Mon Sep 17 00:00:00 2001
+From: Klas Lindfors <k...@yubico.com>
+Date: Mon, 17 Feb 2020 08:58:33 +0100
+Subject: [PATCH] make header declarations extern
+
+fixes #155
+---
+ ykpers-args.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ykpers-args.h b/ykpers-args.h
+index 2a63268..9ff455a 100644
+--- a/ykpers-args.h
++++ b/ykpers-args.h
+@@ -33,8 +33,8 @@
+
+ #include "ykpers.h"
+
+-const char *usage;
+-const char *optstring;
++extern const char *usage;
++extern const char *optstring;
+
+ int args_to_config(int argc, char **argv, YKP_CONFIG *cfg, char *oathid,
+ size_t oathid_len, const char **infname,
diff -Nru yubikey-personalization-1.20.0/debian/patches/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch yubikey-personalization-1.20.0/debian/patches/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch
--- yubikey-personalization-1.20.0/debian/patches/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch 1970-01-01 01:00:00.000000000 +0100
+++ yubikey-personalization-1.20.0/debian/patches/0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch 2020-08-07 13:20:35.000000000 +0200
@@ -0,0 +1,83 @@
+From 0aa2e2cae2e1777863993a10c809bb50f4cde7f8 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@eworm.de>
+Date: Sat, 25 Apr 2020 20:55:28 +0200
+Subject: [PATCH] fix boolean value with json-c 0.14
+
+Upstream removed the TRUE and FALSE defines in commit
+0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
+---
+ ykpers-json.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/ykpers-json.c b/ykpers-json.c
+index a62e907..15ad380 100644
+--- a/ykpers-json.c
++++ b/ykpers-json.c
+@@ -40,7 +40,7 @@
+ #define yk_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
+ #else
+ typedef int json_bool;
+-#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
++#define yk_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? 0 : 1
+ #endif
+
+ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) {
+@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP
+ if(p->mode && (mode & p->mode) == mode) {
+ json_object *joption;
+ json_bool ret = yk_json_object_object_get(options, p->json_text, joption);
+- if(ret == TRUE && json_object_get_type(joption) == json_type_boolean) {
++ if(ret == 1 && json_object_get_type(joption) == json_type_boolean) {
+ int value = json_object_get_boolean(joption);
+ if(value == 1) {
+ p->setter(cfg, true);
+@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
+ ykp_errno = YKP_EINVAL;
+ goto out;
+ }
+- if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == FALSE) {
++ if(yk_json_object_object_get(jobj, "yubiProdConfig", yprod_json) == 0) {
+ ykp_errno = YKP_EINVAL;
+ goto out;
+ }
+- if(yk_json_object_object_get(yprod_json, "mode", jmode) == FALSE) {
++ if(yk_json_object_object_get(yprod_json, "mode", jmode) == 0) {
+ ykp_errno = YKP_EINVAL;
+ goto out;
+ }
+- if(yk_json_object_object_get(yprod_json, "options", options) == FALSE) {
++ if(yk_json_object_object_get(yprod_json, "options", options) == 0) {
+ ykp_errno = YKP_EINVAL;
+ goto out;
+ }
+
+- if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == TRUE) {
++ if(yk_json_object_object_get(yprod_json, "targetConfig", jtarget) == 1) {
+ int target_config = json_object_get_int(jtarget);
+ int command;
+ if(target_config == 1) {
+@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
+ if(mode == MODE_OATH_HOTP) {
+ json_object *jdigits, *jrandom;
+ ykp_set_tktflag_OATH_HOTP(cfg, true);
+- if(yk_json_object_object_get(options, "oathDigits", jdigits) == TRUE) {
++ if(yk_json_object_object_get(options, "oathDigits", jdigits) == 1) {
+ int digits = json_object_get_int(jdigits);
+ if(digits == 8) {
+ ykp_set_cfgflag_OATH_HOTP8(cfg, true);
+ }
+ }
+- if(yk_json_object_object_get(options, "randomSeed", jrandom) == TRUE) {
++ if(yk_json_object_object_get(options, "randomSeed", jrandom) == 1) {
+ int random = json_object_get_boolean(jrandom);
+ int seed = 0;
+ if(random == 1) {
+@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
+ goto out;
+ } else {
+ json_object *jseed;
+- if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == TRUE) {
++ if(yk_json_object_object_get(options, "fixedSeedvalue", jseed) == 1) {
+ seed = json_object_get_int(jseed);
+ }
+ }
diff -Nru yubikey-personalization-1.20.0/debian/patches/series yubikey-personalization-1.20.0/debian/patches/series
--- yubikey-personalization-1.20.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ yubikey-personalization-1.20.0/debian/patches/series 2020-08-07 13:20:48.000000000 +0200
@@ -0,0 +1,2 @@
+09ea16d9e2030e4da6ad00c1e5147e962aa7ff84.patch
+0aa2e2cae2e1777863993a10c809bb50f4cde7f8.patch
signature.asc
Description: PGP signature
