diff options
Diffstat (limited to 'app-crypt/libu2f-server')
| -rw-r--r-- | app-crypt/libu2f-server/Manifest | 3 | ||||
| -rw-r--r-- | app-crypt/libu2f-server/files/libu2f-server-1.1.0-jsonc014.patch | 34 | ||||
| -rw-r--r-- | app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild | 3 |
3 files changed, 38 insertions, 2 deletions
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest index 192a52a6bbfe..dff82de8a70d 100644 --- a/app-crypt/libu2f-server/Manifest +++ b/app-crypt/libu2f-server/Manifest @@ -1,4 +1,5 @@ AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498 +AUX libu2f-server-1.1.0-jsonc014.patch 1137 BLAKE2B 84d26d1439662ee15e72aae0f8789be6326d2fc4eb987d1ab961ce3200750414d9e5173c1f6ec16d210ce0a9d7aa4fd274d84967cef611e1638a1f2404da1e38 SHA512 eaeea076939f52f0c28a24825b56c67fb05be4d1c392f1cadf10452cc465edc5c711c998ef836cabf81886b89641492f9df7c9fe9ae03fe2f05bfcda2f65bdac DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9 -EBUILD libu2f-server-1.1.0.ebuild 1211 BLAKE2B 8061749d02a55b40d4610a977b544c7afb486c0998ce8ef15df0f6ffd7cc3dcfcea5ee48df2b206dca4c860575fc37711a6af4bf3524c8fff5919d9dffb8113a SHA512 4c7feb8946c95f9f8852ec5abffc349528913467b56dbd4a8ada01ff424e235209e2ae025d947957ef526960894bb637778e3884b3e3fe74a3b337a1d2a29e4b +EBUILD libu2f-server-1.1.0.ebuild 1253 BLAKE2B ea8d8530aa01e1f411280be1bd82c92e7a5659b4982ee3f5b7829140db0c69021a7d37636a374bf42140f2d1898e24fb6691e10490d6a97a8ed8a33809760e25 SHA512 44d37de15b2435b9330121cd0146aeae6495d5bf1f1dd49a7991307fe24ce5dd2c9b094bc090474c7ccef0785191380a20214ebeab1b47d8a4191cec7de43976 MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22 diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.1.0-jsonc014.patch b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-jsonc014.patch new file mode 100644 index 000000000000..823dd15abca8 --- /dev/null +++ b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-jsonc014.patch @@ -0,0 +1,34 @@ +From f7c4983b31909299c47bf9b2627c84b6bfe225de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@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 --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild index 15c7230119c7..a16820c036ea 100644 --- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild +++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch" + "${FILESDIR}/${PN}-1.1.0-jsonc014.patch" ) src_prepare() { |