diff --git a/net-libs/gnutls/gnutls35-3.5.14.recipe b/net-libs/gnutls/gnutls35-3.5.15.recipe similarity index 93% rename from net-libs/gnutls/gnutls35-3.5.14.recipe rename to net-libs/gnutls/gnutls35-3.5.15.recipe index 1d27197de..bd6f5317f 100644 --- a/net-libs/gnutls/gnutls35-3.5.14.recipe +++ b/net-libs/gnutls/gnutls35-3.5.15.recipe @@ -10,9 +10,9 @@ COPYRIGHT="2000-2017 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" -CHECKSUM_SHA256="4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda" +CHECKSUM_SHA256="046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5" 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.14.6 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.14.7 compat >= 30 lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES=" @@ -52,7 +52,7 @@ PROVIDES_bin=" cmd:srptool$secondaryArchSuffix " REQUIRES_bin=" - gnutls34$secondaryArchSuffix == $portVersion base + gnutls35$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix @@ -72,7 +72,7 @@ CONFLICTS_bin=" PROVIDES_devel=" gnutls35${secondaryArchSuffix}_devel = $portVersion devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - devel:libgnutls$secondaryArchSuffix = 30.14.6 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.14.7 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/patches/gnutls-3.5.14.patchset b/net-libs/gnutls/patches/gnutls-3.5.15.patchset similarity index 79% rename from net-libs/gnutls/patches/gnutls-3.5.14.patchset rename to net-libs/gnutls/patches/gnutls-3.5.15.patchset index 6c9220d61..3f17174e6 100644 --- a/net-libs/gnutls/patches/gnutls-3.5.14.patchset +++ b/net-libs/gnutls/patches/gnutls-3.5.15.patchset @@ -64,31 +64,6 @@ index 9f70ce3..810879e 100644 2.7.0 -From b2e1563f96d5fa6a3ca2d866e22161681c14b6a3 Mon Sep 17 00:00:00 2001 -From: fbrosson -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 eab4a16..3d1f10f 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -140,8 +140,8 @@ str_idna_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 --- -2.9.2 - - From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 15 Jun 2016 11:04:44 +0000