[Buildroot] [PATCH 1/2] package/ecryptfs-utils: add pkcs11-helper optional dependency

[Buildroot] [PATCH 1/2] package/ecryptfs-utils: add pkcs11-helper optional dependency

[Fabrice Fontaine]

pkcs11-helper is an optional dependency which needs openssl

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ecryptfs-utils/ecryptfs-utils.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
index 737c5b0ebb..393ea4da78 100644
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -26,6 +26,14 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
 ECRYPTFS_UTILS_DEPENDENCIES += openssl
+
+ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y)
+ECRYPTFS_UTILS_CONF_OPTS += --enable-pkcs11-helper
+ECRYPTFS_UTILS_DEPENDENCIES += pkcs11-helper
+else
+ECRYPTFS_UTILS_CONF_OPTS += --disable-pkcs11-helper
+endif
+
 else
 ECRYPTFS_UTILS_CONF_OPTS += --disable-openssl
 endif
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/ecryptfs-utils: add libgpgme optional dependency

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ecryptfs-utils/ecryptfs-utils.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
index 393ea4da78..6eb3add98b 100644
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -16,6 +16,15 @@ ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap
 
 ECRYPTFS_UTILS_CONF_ENV = ac_cv_path_POD2MAN=true
 
+ifeq ($(BR2_PACKAGE_LIBGPGME),y)
+ECRYPTFS_UTILS_CONF_OPTS += \
+	--enable-gpg \
+	--with-gpgme-prefix=$(STAGING_DIR)/usr
+ECRYPTFS_UTILS_DEPENDENCIES += libgpgme
+else
+ECRYPTFS_UTILS_CONF_OPTS += --disable-gpg
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 ECRYPTFS_UTILS_CONF_OPTS += --enable-pam
 ECRYPTFS_UTILS_DEPENDENCIES += linux-pam
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/ecryptfs-utils: add pkcs11-helper optional dependency

[Arnout Vandecappelle]

On 13/06/2022 22:31, Fabrice Fontaine wrote:
> pkcs11-helper is an optional dependency which needs openssl
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

  Applied both to master, thanks.

  Regards,
  Arnout

> ---
>   package/ecryptfs-utils/ecryptfs-utils.mk | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
> index 737c5b0ebb..393ea4da78 100644
> --- a/package/ecryptfs-utils/ecryptfs-utils.mk
> +++ b/package/ecryptfs-utils/ecryptfs-utils.mk
> @@ -26,6 +26,14 @@ endif
>   ifeq ($(BR2_PACKAGE_OPENSSL),y)
>   ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
>   ECRYPTFS_UTILS_DEPENDENCIES += openssl
> +
> +ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y)
> +ECRYPTFS_UTILS_CONF_OPTS += --enable-pkcs11-helper
> +ECRYPTFS_UTILS_DEPENDENCIES += pkcs11-helper
> +else
> +ECRYPTFS_UTILS_CONF_OPTS += --disable-pkcs11-helper
> +endif
> +
>   else
>   ECRYPTFS_UTILS_CONF_OPTS += --disable-openssl
>   endif
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/ecryptfs-utils: add pkcs11-helper optional dependency

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 13/06/2022 22:31, Fabrice Fontaine wrote:
 >> pkcs11-helper is an optional dependency which needs openssl
 >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

 >  Applied both to master, thanks.

Committed series to 2022.05.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot