The gnupg in ptxdist is not supposed to generate keys. Keys from other
systems will likely have a lot cypher and compression options enabled.
To support and use such keys we shall enable all options in the library,
including bz2.
Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
---
rules/gnupg.in | 2 ++
rules/gnupg.make | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/rules/gnupg.in b/rules/gnupg.in
index 1f6c150..164a9dc 100644
--- a/rules/gnupg.in
+++ b/rules/gnupg.in
@@ -8,6 +8,8 @@ config GNUPG
select LIBGCRYPT
select LIBKSBA
select READLINE
+ select BZIP2
+ select BZIP2_LIBBZ2
select ZLIB
help
GnuPG - The GNU Privacy Guard suite of programs
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 0ee87ef..ddcd268 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg
#
# Paths and names
#
-GNUPG_VERSION := 2.0.15
-GNUPG_MD5 := c1286e85b66349879dc4b760dd83e2f1
+GNUPG_VERSION := 2.0.22
+GNUPG_MD5 := ee22e7b4fdbfcb50229c2e6db6db291e
GNUPG := gnupg-$(GNUPG_VERSION)
GNUPG_SUFFIX := tar.bz2
GNUPG_URL := ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
@@ -49,7 +49,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-nls \
--disable-rpath \
--disable-regex \
- --disable-bzip2
+ --enable-bzip2
ifndef PTXCONF_ICONV
GNUPG_AUTOCONF += --without-libiconv-prefix
--
1.8.4.rc3
--
ptxdist mailing list
ptxdist@pengutronix.de
