From: phodina via <help-guix@gnu.org>
To: help-guix <help-guix@gnu.org>
Cc: "Ludovic Courtès" <ludo@gnu.org>,
"Maxim Cournoyer" <maxim.cournoyer@gmail.com>
Subject: [PATCH 1/3] gnu: openssl-3.0: Update to 3.0.4.
Date: Wed, 22 Jun 2022 09:31:55 +0000 [thread overview]
Message-ID: <TPFsnGjH34tECpD8Iu-PPGvstN3Yi-wDXKqOb9zNsr0SxlqPuUN1nTWdLmeylAEnXlZSxBu-oUFOprccBjdeBcMdg4NPZVHgTboBXtMcl4o=@protonmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
Hi,
these patches fixes issue with failing tests for openssl 1.x.x and 3.x.x due to expired certificate.
I opted to go for the newest release which has all the patches instead of including the patches and dropping them later.
On the slightly dark side it means rebuilding ~10000 packages.
I noticed some issues regarding Python 2 modules that have been recently removed. The guix refresh --list dependent command failed so I removed all the references in the second patch.
----
Petr
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-openssl-fixed-Update-to-1.1.1p.patch --]
[-- Type: text/x-patch; name=0003-gnu-openssl-fixed-Update-to-1.1.1p.patch, Size: 1384 bytes --]
From 6e96191998304c8d28c471d5ce60b69601fdbf07 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 22 Jun 2022 11:00:10 +0200
Subject: [PATCH 3/3] gnu: openssl/fixed: Update to 1.1.1p.
* gnu/packages/tls.scm (openssl/fixed): Update to 1.1.1p.
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c7d5b90ae2..206715d937 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -22,6 +22,7 @@
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -507,7 +508,7 @@ (define openssl/fixed
(package
(inherit openssl)
(name "openssl")
- (version "1.1.1n")
+ (version "1.1.1p")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -520,7 +521,7 @@ (define openssl/fixed
(patches (search-patches "openssl-1.1-c-rehash-in.patch"))
(sha256
(base32
- "0ymif8rlc5cf5qp5bh2pxlrgq6xryh7g4sqfvrdjg9gnli8ypp20"))))))
+ "0vyfibydji26wk1fmm0piz0810mfr7j4vaa2k5iwgiv6m8mbcqdz"))))))
(define-public openssl-3.0
(package
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-openssl-3.0-Update-to-3.0.4.patch --]
[-- Type: text/x-patch; name=0001-gnu-openssl-3.0-Update-to-3.0.4.patch, Size: 1158 bytes --]
From 604215e1120251f543a6bb83a1ae300a08de7d91 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 22 Jun 2022 10:31:04 +0200
Subject: [PATCH 1/3] gnu: openssl-3.0: Update to 3.0.4.
* gnu/packages/tls.scm (openssl-3.0): Update to 3.0.4.
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index cf50a88410..c7d5b90ae2 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -525,7 +525,7 @@ (define openssl/fixed
(define-public openssl-3.0
(package
(inherit openssl)
- (version "3.0.3")
+ (version "3.0.4")
(source (origin
(method url-fetch)
(uri (list (string-append "https://www.openssl.org/source/openssl-"
@@ -538,7 +538,7 @@ (define-public openssl-3.0
(patches (search-patches "openssl-3.0-c-rehash-in.patch"))
(sha256
(base32
- "02wcan5izwsxg6vl5fzkqq4icwi7cp4hrj327h05zppirsnph07f"))))
+ "03y0q2pzpkpgfgf74x4pf8gyar9d7pb0l0p7g2s0m2k6k8z88c98"))))
(arguments
(substitute-keyword-arguments (package-arguments openssl)
((#:phases phases '%standard-phases)
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0002-gnu-Remove-references-to-already-removed-Python-2-mo.patch --]
[-- Type: text/x-patch; name=0002-gnu-Remove-references-to-already-removed-Python-2-mo.patch, Size: 2426 bytes --]
From 0b4939e46fc556094e483ad6190424acd9d4efdc Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Wed, 22 Jun 2022 10:45:53 +0200
Subject: [PATCH 2/3] gnu: Remove references to already removed Python 2
modules.
* gnu/packages/python-crypto.scm (python2-cryptography): [native-inputs]: Remove
python2-hypothesis, python2-pretend, python2-pytz python2-pytest.
[propageted-inputs]: Remove all.
* gnu/packages/python-xyz.scm (python-idna): [properties]: Remove.
* gnu/packages/time.scm (python-iso8601): [properties]: Remove.
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 92c1638c6d..479c4a3330 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -654,14 +654,8 @@ (define-public python2-cryptography
;; modules "_openssl" and "_padding".
(delete 'sanity-check))))
(native-inputs
- (list python2-cryptography-vectors python2-hypothesis python2-pretend
- python2-pytz python2-pytest))
- (inputs (list openssl))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs crypto)
- (prepend python2-ipaddress
- python2-backport-ssl-match-hostname
- python2-enum34))))))
+ (list python2-cryptography-vectors))
+ (inputs (list openssl)))))
(define-public python-pyopenssl
(package
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7d73c145b7..5746d099db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11846,7 +11846,6 @@ (define-public python-idna
suitable drop-in replacement for the “encodings.idna” module that comes with
the Python standard library but currently only supports the older 2003
specification.")
- (properties `((python2-variant . ,(delay python2-idna))))
(license license:bsd-4)))
(define-public python-libsass
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 5b0ef6af9e..8a2fb17745 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -359,7 +359,6 @@ (define-public python-iso8601
(description
"This module parses the most common forms of ISO 8601 date strings (e.g.
@code{2007-01-14T20:34:22+00:00}) into @code{datetime} objects.")
- (properties `((python2-variant . ,(delay python2-iso8601))))
(license expat)))
(define-public python-monotonic
--
2.36.1
next reply other threads:[~2022-06-22 9:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 9:31 phodina via [this message]
2022-07-08 12:54 ` [PATCH 1/3] gnu: openssl-3.0: Update to 3.0.4 zimoun
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='TPFsnGjH34tECpD8Iu-PPGvstN3Yi-wDXKqOb9zNsr0SxlqPuUN1nTWdLmeylAEnXlZSxBu-oUFOprccBjdeBcMdg4NPZVHgTboBXtMcl4o=@protonmail.com' \
--to=help-guix@gnu.org \
--cc=ludo@gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=phodina@protonmail.com \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).