mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 1/3] nettle + gnutls: version bumps
Date: Mon, 13 Jun 2016 10:09:03 +0200	[thread overview]
Message-ID: <20160613080903.GC27722@pengutronix.de> (raw)
In-Reply-To: <1465510275-15258-1-git-send-email-r.schwebel@pengutronix.de>

On Fri, Jun 10, 2016 at 12:11:13AM +0200, Robert Schwebel wrote:
> As gnutls cannot be updated without updating nettle as well, do both
> version bumps in one commit. Update nettle from 2.7.1 to 3.2 and gnutls
> from 3.3.13 to 3.5.0.

Fails to build here (maybe only with GNUTLS_OPENSSL enabled):

  CC       openssl_compat.lo
openssl_compat.c:29:27: fatal error: gnutls_global.h: No such file or directory
 #include <gnutls_global.h>
                           ^
compilation terminated.
Makefile:1496: recipe for target 'openssl_compat.lo' failed
make[4]: *** [openssl_compat.lo] Error 1

Michael

> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/gnutls.make | 9 +++++----
>  rules/nettle.make | 7 +++++--
>  2 files changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index 8836a72..95aabcd 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
>  #
>  # Paths and names
>  #
> -GNUTLS_VERSION	:= 3.3.13
> -GNUTLS_MD5	:= a7387fe8bf3e604bf518a6da9ab2a4e6
> +GNUTLS_VERSION	:= 3.5.0
> +GNUTLS_MD5	:= 173154d0b41f6c58881e3fbd88f7e6e4
>  GNUTLS		:= gnutls-$(GNUTLS_VERSION)
>  GNUTLS_SUFFIX	:= tar.xz
>  GNUTLS_URL	:= ftp://ftp.gnutls.org/gcrypt/gnutls/v$(basename $(GNUTLS_VERSION))/$(GNUTLS).$(GNUTLS_SUFFIX)
> @@ -41,7 +41,6 @@ GNUTLS_CONF_OPT		:= \
>  	--enable-padlock \
>  	--enable-dtls-srtp-support \
>  	--enable-alpn-support \
> -	--enable-rsa-export \
>  	--enable-heartbeat-support \
>  	--enable-srp-authentication \
>  	--enable-psk-authentication \
> @@ -53,6 +52,7 @@ GNUTLS_CONF_OPT		:= \
>  	--enable-session-tickets \
>  	--$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
>  	--disable-doc \
> +	--disable-manpages \
>  	--disable-tests \
>  	--disable-gtk-doc \
>  	--disable-nls \
> @@ -68,12 +68,13 @@ GNUTLS_CONF_OPT		:= \
>  	--enable-local-libopts \
>  	--disable-libopts-install \
>  	--disable-guile \
> -	--disable-crywrap \
>  	--without-p11-kit \
>  	--without-tpm \
>  	--without-librt-prefix \
>  	--without-libregex \
>  	--with-zlib \
> +	--disable-tools \
> +	--without-idn \
>  	--without-libz-prefix
>  
>  # ----------------------------------------------------------------------------
> diff --git a/rules/nettle.make b/rules/nettle.make
> index dae19bd..cea78be 100644
> --- a/rules/nettle.make
> +++ b/rules/nettle.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle
>  #
>  # Paths and names
>  #
> -NETTLE_VERSION	:= 2.7.1
> -NETTLE_MD5	:= 003d5147911317931dd453520eb234a5
> +NETTLE_VERSION	:= 3.2
> +NETTLE_MD5	:= afb15b4764ebf1b4e6d06c62bd4d29e4
>  NETTLE		:= nettle-$(NETTLE_VERSION)
>  NETTLE_SUFFIX	:= tar.gz
>  NETTLE_URL	:= http://www.lysator.liu.se/~nisse/archive/$(NETTLE).$(NETTLE_SUFFIX)
> @@ -42,6 +42,9 @@ NETTLE_CONF_OPT		:= \
>  	--disable-openssl \
>  	--disable-gcov \
>  	--disable-documentation \
> +	--disable-fat \
> +	--disable-x86-aesni \
> +	--disable-mini-gmp \
>  	--$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-arm-neon
>  
>  # ----------------------------------------------------------------------------
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

      parent reply	other threads:[~2016-06-13  8:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-09 22:11 Robert Schwebel
2016-06-09 22:11 ` [ptxdist] [PATCH 2/3] xz: version bump 5.0.4 -> 5.2.2 Robert Schwebel
2016-06-14  7:26   ` Michael Olbrich
2016-06-09 22:11 ` [ptxdist] [PATCH 3/3] htop: version bump 1.0.3 -> 2.0.1 Robert Schwebel
2016-06-13 12:48   ` Ladislav Michl
2016-06-14  5:23     ` Robert Schwebel
2016-06-14 12:34       ` Michael Olbrich
2016-06-13  8:09 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160613080903.GC27722@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox