From 7e4ce2e27e4abc74b10c0fd26e5d10f38bd2eb7e Mon Sep 17 00:00:00 2001 From: fbrosson Date: Fri, 14 Oct 2016 23:56:15 +0000 Subject: [PATCH] gnutls: bump to 3.4.16 & 3.5.5. (#824) --- .../{gnutls34-3.4.15.recipe => gnutls34-3.4.16.recipe} | 6 +++--- .../gnutls/{gnutls35-3.5.4.recipe => gnutls35-3.5.5.recipe} | 6 +++--- .../{gnutls-3.4.15.patchset => gnutls-3.4.16.patchset} | 0 .../{gnutls-3.5.4.patchset => gnutls-3.5.5.patchset} | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename net-libs/gnutls/{gnutls34-3.4.15.recipe => gnutls34-3.4.16.recipe} (94%) rename net-libs/gnutls/{gnutls35-3.5.4.recipe => gnutls35-3.5.5.recipe} (94%) rename net-libs/gnutls/patches/{gnutls-3.4.15.patchset => gnutls-3.4.16.patchset} (100%) rename net-libs/gnutls/patches/{gnutls-3.5.4.patchset => gnutls-3.5.5.patchset} (96%) diff --git a/net-libs/gnutls/gnutls34-3.4.15.recipe b/net-libs/gnutls/gnutls34-3.4.16.recipe similarity index 94% rename from net-libs/gnutls/gnutls34-3.4.15.recipe rename to net-libs/gnutls/gnutls34-3.4.16.recipe index 4d0962718..9a9d36f29 100644 --- a/net-libs/gnutls/gnutls34-3.4.15.recipe +++ b/net-libs/gnutls/gnutls34-3.4.16.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="eb2a013905f5f2a0cbf7bcc1d20c85a50065063ee87bd33b496c4e19815e3498" +CHECKSUM_SHA256="d99abb1b320771b58c949bab85e4b654dd1e3e9d92e2572204b7dc479d923927" SOURCE_DIR="gnutls-$portVersion" PATCHES="gnutls-$portVersion.patchset" @@ -22,7 +22,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" gnutls34$secondaryArchSuffix = $portVersion lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - lib:libgnutls$secondaryArchSuffix = 30.6.7 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.6.8 compat >= 30 lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES=" @@ -67,7 +67,7 @@ CONFLICTS_bin=" PROVIDES_devel=" gnutls${secondaryArchSuffix}_devel = $portVersion devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - devel:libgnutls$secondaryArchSuffix = 30.6.7 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.6.8 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/gnutls35-3.5.4.recipe b/net-libs/gnutls/gnutls35-3.5.5.recipe similarity index 94% rename from net-libs/gnutls/gnutls35-3.5.4.recipe rename to net-libs/gnutls/gnutls35-3.5.5.recipe index 1d526b5b5..5ad47e4a0 100644 --- a/net-libs/gnutls/gnutls35-3.5.4.recipe +++ b/net-libs/gnutls/gnutls35-3.5.5.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="4e38014332e0f70c5d19b0eca8d85025ccd0d8be85894c0aaa498b42f6b9a8eb" +CHECKSUM_SHA256="86994fe7804ee16d2811e366b9bf2f75304f8e470ae0e3716d60ffeedac0e529" 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.10.0 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.11.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.10.0 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.11.0 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/patches/gnutls-3.4.15.patchset b/net-libs/gnutls/patches/gnutls-3.4.16.patchset similarity index 100% rename from net-libs/gnutls/patches/gnutls-3.4.15.patchset rename to net-libs/gnutls/patches/gnutls-3.4.16.patchset diff --git a/net-libs/gnutls/patches/gnutls-3.5.4.patchset b/net-libs/gnutls/patches/gnutls-3.5.5.patchset similarity index 96% rename from net-libs/gnutls/patches/gnutls-3.5.4.patchset rename to net-libs/gnutls/patches/gnutls-3.5.5.patchset index 913a46c7e..0f3ea2192 100644 --- a/net-libs/gnutls/patches/gnutls-3.5.4.patchset +++ b/net-libs/gnutls/patches/gnutls-3.5.5.patchset @@ -5,7 +5,7 @@ Subject: include sys/select.h diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c -index dda02a1..2e6c85d 100644 +index 8210608..8da58b9 100644 --- a/tests/mini-dtls-mtu.c +++ b/tests/mini-dtls-mtu.c @@ -24,6 +24,9 @@ @@ -71,10 +71,10 @@ Subject: link mini-dtls-pthread without libpthread. diff --git a/tests/Makefile.am b/tests/Makefile.am -index 794cc64..0da910e 100644 +index 5c1fcb9..c306353 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -128,7 +128,7 @@ conv_utf8_LDADD = $(CMOCKA_LDADD) +@@ -130,7 +130,7 @@ conv_utf8_LDADD = $(CMOCKA_LDADD) endif