diff --git a/.checkpackageignore b/.checkpackageignore index bfaf965b2e..99fd91f2b9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -589,8 +589,6 @@ package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch package/iucode-tool/S00iucode-tool lib_sysv.Variables package/iwd/S40iwd Shellcheck lib_sysv.Variables package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream -package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch lib_patch.Upstream -package/jose/0002-man-add-option-to-skip-building-man-pages.patch lib_patch.Upstream package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream package/keyutils/0001-fix-install-rule.patch lib_patch.Upstream package/keyutils/0002-cifs.patch lib_patch.Sob lib_patch.Upstream diff --git a/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch b/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch deleted file mode 100644 index 0bd259ad8b..0000000000 --- a/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 591fc6da944ffc29936e0019b2bc225ddc81dbba Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 22:48:33 +0100 -Subject: [PATCH] lib/hsh.c: rename hsh local variable - -The hsh local variable name conflicts with the function prototype of -hsh() in hsh.h, causing the following build issues with old compilers -(gcc 4.7): - -hsh.c: In function 'hsh': -hsh.c:28:21: error: declaration of 'hsh' shadows a global declaration [-Werror=shadow] -hsh.c:26:1: error: shadowed declaration is here [-Werror=shadow] -hsh.c: In function 'hsh_buf': -hsh.c:60:21: error: declaration of 'hsh' shadows a global declaration [-Werror=shadow] -hsh.c:26:1: error: shadowed declaration is here [-Werror=shadow] - -Therefore, we rename this local variable to _hsh. - -Submitted-upstream: https://github.com/latchset/jose/pull/51 -Signed-off-by: Thomas Petazzoni ---- - lib/hsh.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/hsh.c b/lib/hsh.c -index c59a95f..a2a891b 100644 ---- a/lib/hsh.c -+++ b/lib/hsh.c -@@ -25,7 +25,7 @@ - json_t * - hsh(jose_cfg_t *cfg, const char *alg, const void *data, size_t dlen) - { -- jose_io_auto_t *hsh = NULL; -+ jose_io_auto_t *_hsh = NULL; - jose_io_auto_t *enc = NULL; - jose_io_auto_t *buf = NULL; - char b[1024] = {}; -@@ -33,8 +33,8 @@ hsh(jose_cfg_t *cfg, const char *alg, const void *data, size_t dlen) - - buf = jose_io_buffer(cfg, b, &l); - enc = jose_b64_enc_io(buf); -- hsh = hsh_io(cfg, alg, enc); -- if (!buf || !enc || !hsh || !hsh->feed(hsh, data, dlen) || !hsh->done(hsh)) -+ _hsh = hsh_io(cfg, alg, enc); -+ if (!buf || !enc || !_hsh || !_hsh->feed(_hsh, data, dlen) || !_hsh->done(_hsh)) - return NULL; - - return json_stringn(b, l); -@@ -57,7 +57,7 @@ hsh_buf(jose_cfg_t *cfg, const char *alg, - const void *data, size_t dlen, void *hash, size_t hlen) - { - const jose_hook_alg_t *a = NULL; -- jose_io_auto_t *hsh = NULL; -+ jose_io_auto_t *_hsh = NULL; - jose_io_auto_t *buf = NULL; - - a = jose_hook_alg_find(JOSE_HOOK_ALG_KIND_HASH, alg); -@@ -71,8 +71,8 @@ hsh_buf(jose_cfg_t *cfg, const char *alg, - return SIZE_MAX; - - buf = jose_io_buffer(cfg, hash, &hlen); -- hsh = a->hash.hsh(a, cfg, buf); -- if (!buf || !hsh || !hsh->feed(hsh, data, dlen) || !hsh->done(hsh)) -+ _hsh = a->hash.hsh(a, cfg, buf); -+ if (!buf || !_hsh || !_hsh->feed(_hsh, data, dlen) || !_hsh->done(_hsh)) - return SIZE_MAX; - - return hlen; --- -2.13.6 - diff --git a/package/jose/0002-man-add-option-to-skip-building-man-pages.patch b/package/jose/0002-man-add-option-to-skip-building-man-pages.patch deleted file mode 100644 index 3a5ad1eadc..0000000000 --- a/package/jose/0002-man-add-option-to-skip-building-man-pages.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 506132d3edc8d062f65fdacf007a15613d27e5c5 Mon Sep 17 00:00:00 2001 -From: Eneas U de Queiroz -Date: Wed, 6 Apr 2022 09:49:48 -0300 -Subject: [PATCH] man: add option to skip building man pages - -Add a 'skip_manpages' option to meson, so that man pages do not get -built. - -Signed-off-by: Eneas U de Queiroz -[Retrieved from: https://github.com/latchset/jose/pull/115] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 24 +++++++++++++----------- - meson_options.txt | 1 + - 2 files changed, 14 insertions(+), 11 deletions(-) - create mode 100644 meson_options.txt - -diff --git a/meson.build b/meson.build -index 1edfbe7..9b40efb 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,6 @@ zlib = dependency('zlib') - threads = dependency('threads') - jansson = dependency('jansson', version: '>=2.10') - libcrypto = dependency('libcrypto', version: '>=1.0.2') --a2x = find_program('a2x', required: false) - - mans = [] - -@@ -63,14 +62,17 @@ pkg.generate( - requires: 'jansson', - ) - --if a2x.found() -- foreach m : mans -- custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1], -- command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'], -- install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]), -- install: true -- ) -- endforeach --else -- warning('Will not build man pages due to missing dependencies!') -+if not get_option('skip_manpages') -+ a2x = find_program('a2x', required: false) -+ if a2x.found() -+ foreach m : mans -+ custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1], -+ command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'], -+ install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]), -+ install: true -+ ) -+ endforeach -+ else -+ warning('Will not build man pages due to missing dependencies!') -+ endif - endif -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..0885515 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1 @@ -+option('skip_manpages', type: 'boolean', value: false, description: 'Do not build manpages') diff --git a/package/jose/jose.hash b/package/jose/jose.hash index 128d26d163..0bee7f46e8 100644 --- a/package/jose/jose.hash +++ b/package/jose/jose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 jose-11.tar.xz +sha256 cee329ef9fce97c4c025604a8d237092f619aaa9f6d35fdf9d8c9052bc1ff95b jose-14.tar.xz sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b COPYING diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 723ebe8bb9..9fd9d1dcaa 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -4,13 +4,13 @@ # ################################################################################ -JOSE_VERSION = 11 +JOSE_VERSION = 14 JOSE_SOURCE = jose-$(JOSE_VERSION).tar.xz JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION) JOSE_LICENSE = Apache-2.0 JOSE_LICENSE_FILES = COPYING JOSE_INSTALL_STAGING = YES JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl -JOSE_CONF_OPTS = -Dskip_manpages=true +JOSE_CONF_OPTS = -Ddocs=disabled $(eval $(meson-package))