From nobody Thu Jun 02 05:30:46 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 3D9DB1B49B00; Thu, 2 Jun 2022 05:30:47 +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 4LDF3W14kxz4rD3; Thu, 2 Jun 2022 05:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654147847; 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=oomEtFpsNd7k9nrZii7uibH+gWw6i0rZWVUyJtEET3w=; b=ym8rVhUTXWfY6OFwql/6m0VwLzMskYGSbWuSaBIGJZfZurbNREmNWI16grHAxga1XQONio JySd1tUcQosDy5gmZvb+7uFBmGg4LV9ub3uYBWmdMSzyZO2EE0Bt4+pwXrIuownXSPs+cC jyn02T5K9wWm6IPy3ctGsl+5Qlrb44qZ4egTlwxAYy7mTqeq4IJrdAOwsDGBzkNEFUcyzf k+nflxhNruhPkZTrFrM1KyZNIYqdTz9YyUUdCQJhq+8YRLMlGWeYzoiov9VZrUh/IDwv/P ItQdcbEg0CU/Zehiva7s1T1sM7uiLtsmyJSAkVgAW2VmcqUE/3mHyLcEHrDGTA== 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 04B4A6C85; Thu, 2 Jun 2022 05:30:47 +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 2525UkbH059310; Thu, 2 Jun 2022 05:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2525UktN059309; Thu, 2 Jun 2022 05:30:46 GMT (envelope-from git) Date: Thu, 2 Jun 2022 05:30:46 GMT Message-Id: <202206020530.2525UktN059309@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: de3ce5e283c8 - main - databases/freetds: Update version 1.3.10=>1.3.11 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de3ce5e283c8d28b0e8a0c7927b2219a3348cad4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654147847; 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=oomEtFpsNd7k9nrZii7uibH+gWw6i0rZWVUyJtEET3w=; b=s8qnmxdGOiCAYahEKguJ4ttNKGRxuGUD9BDCxl/U3sS699ONEaQPUPrUdustqtWlP7Hei0 luYeBNBTt1JOhPKvqewvM9u6GD4ADEtRx2UKw65pWdusJI+g1YvMBEoR+IWR1DVUGTyNXW AHj/6a419FORf9Dpgx3Wn2HhP3MxmIOkaZ1+EGopM53NEbQ5S46b8XX/F6anXmbibfuKSq lSu89HWrGTmqcqPtSJDluxi8sh8528JX2L4FWIg5A9oGmUIxnJl/sk9jBPufp3yfhipazi 0S8kFq+s/qhKeSezj1ZOWIXILNSzw2dWpnlRDfiJmYpP2qhU5+BNG8VI+5ovJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654147847; a=rsa-sha256; cv=none; b=FguvwtZ6ZTorkx47qhsj4X1zuMMH2hk+dg9IEW2wmRJSsBSQf6Csda7Wji9uWka5XR1NEA LelKG6qjXWoxaTrrhBBszd0Oec1XLuj1a3LMnN6U2BYvpkAHldCs5EDzOFo6wYhfgJR3A+ xQDImLzyji3pKqPXkw7ob04LRIsLBRI1ohJdu2aBoxyi/Q9/VZSPQjGvJMPHRdXegBqPZI aRhsIXmH8PrFLrAHPWw7ye0YNr8PHHc9mY1MDyuwIq8Pau0Ml6i1kekGDIZOq+n1aiVdlQ t1CgD2cDJpS7F+YjX6MdRHBtca0oUqbINydCpjZP4wXFgtXM8CcVBd3Ht2KAfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=de3ce5e283c8d28b0e8a0c7927b2219a3348cad4 commit de3ce5e283c8d28b0e8a0c7927b2219a3348cad4 Author: Muhammad Moinur Rahman AuthorDate: 2022-06-02 04:25:13 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-06-02 05:30:29 +0000 databases/freetds: Update version 1.3.10=>1.3.11 Relnotes: https://github.com/FreeTDS/freetds/releases/tag/v1.3.11 --- databases/freetds/Makefile | 3 +- databases/freetds/distinfo | 6 +-- databases/freetds/files/patch-src_tds_tls.c | 70 +++-------------------------- 3 files changed, 9 insertions(+), 70 deletions(-) diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 0283890c5679..30888353ef90 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,8 +1,7 @@ # Created by: Domas Mituzas PORTNAME= freetds -PORTVERSION= 1.3.10 -PORTREVISION= 1 +PORTVERSION= 1.3.11 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= https://www.freetds.org/files/stable/ \ diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo index ae8d2fb334b0..048ac8db3273 100644 --- a/databases/freetds/distinfo +++ b/databases/freetds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650583357 -SHA256 (freetds-1.3.10.tar.bz2) = 819aeaf7feaa1bfdbc2213f81ad067061dd4c56245996a4e2b529d87296a5d63 -SIZE (freetds-1.3.10.tar.bz2) = 2245042 +TIMESTAMP = 1654110934 +SHA256 (freetds-1.3.11.tar.bz2) = 31ab43617cb096788975eb2b5503b32893f1faca2dabe31543b8c09a8d9d1b8a +SIZE (freetds-1.3.11.tar.bz2) = 2245358 diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c index 35612e6faff3..028370fc1025 100644 --- a/databases/freetds/files/patch-src_tds_tls.c +++ b/databases/freetds/files/patch-src_tds_tls.c @@ -1,4 +1,4 @@ ---- src/tds/tls.c.orig 2021-08-31 09:00:01 UTC +--- src/tds/tls.c.orig 2022-05-31 06:46:53 UTC +++ src/tds/tls.c @@ -53,6 +53,10 @@ #include @@ -11,19 +11,11 @@ #include #include #include -@@ -63,7 +67,7 @@ - - /** - * \addtogroup network -- * @{ -+ * @{ - */ - - #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) -@@ -75,6 +79,15 @@ +@@ -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; @@ -32,58 +24,6 @@ +#endif +#define TLS_ST_OK SSL_ST_OK +#endif -+ + /* some compatibility layer */ #if !HAVE_BIO_GET_DATA - static inline void -@@ -115,7 +128,7 @@ tds_pull_func_login(SSL_PULL_ARGS) - int have; - - tdsdump_log(TDS_DBG_FUNC, "in tds_pull_func_login\n"); -- -+ - /* here we are initializing (crypted inside TDS packets) */ - - /* if we have some data send it */ -@@ -450,7 +463,7 @@ tds_ssl_init(TDSSOCKET *tds) - const char *tls_msg; - - xcred = NULL; -- session = NULL; -+ session = NULL; - tls_msg = "initializing tls"; - - if (!tls_initialized) { -@@ -826,18 +839,25 @@ check_name_match(ASN1_STRING *name, const char *hostna - static int - check_name_match(ASN1_STRING *name, const char *hostname) - { -- char *name_utf8 = NULL; -+ char *name_utf8 = NULL, *tmp_name; - int ret, name_len; - - name_len = ASN1_STRING_to_UTF8((unsigned char **) &name_utf8, name); - if (name_len < 0) - return 0; - -+ tmp_name = tds_strndup(name_utf8, name_len); -+ OPENSSL_free(name_utf8); -+ if (!tmp_name) -+ return 0; -+ -+ name_utf8 = tmp_name; -+ - tdsdump_log(TDS_DBG_INFO1, "Got name %s\n", name_utf8); - ret = 0; - if (strlen(name_utf8) == name_len && check_wildcard(name_utf8, hostname)) - ret = 1; -- OPENSSL_free(name_utf8); -+ free(name_utf8); - return ret; - } - -@@ -1095,4 +1115,3 @@ tds_ssl_deinit(TDSCONNECTION *conn) - - #endif - /** @} */ --