From nobody Wed Mar 22 13:14:21 2023 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 4PhTT94FwPz40qVq; Wed, 22 Mar 2023 13:14:21 +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 4PhTT942pVz4VKt; Wed, 22 Mar 2023 13:14:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679490861; 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=OmURo8uPI4JRkXsljg/Ve5qiyVadIXpQBnjYVtu03jA=; b=iOQPFdSQX7fpm3AKXMQOJxlB8e86eoixh6r3jbdC2Ca1ueFZqBlJpaeZ5dQjDzY8znx/e+ FT7pviTOvFBkVMTSSQ0YxO27xVViFCMcrco/xtVMqg5JJZ2u0j0wIUb9va9fAmcvLYm4QU pgdXpJhu2GEo6hj3l9l4JNLgl8VnqBygwoH/uPKS3n/o9AIIgqPLW87Y+cKxqp6mCoUUwr 2lsVApybIi9RqZVL91YEnbdOydVAJL8cw6/XVODXVzySXA5JVvAwS+EtN7kOPAjEDwEK4c vqOfb34dp3bB12yJv/R1q0WHTAuWDbqL8DF3v0c3cwyo1ouRQJweB1y+kWq6IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679490861; 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=OmURo8uPI4JRkXsljg/Ve5qiyVadIXpQBnjYVtu03jA=; b=wh9noYtfzcvHFAvhr+BICVQjinAia5Oj/r0YcHjYgodTeilRSMY3YJiZfnG15f0QPQwkqn tMhJJNNJl3MnBQrOM0xUDs0Gxlyu6GQhoas1xoyMPM7tnJY7KSrywv8jnaPe8ZLp4CdoEo PAtF6tN3dPzoBKWOAh0H0dMmLE8ngA1gm98ix29zvbYE2fo+aszPkTioo39GURs3VqdE6x dwnY01RkYHjBXGVmw4Vf6dM8Mkx4RGQZX66JQ+e2M4JU6EmrDovJqoX1vZnJP553ytMWjK Nwc20veIxcA9YYpba6sJlDp1tNhMM7VGSjbOGX+FEaI9si2eKP+3mXt3TK96lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679490861; a=rsa-sha256; cv=none; b=CBOGQYZn77YdrtKp0xpSOs5KgU59jPvLUAtgqLrYC61F9zM+wz0pgKrnw/VdIMYqqgaTGT 29vIS9jXcA32Dil7B8Nhr8Za2zsTpfy0uQIOEolaEpdWCmTxrLMdnO2fiCDN+AG0dwm89F 2HGAxyaHKDOtOijdE4ag60pQO7IWyM7C/MLrfWopSkvo6zxdlDhzAvfpOtXG4J+DxJiYzH +QP267tadtoRJHuLGdw3VPl00HtFGBIyjshJFcKqp/3ig0eSzjNgzxLIXRO3Dn5PxRI3AC RFOH7YmBxTftZntONjeTwDp8sw81U/V1mZGUxaZHxPqlpOqUapWQPkzQi2d4OA== 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 4PhTT934Z6zvh0; Wed, 22 Mar 2023 13:14:21 +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 32MDELLx095998; Wed, 22 Mar 2023 13:14:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MDELoY095997; Wed, 22 Mar 2023 13:14:21 GMT (envelope-from git) Date: Wed, 22 Mar 2023 13:14:21 GMT Message-Id: <202303221314.32MDELoY095997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 178e3d993185 - main - security/py-{acme,certbot*}: Update to 2.4.0 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 178e3d99318508ab2a9b31c1e8b6213350bff63b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=178e3d99318508ab2a9b31c1e8b6213350bff63b commit 178e3d99318508ab2a9b31c1e8b6213350bff63b Author: Yasuhiro Kimura AuthorDate: 2023-03-08 04:55:23 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-03-22 13:13:45 +0000 security/py-{acme,certbot*}: Update to 2.4.0 ChangeLog: https://github.com/certbot/certbot/releases/tag/v2.4.0 PR: 270025 Approved by: maintainer timeout --- security/py-acme/distinfo | 6 ++--- security/py-acme/version.mk | 2 +- security/py-certbot-apache/distinfo | 6 ++--- security/py-certbot-dns-cloudflare/distinfo | 6 ++--- security/py-certbot-dns-digitalocean/distinfo | 6 ++--- security/py-certbot-dns-dnsimple/distinfo | 6 ++--- security/py-certbot-dns-dnsmadeeasy/distinfo | 6 ++--- security/py-certbot-dns-gehirn/distinfo | 6 ++--- security/py-certbot-dns-google/distinfo | 6 ++--- security/py-certbot-dns-linode/distinfo | 6 ++--- security/py-certbot-dns-luadns/distinfo | 6 ++--- security/py-certbot-dns-nsone/distinfo | 6 ++--- security/py-certbot-dns-ovh/distinfo | 6 ++--- security/py-certbot-dns-rfc2136/distinfo | 6 ++--- security/py-certbot-dns-route53/distinfo | 6 ++--- security/py-certbot-dns-sakuracloud/distinfo | 6 ++--- security/py-certbot-nginx/distinfo | 6 ++--- security/py-certbot/distinfo | 6 ++--- security/py-certbot/files/patch-tests_cli__test.py | 28 +++++++++++----------- 19 files changed, 66 insertions(+), 66 deletions(-) diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo index 8ea7b9fc99fd..7564728cf10b 100644 --- a/security/py-acme/distinfo +++ b/security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510748 -SHA256 (acme-2.3.0.tar.gz) = eac6849d28132d8490a76f638775d627fbae2c47f2807d78e9bbfb4bde48c2fc -SIZE (acme-2.3.0.tar.gz) = 89787 +TIMESTAMP = 1678249637 +SHA256 (acme-2.4.0.tar.gz) = 755efb9c8e97aa0a4ee6d739189546e5a01f3adb1292688db280a8161060acfe +SIZE (acme-2.4.0.tar.gz) = 89576 diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk index e0cfffca7405..257b2a0c309a 100644 --- a/security/py-acme/version.mk +++ b/security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 2.3.0 +ACME_VERSION= 2.4.0 diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index 63a0a58ca975..17919fc8ffcf 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510748 -SHA256 (certbot-apache-2.3.0.tar.gz) = a9a95d5ef25772e467f89237c42cd9cbe95d90f138b1082a878976c0239f1e0e -SIZE (certbot-apache-2.3.0.tar.gz) = 205850 +TIMESTAMP = 1678249638 +SHA256 (certbot-apache-2.4.0.tar.gz) = dd2eba75df6024e469c44f445b801f81f79936f28e8d2a71b6af3f0067287d15 +SIZE (certbot-apache-2.4.0.tar.gz) = 205404 diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index 11f0794e700f..4403d252c649 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510749 -SHA256 (certbot-dns-cloudflare-2.3.0.tar.gz) = 9778f98aae1d0d6f3b3022bd2f70a6212cfe5c65f2f5ceea79d282ce5387f752 -SIZE (certbot-dns-cloudflare-2.3.0.tar.gz) = 16352 +TIMESTAMP = 1678249638 +SHA256 (certbot-dns-cloudflare-2.4.0.tar.gz) = 2bd62947469db8519a577da6fd59219be16ba37fa3cd36a001bdb44ff2a17699 +SIZE (certbot-dns-cloudflare-2.4.0.tar.gz) = 16327 diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index b0a5fdd2971d..1c8e754e3041 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510749 -SHA256 (certbot-dns-digitalocean-2.3.0.tar.gz) = 476bedfeb740171a1b368d0d719d15785addfef37ba9b2f86d2472d55d8cfe95 -SIZE (certbot-dns-digitalocean-2.3.0.tar.gz) = 14210 +TIMESTAMP = 1678249639 +SHA256 (certbot-dns-digitalocean-2.4.0.tar.gz) = c799cd62be33c0b463cd75df98b8f84a4f3a29fc88fbed6f2113f4b0cd09d9e1 +SIZE (certbot-dns-digitalocean-2.4.0.tar.gz) = 14183 diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index 9e8ce7fbd17f..1bd6d715afda 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510749 -SHA256 (certbot-dns-dnsimple-2.3.0.tar.gz) = ded601743438728fdd7d7c6fbd2acd95d5862c81ab9d7e1b6d1f71561fd0d85b -SIZE (certbot-dns-dnsimple-2.3.0.tar.gz) = 12506 +TIMESTAMP = 1678249640 +SHA256 (certbot-dns-dnsimple-2.4.0.tar.gz) = 88971d6cd5da5ce98eefc6b821e1e75bd8ee47c74003ac1334935f1b7ce8a9b8 +SIZE (certbot-dns-dnsimple-2.4.0.tar.gz) = 12511 diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index acbb9cdd5f73..697c9cca3816 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510749 -SHA256 (certbot-dns-dnsmadeeasy-2.3.0.tar.gz) = 070e0a6e82bf525265b3680cfb7922895cdf1bb75d4e2e50e6828418d89fd4df -SIZE (certbot-dns-dnsmadeeasy-2.3.0.tar.gz) = 12719 +TIMESTAMP = 1678249641 +SHA256 (certbot-dns-dnsmadeeasy-2.4.0.tar.gz) = 963824366100c0a8c6f9124eef3a6cda6c5947c78d88fd3b11849c273f003fdf +SIZE (certbot-dns-dnsmadeeasy-2.4.0.tar.gz) = 12726 diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index f4cf2da5f94f..ec67de9b33a3 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510750 -SHA256 (certbot-dns-gehirn-2.3.0.tar.gz) = 4e84b80e45555c122b11621a90bb18d716f2bdbef64ab59cdf975975ac9a369f -SIZE (certbot-dns-gehirn-2.3.0.tar.gz) = 12611 +TIMESTAMP = 1678249641 +SHA256 (certbot-dns-gehirn-2.4.0.tar.gz) = 24d16b6d84eea92143d8f697853b50d8a94b5272da83e424a2efdd59378d38e6 +SIZE (certbot-dns-gehirn-2.4.0.tar.gz) = 12612 diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index 26f8aa7ba177..cd4987df3bcb 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510750 -SHA256 (certbot-dns-google-2.3.0.tar.gz) = 84e0ab4014cf9773c04bccc77622615d12901a2b3e06c780efa6104170ac986d -SIZE (certbot-dns-google-2.3.0.tar.gz) = 23899 +TIMESTAMP = 1678249642 +SHA256 (certbot-dns-google-2.4.0.tar.gz) = f4fbbeb27bdaf7426b6e12f0aae31bc98531015969981c7ede63aa74d9f119b1 +SIZE (certbot-dns-google-2.4.0.tar.gz) = 23881 diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index aea83a67e42e..db4bd054b0d1 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510750 -SHA256 (certbot-dns-linode-2.3.0.tar.gz) = c594f246490f74ed87609824a9008139b7e8a202fc13388a818feccf941a658b -SIZE (certbot-dns-linode-2.3.0.tar.gz) = 13074 +TIMESTAMP = 1678249642 +SHA256 (certbot-dns-linode-2.4.0.tar.gz) = 7433c1d58e558b09bdd82eba16e8481873cd74fc9fac114f3a61d9c57f4f4090 +SIZE (certbot-dns-linode-2.4.0.tar.gz) = 13092 diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index b2db461a02c6..9a97aa70c6ba 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510750 -SHA256 (certbot-dns-luadns-2.3.0.tar.gz) = 1134b51af8df3645563ac85656595fac2a171542f6df446a0cd50a7c82ae42ae -SIZE (certbot-dns-luadns-2.3.0.tar.gz) = 12537 +TIMESTAMP = 1678249643 +SHA256 (certbot-dns-luadns-2.4.0.tar.gz) = 9e3c162c19d7f451ddf534ec50069d7ac4c9c2d3e3d5056218511f74feebc75a +SIZE (certbot-dns-luadns-2.4.0.tar.gz) = 12540 diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index 8403103b1b2c..4d60965f2640 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510750 -SHA256 (certbot-dns-nsone-2.3.0.tar.gz) = a9dfda64619daca3b915164e7cce6c85695823e8d61b1bcf7fb7e3cf274e65e7 -SIZE (certbot-dns-nsone-2.3.0.tar.gz) = 12580 +TIMESTAMP = 1678249644 +SHA256 (certbot-dns-nsone-2.4.0.tar.gz) = f3a01bcdfa3363c2a8c4ba643ccc1ab3ab9c266056698f2a6a982c53798e1b86 +SIZE (certbot-dns-nsone-2.4.0.tar.gz) = 12583 diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index e1ea92db7874..b81cdf7d1265 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510751 -SHA256 (certbot-dns-ovh-2.3.0.tar.gz) = af30f71eade51b0df8dd48a487c570ca4587f918f4406b70e4f6a93f8b475122 -SIZE (certbot-dns-ovh-2.3.0.tar.gz) = 13002 +TIMESTAMP = 1678249644 +SHA256 (certbot-dns-ovh-2.4.0.tar.gz) = d705da075772f14a763bb494247748b4fa26ccbd6e37e228a39aee91c229090b +SIZE (certbot-dns-ovh-2.4.0.tar.gz) = 13004 diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 54334a68e567..e689e4c2e96d 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510751 -SHA256 (certbot-dns-rfc2136-2.3.0.tar.gz) = 3b6a5ee17fec6e369903316835eabcfe9c996b6158003af3ae923e261219db4a -SIZE (certbot-dns-rfc2136-2.3.0.tar.gz) = 16380 +TIMESTAMP = 1678249645 +SHA256 (certbot-dns-rfc2136-2.4.0.tar.gz) = b8131a0e19c8adcdf27980b373cc7f471dc3f30350770c96fba70b31d3de596b +SIZE (certbot-dns-rfc2136-2.4.0.tar.gz) = 16351 diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index f69952cf1abe..f16bd27f6ac4 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510751 -SHA256 (certbot-dns-route53-2.3.0.tar.gz) = 1af8e98090568d30444f0e1c91487857c8a9c2c60fbb06f6cb007a3b62905786 -SIZE (certbot-dns-route53-2.3.0.tar.gz) = 15043 +TIMESTAMP = 1678249646 +SHA256 (certbot-dns-route53-2.4.0.tar.gz) = a824e847130b803d8029bc17d3662fecc5806d5808cc7ea59fb4267c4354c364 +SIZE (certbot-dns-route53-2.4.0.tar.gz) = 15013 diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index 98eba044d396..4aa1f5fe2097 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510751 -SHA256 (certbot-dns-sakuracloud-2.3.0.tar.gz) = 6bfc03b2a9b4b49c4c0328ba5c52c700459683dc70374ce143f3450effb90142 -SIZE (certbot-dns-sakuracloud-2.3.0.tar.gz) = 12607 +TIMESTAMP = 1678249646 +SHA256 (certbot-dns-sakuracloud-2.4.0.tar.gz) = d5ef21d1d61fde6986321805cb06308606c8276f3a60f287e0f49091844fb690 +SIZE (certbot-dns-sakuracloud-2.4.0.tar.gz) = 12626 diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index 52fcfcfef8b5..3a2a3b3fc4f7 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510752 -SHA256 (certbot-nginx-2.3.0.tar.gz) = ab3aadc6b19b4d67a3f6b7f5f05b98e94ece99006a2902a93325fabe76cdb20b -SIZE (certbot-nginx-2.3.0.tar.gz) = 79850 +TIMESTAMP = 1678249647 +SHA256 (certbot-nginx-2.4.0.tar.gz) = 8e86d889864731ec7e5b0fd52212d07165345010feea11afd57b690ac24fb113 +SIZE (certbot-nginx-2.4.0.tar.gz) = 78622 diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index 3fb9106b9eaa..31d3e61c165e 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676510748 -SHA256 (certbot-2.3.0.tar.gz) = 93d39f0a9547b1251bf8101bd73f26dbaf3e0eb13448b8690f6e0dd9aa4dcd8a -SIZE (certbot-2.3.0.tar.gz) = 426637 +TIMESTAMP = 1678249637 +SHA256 (certbot-2.4.0.tar.gz) = 06bfde9e177a185fa7a7c0a8e533dfb03c6648ef90a205d3a8345e1966d5eb04 +SIZE (certbot-2.4.0.tar.gz) = 425768 diff --git a/security/py-certbot/files/patch-tests_cli__test.py b/security/py-certbot/files/patch-tests_cli__test.py index f285dc6c2054..5499547b3ff7 100644 --- a/security/py-certbot/files/patch-tests_cli__test.py +++ b/security/py-certbot/files/patch-tests_cli__test.py @@ -1,6 +1,6 @@ # See files/patch-certbot-compat-misc.py ---- tests/cli_test.py.orig 2021-03-02 21:37:04 UTC +--- tests/cli_test.py.orig 2023-03-07 21:17:25 UTC +++ tests/cli_test.py @@ -1,6 +1,7 @@ """Tests for certbot._internal.cli.""" @@ -9,22 +9,22 @@ +import sys from importlib import reload as reload_module import io - import tempfile -@@ -62,9 +63,14 @@ class FlagDefaultTest(unittest.TestCase): + import sys +@@ -60,9 +61,14 @@ class FlagDefaultTest(unittest.TestCase): def test_default_directories(self): if os.name != 'nt': -- self.assertEqual(cli.flag_default('config_dir'), '/etc/letsencrypt') -- self.assertEqual(cli.flag_default('work_dir'), '/var/lib/letsencrypt') -- self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt') +- assert cli.flag_default('config_dir') == '/etc/letsencrypt' +- assert cli.flag_default('work_dir') == '/var/lib/letsencrypt' +- assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' + if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): -+ self.assertEqual(cli.flag_default('config_dir'), '/usr/local/etc/letsencrypt') -+ self.assertEqual(cli.flag_default('work_dir'), '/var/db/letsencrypt') -+ self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt') ++ assert cli.flag_default('config_dir') == '/usr/local/etc/letsencrypt' ++ assert cli.flag_default('work_dir') == '/var/db/letsencrypt' ++ assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' + else: -+ self.assertEqual(cli.flag_default('config_dir'), '/etc/letsencrypt') -+ self.assertEqual(cli.flag_default('work_dir'), '/var/lib/letsencrypt') -+ self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt') ++ assert cli.flag_default('config_dir') == '/etc/letsencrypt' ++ assert cli.flag_default('work_dir') == '/var/lib/letsencrypt' ++ assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' else: - self.assertEqual(cli.flag_default('config_dir'), 'C:\\Certbot') - self.assertEqual(cli.flag_default('work_dir'), 'C:\\Certbot\\lib') + assert cli.flag_default('config_dir') == 'C:\\Certbot' + assert cli.flag_default('work_dir') == 'C:\\Certbot\\lib'