mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-21 19:20:08 +02:00
gnutls: bump to 3.7.8 (#7528)
This commit is contained in:
kenmays
GitHub
@@ -1,222 +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="1"
|
||||
SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3"
|
||||
SOURCE_DIR="gnutls-$portVersion"
|
||||
PATCHES="gnutls-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2 ?arm ?ppc"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
commandBinDir=$binDir
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
libgnutls_opensslVersion="27.0.2"
|
||||
libgnutlsVersion="30.28.2"
|
||||
libgnutlsxxVersion="28.1.0"
|
||||
|
||||
libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}"
|
||||
libgnutlsVersionCompat="$libgnutlsVersion compat >= ${libgnutlsVersion%%.*}"
|
||||
libgnutlsxxVersionCompat="$libgnutlsxxVersion compat >= ${libgnutlsxxVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
gnutls$secondaryArchSuffix = $portVersion
|
||||
lib:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
|
||||
lib:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
|
||||
lib:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libgcrypt$secondaryArchSuffix
|
||||
lib:libgmp$secondaryArchSuffix
|
||||
lib:libgpg_error$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libidn2$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libnettle$secondaryArchSuffix
|
||||
lib:libp11_kit$secondaryArchSuffix
|
||||
lib:libtasn1$secondaryArchSuffix
|
||||
lib:libunistring$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
CONFLICTS="
|
||||
gnutls34$secondaryArchSuffix
|
||||
gnutls35$secondaryArchSuffix
|
||||
gnutls36$secondaryArchSuffix
|
||||
"
|
||||
REPLACES="
|
||||
gnutls36$secondaryArchSuffix
|
||||
"
|
||||
|
||||
if [ -z "$commandSuffix" ]; then
|
||||
PROVIDES_bin="
|
||||
gnutls${secondaryArchSuffix}_bin = $portVersion
|
||||
cmd:certtool
|
||||
cmd:gnutls_cli
|
||||
cmd:gnutls_cli_debug
|
||||
cmd:gnutls_serv
|
||||
cmd:ocsptool
|
||||
cmd:p11tool
|
||||
cmd:psktool
|
||||
cmd:srptool
|
||||
"
|
||||
REQUIRES_bin="
|
||||
gnutls$secondaryArchSuffix == $portVersion base
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libgcrypt$secondaryArchSuffix
|
||||
lib:libgpg_error$secondaryArchSuffix
|
||||
lib:libgmp$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libidn2$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libnettle$secondaryArchSuffix
|
||||
lib:libp11_kit$secondaryArchSuffix
|
||||
lib:libtasn1$secondaryArchSuffix
|
||||
lib:libunistring$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
CONFLICTS_bin="
|
||||
gnutls34${secondaryArchSuffix}_bin
|
||||
gnutls35${secondaryArchSuffix}_bin
|
||||
gnutls36${secondaryArchSuffix}_bin
|
||||
"
|
||||
REPLACES_bin="
|
||||
gnutls36${secondaryArchSuffix}_bin
|
||||
"
|
||||
fi
|
||||
|
||||
PROVIDES_devel="
|
||||
gnutls${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
|
||||
devel:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
|
||||
devel:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
gnutls$secondaryArchSuffix == $portVersion base
|
||||
devel:libgcrypt$secondaryArchSuffix
|
||||
devel:libgpg_error$secondaryArchSuffix
|
||||
devel:libidn2$secondaryArchSuffix
|
||||
devel:libnettle$secondaryArchSuffix >= 8
|
||||
devel:libp11_kit$secondaryArchSuffix
|
||||
devel:libtasn1$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
CONFLICTS_devel="
|
||||
gnutls34${secondaryArchSuffix}_devel
|
||||
gnutls35${secondaryArchSuffix}_devel
|
||||
gnutls36${secondaryArchSuffix}_devel
|
||||
"
|
||||
REPLACES_devel="
|
||||
gnutls36${secondaryArchSuffix}_devel
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libgcrypt$secondaryArchSuffix
|
||||
devel:libgmp$secondaryArchSuffix
|
||||
devel:libgpg_error$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libidn2$secondaryArchSuffix
|
||||
devel:libnettle$secondaryArchSuffix >= 8
|
||||
devel:libp11_kit$secondaryArchSuffix
|
||||
devel:libtasn1$secondaryArchSuffix
|
||||
devel:libunistring$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:autoheader
|
||||
cmd:automake
|
||||
cmd:autopoint
|
||||
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
|
||||
"
|
||||
|
||||
debugList=(
|
||||
"$libDir"/libgnutls-openssl.so.$libgnutls_opensslVersion
|
||||
"$libDir"/libgnutls.so.$libgnutlsVersion
|
||||
"$libDir"/libgnutlsxx.so.$libgnutlsxxVersion
|
||||
)
|
||||
if [ -z "$commandSuffix" ]; then
|
||||
debugList+=(
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/certtool
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-cli
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-cli-debug
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/gnutls-serv
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/ocsptool
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/psktool
|
||||
"${commandBinDir/gnutls$secondaryArchSuffix/gnutls${secondaryArchSuffix}_bin}"/srptool
|
||||
)
|
||||
fi
|
||||
defineDebugInfoPackage gnutls$secondaryArchSuffix "${debugList[@]}"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
|
||||
--enable-openssl-compatibility \
|
||||
--disable-hardware-acceleration \
|
||||
--disable-nls \
|
||||
--with-default-trust-store-file=/system/data/ssl/CARootCertificates.pem
|
||||
make $jobArgs AUTOCONF=: AUTOMAKE=: AUTOHEADER=: ACLOCAL=:
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install AUTOCONF=: AUTOMAKE=: AUTOHEADER=: ACLOCAL=:
|
||||
|
||||
rm -f "$infoDir"/dir
|
||||
rm -f "$libDir"/libgnutls*.la
|
||||
|
||||
prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx
|
||||
fixPkgconfig
|
||||
|
||||
if [ -n "$commandSuffix" ]; then
|
||||
rm -rf "$commandBinDir" "$documentationDir"
|
||||
maybe_manDir_man3=
|
||||
else
|
||||
maybe_manDir_man3="$manDir"/man3
|
||||
fi
|
||||
|
||||
packageEntries devel \
|
||||
"$developDir" \
|
||||
${maybe_manDir_man3:+"$maybe_manDir_man3"}
|
||||
|
||||
if [ -z "$commandSuffix" ]; then
|
||||
packageEntries bin \
|
||||
"$commandBinDir" \
|
||||
"$manDir"/man1
|
||||
rmdir "$manDir"
|
||||
fi
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check LIBS="-lgnu"
|
||||
}
|
||||
@@ -12,7 +12,7 @@ COPYRIGHT="2000-2018 Free Software Fundation Inc.
|
||||
LICENSE="GNU LGPL v2.1"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="be9143d0d58eab64dba9b77114aaafac529b6c0d7e81de6bdf1c9b59027d2106"
|
||||
CHECKSUM_SHA256="c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114"
|
||||
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.34.1"
|
||||
libgnutlsVersion="30.34.2"
|
||||
libgnutlsxxVersion="30.0.0"
|
||||
|
||||
libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}"
|
||||
@@ -1,94 +0,0 @@
|
||||
From 1b338cadf6aac86feb0dd8531b03f78f9fcd03b3 Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
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 1ae7325..b70db98 100644
|
||||
--- a/tests/mini-dtls-mtu.c
|
||||
+++ b/tests/mini-dtls-mtu.c
|
||||
@@ -24,6 +24,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef __HAIKU__
|
||||
+# include <sys/select.h>
|
||||
+#endif
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef __HAIKU__
|
||||
+# include <sys/select.h>
|
||||
+#endif
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
diff --git a/tests/mini-record-failure.c b/tests/mini-record-failure.c
|
||||
index da4e313..f612365 100644
|
||||
--- a/tests/mini-record-failure.c
|
||||
+++ b/tests/mini-record-failure.c
|
||||
@@ -27,6 +27,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#ifdef __HAIKU__
|
||||
+# include <sys/select.h>
|
||||
+#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
||||
From f5b347a15b3d21948d654a3d19a0d3a905bf674d Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
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.24.0
|
||||
|
||||
|
||||
From fe0a7d0f4b2b257ce8c3a97320927452b0220ded Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Wed, 18 Jul 2018 07:44:23 +0000
|
||||
Subject: doc/examples/tlsproxy/tlsproxy.c calls strdupa and fails to build
|
||||
|
||||
so let's just skip it for now.
|
||||
|
||||
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
|
||||
index c40bf4f..85c6bd6 100644
|
||||
--- a/doc/examples/Makefile.am
|
||||
+++ b/doc/examples/Makefile.am
|
||||
@@ -74,7 +74,6 @@ if ENABLE_SRP
|
||||
noinst_PROGRAMS += ex-client-srp ex-serv-srp
|
||||
endif
|
||||
|
||||
-noinst_PROGRAMS += tlsproxy/tlsproxy
|
||||
|
||||
tlsproxy_tlsproxy_SOURCES = tlsproxy/buffer.c tlsproxy/buffer.h tlsproxy/crypto-gnutls.c \
|
||||
tlsproxy/crypto-gnutls.h tlsproxy/tlsproxy.c
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4d052f4cdffb5d6b1eeb04f3441002cfd79ae075 Mon Sep 17 00:00:00 2001
|
||||
From d5308b25f1afb8bf98f4dbab9156069f3574933e Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Tue, 7 Jun 2016 03:05:44 +0000
|
||||
Subject: include sys/select.h
|
||||
@@ -47,10 +47,10 @@ index 5eb2eff..1f179e7 100644
|
||||
#if defined(_WIN32)
|
||||
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
||||
From 6849461521b15853f3bc0c92c1d5db58e6e42a0d Mon Sep 17 00:00:00 2001
|
||||
From 334834350c2db80b5c7113c287f2920a4bac4aff Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Wed, 6 Jul 2016 22:11:20 +0000
|
||||
Subject: Use /bin/perl instead of /usr/bin/perl.
|
||||
@@ -67,10 +67,10 @@ index 34978d3..96b1067 100755
|
||||
# Copyright (C) 2011-2012 Free Software Foundation, Inc.
|
||||
#
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
|
||||
From e00e545a0f3d443153d8d3c250b0bac26f6f10d2 Mon Sep 17 00:00:00 2001
|
||||
From fddc58ad729d433af8636b4f5e52f5acc9ec5f75 Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Wed, 18 Jul 2018 07:44:23 +0000
|
||||
Subject: doc/examples/tlsproxy/tlsproxy.c calls strdupa and fails to build
|
||||
@@ -90,20 +90,20 @@ 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.36.1
|
||||
2.37.3
|
||||
|
||||
|
||||
From 5afa5b1deca1cbf50934967451914a9cebb4aa48 Mon Sep 17 00:00:00 2001
|
||||
From 443ee88bf3c05e38dc0304ef8a5165a8eb8c8807 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 13 Aug 2022 11:06:09 +1000
|
||||
Subject: Remove static for _Thread_local variables
|
||||
|
||||
|
||||
diff --git a/lib/fips.c b/lib/fips.c
|
||||
index f3d7773..e5c757e 100644
|
||||
index 54eb4a3..3ed17bd 100644
|
||||
--- a/lib/fips.c
|
||||
+++ b/lib/fips.c
|
||||
@@ -50,9 +50,9 @@ struct gnutls_fips140_context_st {
|
||||
@@ -52,9 +52,9 @@ struct gnutls_fips140_context_st {
|
||||
* can use gnutls_fips140_set_mode() to override a specific
|
||||
* operation on a thread */
|
||||
static gnutls_fips_mode_t _global_fips_mode = -1;
|
||||
@@ -131,5 +131,5 @@ index f1abe74..2219cda 100644
|
||||
struct rnd_ctx_list_st {
|
||||
void *ctx;
|
||||
--
|
||||
2.36.1
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user