From nobody Mon Aug 07 12:27:09 2023 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 4RKFv15XKRz4mWyd; Mon, 7 Aug 2023 12:27:09 +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 4RKFv14yvNz3ZlL; Mon, 7 Aug 2023 12:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691411229; 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=8pwnpR03W/HzqZJWDmsHnMBfV4nzLZhIjy+KtA9Cs8I=; b=Sp8ZYLvMAH2Tu56vKzsXleDNlHGNU+5gw85pmgjP0TdW04ZSOOYvTu9HT6ZUnd1lY8W77G uRuk+lR/h3SVT3pM8j0In96vabMRriml5ET3cXOU9RN/XjkrlswLZdns4kEp/uUgsdTI6C t0F01pjHCicwgbOAiFmbuTQY+n//P2rNO3JhuHZSdAQwG85tH6qeWQweEQ9e8c7D5vYmij HxhVdUhmWOoIgc6xyNvhj4PlV0mUqq4q6DtpFQeeZ2+kw/FlKQnKH8zPW/0mQFO6WzXWwX FfeQTEzsEhmFamYVm4zS1aSbJTIuVMDhHKdoLKL31jukrXkIIbTVjo0MeyvWaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691411229; 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=8pwnpR03W/HzqZJWDmsHnMBfV4nzLZhIjy+KtA9Cs8I=; b=lrZSW3LnqOjFjpbvU4K4+vO+F7ZGCE3V+RDYreggkebsb8opZic3xmzs4fFnxPF8+2tONz gkYIAOmTKR/04l/OH2vDLqgRQ9AeriwDJbJZyp5SvYgoS6PGI1uoWaQDlF4KS50dqZIZGr YGkXk2flU0MiStoaOFhsOpdq/UqexVEvkAiFLC0xwD12n5bfhpZaymJuuXngh4suGD0i0d 2puAb6szGq8/Bu1h3JOFpgKpoJ8UxelwK0MfKG+ZCrHUj333l9752CFOSOH7SixME43V/F biwWYsS7zVVzhJUPd8Un7U/p7FOrSg09zkOQjm4q4cvjXsBtrZhZX7bn4FZ0Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691411229; a=rsa-sha256; cv=none; b=VAfZqxAQcKEMOuHMFPrxZTehtVWXldtZ9ikpXZ5p0PkdhLgvhqE34KaA6M6dk0EGVEn7Wz xkYSP4xyQlh7eCtJn23d5PMeLVzjfLB8yRcydbArdl35FWBHnA9qsRAM91mB5lQXRiPY0q qUhMmdtcS7p2TM4ydo7H1jyOv0YAWQVL5UF+lbOY+egFFRK57exWadc+52FX/usvkfZ7zk BNJED3N1cd1vItrFj2TrRHDKppykNz6DUGMAtef4Q5I+jnVydbqCA3ud09f3x18OabsIko WmohgWEqMLXQv9Fl1xwj9S6t1b77TP6E4kwKpG8bV1uglqAIJOdYebWieNzCCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKFv142SZzrxM; Mon, 7 Aug 2023 12:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377CR9x6026725; Mon, 7 Aug 2023 12:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377CR9xZ026724; Mon, 7 Aug 2023 12:27:09 GMT (envelope-from git) Date: Mon, 7 Aug 2023 12:27:09 GMT Message-Id: <202308071227.377CR9xZ026724@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: 6c2f5fd23f9b - main - devel/thrift-c_glib: Fix build with openssl3 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: 6c2f5fd23f9bd7ead34f2d7a70dcbad1eb70d3c6 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c2f5fd23f9bd7ead34f2d7a70dcbad1eb70d3c6 commit 6c2f5fd23f9bd7ead34f2d7a70dcbad1eb70d3c6 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-07 02:29:05 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-07 11:54:43 +0000 devel/thrift-c_glib: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- devel/thrift-c_glib/Makefile | 6 ---- ..._thrift_c__glib_transport_thrift__ssl__socket.c | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile index fec3671f2a2c..f92aa8a86df8 100644 --- a/devel/thrift-c_glib/Makefile +++ b/devel/thrift-c_glib/Makefile @@ -28,12 +28,6 @@ USE_LDCONFIG= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" -.include - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L -.endif - post-patch: @${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \ ${WRKSRC}/lib/rb/ext/extconf.rb diff --git a/devel/thrift-c_glib/files/patch-lib_c__glib_src_thrift_c__glib_transport_thrift__ssl__socket.c b/devel/thrift-c_glib/files/patch-lib_c__glib_src_thrift_c__glib_transport_thrift__ssl__socket.c new file mode 100644 index 000000000000..93f34cc44d9b --- /dev/null +++ b/devel/thrift-c_glib/files/patch-lib_c__glib_src_thrift_c__glib_transport_thrift__ssl__socket.c @@ -0,0 +1,35 @@ +--- lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c.orig 2023-08-07 02:22:44 UTC ++++ lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c +@@ -86,7 +86,7 @@ static unsigned long thrift_ssl_socket_static_id_funct + #endif + } + +-static void thrift_ssl_socket_static_locking_callback(int mode, int n, const char* unk, int id) ++static void thrift_ssl_socket_static_locking_callback(int mode, int n, const char* unk, int id) + { + THRIFT_UNUSED_VAR (unk); + THRIFT_UNUSED_VAR (id); +@@ -380,7 +380,7 @@ gboolean + thrift_ssl_socket_flush (ThriftTransport *transport, GError **error) + { + ThriftSSLSocket *ssl_socket = THRIFT_SSL_SOCKET (transport); +- ++ + ThriftSocket *socket = THRIFT_SOCKET (transport); + + ThriftTransportClass *ttc = THRIFT_TRANSPORT_GET_CLASS (transport); +@@ -675,7 +675,9 @@ thrift_ssl_socket_initialize_openssl(void) + SSL_library_init(); + ERR_load_crypto_strings(); + SSL_load_error_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_BIO_strings(); ++#endif + + /* Setup locking */ + g_debug("We setup %d threads locks", thrift_ssl_socket_static_thread_setup()); +@@ -867,4 +869,3 @@ thrift_ssl_socket_context_initialize(ThriftSSLSocketPr + + return context; + } +-