From nobody Fri Mar 25 13:45:43 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 CF9DC1A2F81C; Fri, 25 Mar 2022 13:45:45 +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 4KQ3JS6J42z3Mt9; Fri, 25 Mar 2022 13:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648215945; 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=tMo6KCVKkLyjvwYHFf/F8rvveXfeCg1yl6QoHKh/ros=; b=PPlumYFfGbPwankrv0mYYljVT4eqjDmLhPanLn3e57SSQ9DrMcALSdCGwiTYyNogYcBhFJ fleDpchLsAWqqhRJCD0+S46Bs8r1CE3sLZ7x3lCxJvLcysqyD7NKL3xUlUr103DNZIJSDC etoDalv6fzQjpdfMB07QKTlcP+NRJ1L14fihJ10YoZbIgPZUXSJp72cRsB5bprbm4TwfoE PCsGG7pqaMSFzIkE3MUX3gKejss9ybxqDBe53cx4xHlMp87wHKMJoRuDbnwZMan44nzwQb dTOJCrv4isFx10AAh1VjLnnQhPQIsi/obnnv5EuSBa8eJNA0gtrogMJcpVp7iQ== 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 EF94454E0; Fri, 25 Mar 2022 13:45:43 +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 22PDjhPi022447; Fri, 25 Mar 2022 13:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDjhSY022446; Fri, 25 Mar 2022 13:45:43 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:45:43 GMT Message-Id: <202203251345.22PDjhSY022446@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 213add47de1a - main - www/py-aioh2: Fix build with Python 3.7+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 213add47de1a7e72d3f37dcadf68422fb34fbb73 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648215945; 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=tMo6KCVKkLyjvwYHFf/F8rvveXfeCg1yl6QoHKh/ros=; b=aqQ+cL6TG5LSkwE6VrzgqN0sK1zyNfheBhsrwDBT75razLu3aHoLnvFTWUCgKJ8348NySX NePUeow7iIAaere71W/Ebw2RY3gSTM/694zk0u3rsGcCxxt9uz+/PY/y+/3YhTBYFIThIz W8LFkdk8f1vIfseIF5+JEcsFEtF+jqukyg18sxre3AMkpZenlbwm1kss8aILdCozv7qeuU ba3rwn6qeVNhDoSa8BDpcfHihExpKmVjs1Ak00SRVrY5nJRVYo1IBHqSNjgKjdInIi3469 UYhBJtjTGL6vRehz2ANaeG7Uu+E6MBVknvx+M+Rdgo2IfmjSFh5rRfJILu3W/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648215945; a=rsa-sha256; cv=none; b=ys8g6c5POp9D3l0LlZvXtyq6RWV5DIQb5/MfOY648DUqRbBLbS8qHwfB/MTiEBuqUWImn4 WbJspeIgzhzSgqXt40N/UK7tiS296C1WN8a4pSOl+Li2sOCtsGm/ZZvLtlcaLw1ITzyvTp DF8nfuLQKuHjSVLZrVECVLL9EcvFsZaYvrjiXJYiT8GyLq9o/8o7xrUkJS+47OBVdpP10Z T0M9EGsYyXsg6ejE/izPHllkDh1GJ2BmH5I3gjDHbElXBLMYxz7xSf/5k6tZwtCi+WRGOI ivcDF0tmj3cL3DiGPwD8dbQurjhvwe7q0P1csFmwSVwPLwWVSJ/jxuwFsxaCfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=213add47de1a7e72d3f37dcadf68422fb34fbb73 commit 213add47de1a7e72d3f37dcadf68422fb34fbb73 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:04:49 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:37:17 +0000 www/py-aioh2: Fix build with Python 3.7+ --- www/py-aioh2/Makefile | 2 +- www/py-aioh2/files/patch-aioh2-helper.py | 8 ++++++++ www/py-aioh2/files/patch-aioh2-protocol.py | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/www/py-aioh2/Makefile b/www/py-aioh2/Makefile index dcf1ce40304d..23c495a4da46 100644 --- a/www/py-aioh2/Makefile +++ b/www/py-aioh2/Makefile @@ -12,7 +12,7 @@ COMMENT= HTTP/2 implementation with hyper-h2 on Python 3 asyncio LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h2>=3:www/py-h2@${PY_FLAVOR} \ +xRUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h2>=3:www/py-h2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}priority>=1.3.0:www/py-priority@${PY_FLAVOR} USES= python:3.4+ diff --git a/www/py-aioh2/files/patch-aioh2-helper.py b/www/py-aioh2/files/patch-aioh2-helper.py new file mode 100644 index 000000000000..1df8af12a2a2 --- /dev/null +++ b/www/py-aioh2/files/patch-aioh2-helper.py @@ -0,0 +1,8 @@ +--- aioh2/helper.py.orig 2018-02-05 02:31:19 UTC ++++ aioh2/helper.py +@@ -86,4 +86,4 @@ if hasattr(socket, 'AF_UNIX'): + if hasattr(asyncio, 'ensure_future'): # Python >= 3.5 + async_task = asyncio.ensure_future + else: +- async_task = asyncio.async ++ async_task = getattr(asyncio, "async") diff --git a/www/py-aioh2/files/patch-aioh2-protocol.py b/www/py-aioh2/files/patch-aioh2-protocol.py new file mode 100644 index 000000000000..1bad65b74c6b --- /dev/null +++ b/www/py-aioh2/files/patch-aioh2-protocol.py @@ -0,0 +1,11 @@ +--- aioh2/protocol.py.orig 2017-12-03 09:08:55 UTC ++++ aioh2/protocol.py +@@ -380,7 +380,7 @@ class H2Protocol(asyncio.Protocol): + if self._handler: + raise Exception('Handler was already set') + if handler: +- self._handler = asyncio.async(handler, loop=self._loop) ++ self._handler = async_task(handler, loop=self._loop) + + def close_connection(self): + self._transport.close()