From nobody Wed May 15 03:36:41 2024 X-Original-To: dev-commits-ports-all@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 4VfJmn5Np8z5K2QT; Wed, 15 May 2024 03:36:41 +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 4VfJmn48hnz45L8; Wed, 15 May 2024 03:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715744201; 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=9OcjmU27SmBvFCX8yZvLqJXcuHv2O+7l7qn7nXn8F4A=; b=lhhjwVS8SUTZz6n3O8AdlCYl3xwVeygcog61jFcpJ0XAavXVICWYKgtD59dvEbPpvdXeJY BiX3MNFcd5QedQh8dxWz/B5u3WASXumUuu8Vchn0vxohen/aQosfWjFFtlynQqmGMRUQ0A Mx0tPGJUYkis+e5h4LEMtuaFKkvIllGX7WF01tSjIJ1NYXqimhTF7AySCgvws+1+F6J6bX 8dfpIbScHe6IjbK6/oF9X3NWAcllkxzRXChREZiPwC+uCj7VfGgeRUT9cSbZ1dHnLTd1Iv bD1TZEH6qq847Tl/l81Am4kvVy21Cgry+RXt0I+mLyeLG+yHrtlIMvCuavhQ+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715744201; a=rsa-sha256; cv=none; b=armNaa9UrkH7n6rVbZxehscnu8DEgPRSv5Racr3HIY29lmfV1I2jkSKgLzfT3IEkf2b1aF O2qrKRg61pRLSZXO4oiAmuZh4yX5iiuqTb738VqynoyImPKm6+5C3iYCylThvYMzMkthjO MsPa80VFsqjBNQr7nOtCnzGJkmRCpdRVJeTcNJsqSL1Njoe81N12+1eEfuBc2FNopwSe7+ A5zEDbzPYe5saw8gNmJjku78okqFbLeCVqCeh97dnnZE0I7MI0xH6oFz5iUW0r8AhSq/co JGURdMXSoNmjoIx6wv1syfuISQXPqZT4beqwEDQVUFbAHwk6YmvrC6gaiTb6CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715744201; 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=9OcjmU27SmBvFCX8yZvLqJXcuHv2O+7l7qn7nXn8F4A=; b=AWmGsBZpor4b4illMQfmOfEbYR9FDp5p9/1n5VSE4FitJa2UdfU4p3v9LZ3bqE7J1q42Dq +fWeL9xffoEb0s/8Vg9/Es9fssAcZRpQUE3LtlI/531C2XEIbuVDfoWwzSRFf/au5vaM7x 2JkIUUTZsE7F1ZQv9k5oCpF+1+ah64LpcXfFuDAoULT69FYoEEC4H4xZjDDFheAuLMunsH ZuwoH1osvLFJkJmqtYjXjBz7bGmGs06/1kQ/wRSEdh1vj8WnCZOJHPWTLRlpcNHGeN0kin 5k+j4UZ+wbDBop+dTBn/gLsQq07tjiscCMCMv8hw3nPPfqlNlJ9HijhRT8v4fQ== 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 4VfJmn3m7wz1075; Wed, 15 May 2024 03:36:41 +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 44F3afSl003460; Wed, 15 May 2024 03:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44F3afZL003457; Wed, 15 May 2024 03:36:41 GMT (envelope-from git) Date: Wed, 15 May 2024 03:36:41 GMT Message-Id: <202405150336.44F3afZL003457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yasuhiro Kimura Subject: git: 35b4d1f670d8 - 2024Q2 - lang/python27: Fix build with 'DEFAULT_VERSIONS=ssl=openssl' List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 35b4d1f670d897a7e8614df4f5e19da521208c5a Auto-Submitted: auto-generated The branch 2024Q2 has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=35b4d1f670d897a7e8614df4f5e19da521208c5a commit 35b4d1f670d897a7e8614df4f5e19da521208c5a Author: Yasuhiro Kimura AuthorDate: 2024-05-15 03:34:26 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-05-15 03:36:00 +0000 lang/python27: Fix build with 'DEFAULT_VERSIONS=ssl=openssl' Reported by: Odhiambo Washington Approved by: portmgr blanket (just fix it) MFH: 2024Q2 (cherry picked from commit 69ce5e29a540b5550a269d18651fdea2b7c79eda) --- lang/python27/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 44c4fa1ed2c1..9f8d453d4424 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -121,7 +121,8 @@ post-patch: # openssl/opensslv.h so setup.py just detects the string as 00000000 # However care should be taken for the OSVERSION. If OpenSSL 3.0.9 # lands later the OSVERSION string should be fixed accordingly -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && (${SSL_DEFAULT} == base || ${SSL_DEFAULT:Mopenssl3*} ) +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && (${SSL_DEFAULT} == base || \ + ${SSL_DEFAULT} == openssl || ${SSL_DEFAULT:Mopenssl3*} ) @${REINPLACE_CMD} -e 's|00907000|00000000|' \ ${WRKSRC}/setup.py .endif