[ptxdist] [PATCH] gnupg: version bump to 2.0.22 and add bz2 support

[ptxdist] [PATCH] gnupg: version bump to 2.0.22 and add bz2 support

[Michael Grzeschik]

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 rules/gnupg.in   | 2 ++
 rules/gnupg.make | 7 +++----
 2 files changed, 5 insertions(+), 4 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..b684f85 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)
@@ -48,8 +48,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
 	--disable-dns-srv \
 	--disable-nls \
 	--disable-rpath \
-	--disable-regex \
-	--disable-bzip2
+	--disable-regex
 
 ifndef PTXCONF_ICONV
 GNUPG_AUTOCONF += --without-libiconv-prefix
-- 
1.8.4.rc3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] gnupg: version bump to 2.0.22 and add bz2 support

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 1800 bytes --]

On 10/11/2013 03:20 PM, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>

please make bzip optional

> ---
>  rules/gnupg.in   | 2 ++
>  rules/gnupg.make | 7 +++----
>  2 files changed, 5 insertions(+), 4 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..b684f85 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)
> @@ -48,8 +48,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
>  	--disable-dns-srv \
>  	--disable-nls \
>  	--disable-rpath \
> -	--disable-regex \
> -	--disable-bzip2
> +	--disable-regex

...and use something like

    --$(call ptx/endis, PTXCONF_GNUPG_BZIP2)-bzip2

here

>  
>  ifndef PTXCONF_ICONV
>  GNUPG_AUTOCONF += --without-libiconv-prefix
> 

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de