From nobody Tue Nov 01 10:31:15 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N1mX32swbz4gwpR; Tue, 1 Nov 2022 10:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N1mX32QX9z3M5Q; Tue, 1 Nov 2022 10:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667298675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTW21DC3I/YdfQu7NtMGIJASGVLDkW+VSRR1Bm8rv44=; b=VXFTk+Zrp85ZD/eFpbbdjvteDPFGfLgNjHwUA5lWJbtYp6D6hF6dB04Oxh0+EE1UsaEQul /DXaYrrxJfejtui0BpiUpOdLBJcIRxEbLTPSzqmolDW6a4014moZjpHmDgIdfXuTizxvsw MeRl0GNeIKo6NaSpDBCkzWwW8FJxZn9tLlnlMBZ60c+3i9OHLNJJVOV+znZfuXlLljdVbz 2CIArn+hrkMrMucrdLVvt35V19a+ba4SUWYY1EwxprYuBJqCpXD7/DZqG7bNyuTTaUHMJL +Pg/O02VnmgWMbifnvVZA482kUDE+9AyapuCrj9LduS28vkBKIdu7XfXga+kUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N1mX31Cdrz1BTx; Tue, 1 Nov 2022 10:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A1AVFuV071031; Tue, 1 Nov 2022 10:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1AVFJ0071030; Tue, 1 Nov 2022 10:31:15 GMT (envelope-from git) Date: Tue, 1 Nov 2022 10:31:15 GMT Message-Id: <202211011031.2A1AVFJ0071030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 59e28f1603b3 - main - databases/freetds: Fix build with libressl 3.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59e28f1603b39daa7ebe4ad909bbd3146927a004 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667298675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zTW21DC3I/YdfQu7NtMGIJASGVLDkW+VSRR1Bm8rv44=; b=dazBdGrJPcwAuLV9U7xe3bWp51GdvclQrdhvmNSESfAbWe4lfWHh73LZL8qwXAVNY7/YIU MNFQFl82SNkIXAoHayhX753lgOybh1dBQlk5vvDg/qKUzvctaLN51/X4xUwV276A64iE2w /L5At1rmUuYguLAzLS4GOBbqx9twjohHUlyIwKZta7nTSAackCT5gxx4iS5AzvnCtR+tMG Ds/VNTC3NWCFdszkQM/VfOmkW75P3iCiVTeNI7j0iwTwsf7ESUBAqYX7iZdRbjjGtX5+we zADW6D7fks06DcLQIfwJFW+Z+st5XP4pp1znIj1Z0IF3vIvJogZyUbdYDILXpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667298675; a=rsa-sha256; cv=none; b=e4Bem1d5H5qFu0RhuCrg8k5dQb7gCYHWXgj0rwdFM9ijES2GjjGtR3zFP2D+06H0Yd56sv T8FJJCpk9WW+8NRgN9r/k9M+W5pixV8MIwPasHC7L2KlM2gTU9cTW2oltdBPw5eYlugQJv E1fSp+fhWD9og27tfH8wNBSeIkhOPiEFvJDBWClXsxvyvq1ij76J0kKppRVAbyDEgXmmAn x8CQaRn/nizFFj+rzPhDmh5bMmUOS57oJqfSNWjSjNkZr+WvzrZE+XQ0bZme4uB6dzgS/d Q20DOEWAXFQ7USwRZM0hHSu2LF6tzG+Mu+nkRobLTRfY0GNhBLTcm11kOvWGRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=59e28f1603b39daa7ebe4ad909bbd3146927a004 commit 59e28f1603b39daa7ebe4ad909bbd3146927a004 Author: Felix Palmen AuthorDate: 2022-10-17 11:45:38 +0000 Commit: Felix Palmen CommitDate: 2022-11-01 10:30:35 +0000 databases/freetds: Fix build with libressl 3.5 Approved by: bofh (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D37052 --- .../files/patch-src_tds_sec__negotiate__openssl.h | 14 ---------- databases/freetds/files/patch-src_tds_tls.c | 32 ++++++++++++---------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h b/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h deleted file mode 100644 index 301e80834bf7..000000000000 --- a/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tds/sec_negotiate_openssl.h.orig 2017-02-15 09:00:01 UTC -+++ src/tds/sec_negotiate_openssl.h -@@ -37,6 +37,11 @@ - #error HAVE_OPENSSL not defines, this file should not be included - #endif - -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL -+#undef OPENSSL_VERSION_NUMBER -+#define OPENSSL_VERSION_NUMBER 0x1000107fL -+#endif -+ - static inline const BIGNUM* - rsa_get_n(const RSA *rsa) - { diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c index 028370fc1025..7fb0c8912abb 100644 --- a/databases/freetds/files/patch-src_tds_tls.c +++ b/databases/freetds/files/patch-src_tds_tls.c @@ -11,19 +11,21 @@ #include #include #include -@@ -74,6 +78,15 @@ - #define SSL_PUSH_ARGS gnutls_transport_ptr_t ptr, const void *data, size_t len - #define SSL_PTR ptr - #else -+ -+#ifdef LIBRESSL_VERSION_NUMBER -+#if LIBRESSL_VERSION_NUMBER < 0x2070000FL -+static pthread_mutex_t *openssllocks; -+#undef OPENSSL_VERSION_NUMBER -+#define OPENSSL_VERSION_NUMBER 0x1000107fL -+#endif -+#define TLS_ST_OK SSL_ST_OK -+#endif +@@ -600,7 +604,7 @@ tds_ssl_free(BIO *a) + return 1; + } + +-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x1010000FL + static BIO_METHOD tds_method_login[1] = { + { + BIO_TYPE_MEM, +@@ -664,7 +668,7 @@ tds_deinit_openssl_methods(void) + # endif + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x1010000FL + static tds_mutex *openssl_locks; - /* some compatibility layer */ - #if !HAVE_BIO_GET_DATA + static void