diff options
| -rw-r--r-- | patches/gnutls-2.12.21/0001-check-if-gets-is-defined-before-doing-something-with.patch | 48 | ||||
| -rw-r--r-- | patches/gnutls-2.12.21/series | 4 | ||||
| -rw-r--r-- | rules/gnutls.in | 2 | ||||
| -rw-r--r-- | rules/gnutls.make | 48 |
4 files changed, 42 insertions, 60 deletions
diff --git a/patches/gnutls-2.12.21/0001-check-if-gets-is-defined-before-doing-something-with.patch b/patches/gnutls-2.12.21/0001-check-if-gets-is-defined-before-doing-something-with.patch deleted file mode 100644 index ae596d4b8..000000000 --- a/patches/gnutls-2.12.21/0001-check-if-gets-is-defined-before-doing-something-with.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 6 Dec 2012 07:46:44 +0100 -Subject: [PATCH] check if gets is defined before doing something with it - -glibc 2.16 has removed gets completely - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - gl/stdio.in.h | 2 ++ - lib/gl/stdio.in.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/gl/stdio.in.h b/gl/stdio.in.h -index 9dc7c4a..8cb19d7 100644 ---- a/gl/stdio.in.h -+++ b/gl/stdio.in.h -@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s)); - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - - -diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h -index 03bea2a..cb6483b 100644 ---- a/lib/gl/stdio.in.h -+++ b/lib/gl/stdio.in.h -@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s)); - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - - diff --git a/patches/gnutls-2.12.21/series b/patches/gnutls-2.12.21/series deleted file mode 100644 index d18203fe7..000000000 --- a/patches/gnutls-2.12.21/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-check-if-gets-is-defined-before-doing-something-with.patch -# c766a4de912f6c041c750f5bc8f94c3e - git-ptx-patches magic diff --git a/rules/gnutls.in b/rules/gnutls.in index 3a5bd3ac5..73e610fe6 100644 --- a/rules/gnutls.in +++ b/rules/gnutls.in @@ -2,8 +2,10 @@ menuconfig GNUTLS tristate + select ZLIB select LIBGCRYPT select LIBTASN1 + select NETTLE select OPENSSL if GNUTLS_OPENSSL prompt "gnutls " help diff --git a/rules/gnutls.make b/rules/gnutls.make index 08923aed5..61554f5de 100644 --- a/rules/gnutls.make +++ b/rules/gnutls.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls # # Paths and names # -GNUTLS_VERSION := 2.12.21 -GNUTLS_MD5 := 93ffac7507dd39a4c6a672ca6976d397 +GNUTLS_VERSION := 3.2.12.1 +GNUTLS_MD5 := a795db68253d1336f1e3c2ee48c1fee4 GNUTLS := gnutls-$(GNUTLS_VERSION) -GNUTLS_SUFFIX := tar.bz2 -GNUTLS_URL := $(call ptx/mirror, GNU, gnutls/$(GNUTLS).$(GNUTLS_SUFFIX)) +GNUTLS_SUFFIX := tar.xz +GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/$(GNUTLS).$(GNUTLS_SUFFIX) GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX) GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS) GNUTLS_LICENSE := LGPLv3+ @@ -35,11 +35,41 @@ GNUTLS_LICENSE := LGPLv3+ GNUTLS_CONF_TOOL := autoconf GNUTLS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --with-libgcrypt \ - --with-libgcrypt-prefix=$(PTXDIST_SYSROOT_TARGET)/usr \ - --without-p11-kit \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --enable-threads=posix \ + --enable-cxx \ + --enable-hardware-acceleration \ + --enable-non-suiteb-curves \ + --enable-dtls-srtp-support \ + --enable-alpn-support \ + --enable-rsa-export \ + --enable-heartbeat-support \ + --enable-srp-authentication \ + --enable-psk-authentication \ + --enable-anon-authentication \ + --enable-dhe \ + --enable-ecdhe \ + --enable-openpgp-authentication \ + --enable-ocsp \ --$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \ - --disable-guile + --disable-doc \ + --disable-tests \ + --disable-gtk-doc \ + --disable-nls \ + --disable-rpath \ + --disable-valgrind-tests \ + --disable-gcc-warnings \ + --enable-shared \ + --disable-static \ + --disable-libdane \ + --enable-local-libopts \ + --disable-libopts-install \ + --disable-guile \ + --disable-crywrap \ + --without-p11-kit \ + --without-tpm \ + --without-libregex \ + --with-zlib # ---------------------------------------------------------------------------- # Target-Install @@ -55,6 +85,8 @@ $(STATEDIR)/gnutls.targetinstall: @$(call install_fixup, gnutls,DESCRIPTION,missing) @$(call install_lib, gnutls, 0, 0, 0644, libgnutls) + @$(call install_lib, gnutls, 0, 0, 0644, libgnutls-xssl) + @$(call install_lib, gnutls, 0, 0, 0644, libgnutlsxx) ifdef PTXCONF_GNUTLS_OPENSSL @$(call install_lib, gnutls, 0, 0, 0644, libgnutls-openssl) |