Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
bfbd509e
Commit
bfbd509e
authored
Sep 17, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update gnutls to 3.1.14
parent
f1d68241
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
17 deletions
+17
-17
contrib/src/gnutls/SHA512SUMS
contrib/src/gnutls/SHA512SUMS
+1
-1
contrib/src/gnutls/downgrade-automake-requirement.patch
contrib/src/gnutls/downgrade-automake-requirement.patch
+3
-3
contrib/src/gnutls/gnutls-win32.patch
contrib/src/gnutls/gnutls-win32.patch
+11
-11
contrib/src/gnutls/rules.mak
contrib/src/gnutls/rules.mak
+2
-2
No files found.
contrib/src/gnutls/SHA512SUMS
View file @
bfbd509e
e
5a60b2480f04af08bbb07444e5cc55d73854c2b049ab048ffd19a7aba43b61a580455f3d679e4f8fadcc0bae2b530d4b6276138670429ea32b6d109945270db gnutls-3.1.12
.tar.xz
e
9b91084311f30126c74e651e013fa68cd8d561fce36a6a33ccc7db6af8832700ebd2b9ca8c4e44e6c89da0ce8be7af882c71d43757257f497675024a6d51107 gnutls-3.1.14
.tar.xz
contrib/src/gnutls/downgrade-automake-requirement.patch
View file @
bfbd509e
--- gnutls
/configure.ac.orig 2013-03-25 22:24:57.224241327 -04
00
+++ gnutls
/configure.ac 2013-03-25 22:25:10.930919097 -04
00
--- gnutls
-3.1.14/configure.ac.orig 2013-09-17 18:17:09.840217108 +02
00
+++ gnutls
-3.1.14/configure.ac 2013-09-17 18:19:36.609535012 +02
00
@@ -26,7 +26,7 @@
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([1.1
1.3
no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
-AM_INIT_AUTOMAKE([1.1
2.2
no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
+AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])
...
...
contrib/src/gnutls/gnutls-win32.patch
View file @
bfbd509e
...
...
@@ -15,17 +15,6 @@
# endif
+#endif
#endif /* !HAVE_DECL_GAI_STRERROR */
--- gnutls-3.1.10/lib/gnutls.pc.in.orig 2013-03-25 14:41:04.248360118 +0100
+++ gnutls-3.1.10/lib/gnutls.pc.in 2013-03-25 14:41:03.355020008 +0100
@@ -18,7 +18,7 @@
Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnutls.org/
Version: @VERSION@
-Libs: -L${libdir} -lgnutls
+Libs: -L${libdir} -lgnutls -lws2_32 -lcrypt32 @LTLIBINTL@
Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--- gnutls/gl/msvc-inval.c.orig 2013-07-02 17:57:58.000000000 +0200
+++ gnutls/gl/msvc-inval.c 2013-07-02 17:58:05.000000000 +0200
@@ -28,7 +28,7 @@
...
...
@@ -37,3 +26,14 @@
gl_msvc_invalid_parameter_handler (const wchar_t *expression,
const wchar_t *function,
const wchar_t *file,
--- gnutls-3.1.14/lib/gnutls.pc.in.orig 2013-09-17 18:14:16.270374773 +0200
+++ gnutls-3.1.14/lib/gnutls.pc.in 2013-09-17 18:16:10.232464936 +0200
@@ -18,7 +18,7 @@
Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnutls.org/
Version: @VERSION@
-Libs: -L${libdir} -lgnutls
+Libs: -L${libdir} -lgnutls -lws2_32 -lcrypt32 @LTLIBINTL@
Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@ @GMP_LIBS@
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
contrib/src/gnutls/rules.mak
View file @
bfbd509e
# GnuTLS
GNUTLS_VERSION
:=
3.1.1
2
GNUTLS_VERSION
:=
3.1.1
4
GNUTLS_URL
:=
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-
$(GNUTLS_VERSION)
.tar.xz
ifdef
BUILD_NETWORK
...
...
@@ -47,8 +47,8 @@ GNUTLS_CONF := \
DEPS_gnutls
=
nettle
$(DEPS_nettle)
.gnutls
:
gnutls
ifdef
HAVE_ANDROID
$(RECONF)
ifdef
HAVE_ANDROID
cd
$<
&&
$(HOSTVARS)
gl_cv_header_working_stdint_h
=
yes
./configure
$(GNUTLS_CONF)
else
cd
$<
&&
$(HOSTVARS)
./configure
$(GNUTLS_CONF)
...
...
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