diff --git a/net-libs/gnutls/gnutls34-3.4.14.recipe b/net-libs/gnutls/gnutls34-3.4.15.recipe similarity index 94% rename from net-libs/gnutls/gnutls34-3.4.14.recipe rename to net-libs/gnutls/gnutls34-3.4.15.recipe index a1d8126d8..4d0962718 100644 --- a/net-libs/gnutls/gnutls34-3.4.14.recipe +++ b/net-libs/gnutls/gnutls34-3.4.15.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="35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23" +CHECKSUM_SHA256="eb2a013905f5f2a0cbf7bcc1d20c85a50065063ee87bd33b496c4e19815e3498" 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.6 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.6.7 compat >= 30 lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES=" @@ -34,7 +34,6 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix " -# lib:libgcrypt$secondaryArchSuffix CONFLICTS=" gnutls35$secondaryArchSuffix " @@ -68,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.6 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.6.7 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/gnutls35-3.5.3.recipe b/net-libs/gnutls/gnutls35-3.5.4.recipe similarity index 93% rename from net-libs/gnutls/gnutls35-3.5.3.recipe rename to net-libs/gnutls/gnutls35-3.5.4.recipe index 6bdf55ab4..1d526b5b5 100644 --- a/net-libs/gnutls/gnutls35-3.5.3.recipe +++ b/net-libs/gnutls/gnutls35-3.5.4.recipe @@ -12,17 +12,17 @@ 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="92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef" +CHECKSUM_SHA256="4e38014332e0f70c5d19b0eca8d85025ccd0d8be85894c0aaa498b42f6b9a8eb" SOURCE_DIR="gnutls-$portVersion" PATCHES="gnutls-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm ?ppc" +ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" gnutls35$secondaryArchSuffix = $portVersion lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27 - lib:libgnutls$secondaryArchSuffix = 30.9.0 compat >= 30 + lib:libgnutls$secondaryArchSuffix = 30.10.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.9.0 compat >= 30 + devel:libgnutls$secondaryArchSuffix = 30.10.0 compat >= 30 devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 " REQUIRES_devel=" diff --git a/net-libs/gnutls/patches/gnutls-3.4.14.patchset b/net-libs/gnutls/patches/gnutls-3.4.15.patchset similarity index 100% rename from net-libs/gnutls/patches/gnutls-3.4.14.patchset rename to net-libs/gnutls/patches/gnutls-3.4.15.patchset diff --git a/net-libs/gnutls/patches/gnutls-3.5.3.patchset b/net-libs/gnutls/patches/gnutls-3.5.4.patchset similarity index 92% rename from net-libs/gnutls/patches/gnutls-3.5.3.patchset rename to net-libs/gnutls/patches/gnutls-3.5.4.patchset index 05fa4e08b..913a46c7e 100644 --- a/net-libs/gnutls/patches/gnutls-3.5.3.patchset +++ b/net-libs/gnutls/patches/gnutls-3.5.4.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 6f52e33..4e8ee4d 100644 +index dda02a1..2e6c85d 100644 --- a/tests/mini-dtls-mtu.c +++ b/tests/mini-dtls-mtu.c @@ -24,6 +24,9 @@ @@ -19,7 +19,7 @@ index 6f52e33..4e8ee4d 100644 #include #include diff --git a/tests/mini-dtls-pthread.c b/tests/mini-dtls-pthread.c -index 64cbba5..f447eab 100644 +index 7701255..c992842 100644 --- a/tests/mini-dtls-pthread.c +++ b/tests/mini-dtls-pthread.c @@ -26,6 +26,9 @@ @@ -33,7 +33,7 @@ index 64cbba5..f447eab 100644 #include #include diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c -index 9087dc5..0c72b5a 100644 +index 9ace1a5..b087721 100644 --- a/tests/mini-dtls-record-asym.c +++ b/tests/mini-dtls-record-asym.c @@ -26,6 +26,9 @@ @@ -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 02ce346..c2f9a0f 100644 +index 9f70ce3..810879e 100644 --- a/tests/mini-record-failure.c +++ b/tests/mini-record-failure.c @@ -26,6 +26,9 @@ @@ -71,11 +71,11 @@ Subject: link mini-dtls-pthread without libpthread. diff --git a/tests/Makefile.am b/tests/Makefile.am -index 6aff107..dafa9a3 100644 +index 794cc64..0da910e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -124,7 +124,7 @@ LDADD += $(CMOCKA_LIBS) - ctests += dtls-sliding-window +@@ -128,7 +128,7 @@ conv_utf8_LDADD = $(CMOCKA_LDADD) + endif -mini_dtls_pthread_LDADD = $(LDADD) -lpthread