From f50dc54f247716d837121ee29205c3c5f0524ae3 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 22 Sep 2022 16:02:24 -0700
Subject: [PATCH] Revert "jose: remove libjose"

This reverts commit 02d6c8346cfae7c2de456800a862a7dd90782858.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 09781a8a65fa6624db55867f6918e9b4c03d7a32)
---
 libs/jose/Makefile | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/libs/jose/Makefile b/libs/jose/Makefile
index 6360a70d3..1be469718 100644
--- a/libs/jose/Makefile
+++ b/libs/jose/Makefile
@@ -19,15 +19,20 @@ PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_DEPENDS:=openssl
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/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
+endef
+
 define Package/jose
   SECTION:=utils
   TITLE:=Provides a full crypto stack including key generation, signing and encryption.
-  DEPENDS:=+jansson
+  DEPENDS:=+libjose
   URL:=https://github.com/latchset/jose
 endef
 
@@ -37,22 +42,31 @@ define Package/jose/description
 	crypto stack including key generation, signing and encryption.
 endef
 
-MESON_ARGS += \
-	-Ddefault_library=static
+define Package/libjose/description
+	libjose is a library for performing various tasks on JSON
+	Object Signing and Encryption (JOSE) objects. José provides a full
+	crypto stack including key generation, signing and encryption.
+endef
 
 define Build/InstallDev
 	$(INSTALL_DIR)	$(1)/usr/lib
 	$(INSTALL_DIR)  $(1)/usr/include
 	$(INSTALL_DIR)	$(1)/usr/include/$(PKG_NAME)
 	$(INSTALL_DIR)	$(1)/usr/lib/pkgconfig
-	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).a	$(1)/usr/lib
+	$(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_INSTALL_DIR)/usr/lib/pkgconfig/*.pc	$(1)/usr/lib/pkgconfig
 endef
 
+define Package/libjose/install
+	$(INSTALL_DIR)	$(1)/usr/lib
+	$(CP)		$(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so*	$(1)/usr/lib/
+endef
+
 define Package/jose/install
 	$(INSTALL_DIR)  $(1)/usr/bin
 	$(INSTALL_BIN)  $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME)          $(1)/usr/bin/
 endef
 
+$(eval $(call BuildPackage,libjose))
 $(eval $(call BuildPackage,jose))