Skip to content

V
vlc
Commit 5122100f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: update GnuTLS to 3.1.10

parent 503b1ff7
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 57 deletions
contrib/src/gnutls/SHA512SUMS
View file @ 5122100f
7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 gnutls-2.12.23.tar.bz2 cfe381825b9d9a6e040a2eccd1adb0927c058c3c512298525ad39e584796e4de5b1972301cd2f024ac071eb328e783a0cbc5e4474154e106227cd197eddc35d2 gnutls-3.1.10.tar.xz
contrib/src/gnutls/gnutls-no-egd.patch
View file @ 5122100f
diff -ru gnutls.orig/lib/nettle/Makefile.am gnutls/lib/nettle/Makefile.am diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c
--- gnutls.orig/lib/nettle/Makefile.am 2011-07-19 20:25:09.000000000 +0300 --- gnutls-3.1.10/lib/nettle/Makefile.am.orig 2013-03-25 14:41:50.265377296 +0100
+++ gnutls/lib/nettle/Makefile.am 2011-07-19 20:25:39.000000000 +0300 +++ gnutls-3.1.10/lib/nettle/Makefile.am 2013-03-25 14:50:17.436084975 +0100
@@ -35,4 +35,4 @@ @@ -33,7 +33,7 @@
noinst_LTLIBRARIES = libcrypto.la noinst_LTLIBRARIES = libcrypto.la
-libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h -libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
+libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c +libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c \
--- gnutls/lib/nettle/Makefile.in.orig 2011-11-22 23:27:22.099568057 -0500 multi.c wmnaf.c ecc_free.c ecc.h ecc_make_key.c ecc_shared_secret.c \
+++ gnutls/lib/nettle/Makefile.in 2011-11-22 23:27:45.711685158 -0500 ecc_map.c ecc_mulmod.c ecc_mulmod_cached.c \
@@ -117,8 +117,7 @@ ecc_points.c ecc_projective_dbl_point_3.c ecc_projective_isneutral.c \
CONFIG_CLEAN_VPATH_FILES = --- gnutls-3.1.10/lib/nettle/Makefile.in.orig 2013-03-25 14:41:50.268710655 +0100
+++ gnutls-3.1.10/lib/nettle/Makefile.in 2013-03-25 14:51:42.180123726 +0100
@@ -219,7 +219,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES) LTLIBRARIES = $(noinst_LTLIBRARIES)
libcrypto_la_LIBADD = libcrypto_la_LIBADD =
-am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo \ am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo \
- egd.lo - egd.lo multi.lo wmnaf.lo ecc_free.lo ecc_make_key.lo \
+am_libcrypto_la_OBJECTS = pk.lo mpi.lo mac.lo cipher.lo rnd.lo init.lo + multi.lo wmnaf.lo ecc_free.lo ecc_make_key.lo \
libcrypto_la_OBJECTS = $(am_libcrypto_la_OBJECTS) ecc_shared_secret.lo ecc_map.lo ecc_mulmod.lo \
AM_V_lt = $(am__v_lt_$(V)) ecc_mulmod_cached.lo ecc_points.lo \
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) ecc_projective_dbl_point_3.lo ecc_projective_isneutral.lo \
@@ -829,7 +828,7 @@ @@ -1536,7 +1536,7 @@
-I$(srcdir)/../includes -I$(builddir)/../includes \ -I$(srcdir)/../includes -I$(builddir)/../includes \
-I$(srcdir)/.. $(am__append_1) -I$(builddir)/../../gl -I$(srcdir)/.. $(am__append_1)
noinst_LTLIBRARIES = libcrypto.la noinst_LTLIBRARIES = libcrypto.la
-libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h -libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
+libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c +libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c \
all: all-am multi.c wmnaf.c ecc_free.c ecc.h ecc_make_key.c ecc_shared_secret.c \
ecc_map.c ecc_mulmod.c ecc_mulmod_cached.c \
.SUFFIXES: ecc_points.c ecc_projective_dbl_point_3.c ecc_projective_isneutral.c \
@@ -883,7 +882,6 @@ @@ -1610,7 +1610,6 @@
-rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc_shared_secret.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc_sign_hash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecc_verify_hash.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi.Plo@am__quote@
diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c --- gnutls-3.1.10/lib/nettle/rnd.c.orig 2013-03-21 21:42:28.000000000 +0100
--- gnutls.orig/lib/nettle/rnd.c 2011-07-19 20:25:09.000000000 +0300 +++ gnutls-3.1.10/lib/nettle/rnd.c 2013-03-25 14:52:50.004027534 +0100
+++ gnutls/lib/nettle/rnd.c 2011-07-19 20:26:47.000000000 +0300 @@ -205,7 +205,7 @@
@@ -159,7 +159,7 @@ #include <sys/time.h>
#ifdef HAVE_GETRUSAGE #include <fcntl.h>
#include <sys/resource.h> #include <locks.h>
#endif
-#include "egd.h" -#include "egd.h"
+//#include "egd.h" +//#include "egd.h"
#define DEVICE_READ_SIZE 16 #define DEVICE_READ_SIZE 16
#define DEVICE_READ_SIZE_MAX 32 #define DEVICE_READ_SIZE_MAX 32
@@ -288,6 +288,7 @@ @@ -276,6 +276,7 @@
return 0; return 0;
} }
...@@ -56,7 +57,7 @@ diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c ...@@ -56,7 +57,7 @@ diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c
static int static int
do_device_source_egd (int init) do_device_source_egd (int init)
{ {
@@ -342,6 +343,7 @@ @@ -329,6 +330,7 @@
} }
return 0; return 0;
} }
...@@ -64,7 +65,7 @@ diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c ...@@ -64,7 +65,7 @@ diff -ru gnutls.orig/lib/nettle/rnd.c gnutls/lib/nettle/rnd.c
static int static int
do_device_source (int init) do_device_source (int init)
@@ -359,11 +361,13 @@ @@ -346,11 +348,13 @@
do_source = do_device_source_urandom; do_source = do_device_source_urandom;
ret = do_source (init); ret = do_source (init);
......
contrib/src/gnutls/gnutls-win32.patch
View file @ 5122100f
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
# endif # endif
+#endif +#endif
#endif /* !HAVE_DECL_GAI_STRERROR */ #endif /* !HAVE_DECL_GAI_STRERROR */
--- gnutls-2.12.20/lib/gnutls.pc.in.orig 2012-09-27 14:40:07.243581693 +0200 --- gnutls-3.1.10/lib/gnutls.pc.in.orig 2013-03-25 14:41:04.248360118 +0100
+++ gnutls-2.12.20/lib/gnutls.pc.in 2012-01-06 20:06:23.000000000 +0100 +++ gnutls-3.1.10/lib/gnutls.pc.in 2013-03-25 14:41:03.355020008 +0100
@@ -19,7 +19,7 @@ @@ -18,7 +18,7 @@
Description: Transport Security Layer implementation for the GNU system Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/ URL: http://www.gnutls.org/
Version: @VERSION@ Version: @VERSION@
-Libs: -L${libdir} -lgnutls -Libs: -L${libdir} -lgnutls
+Libs: -L${libdir} -lgnutls -lws2_32 -lcrypt32 @LTLIBINTL@ +Libs: -L${libdir} -lgnutls -lws2_32 -lcrypt32 @LTLIBINTL@
Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@ Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@
@GNUTLS_REQUIRES_PRIVATE@ @GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir} Cflags: -I${includedir}
contrib/src/gnutls/no-create-time-h.patch
View file @ 5122100f
--- gnutls/lib/gl/Makefile.am 2011-04-07 17:30:44.000000000 -0700 --- gnutls/gl/Makefile.am 2011-04-07 17:30:44.000000000 -0700
+++ gnutls/lib/gl/Makefile.am 2012-03-02 19:51:53.576555217 -0800 +++ gnutls/gl/Makefile.am 2012-03-02 19:51:53.576555217 -0800
@@ -891,7 +891,7 @@ EXTRA_DIST += sys_stat.in.h @@ -891,7 +891,7 @@ EXTRA_DIST += sys_stat.in.h
## begin gnulib module time ## begin gnulib module time
......
contrib/src/gnutls/read-file-limits.h.patch
View file @ 5122100f
--- gnutls/lib/gl/read-file.c.orig 2012-03-06 20:59:29.600593329 -0500 --- gnutls/gl/read-file.c.orig 2012-03-06 20:59:29.600593329 -0500
+++ gnutls/lib/gl/read-file.c 2012-03-06 20:59:44.568593328 -0500 +++ gnutls/gl/read-file.c 2012-03-06 20:59:44.568593328 -0500
@@ -35,6 +35,9 @@ @@ -35,6 +35,9 @@
/* Get errno. */ /* Get errno. */
#include <errno.h> #include <errno.h>
......
contrib/src/gnutls/rules.mak
View file @ 5122100f
# GnuTLS # GnuTLS
GNUTLS_VERSION := 2.12.23 GNUTLS_VERSION := 3.1.10
GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-$(GNUTLS_VERSION).tar.bz2 GNUTLS_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-$(GNUTLS_VERSION).tar.xz
PKGS += gnutls PKGS += gnutls
ifeq ($(call need_pkg,"gnutls >= 2.0.0"),) ifeq ($(call need_pkg,"gnutls >= 2.0.0"),)
PKGS_FOUND += gnutls PKGS_FOUND += gnutls
endif endif
$(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.bz2: $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
$(call download,$(GNUTLS_URL)) $(call download,$(GNUTLS_URL))
.sum-gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls: gnutls-$(GNUTLS_VERSION).tar.xz
gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
$(UNPACK) $(UNPACK)
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch $(APPLY) $(SRC)/gnutls/gnutls-win32.patch
...@@ -24,7 +24,6 @@ endif ...@@ -24,7 +24,6 @@ endif
$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch $(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
$(APPLY) $(SRC)/gnutls/read-file-limits.h.patch $(APPLY) $(SRC)/gnutls/read-file-limits.h.patch
$(call pkg_static,"lib/gnutls.pc.in") $(call pkg_static,"lib/gnutls.pc.in")
$(call pkg_static,"libextra/gnutls-extra.pc.in")
$(UPDATE_AUTOCONFIG) $(UPDATE_AUTOCONFIG)
$(MOVE) $(MOVE)
...@@ -35,22 +34,20 @@ GNUTLS_CONF := \ ...@@ -35,22 +34,20 @@ GNUTLS_CONF := \
--disable-srp-authentication \ --disable-srp-authentication \
--disable-psk-authentication-FIXME \ --disable-psk-authentication-FIXME \
--disable-anon-authentication \ --disable-anon-authentication \
--disable-camellia \
--disable-openpgp-authentication \ --disable-openpgp-authentication \
--disable-session-ticket \
--disable-openssl-compatibility \ --disable-openssl-compatibility \
--disable-guile \ --disable-guile \
$(HOSTCONF) $(HOSTCONF)
USE_GCRYPT=0 USE_GCRYPT=0
ifdef HAVE_WIN32 ifdef HAVE_WIN32
USE_GCRYPT=1 USE_GCRYPT=0
endif endif
ifdef HAVE_MACOSX ifdef HAVE_MACOSX
USE_GCRYPT=1 USE_GCRYPT=1
endif endif
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
USE_GCRYPT=1 USE_GCRYPT=0
endif endif
ifeq (1,$(USE_GCRYPT)) ifeq (1,$(USE_GCRYPT))
...@@ -67,5 +64,6 @@ ifdef HAVE_ANDROID ...@@ -67,5 +64,6 @@ ifdef HAVE_ANDROID
else else
cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF) cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
endif endif
cd $</gl && $(MAKE) install
cd $</lib && $(MAKE) install cd $</lib && $(MAKE) install
touch $@ touch $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment