[Buildroot] [PATCH 1/2] package/pinentry: bump to version 1.1.0

[Buildroot] [PATCH 1/2] package/pinentry: bump to version 1.1.0

[Fabrice Fontaine]

Add hash for license file

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/pinentry/pinentry.hash | 5 +++--
 package/pinentry/pinentry.mk   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/pinentry/pinentry.hash b/package/pinentry/pinentry.hash
index ef450b3c41..c9610d6eb1 100644
--- a/package/pinentry/pinentry.hash
+++ b/package/pinentry/pinentry.hash
@@ -1,4 +1,5 @@
 # From https://www.gnupg.org/download/integrity_check.html
-sha1  85d9ac81ebad3fb082514c505c90c39a0456f1f6  pinentry-1.0.0.tar.bz2
+sha1  693bdf9f48dfb3e040d92f50b1bb464e268b9fb0  pinentry-1.1.0.tar.bz2
 # Locally computed
-sha256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a  pinentry-1.0.0.tar.bz2
+sha256 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570  pinentry-1.1.0.tar.bz2
+sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34  COPYING
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
index ce82f1090a..0e9dfb2f0e 100644
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PINENTRY_VERSION = 1.0.0
+PINENTRY_VERSION = 1.1.0
 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2
 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry
 PINENTRY_LICENSE = GPL-2.0+
-- 
2.24.1

[Buildroot] [PATCH 2/2] package/pinentry: add pinentry-fltk

[Fabrice Fontaine]

pinentry-fltk has been added in version 1.1.0 with
https://github.com/gpg/pinentry/commit/6c45eed62214b44fcc11e642b19df7b6ca0da0bd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/pinentry/Config.in   | 13 +++++++++++++
 package/pinentry/pinentry.mk |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index 518e3ad37f..9048edd21b 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -15,6 +15,19 @@ menuconfig BR2_PACKAGE_PINENTRY
 
 if BR2_PACKAGE_PINENTRY
 
+config BR2_PACKAGE_PINENTRY_FLTK
+	bool "pinentry-fltk"
+	depends on BR2_USE_MMU # fltk
+	depends on BR2_INSTALL_LIBSTDCPP # fltk
+	depends on BR2_PACKAGE_XORG7 # fltk
+	select BR2_PACKAGE_FLTK
+	help
+	  The pinentry-fltk tool
+
+comment "pinentry-fltk needs X and a toolchain w/ C++"
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_XORG7 || !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_PINENTRY_NCURSES
 	bool "pinentry-ncurses"
 	select BR2_PACKAGE_NCURSES
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
index 0e9dfb2f0e..1bc1adab17 100644
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -36,6 +36,15 @@ else
 PINENTRY_CONF_OPTS += --disable-libsecret
 endif
 
+# pinentry-fltk backend
+ifeq ($(BR2_PACKAGE_PINENTRY_FLTK),y)
+PINENTRY_CONF_ENV += ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config
+PINENTRY_CONF_OPTS += --enable-pinentry-fltk
+PINENTRY_DEPENDENCIES += fltk
+else
+PINENTRY_CONF_OPTS += --disable-pinentry-fltk
+endif
+
 # pinentry-ncurses backend
 ifeq ($(BR2_PACKAGE_PINENTRY_NCURSES),y)
 PINENTRY_CONF_OPTS += --enable-ncurses --with-ncurses-include-dir=none
-- 
2.24.1

[Buildroot] [PATCH 1/2] package/pinentry: bump to version 1.1.0

[Thomas Petazzoni]

On Thu,  9 Jan 2020 20:06:03 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Add hash for license file
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/pinentry/pinentry.hash | 5 +++--
>  package/pinentry/pinentry.mk   | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)

Both applied to master. Thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com