diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-06-01 18:42:23 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-06-02 02:02:27 -0700 |
| commit | 63ac7ada00f45c03f78c2a17bbf1632de119e929 (patch) | |
| tree | f372a2bc2de5a0c450e62ac3619d6f9cc3f2a2aa /libs/jose | |
| parent | d49f59cfc5471096322c038e5b5ce043ced7339a (diff) | |
jose: update to 11
Reorganized Makefile slightly for consistency between packages.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs/jose')
| -rw-r--r-- | libs/jose/Makefile | 20 | ||||
| -rw-r--r-- | libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch | 31 | ||||
| -rw-r--r-- | libs/jose/patches/020-openssl-deprecated.patch | 21 |
3 files changed, 10 insertions, 62 deletions
diff --git a/libs/jose/Makefile b/libs/jose/Makefile index 20b9c2f7e..d6d602195 100644 --- a/libs/jose/Makefile +++ b/libs/jose/Makefile @@ -8,26 +8,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jose -PKG_VERSION:=10 -PKG_RELEASE:=2 +PKG_VERSION:=11 +PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72 +PKG_HASH:=e272afe7717e22790c383f3164480627a567c714ccb80c1ee96f62c9929d8225 -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 +PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com> +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=COPYING -PKG_FIXUP:=autoreconf +PKG_BUILD_DEPENDS:=meson/host include $(INCLUDE_DIR)/package.mk +include ../../devel/meson/meson.mk define Package/libjose SECTION:=libs TITLE:=Provides a full crypto stack including key generation, signing and encryption. DEPENDS:=+zlib +jansson +libopenssl +libpthread URL:=https://github.com/latchset/jose - MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com> endef define Package/jose @@ -35,7 +36,6 @@ define Package/jose TITLE:=Provides a full crypto stack including key generation, signing and encryption. DEPENDS:=+libjose URL:=https://github.com/latchset/jose - MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com> endef define Package/jose/description @@ -57,7 +57,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/*.h $(1)/usr/include/$(PKG_NAME) - $(CP) $(PKG_BUILD_DIR)/*.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig endef define Package/libjose/install diff --git a/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch b/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch deleted file mode 100644 index 7639aca23..000000000 --- a/libs/jose/patches/010-fix_minor_leak_upstream_198f720.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 198f7207427ad7f569aa3592ea16e2bb400db040 Mon Sep 17 00:00:00 2001 -From: Nathaniel McCallum <npmccallum@redhat.com> -Date: Fri, 29 Sep 2017 14:49:57 -0400 -Subject: [PATCH] Fix minor FILE* leak - ---- - cmd/jwe/pwd.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/cmd/jwe/pwd.h -+++ b/cmd/jwe/pwd.h -@@ -57,8 +57,10 @@ jwe_getpass(const char *prompt) - nf.c_lflag &= ~ECHO; - nf.c_lflag |= ECHONL; - -- if (tcsetattr(fileno(tty), TCSANOW, &nf) != 0) -+ if (tcsetattr(fileno(tty), TCSANOW, &nf) != 0) { -+ fclose(tty); - return NULL; -+ } - - fprintf(tty, "%s", prompt); - -@@ -72,6 +74,7 @@ jwe_getpass(const char *prompt) - } - - tcsetattr(fileno(tty), TCSANOW, &of); -+ fclose(tty); - return pwd; - } - #endif diff --git a/libs/jose/patches/020-openssl-deprecated.patch b/libs/jose/patches/020-openssl-deprecated.patch deleted file mode 100644 index 7ae664bca..000000000 --- a/libs/jose/patches/020-openssl-deprecated.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/lib/openssl/compat.h -+++ b/lib/openssl/compat.h -@@ -17,6 +17,7 @@ - - #pragma once - -+#include <openssl/bn.h> - #include <openssl/hmac.h> - #include <openssl/ec.h> - #include <openssl/ecdsa.h> ---- a/lib/openssl/misc.c -+++ b/lib/openssl/misc.c -@@ -185,6 +185,8 @@ add_entity(json_t *root, json_t *obj, co - static void __attribute__((constructor)) - constructor(void) - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - OpenSSL_add_all_algorithms(); -+#endif - RAND_poll(); - } |