From b90c0d81222da33b5a69ca5539bbab8c4c7c2329 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Fri, 19 Aug 2016 18:46:10 +0000 Subject: [PATCH] gnutls: bump to 3.5.3. (#760) --- ...utls35-3.5.2.recipe => gnutls35-3.5.3.recipe} | 6 +++--- ...utls-3.5.2.patchset => gnutls-3.5.3.patchset} | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) rename net-libs/gnutls/{gnutls35-3.5.2.recipe => gnutls35-3.5.3.recipe} (94%) rename net-libs/gnutls/patches/{gnutls-3.5.2.patchset => gnutls-3.5.3.patchset} (89%) diff --git a/net-libs/gnutls/gnutls35-3.5.2.recipe b/net-libs/gnutls/gnutls35-3.5.3.recipe similarity index 94% rename from net-libs/gnutls/gnutls35-3.5.2.recipe rename to net-libs/gnutls/gnutls35-3.5.3.recipe index 56665c298..6bdf55ab4 100644 --- a/net-libs/gnutls/gnutls35-3.5.2.recipe +++ b/net-libs/gnutls/gnutls35-3.5.3.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2000-2016 Free Software Fundation Inc. LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" -CHECKSUM_SHA256="2b45e95cbfd21d76da6fc4846794d8845dbc66bb03c6aa1428881586cfbe8582" +CHECKSUM_SHA256="92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef" SOURCE_DIR="gnutls-$portVersion" PATCHES="gnutls-$portVersion.patchset" @@ -22,7 +22,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" gnutls35$secondaryArchSuffix = $portVersion lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - lib:libgnutls$secondaryArchSuffix = 30.8.1 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.9.0 compat >= 30 lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES=" @@ -68,7 +68,7 @@ CONFLICTS_bin=" PROVIDES_devel=" gnutls${secondaryArchSuffix}_devel = $portVersion devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - devel:libgnutls$secondaryArchSuffix = 30.8.1 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.9.0 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/patches/gnutls-3.5.2.patchset b/net-libs/gnutls/patches/gnutls-3.5.3.patchset similarity index 89% rename from net-libs/gnutls/patches/gnutls-3.5.2.patchset rename to net-libs/gnutls/patches/gnutls-3.5.3.patchset index 3264d9382..05fa4e08b 100644 --- a/net-libs/gnutls/patches/gnutls-3.5.2.patchset +++ b/net-libs/gnutls/patches/gnutls-3.5.3.patchset @@ -47,7 +47,7 @@ index 9087dc5..0c72b5a 100644 #include #include diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c -index a13e9a1..4e86760 100644 +index 02ce346..c2f9a0f 100644 --- a/tests/mini-record-failure.c +++ b/tests/mini-record-failure.c @@ -26,6 +26,9 @@ @@ -64,27 +64,27 @@ index a13e9a1..4e86760 100644 2.7.0 -From b09109e729147a22a6be72dfc32a8e00151fdb27 Mon Sep 17 00:00:00 2001 +From b2e1563f96d5fa6a3ca2d866e22161681c14b6a3 Mon Sep 17 00:00:00 2001 From: fbrosson -Date: Tue, 7 Jun 2016 03:05:44 +0000 +Date: Tue, 9 Aug 2016 16:39:14 +0000 Subject: link mini-dtls-pthread without libpthread. diff --git a/tests/Makefile.am b/tests/Makefile.am -index e1f365f..385deee 100644 +index 6aff107..dafa9a3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -114,7 +114,7 @@ if HAVE_SECCOMP_TESTS - ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp +@@ -124,7 +124,7 @@ LDADD += $(CMOCKA_LIBS) + ctests += dtls-sliding-window endif -mini_dtls_pthread_LDADD = $(LDADD) -lpthread +mini_dtls_pthread_LDADD = $(LDADD) + # These tests need gnulib for memmem() resume_psk_CFLAGS = -DUSE_PSK - resume_psk_SOURCES = resume.c -- -2.7.0 +2.9.2 From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001