From nobody Fri Aug 18 02:57:26 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 4RRmkZ4gHVz4qXRh; Fri, 18 Aug 2023 02:57:26 +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 4RRmkZ1schz3XXR; Fri, 18 Aug 2023 02:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692327446; 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=ao6jr1NOVhcG1LC4Z7MGBUgjrGLEHB1uAstfzTIjtmE=; b=sXzBn68bv8Q1CfdDjVxJj+5elAO/xf0kLDTFpoCKk+gJypWhXfDG+t5W8ZdduvzflUiAAQ ST17qKlzC6BzrI4oxCV/5pmxAVNYNqHUVShPug1Q3LVFbi8AZtjtnZ7Hn24Fqirv1INsZd KDLjzJqcOMX/WiFmWB/4P51Z86hveJg/l8dl7TxBLxQ0f77BymABl7IiuEUOGCcpgc18Z/ MV9CYLKUDE/OQmbREwyMGR6ctS+sFsfR94x8Z1M0vPU2hy+2+HZl5BuAwZll+FFoUfIYg0 kG1DnekTMYsDbqBYcwF7A9msffqVZ9Z9KDySHn2+rq2SzvF/bvsCcQ+uO1oR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692327446; 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=ao6jr1NOVhcG1LC4Z7MGBUgjrGLEHB1uAstfzTIjtmE=; b=SHYpssYqDVzgLClOBq9EmJvUriTCBnZ99CojvVehUUF1fp63UY7gdEpuQEM+D2uNehd1t9 zM5Ahf1/+OoGEI5Xq0vXuLlOzW+eA+s97XuQq9s5JmvxxxCCERN4dTnPYlDun8yu0oYqyz XogxbQE/Rrwhk9Y0cX3kdvCA7+NiUj5bBMLVFQTAnZJ4ILGCixSo5CXRVSdz6weyJPiI/u /dOTti/zdIE5avAAoMOLSx9vfS1DNxN4zfDmaqN1BGJYdDk1H3Qp22D5hX4DOfUWnwKBAL fz9Cf/uQHO91Bq23zjwvGoGUROjfhXbHWJ/oMCLfRCNmf9SXvsbjwJ/jtQ0JlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692327446; a=rsa-sha256; cv=none; b=qG69mS9JvISrNmMcxVnG3ecjcdQpVZMl5ZAR5lwlU07O6ycUbzPwk/jTaRMUV26ILTVj6V A49RQyXXPlNDHZwHkslb3PFjZvfZN2fTO2hJOGnzQnMdEIlh2BpXF7gWlkB585PFxAMGd+ gi93wR7czpQNakbmXRmW3AyJtAA06pIxR0bGCW/EvPwznw4u6YeSlihvlY+/2Dnd1dvpYu 1b6zDZi4WYj4pB661UY5WzEfwM86R91OYwXSUUO/NU4dKL0By+rghVd9BQBg7dvHuOF12c qJlywxDrFTZyN2hbOS0SCuCOEI8nnagPIkqkrG6dJ9JlzQ6qQvTthZuXO0C6Jg== 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 4RRmkZ0smvzyY7; Fri, 18 Aug 2023 02:57:26 +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 37I2vQce080198; Fri, 18 Aug 2023 02:57:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I2vQYB080195; Fri, 18 Aug 2023 02:57:26 GMT (envelope-from git) Date: Fri, 18 Aug 2023 02:57:26 GMT Message-Id: <202308180257.37I2vQYB080195@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: fe2bbe58908f - main - news/nzbget: 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: fe2bbe58908f4c3577ba2ffae0ded22db6e804ec Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe2bbe58908f4c3577ba2ffae0ded22db6e804ec commit fe2bbe58908f4c3577ba2ffae0ded22db6e804ec Author: Muhammad Moinur Rahman AuthorDate: 2023-08-18 02:53:50 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-18 02:57:11 +0000 news/nzbget: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- news/nzbget/Makefile | 2 +- news/nzbget/files/patch-configure.ac | 4 ++-- news/nzbget/files/patch-daemon_connect_TlsSocket.cpp | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile index ea5a08273a4c..20807b0566df 100644 --- a/news/nzbget/Makefile +++ b/news/nzbget/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --disable-sigchld-handler .endif .if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L +CXXFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .endif post-install: diff --git a/news/nzbget/files/patch-configure.ac b/news/nzbget/files/patch-configure.ac index 727d6b320cfa..f23d7de16403 100644 --- a/news/nzbget/files/patch-configure.ac +++ b/news/nzbget/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2018-06-06 19:34:34 UTC +--- configure.ac.orig 2023-08-18 02:50:39 UTC +++ configure.ac @@ -37,7 +37,7 @@ dnl Check for programs. dnl @@ -9,7 +9,7 @@ AC_PROG_INSTALL -@@ -553,7 +553,7 @@ dnl +@@ -554,7 +554,7 @@ dnl AC_MSG_CHECKING(whether to use SIMD-optimized routines) USE_SIMD=no case $host_cpu in diff --git a/news/nzbget/files/patch-daemon_connect_TlsSocket.cpp b/news/nzbget/files/patch-daemon_connect_TlsSocket.cpp new file mode 100644 index 000000000000..ac3bb6bb6199 --- /dev/null +++ b/news/nzbget/files/patch-daemon_connect_TlsSocket.cpp @@ -0,0 +1,11 @@ +--- daemon/connect/TlsSocket.cpp.orig 2023-08-18 02:50:58 UTC ++++ daemon/connect/TlsSocket.cpp +@@ -188,7 +188,7 @@ void TlsSocket::Final() + #endif /* HAVE_LIBGNUTLS */ + + #ifdef HAVE_OPENSSL +-#ifndef LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x30000000L && ! defined (LIBRESSL_VERSION_NUMBER) + FIPS_mode_set(0); + #endif + #ifdef NEED_CRYPTO_LOCKING