From cb5f616dff847bf7906f6af93d9127be6eb1a969 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sat, 5 Nov 2016 17:24:07 +0000 Subject: [PATCH] gnutls: bump to 3.5.6. (#857) --- .../gnutls/{gnutls35-3.5.5.recipe => gnutls35-3.5.6.recipe} | 6 +++--- .../{gnutls-3.5.5.patchset => gnutls-3.5.6.patchset} | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) rename net-libs/gnutls/{gnutls35-3.5.5.recipe => gnutls35-3.5.6.recipe} (94%) rename net-libs/gnutls/patches/{gnutls-3.5.5.patchset => gnutls-3.5.6.patchset} (95%) diff --git a/net-libs/gnutls/gnutls35-3.5.5.recipe b/net-libs/gnutls/gnutls35-3.5.6.recipe similarity index 94% rename from net-libs/gnutls/gnutls35-3.5.5.recipe rename to net-libs/gnutls/gnutls35-3.5.6.recipe index 5ad47e4a0..d94911239 100644 --- a/net-libs/gnutls/gnutls35-3.5.5.recipe +++ b/net-libs/gnutls/gnutls35-3.5.6.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="86994fe7804ee16d2811e366b9bf2f75304f8e470ae0e3716d60ffeedac0e529" +CHECKSUM_SHA256="6338b715bf31c758606ffa489c7f87ee1beab947114fbd2ffefd73170a8c6b9a" 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.11.0 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.12.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.11.0 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.12.0 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/patches/gnutls-3.5.5.patchset b/net-libs/gnutls/patches/gnutls-3.5.6.patchset similarity index 95% rename from net-libs/gnutls/patches/gnutls-3.5.5.patchset rename to net-libs/gnutls/patches/gnutls-3.5.6.patchset index 0f3ea2192..6970518c6 100644 --- a/net-libs/gnutls/patches/gnutls-3.5.5.patchset +++ b/net-libs/gnutls/patches/gnutls-3.5.6.patchset @@ -71,15 +71,17 @@ Subject: link mini-dtls-pthread without libpthread. diff --git a/tests/Makefile.am b/tests/Makefile.am -index 5c1fcb9..c306353 100644 +index 499e821..a0137c9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -130,7 +130,7 @@ conv_utf8_LDADD = $(CMOCKA_LDADD) +@@ -134,8 +134,8 @@ conv_utf8_LDADD = $(CMOCKA_LDADD) endif -mini_dtls_pthread_LDADD = $(LDADD) -lpthread +-rng_pthread_LDADD = $(LDADD) -lpthread +mini_dtls_pthread_LDADD = $(LDADD) ++rng_pthread_LDADD = $(LDADD) # These tests need gnulib for memmem() resume_psk_CFLAGS = -DUSE_PSK