Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
2adac96f
Commit
2adac96f
authored
Jul 19, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: switch gnutls to nettle (non-Win32 so far)
parent
bb581878
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
3 deletions
+61
-3
contrib/src/gnutls/gnutls-no-egd.patch
contrib/src/gnutls/gnutls-no-egd.patch
+51
-0
contrib/src/gnutls/rules.mak
contrib/src/gnutls/rules.mak
+10
-3
No files found.
contrib/src/gnutls/gnutls-no-egd.patch
0 → 100644
View file @
2adac96f
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)
{
contrib/src/gnutls/rules.mak
View file @
2adac96f
...
...
@@ -16,6 +16,7 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.bz2:
gnutls
:
gnutls-$(GNUTLS_VERSION).tar.bz2 .sum-gnutls
$(UNPACK)
$(APPLY)
$(SRC)
/gnutls/gnutls-win32.patch
$(APPLY)
$(SRC)
/gnutls/gnutls-no-egd.patch
$(MOVE)
GNUTLS_CONF
:=
\
...
...
@@ -30,11 +31,17 @@ GNUTLS_CONF := \
--disable-session-ticket
\
--disable-openssl-compatibility
\
--disable-guile
\
--with-libgcrypt
\
$(HOSTCONF)
.gnutls
:
gnutls .gcrypt .gpg-error
#
$(RECONF)
ifdef
HAVE_WIN32
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
$<
/lib
&&
$(MAKE)
install
touch
$@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment