Commit 2adac96f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

contrib: switch gnutls to nettle (non-Win32 so far)

parent bb581878
diff -ru gnutls.orig//lib/nettle/Makefile.am gnutls//lib/nettle/Makefile.am
--- gnutls.orig//lib/nettle/Makefile.am 2011-07-19 20:25:09.000000000 +0300
+++ gnutls//lib/nettle/Makefile.am 2011-07-19 20:25:39.000000000 +0300
@@ -35,4 +35,4 @@
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
diff -ru gnutls.orig//lib/nettle/rnd.c gnutls//lib/nettle/rnd.c
--- gnutls.orig//lib/nettle/rnd.c 2011-07-19 20:25:09.000000000 +0300
+++ gnutls//lib/nettle/rnd.c 2011-07-19 20:26:47.000000000 +0300
@@ -159,7 +159,7 @@
#ifdef HAVE_GETRUSAGE
#include <sys/resource.h>
#endif
-#include "egd.h"
+//#include "egd.h"
#define DEVICE_READ_SIZE 16
#define DEVICE_READ_SIZE_MAX 32
@@ -288,6 +288,7 @@
return 0;
}
+#if 0
static int
do_device_source_egd (int init)
{
@@ -342,6 +343,7 @@
}
return 0;
}
+#endif
static int
do_device_source (int init)
@@ -359,11 +361,13 @@
do_source = do_device_source_urandom;
ret = do_source (init);
+#if 0
if (ret < 0)
{
do_source = do_device_source_egd;
ret = do_source (init);
}
+#endif
if (ret < 0)
{
...@@ -16,6 +16,7 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.bz2: ...@@ -16,6 +16,7 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.bz2:
gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/gnutls/gnutls-win32.patch $(APPLY) $(SRC)/gnutls/gnutls-win32.patch
$(APPLY) $(SRC)/gnutls/gnutls-no-egd.patch
$(MOVE) $(MOVE)
GNUTLS_CONF := \ GNUTLS_CONF := \
...@@ -30,11 +31,17 @@ GNUTLS_CONF := \ ...@@ -30,11 +31,17 @@ GNUTLS_CONF := \
--disable-session-ticket \ --disable-session-ticket \
--disable-openssl-compatibility \ --disable-openssl-compatibility \
--disable-guile \ --disable-guile \
--with-libgcrypt \
$(HOSTCONF) $(HOSTCONF)
.gnutls: gnutls .gcrypt .gpg-error ifdef HAVE_WIN32
#$(RECONF) GNUTLS_CONF += --with-libgcrypt
DEPS_gnutls = gcrypt $(DEPS_gcrypt)
else
DEPS_gnutls = nettle $(DEPS_nettle)
endif
.gnutls: gnutls
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF) cd $< && $(HOSTVARS) ./configure $(GNUTLS_CONF)
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