Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
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
Steve Lhomme
VLC
Commits
77c81de4
Commit
77c81de4
authored
Dec 26, 2017
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: gnutls: update to current stable 3.5.16 (fixes #19350)
parent
9bca12c0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
contrib/src/gnutls/SHA512SUMS
contrib/src/gnutls/SHA512SUMS
+1
-1
contrib/src/gnutls/gnutls-pkgconfig-static.patch
contrib/src/gnutls/gnutls-pkgconfig-static.patch
+5
-4
contrib/src/gnutls/rules.mak
contrib/src/gnutls/rules.mak
+4
-3
No files found.
contrib/src/gnutls/SHA512SUMS
View file @
77c81de4
d75f6b4dea2dc742cd7f60ee0ee540d41b69991aaa937ca0138cfdf4a1e0dfaaa3863464303bfa5799e14ee02de252f71c59a7a9e57b96ff8af653e419edfd4e gnutls-3.4.14
.tar.xz
451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07 gnutls-3.5.16
.tar.xz
contrib/src/gnutls/gnutls-pkgconfig-static.patch
View file @
77c81de4
--- gnutls/lib/gnutls.pc.in 2015-11-03 21:47:28.000000000 +0000
+++ gnutls.patched/lib/gnutls.pc.in 2016-11-02 22:53:04.272156182 +0000
diff -ru gnutls-3.5.16/lib/gnutls.pc.in gnutls-3.5.16.patched/lib/gnutls.pc.in
--- gnutls-3.5.16/lib/gnutls.pc.in 2017-03-28 20:20:50.000000000 +0300
+++ gnutls-3.5.16.patched/lib/gnutls.pc.in 2017-12-26 16:47:54.502835713 +0200
@@ -19,6 +19,6 @@
URL: http://www.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-Libs.private: @LIBZ
@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP
_LIBS@
+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIB
PTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @NETTLE_LIBS@ @LIBIDN_LIBS@ @HOGWEED
_LIBS@
-Libs.private: @LIBZ
_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2
_LIBS@
+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIB
NSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBIDN_LIBS@ @HOGWEED_LIBS@ @NETTLE
_LIBS@
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
contrib/src/gnutls/rules.mak
View file @
77c81de4
# GnuTLS
GNUTLS_VERSION
:=
3.
4.14
GNUTLS_URL
:=
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.
4
/gnutls-
$(GNUTLS_VERSION)
.tar.xz
GNUTLS_VERSION
:=
3.
5.16
GNUTLS_URL
:=
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.
5
/gnutls-
$(GNUTLS_VERSION)
.tar.xz
ifdef
BUILD_NETWORK
ifndef
HAVE_DARWIN_OS
...
...
@@ -34,8 +34,8 @@ ifdef HAVE_ANDROID
$(APPLY)
$(SRC)
/gnutls/gnutls-android.patch
endif
$(APPLY)
$(SRC)
/gnutls/read-file-limits.h.patch
$(APPLY)
$(SRC)
/gnutls/mac-keychain-lookup.patch
ifdef
HAVE_MACOSX
$(APPLY)
$(SRC)
/gnutls/mac-keychain-lookup.patch
$(APPLY)
$(SRC)
/gnutls/gnutls-pkgconfig-osx.patch
$(APPLY)
$(SRC)
/gnutls/gnutls-disable-getentropy-osx.patch
endif
...
...
@@ -59,6 +59,7 @@ GNUTLS_CONF := \
--disable-doc
\
--disable-tests
\
--with-included-libtasn1
\
--with-included-unistring
\
$(HOSTCONF)
GNUTLS_ENV
:=
$(HOSTVARS)
...
...
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