From: Thibaut Robert <redacted>
Date: Fri, 22 May 2020 08:43:50 +0000 (+0200)
Subject: p11-kit: fix configuration directory (#12246)
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=68bbd6d435a1afd7e98cd763ce4630a76b1097f1;p=openwrt-packages.git

p11-kit: fix configuration directory (#12246)

* p11-kit: fix configuration directory

p11-kit looks for its configuration files in /etc/pkcs11, not /etc/p11-kit

Signed-off-by: Thibaut Robert <redacted>

* p11-kit: bump PKG_RELEASE

Signed-off-by: Thibaut Robert <redacted>
---

diff --git a/libs/p11-kit/Makefile b/libs/p11-kit/Makefile
index 1503d1204..960c92126 100644
--- a/libs/p11-kit/Makefile
+++ b/libs/p11-kit/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=p11-kit
 PKG_VERSION:=0.23.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/p11-glue/p11-kit/releases/download/$(PKG_VERSION)
@@ -62,9 +62,9 @@ endef
 define Package/p11-kit/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libp11-kit.so.* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc/p11-kit/modules/
+	$(INSTALL_DIR) $(1)/etc/pkcs11/modules/
 ifneq ($(CONFIG_PACKAGE_libopensc),)
-	$(CP) ./files/opensc.module $(1)/etc/p11-kit/modules/
+	$(CP) ./files/opensc.module $(1)/etc/pkcs11/modules/
 endif
 endef