[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: update nettle to 3.7.3

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
a07879c6 by Marvin Scholz at 2022-07-20T13:42:01+00:00
contrib: update nettle to 3.7.3

(cherry picked from commit 263b3cbbf6c9dcb8978f355f5f28080525d6a856)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

- - - - -
06ae3cf5 by Jean-Baptiste Kempf at 2022-07-20T13:42:01+00:00
Contribs: udpate GnuTLS to 3.6.16

(cherry picked from commit f133190aedd7d65d4d34534496a15c41115d10a0)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

- - - - -


5 changed files:

- contrib/src/gnutls/SHA512SUMS
- contrib/src/gnutls/rules.mak
- contrib/src/nettle/SHA512SUMS
- − contrib/src/nettle/fix-cc-for-build.patch
- contrib/src/nettle/rules.mak


Changes:

=====================================
contrib/src/gnutls/SHA512SUMS
=====================================
@@ -1 +1 @@
-f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c  gnutls-3.6.15.tar.xz
+72c78d7fcb024393c1d15f2a1856608ae4460ba43cc5bbbb4c29b80508cae6cb822df4638029de2363437d110187e0a3cc19a7288c3b2f44b2f648399a028438  gnutls-3.6.16.tar.xz


=====================================
contrib/src/gnutls/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.6.15
+GNUTLS_VERSION := 3.6.16
 GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK


=====================================
contrib/src/nettle/SHA512SUMS
=====================================
@@ -1 +1 @@
-26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f  nettle-3.4.1.tar.gz
+9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437  nettle-3.7.3.tar.gz


=====================================
contrib/src/nettle/fix-cc-for-build.patch deleted
=====================================
@@ -1,34 +0,0 @@
-From 91df68136ad1562cf9217599254706d8cfa970ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud at savoirfairelinux.com>
-Date: Sun, 20 Sep 2020 19:35:54 +0200
-Subject: [PATCH] m4: follow GMP changes for GMP_PROG_CC_FOR_BUILD
-
----
- aclocal.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 513b2df4..e81e0351 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -369,7 +369,7 @@ cat >conftest.c <<EOF
- int
- main ()
- {
--  exit(0);
-+  return 0;
- }
- EOF
- gmp_compile="$1 conftest.c"
-@@ -410,7 +410,7 @@ else
- int
- main ()
- {
--  exit (0);
-+  return 0;
- }
- EOF
-   for i in .exe ,ff8 ""; do
--- 
-GitLab
-


=====================================
contrib/src/nettle/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # Nettle
 
-NETTLE_VERSION := 3.4.1
+NETTLE_VERSION := 3.7.3
 NETTLE_URL := $(GNU)/nettle/nettle-$(NETTLE_VERSION).tar.gz
 
 ifeq ($(call need_pkg,"nettle >= 2.7"),)
@@ -20,7 +20,6 @@ $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
 
 nettle: nettle-$(NETTLE_VERSION).tar.gz .sum-nettle
 	$(UNPACK)
-	$(APPLY) $(SRC)/nettle/fix-cc-for-build.patch
 	$(MOVE)
 
 DEPS_nettle = gmp $(DEPS_gmp)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/05445b74a38d045cb28f71f96ccbe882445a031e...06ae3cf5962550e916e694e42a28bdffbe5ac5a0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/05445b74a38d045cb28f71f96ccbe882445a031e...06ae3cf5962550e916e694e42a28bdffbe5ac5a0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance