From nobody Wed Jul 10 05:02:28 2024 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 4WJm1x18Pjz5Q8Kp; Wed, 10 Jul 2024 05:02:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJm1w2kRTz4W7Z; Wed, 10 Jul 2024 05:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720587748; 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=1pUptNLvEuRnq6mzL6t2Y2TDVgNRSd5WukFLD71mXgY=; b=Q91d26W4A64LUTy392AI00ecvyjalIEeq5dhv4b+zMxkffsA5dmAPteF8RmS+AWvxEKmJG 3oH9+Szh4/fq9L/sXfgtFclDG4Bj0ltGsFeXssIxcQZToOiBD2W2Tqox8VEGKkmlnsUYOP 4Ki6SSw33RA8RCSvUVLpYcdIg40jp68MpeYpNgWfJKhGFrtU+lIS1/ubVt56jC/sbjcWYf jL+quEsZx3kfilzg6ZDYkX0zLvG0lhmzf5wE36vPts572a2iK94jufJKvdOTSGzq8WKtVe a93LL3wYmYaUWn3lpWzHsWvrILlZ+VazPsMfIsRf3Cpc45Rhb9HpiyBTr1KcEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720587748; a=rsa-sha256; cv=none; b=bz1Hvq1JTfyGoK08dOeJ9iGJ+ECdGEPNa/w/xyDC6zFRWccjheXdaKOW1XLHSkJlT1pur+ UBxn1H01qELF9ItPn0YTy0I5qaTfp1WBCHhLZMq7DZV0LQVB4WifTwLeLocLmBPtCOUGg0 x9mlM9UWAkHc4b1NskDofSMcsrSFQh/MHkGdQXWceVmsaupH8J6R3ORBBk33c2XyBvhEze sW1vBCs70OAw5eFQOzsMSPQdT71M1vV3dD8OMMyaDLFc8oSn9Qo/iIdyBmg2p3Ih7yGjPH ZOFyxc/EvhNejMqiI7Yc8i+gQosiJLwZZw9ranjbpJem5YOy6xCdo4Av97FsJA== 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=1720587748; 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=1pUptNLvEuRnq6mzL6t2Y2TDVgNRSd5WukFLD71mXgY=; b=JBbiauHM9jF8sYTjv8KvGRkxTwlC4vhFgp1vmhj922HZjfRYvAFTR8cMlkooG8QhK+Tb9/ vToSnu/brQ7bC4V5igHQyzyafEtzK2Y9HXrmdqYBJTPin0gYwKguMevCx/6f9dWWOEs+ya 1oxxdQYtMKtwWfODxj30Os7aMkSXGGfeKSa7DdWDXJ+NM9vsVKtUjSxGuWO13gAN10Tfgc e8ge2mtGbbUfRmSucE5W0Zpkv6fa8ZNf726GaybMiUeiSdQDLcS1ub74q68lDK60z49hMB 0cXwyjWEFvT3KabZ6UTBXIwXsl0eGFrhHqosrLnTyJzPRoXTjXxh598urlXgwg== 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 4WJm1w2LR8z14LY; Wed, 10 Jul 2024 05:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46A52S3U043818; Wed, 10 Jul 2024 05:02:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46A52SVf043815; Wed, 10 Jul 2024 05:02:28 GMT (envelope-from git) Date: Wed, 10 Jul 2024 05:02:28 GMT Message-Id: <202407100502.46A52SVf043815@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: 06adb14f7c14 - main - security/py-certbot-dns-cloudflare: Allow build with py-cloudflare 2.20 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 06adb14f7c14ce3a6b1b79212ecb5e669a39425a Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=06adb14f7c14ce3a6b1b79212ecb5e669a39425a commit 06adb14f7c14ce3a6b1b79212ecb5e669a39425a Author: Po-Chuan Hsieh AuthorDate: 2024-07-10 04:58:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-07-10 04:59:40 +0000 security/py-certbot-dns-cloudflare: Allow build with py-cloudflare 2.20 - Bump PORTREVISION for package change --- security/py-certbot-dns-cloudflare/Makefile | 3 ++- .../files/patch-cloudflare | 28 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/security/py-certbot-dns-cloudflare/Makefile b/security/py-certbot-dns-cloudflare/Makefile index 87772f23881d..e5ba275f7908 100644 --- a/security/py-certbot-dns-cloudflare/Makefile +++ b/security/py-certbot-dns-cloudflare/Makefile @@ -1,5 +1,6 @@ PORTNAME= certbot-dns-cloudflare PORTVERSION= ${ACME_VERSION} +PORTREVISION= 1 CATEGORIES= security python MASTER_SITES= PYPI \ https://github.com/certbot/certbot/releases/download/v${PORTVERSION}/ @@ -19,7 +20,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cloudflare>=1.5.1<2.20:dns/py-cloudflare@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cloudflare>=1.5.1<2.20_99:dns/py-cloudflare@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=41.6.0:devel/py-setuptools@${PY_FLAVOR} USES= python diff --git a/security/py-certbot-dns-cloudflare/files/patch-cloudflare b/security/py-certbot-dns-cloudflare/files/patch-cloudflare new file mode 100644 index 000000000000..c7e24299416b --- /dev/null +++ b/security/py-certbot-dns-cloudflare/files/patch-cloudflare @@ -0,0 +1,28 @@ +--- certbot_dns_cloudflare/_internal/dns_cloudflare.py.orig 2024-06-05 21:34:02 UTC ++++ certbot_dns_cloudflare/_internal/dns_cloudflare.py +@@ -99,12 +99,12 @@ class _CloudflareClient: + # We can't use named arguments in this case, as it would break compatibility with + # the Cloudflare library since version 2.10.1, as the `token` argument was used for + # tokens and keys alike and the `key` argument did not exist in earlier versions. +- self.cf = CloudFlare.CloudFlare(email, api_key) ++ self.cf = CloudFlare.CloudFlare(email, api_key, warnings=False) + else: + # If no email was specified, we're using just a token. Let's use the named argument + # for simplicity, which is compatible with all (current) versions of the Cloudflare + # library. +- self.cf = CloudFlare.CloudFlare(token=api_token) ++ self.cf = CloudFlare.CloudFlare(token=api_token, warnings=False) + + def add_txt_record(self, domain: str, record_name: str, record_content: str, + record_ttl: int) -> None: +--- setup.py.orig 2024-06-05 21:34:03 UTC ++++ setup.py +@@ -9,7 +9,7 @@ install_requires = [ + install_requires = [ + # for now, do not upgrade to cloudflare>=2.20 to avoid deprecation warnings and the breaking + # changes in version 3.0. see https://github.com/certbot/certbot/issues/9938 +- 'cloudflare>=1.5.1, <2.20', ++ 'cloudflare>=1.5.1, <=2.20', + 'setuptools>=41.6.0', + ] +