From 011c0ac5365ce32c5f7425dade807acf37db0e7a Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 24 Aug 2017 11:26:52 +0300 Subject: [PATCH] gnutls35: restore recipe as it is a current stable release * specify conflicting packages --- net-libs/gnutls/gnutls34-3.4.17.recipe | 5 +- net-libs/gnutls/gnutls35-3.5.14.recipe | 147 ++++++++++++++++++ net-libs/gnutls/gnutls36-3.6.0.recipe | 5 +- .../gnutls/patches/gnutls-3.5.14.patchset | 133 ++++++++++++++++ 4 files changed, 288 insertions(+), 2 deletions(-) create mode 100644 net-libs/gnutls/gnutls35-3.5.14.recipe create mode 100644 net-libs/gnutls/patches/gnutls-3.5.14.patchset diff --git a/net-libs/gnutls/gnutls34-3.4.17.recipe b/net-libs/gnutls/gnutls34-3.4.17.recipe index 2bd3bb1d5..0157ba5e5 100644 --- a/net-libs/gnutls/gnutls34-3.4.17.recipe +++ b/net-libs/gnutls/gnutls34-3.4.17.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2000-2016 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" LICENSE="GNU LGPL v2.1" -REVISION="2" +REVISION="3" SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" CHECKSUM_SHA256="9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e" SOURCE_DIR="gnutls-$portVersion" @@ -36,6 +36,7 @@ REQUIRES=" " CONFLICTS=" gnutls35$secondaryArchSuffix + gnutls36$secondaryArchSuffix " PROVIDES_bin=" @@ -62,6 +63,7 @@ REQUIRES_bin=" CONFLICTS_bin=" gnutls${secondaryArchSuffix}_bin gnutls35${secondaryArchSuffix}_bin + gnutls36${secondaryArchSuffix}_bin " PROVIDES_devel=" @@ -81,6 +83,7 @@ REQUIRES_devel=" CONFLICTS_devel=" gnutls${secondaryArchSuffix}_devel gnutls35${secondaryArchSuffix}_devel + gnutls36${secondaryArchSuffix}_devel " BUILD_REQUIRES=" diff --git a/net-libs/gnutls/gnutls35-3.5.14.recipe b/net-libs/gnutls/gnutls35-3.5.14.recipe new file mode 100644 index 000000000..1d27197de --- /dev/null +++ b/net-libs/gnutls/gnutls35-3.5.14.recipe @@ -0,0 +1,147 @@ +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-2017 Free Software Fundation Inc. + 2004-2008 Simon Josefsson + 2000-2004 Nikos Mavrogiannopoulos" +LICENSE="GNU LGPL v2.1" +REVISION="2" +SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" +CHECKSUM_SHA256="4aa12dec92f42a0434df794aca3d02f6f2a35b47b48c01252de65f355c051bda" +SOURCE_DIR="gnutls-$portVersion" +PATCHES="gnutls-$portVersion.patchset" + +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.14.6 compat >= 30 + lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libgcrypt$secondaryArchSuffix + lib:libgpg_error$secondaryArchSuffix + lib:libnettle$secondaryArchSuffix + lib:libgmp$secondaryArchSuffix + lib:libiconv$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=" + gnutls34$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix + lib:libgcrypt$secondaryArchSuffix + lib:libgpg_error$secondaryArchSuffix + lib:libnettle$secondaryArchSuffix + lib:libgmp$secondaryArchSuffix + lib:libiconv$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 = 27.0.2 compat >= 27 + devel:libgnutls$secondaryArchSuffix = 30.14.6 compat >= 30 + devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28 + " +REQUIRES_devel=" + gnutls35$secondaryArchSuffix == $portVersion base + devel:libgcrypt$secondaryArchSuffix + devel:libgpg_error$secondaryArchSuffix + devel:libnettle$secondaryArchSuffix + 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 + devel:libgmp$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libtasn1$secondaryArchSuffix + devel:libunistring$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:autom4te + cmd:automake + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:perl + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + runConfigure ./configure --without-p11-kit --disable-nls \ + --enable-openssl-compatibility + make $jobArgs +} + +INSTALL() +{ + make install + + rm -f $libDir/libgnutls*.la + + prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx + fixPkgconfig + + packageEntries devel \ + $developDir \ + $manDir/man3 + + packageEntries bin \ + $binDir \ + $documentationDir +} + +TEST() +{ + make check +} diff --git a/net-libs/gnutls/gnutls36-3.6.0.recipe b/net-libs/gnutls/gnutls36-3.6.0.recipe index fce34c6d3..2eac14719 100644 --- a/net-libs/gnutls/gnutls36-3.6.0.recipe +++ b/net-libs/gnutls/gnutls36-3.6.0.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2000-2017 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" LICENSE="GNU LGPL v2.1" -REVISION="1" +REVISION="2" SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz" CHECKSUM_SHA256="2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72" SOURCE_DIR="gnutls-$portVersion" @@ -38,6 +38,7 @@ REQUIRES=" " CONFLICTS=" gnutls34$secondaryArchSuffix + gnutls35$secondaryArchSuffix " PROVIDES_bin=" @@ -65,6 +66,7 @@ REQUIRES_bin=" CONFLICTS_bin=" gnutls${secondaryArchSuffix}_bin gnutls34${secondaryArchSuffix}_bin + gnutls35${secondaryArchSuffix}_bin " PROVIDES_devel=" @@ -84,6 +86,7 @@ REQUIRES_devel=" CONFLICTS_devel=" gnutls${secondaryArchSuffix}_devel gnutls34${secondaryArchSuffix}_devel + gnutls35{secondaryArchSuffix}_devel " BUILD_REQUIRES=" diff --git a/net-libs/gnutls/patches/gnutls-3.5.14.patchset b/net-libs/gnutls/patches/gnutls-3.5.14.patchset new file mode 100644 index 000000000..6c9220d61 --- /dev/null +++ b/net-libs/gnutls/patches/gnutls-3.5.14.patchset @@ -0,0 +1,133 @@ +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 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 +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 +