From 4aaa3d66ff13f8d8226c799c0294b0fbdf73ad9c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 20 Nov 2019 17:41:05 +0100 Subject: [PATCH] gnutls: bump version. drop gnutls35. --- ...utls-3.6.4.recipe => gnutls-3.6.10.recipe} | 6 +- net-libs/gnutls/gnutls35-3.5.19.recipe | 173 ------------------ .../gnutls/patches/gnutls-3.5.19.patchset | 108 ----------- ...-3.6.4.patchset => gnutls-3.6.10.patchset} | 28 +-- 4 files changed, 10 insertions(+), 305 deletions(-) rename net-libs/gnutls/{gnutls-3.6.4.recipe => gnutls-3.6.10.recipe} (98%) delete mode 100644 net-libs/gnutls/gnutls35-3.5.19.recipe delete mode 100644 net-libs/gnutls/patches/gnutls-3.5.19.patchset rename net-libs/gnutls/patches/{gnutls-3.6.4.patchset => gnutls-3.6.10.patchset} (78%) diff --git a/net-libs/gnutls/gnutls-3.6.4.recipe b/net-libs/gnutls/gnutls-3.6.10.recipe similarity index 98% rename from net-libs/gnutls/gnutls-3.6.4.recipe rename to net-libs/gnutls/gnutls-3.6.10.recipe index f55035d40..3959f74ba 100644 --- a/net-libs/gnutls/gnutls-3.6.4.recipe +++ b/net-libs/gnutls/gnutls-3.6.10.recipe @@ -10,9 +10,9 @@ COPYRIGHT="2000-2018 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" -CHECKSUM_SHA256="c663a792fbc84349c27c36059181f2ca86c9442e75ee8b0ad72f5f9b35deab3a" +CHECKSUM_SHA256="b1f3ca67673b05b746a961acf2243eaae0ffe658b6a6494265c648e7c7812293" SOURCE_DIR="gnutls-$portVersion" PATCHES="gnutls-$portVersion.patchset" @@ -27,7 +27,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then fi libgnutls_opensslVersion="27.0.2" -libgnutlsVersion="30.22.0" +libgnutlsVersion="30.26.0" libgnutlsxxVersion="28.1.0" libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}" diff --git a/net-libs/gnutls/gnutls35-3.5.19.recipe b/net-libs/gnutls/gnutls35-3.5.19.recipe deleted file mode 100644 index 513e819d1..000000000 --- a/net-libs/gnutls/gnutls35-3.5.19.recipe +++ /dev/null @@ -1,173 +0,0 @@ -SUMMARY="A TLS 1.0 and SSL 3.0 implementation for the GNU project" -DESCRIPTION="GnuTLS is a secure communications library implementing the SSL, \ -TLS and DTLS protocols and technologies around them. It provides a simple C \ -language application programming interface (API) to access the secure \ -communications protocols as well as APIs to parse and write X.509, PKCS #12, \ -OpenPGP and other required structures. It is aimed to be portable and \ -efficient with focus on security and interoperability." -HOMEPAGE="https://www.gnutls.org/" -COPYRIGHT="2000-2018 Free Software Fundation Inc. - 2004-2008 Simon Josefsson - 2000-2004 Nikos Mavrogiannopoulos" -LICENSE="GNU LGPL v2.1" -REVISION="2" -SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" -CHECKSUM_SHA256="1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44" -SOURCE_DIR="gnutls-$portVersion" -PATCHES="gnutls-$portVersion.patchset" - -ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc" -SECONDARY_ARCHITECTURES="x86" - -libgnutls_opensslVersion="27.0.2" -libgnutlsVersion="30.14.11" -libgnutlsxxVersion="28.1.0" - -libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}" -libgnutlsVersionCompat="$libgnutlsVersion compat >= ${libgnutlsVersion%%.*}" -libgnutlsxxVersionCompat="$libgnutlsxxVersion compat >= ${libgnutlsxxVersion%%.*}" - -PROVIDES=" - gnutls35$secondaryArchSuffix = $portVersion - lib:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat - lib:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat - lib:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libgcrypt$secondaryArchSuffix - lib:libgpg_error$secondaryArchSuffix - lib:libnettle$secondaryArchSuffix - lib:libgmp$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libidn2$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libtasn1$secondaryArchSuffix - lib:libunistring$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -CONFLICTS=" - gnutls34$secondaryArchSuffix - gnutls36$secondaryArchSuffix - " - -PROVIDES_bin=" - gnutls35${secondaryArchSuffix}_bin = $portVersion - cmd:certtool$secondaryArchSuffix - cmd:gnutls_cli$secondaryArchSuffix - cmd:gnutls_cli_debug$secondaryArchSuffix - cmd:gnutls_serv$secondaryArchSuffix - cmd:ocsptool$secondaryArchSuffix - cmd:psktool$secondaryArchSuffix - cmd:srptool$secondaryArchSuffix - " -REQUIRES_bin=" - gnutls35$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix - lib:libgcrypt$secondaryArchSuffix - lib:libgpg_error$secondaryArchSuffix - lib:libnettle$secondaryArchSuffix - lib:libgmp$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libidn2$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libtasn1$secondaryArchSuffix - lib:libunistring$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -CONFLICTS_bin=" - gnutls${secondaryArchSuffix}_bin - gnutls34${secondaryArchSuffix}_bin - gnutls36${secondaryArchSuffix}_bin - " - -PROVIDES_devel=" - gnutls35${secondaryArchSuffix}_devel = $portVersion - devel:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat - devel:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat - devel:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat - " -REQUIRES_devel=" - gnutls35$secondaryArchSuffix == $portVersion base - devel:libgcrypt$secondaryArchSuffix - devel:libgpg_error$secondaryArchSuffix - devel:libnettle$secondaryArchSuffix >= 7 - devel:libtasn1$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -CONFLICTS_devel=" - gnutls${secondaryArchSuffix}_devel - gnutls34${secondaryArchSuffix}_devel - gnutls36${secondaryArchSuffix}_devel - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libgcrypt$secondaryArchSuffix - devel:libgpg_error$secondaryArchSuffix - devel:libnettle$secondaryArchSuffix >= 7 - devel:libgmp$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libidn2$secondaryArchSuffix - devel:libtasn1$secondaryArchSuffix - devel:libunistring$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:autoheader - cmd:automake - cmd:autopoint - cmd:autoreconf - cmd:find - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:makeinfo - cmd:perl - cmd:pkg_config$secondaryArchSuffix - " - -TEST_REQUIRES=" - cmd:cvs - cmd:git - " - -defineDebugInfoPackage gnutls35$secondaryArchSuffix \ - $libDir/libgnutls-openssl.so.$libgnutls_opensslVersion \ - $libDir/libgnutls.so.$libgnutlsVersion \ - $libDir/libgnutlsxx.so.$libgnutlsxxVersion - -BUILD() -{ - autoreconf -fi - runConfigure ./configure --without-p11-kit --disable-nls \ - --enable-openssl-compatibility - make $jobArgs -} - -INSTALL() -{ - make install - - rm -f $infoDir/dir - rm -f $libDir/libgnutls*.la - - prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx - fixPkgconfig - - packageEntries devel \ - $developDir \ - $manDir/man3 - - packageEntries bin \ - $binDir \ - $documentationDir -} - -TEST() -{ - make check LIBS="-lgnu" -} diff --git a/net-libs/gnutls/patches/gnutls-3.5.19.patchset b/net-libs/gnutls/patches/gnutls-3.5.19.patchset deleted file mode 100644 index 3f17174e6..000000000 --- a/net-libs/gnutls/patches/gnutls-3.5.19.patchset +++ /dev/null @@ -1,108 +0,0 @@ -From 9ae7b7ca24f41d064b6020137e0aecf7e67c0893 Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Tue, 7 Jun 2016 03:05:44 +0000 -Subject: include sys/select.h - - -diff --git a/tests/mini-dtls-mtu.c b/tests/mini-dtls-mtu.c -index 8210608..8da58b9 100644 ---- a/tests/mini-dtls-mtu.c -+++ b/tests/mini-dtls-mtu.c -@@ -24,6 +24,9 @@ - - #include - #include -+#ifdef __HAIKU__ -+# include -+#endif - #include - #include - #include -diff --git a/tests/mini-dtls-pthread.c b/tests/mini-dtls-pthread.c -index 7701255..c992842 100644 ---- a/tests/mini-dtls-pthread.c -+++ b/tests/mini-dtls-pthread.c -@@ -26,6 +26,9 @@ - - #include - #include -+#ifdef __HAIKU__ -+# include -+#endif - #include - #include - #include -diff --git a/tests/mini-dtls-record-asym.c b/tests/mini-dtls-record-asym.c -index 9ace1a5..b087721 100644 ---- a/tests/mini-dtls-record-asym.c -+++ b/tests/mini-dtls-record-asym.c -@@ -26,6 +26,9 @@ - - #include - #include -+#ifdef __HAIKU__ -+# include -+#endif - #include - #include - #include -diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c -index 9f70ce3..810879e 100644 ---- a/tests/mini-record-failure.c -+++ b/tests/mini-record-failure.c -@@ -26,6 +26,9 @@ - - #include - #include -+#ifdef __HAIKU__ -+# include -+#endif - - #if defined(_WIN32) - --- -2.7.0 - - -From aa560535eef19064c892a1051492576fdd54183c Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Wed, 15 Jun 2016 11:04:44 +0000 -Subject: Do not skip the test-float test in gl/tests/. - - -diff --git a/gl/tests/test-float.c b/gl/tests/test-float.c -index 1c95b12..fbc2862 100644 ---- a/gl/tests/test-float.c -+++ b/gl/tests/test-float.c -@@ -23,7 +23,7 @@ - #include "fpucw.h" - #include "macros.h" - --#if 0 -+#if 1 - - /* Check that FLT_RADIX is a constant expression. */ - int a[] = { FLT_RADIX }; --- -2.8.4 - - -From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001 -From: fbrosson -Date: Wed, 6 Jul 2016 22:11:20 +0000 -Subject: Use /bin/perl instead of /usr/bin/perl. - - -diff --git a/doc/scripts/split-texi.pl b/doc/scripts/split-texi.pl -index 34978d3..96b1067 100755 ---- a/doc/scripts/split-texi.pl -+++ b/doc/scripts/split-texi.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/bin/perl - - # Copyright (C) 2011-2012 Free Software Foundation, Inc. - # --- -2.9.0 - diff --git a/net-libs/gnutls/patches/gnutls-3.6.4.patchset b/net-libs/gnutls/patches/gnutls-3.6.10.patchset similarity index 78% rename from net-libs/gnutls/patches/gnutls-3.6.4.patchset rename to net-libs/gnutls/patches/gnutls-3.6.10.patchset index c09933e91..78098b4d5 100644 --- a/net-libs/gnutls/patches/gnutls-3.6.4.patchset +++ b/net-libs/gnutls/patches/gnutls-3.6.10.patchset @@ -1,4 +1,4 @@ -From 9ae7b7ca24f41d064b6020137e0aecf7e67c0893 Mon Sep 17 00:00:00 2001 +From 1b338cadf6aac86feb0dd8531b03f78f9fcd03b3 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 7 Jun 2016 03:05:44 +0000 Subject: include sys/select.h @@ -14,20 +14,6 @@ index 1ae7325..b70db98 100644 #include +#ifdef __HAIKU__ +# include -+#endif - #include - #include - #include -diff --git a/tests/mini-dtls-pthread.c b/tests/mini-dtls-pthread.c -index 7701255..c992842 100644 ---- a/tests/mini-dtls-pthread.c -+++ b/tests/mini-dtls-pthread.c -@@ -26,6 +26,9 @@ - - #include - #include -+#ifdef __HAIKU__ -+# include +#endif #include #include @@ -47,7 +33,7 @@ index 9ace1a5..b087721 100644 #include #include diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c -index 02b0546..7dc0319 100644 +index da4e313..f612365 100644 --- a/tests/mini-record-failure.c +++ b/tests/mini-record-failure.c @@ -27,6 +27,9 @@ @@ -61,10 +47,10 @@ index 02b0546..7dc0319 100644 #if defined(_WIN32) -- -2.16.1 +2.24.0 -From b2826162157672e4b8ea7d0ceb03282e596734e1 Mon Sep 17 00:00:00 2001 +From f5b347a15b3d21948d654a3d19a0d3a905bf674d Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 6 Jul 2016 22:11:20 +0000 Subject: Use /bin/perl instead of /usr/bin/perl. @@ -81,10 +67,10 @@ index 34978d3..96b1067 100755 # Copyright (C) 2011-2012 Free Software Foundation, Inc. # -- -2.9.0 +2.24.0 -From 4470c1235656f1345eef680f9f532fb1cace36ab Mon Sep 17 00:00:00 2001 +From fe0a7d0f4b2b257ce8c3a97320927452b0220ded Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 18 Jul 2018 07:44:23 +0000 Subject: doc/examples/tlsproxy/tlsproxy.c calls strdupa and fails to build @@ -104,5 +90,5 @@ index c40bf4f..85c6bd6 100644 tlsproxy_tlsproxy_SOURCES = tlsproxy/buffer.c tlsproxy/buffer.h tlsproxy/crypto-gnutls.c \ tlsproxy/crypto-gnutls.h tlsproxy/tlsproxy.c -- -2.18.0 +2.24.0