From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/certbot/files/
Date: Mon, 14 Oct 2024 00:35:05 +0000 (UTC) [thread overview]
Message-ID: <1728866064.6cf1e696cb6a62e70a9f5f9f01933ef571d4109a.sam@gentoo> (raw)
commit: 6cf1e696cb6a62e70a9f5f9f01933ef571d4109a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 14 00:34:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 14 00:34:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf1e696
app-crypt/certbot: drop obsolete patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
...karound-cryptography-deprecation-warnings.patch | 36 ----------------------
1 file changed, 36 deletions(-)
diff --git a/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch b/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
deleted file mode 100644
index ecaf4830eb24..000000000000
--- a/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/certbot/certbot/issues/9967
-https://bugs.gentoo.org/937889
---- a/certbot/ocsp.py
-+++ b/certbot/ocsp.py
-@@ -4,6 +4,7 @@ from datetime import timedelta
- import logging
- import re
- import subprocess
-+import warnings
- from subprocess import PIPE
- from typing import Optional
- from typing import Tuple
-@@ -235,12 +236,17 @@ def _check_ocsp_response(response_ocsp: 'ocsp.OCSPResponse', request_ocsp: 'ocsp
- # https://github.com/openssl/openssl/blob/ef45aa14c5af024fcb8bef1c9007f3d1c115bd85/crypto/ocsp/ocsp_cl.c#L338-L391
- # thisUpdate/nextUpdate are expressed in UTC/GMT time zone
- now = datetime.now(pytz.UTC).replace(tzinfo=None)
-- if not response_ocsp.this_update:
-- raise AssertionError('param thisUpdate is not set.')
-- if response_ocsp.this_update > now + timedelta(minutes=5):
-- raise AssertionError('param thisUpdate is in the future.')
-- if response_ocsp.next_update and response_ocsp.next_update < now - timedelta(minutes=5):
-- raise AssertionError('param nextUpdate is in the past.')
-+ with warnings.catch_warnings():
-+ # Workaround for deprecation warnings w/ newer cryptography
-+ # https://github.com/certbot/certbot/issues/9967 (bug #937889)
-+ warnings.filterwarnings("ignore", category=CryptographyDeprecationWarning)
-+
-+ if not response_ocsp.this_update:
-+ raise AssertionError('param thisUpdate is not set.')
-+ if response_ocsp.this_update > now + timedelta(minutes=5):
-+ raise AssertionError('param thisUpdate is in the future.')
-+ if response_ocsp.next_update and response_ocsp.next_update < now - timedelta(minutes=5):
-+ raise AssertionError('param nextUpdate is in the past.')
-
-
- def _check_ocsp_response_signature(response_ocsp: 'ocsp.OCSPResponse',
reply other threads:[~2024-10-14 0:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1728866064.6cf1e696cb6a62e70a9f5f9f01933ef571d4109a.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox