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.

Signed-off-by: Robert Schwebel <[email protected]>
---
 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
[email protected]

Reply via email to