[bug#74045] [PATCH 0/2] Update LibreSSL to 4.0.0, and OpenSMTPD to 7.6.0p1

[bug#74045] [PATCH 0/2] Update LibreSSL to 4.0.0, and OpenSMTPD to 7.6.0p1

[ashish.is--- via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

Hi,

Attached patch series updates LibreSSL to 4.0.0, and OpenSMTPD to
7.6.0p1. Since OpenSMTPD depends on API introduced in LibreSSL, hence
LibreSSL also needs updating in conjunction.

Ashish SHUKLA (2):
  gnu: libressl: Update to 4.0.0.
  gnu: opensmtpd: Update to 7.6.0p1

 gnu/packages/mail.scm |  5 +++--
 gnu/packages/tls.scm  | 19 ++++---------------
 2 files changed, 7 insertions(+), 17 deletions(-)


base-commit: 091131af64fd4e4e925fff829fa19097cfcdfcc5
-- 
2.47.0

[bug#74045] [PATCH 1/2] gnu: libressl: Update to 4.0.0.

[ashish.is--- via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

Test certificate is updated upstream, so no need for a hack anymore.

* gnu/packages/tls.scm (libressl): Update to 4.0.0.
[native-inputs]: Remove. [arguments]<phases>: Remove.

Change-Id: Ib22aae8e48af4b4f9b5039283e563b419e629cf0
---
 gnu/packages/tls.scm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1a1ce0d215..0f1c88f507 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 © 2024 Ashish SHUKLA <ashish.is@lostca.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -653,14 +654,14 @@ (define-public bearssl
 (define-public libressl
   (package
     (name "libressl")
-    (version "3.7.3")
+    (version "4.0.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://openbsd/LibreSSL/"
                                   "libressl-" version ".tar.gz"))
               (sha256
                (base32
-                "1csx6gfgiqr43dw23qj2mr5jbkcd99kqavwb4vbmp0hcm5bchj3r"))))
+                "1r518q11qwx9zr1niqjh4ci63x1s51gx6g8f3p3xzhxcy1aik12d"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -675,19 +676,7 @@ (define-public libressl
                        "/share/libressl-"
                        ,(package-version this-package))
         ;; Provide a TLS-enabled netcat.
-        "--enable-nc")
-
-       #:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      (when tests?
-                        ;; 'tests/tlstest.sh' started failing in 2024 due to
-                        ;; an expired test certificate.
-                        (invoke "datefudge" "2020-01-01"
-                                "make" "check"
-                                "-j" (number->string
-                                      (parallel-job-count)))))))))
-    (native-inputs (list datefudge))
+        "--enable-nc")))
     (properties
      `((release-monitoring-url . "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/")))
     (home-page "https://www.libressl.org/")
-- 
2.47.0

[bug#74045] [PATCH 2/2] gnu: opensmtpd: Update to 7.6.0p1

[ashish.is--- via Guix-patches via]

From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/mail.scm (opensmtpd): Update to 7.6.0p1

Change-Id: I1749cecc8c9b05ce8c9c46be5ba5f5fb961647d2
---
 gnu/packages/mail.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ead8740627..abf35c609f 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -57,6 +57,7 @@
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
 ;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
+;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3293,14 +3294,14 @@ (define-public sieve-connect
 (define-public opensmtpd
   (package
     (name "opensmtpd")
-    (version "7.5.0p0")
+    (version "7.6.0p1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.opensmtpd.org/archives/"
                            "opensmtpd-" version ".tar.gz"))
        (sha256
-        (base32 "1763w26zvvc3kf8giqg4lwn5n1ypmgh73agf5k3yq6qc7hww3xc4"))))
+        (base32 "15sa1vzh6rbl0c8fwl4kz5zrlarp8mxaw47q6wk3lrd6h9lq0z5j"))))
     (build-system gnu-build-system)
     (inputs
      ;; OpenSMTPd bundled (a subset of) libasr and libtls, which we use.  See
-- 
2.47.0

bug#74045: [PATCH 0/2] Update LibreSSL to 4.0.0, and OpenSMTPD to 7.6.0p1

[Ludovic Courtès]

Hi,

ashish.is@lostca.se skribis:

>   gnu: libressl: Update to 4.0.0.
>   gnu: opensmtpd: Update to 7.6.0p1

Finally applied both.  I tested with ‘guix build -P1 libressl’ that
there are no new failures.

Note that the OpenSMTPD system test already failed prior to this
update and still does:

  https://ci.guix.gnu.org/build/7583577/details

It would be great if you could take a look at it!

Thanks,
Ludo’.

[bug#74045] [PATCH 0/2] Update LibreSSL to 4.0.0, and OpenSMTPD to 7.6.0p1

[Ashish SHUKLA via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

El 2024-12-26 23:04, Ludovic Courtès escribió:
> Hi,
>
> ashish.is@lostca.se skribis:
>
> >   gnu: libressl: Update to 4.0.0.
> >   gnu: opensmtpd: Update to 7.6.0p1
>
> Finally applied both.  I tested with ‘guix build -P1 libressl’ that
> there are no new failures.
>
> Note that the OpenSMTPD system test already failed prior to this
> update and still does:
>
>   https://ci.guix.gnu.org/build/7583577/details
>
> It would be great if you could take a look at it!
>
> Thanks,
> Ludo’.

Sure, I've added it to my TODO list. Thanks for committing the patches.

Happy Hol[yi]days! :)

Thanks!
-- 
Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0

"If I destroy you, what business is it of yours ?" (Dark Forest, Liu Cixin)


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 992 bytes --]