[bug#62894] [PATCH core-updates 0/2] gnu: samba: Fix build on i686-linux.

[bug#62894] [PATCH core-updates 0/2] gnu: samba: Fix build on i686-linux.

[John Kehayias via Guix-patches via]

Hi Guix,

Two patches here:

1. Fix samba building on i686-linux, as the selftest configure option requires python-cryptography, which relies on rust and thus won't work on i686 currently. So conditionally enable this flag and that native-input.

   The check here happens twice, better to have a let form for the whole package (or even reduce it to a "rust?" variable)? I went with the check we use for librsvg, but haven't checked on aarch64 if this does build. I did test that samba builds for x86_64 and i686-linux and this allows wine on x86_64 to build for me as well.

2. In doing this I noticed that samba is outdated and vulnerable to CVEs so I updated it in the next patch. I separately verified the download's signature, though samba's key is expired, so...

I didn't push this directly since I wasn't sure if there was a more elegant way to do this check and since I'm not certain on the rust architectures question.

A similar fix is needed on master I believe, but since the inheritance is flipped there I wasn't sure if this will just confuse the upcoming merge more. If the core-updates merge is happening soon we can wait? Or once this is good for core-updates I'll push the same fix to master.

Thanks!
John

[bug#62894] [PATCH core-updates 1/2] gnu: samba: Fix build on i686-linux.

[John Kehayias via Guix-patches via]

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

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-samba-Fix-build-on-i686-linux.patch --]
[-- Type: text/x-patch; name=0001-gnu-samba-Fix-build-on-i686-linux.patch, Size: 5616 bytes --]

From 5f0faac057e9706e2c0c5d19895173c50d119434 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Mon, 17 Apr 2023 00:09:25 -0400
Subject: [PATCH 1/2] gnu: samba: Fix build on i686-linux.

* gnu/packages/samba.scm (samba)[phases]{configure}: Make "--enable-selftest"
conditional on architectures with rust support, as python-cryptography is
needed.
[native-inputs]: Only include python-cryptography for architectures with rust.
---
 gnu/packages/samba.scm | 70 +++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 8c004a1aac..1621706807 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
+;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -208,21 +209,28 @@ (define-public samba/pinned
            (replace 'configure
              ;; Samba uses a custom configuration script that runs WAF.
              (lambda* (#:key inputs #:allow-other-keys)
-               (let* ((libdir (string-append #$output "/lib")))
-                 (invoke "./configure"
-                         "--enable-selftest"
-                         "--enable-fhs"
-                         (string-append "--prefix=" #$output)
-                         "--sysconfdir=/etc"
-                         "--localstatedir=/var"
-                         ;; Install public and private libraries into
-                         ;; a single directory to avoid RPATH issues.
-                         (string-append "--libdir=" libdir)
-                         (string-append "--with-privatelibdir=" libdir)
-                         "--with-system-mitkrb5"
-                         (string-append "--with-system-mitkdc="
-                                        (search-input-file inputs "sbin/krb5kdc"))
-                         "--with-experimental-mit-ad-dc"))))
+               (let* ((libdir (string-append #$output "/lib"))
+                      (system (or #$(%current-target-system)
+                                  #$(%current-system))))
+                 (apply invoke `("./configure"
+                                 ;; The selftest requires python-cryptography, only
+                                 ;; available where we have rust.
+                                 ,@(if (or (string-prefix? "x86_64-" system)
+                                           (string-prefix? "aarch64-" system))
+                                       '("--enable-selftest")
+                                       '())
+                                 "--enable-fhs"
+                                 ,(string-append "--prefix=" #$output)
+                                 "--sysconfdir=/etc"
+                                 "--localstatedir=/var"
+                                 ;; Install public and private libraries into
+                                 ;; a single directory to avoid RPATH issues.
+                                 ,(string-append "--libdir=" libdir)
+                                 ,(string-append "--with-privatelibdir=" libdir)
+                                 "--with-system-mitkrb5"
+                                 ,(string-append "--with-system-mitkdc="
+                                                 (search-input-file inputs "sbin/krb5kdc"))
+                                 "--with-experimental-mit-ad-dc")))))
            (add-before 'install 'disable-etc,var-samba-directories-setup
              (lambda _
                (substitute* "dynconfig/wscript"
@@ -255,19 +263,25 @@ (define-public samba/pinned
       ;; In Requires or Requires.private of pkg-config files.
       (list ldb talloc tevent))
      (native-inputs
-      (list perl-parse-yapp
-            pkg-config
-            python-cryptography         ;for krb5 tests
-            python-dnspython
-            python-iso8601
-            python-markdown
-            rpcsvc-proto                ;for 'rpcgen'
-            python-pyasn1               ;for krb5 tests
-            ;; For generating man pages.
-            docbook-xml-4.2
-            docbook-xsl
-            libxslt
-            libxml2))                   ;for XML_CATALOG_FILES
+      (append (list perl-parse-yapp
+                    pkg-config
+                    python-dnspython
+                    python-iso8601
+                    python-markdown
+                    rpcsvc-proto                ;for 'rpcgen'
+                    python-pyasn1               ;for krb5 tests
+                    ;; For generating man pages.
+                    docbook-xml-4.2
+                    docbook-xsl
+                    libxslt
+                    libxml2)                    ;for XML_CATALOG_FILES
+              ;; For krb5 tests, only where we have rust available.
+              (let ((system (or (%current-target-system)
+                                (%current-system))))
+                (if (or (string-prefix? "x86_64-" system)
+                        (string-prefix? "aarch64-" system))
+                    (list python-cryptography)
+                    '()))))
      (home-page "https://www.samba.org/")
      (synopsis
       "The standard Windows interoperability suite of programs for GNU and Unix")
-- 
2.39.2

[bug#62894] [PATCH core-updates 2/2] gnu: samba: Update to 4.18.1.

[John Kehayias via Guix-patches via]

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

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-samba-Update-to-4.18.1.patch --]
[-- Type: text/x-patch; name=0002-gnu-samba-Update-to-4.18.1.patch, Size: 1264 bytes --]

From 494277966cec68249f4c978dd52ebd1e8b527296 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Mon, 17 Apr 2023 00:11:33 -0400
Subject: [PATCH 2/2] gnu: samba: Update to 4.18.1.

* gnu/packages/samba.scm (samba): Update to 4.18.1.
---
 gnu/packages/samba.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 1621706807..f95ce13fc8 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -298,7 +298,7 @@ (define-public samba
   (package
     (inherit samba/pinned)
     (name "samba")
-    (version "4.17.0")
+    (version "4.18.1")
     (source
      ;; For updaters: the current PGP fingerprint is
      ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
@@ -307,7 +307,7 @@ (define-public samba
        (uri (string-append "https://download.samba.org/pub/samba/stable/"
                            "samba-" version ".tar.gz"))
        (sha256
-        (base32 "0fl2y5avmyxjadh6zz0fwz35akd6c4j9lldzp2kyvjrgm36qx1h4"))))
+        (base32 "03ncp49pfpzjla205y3xpb9iy61dz4pryyrvyz26422a4hpsmpnf"))))
     (properties (alist-delete 'hidden? (package-properties samba/pinned)))))
 
 (define-public talloc
-- 
2.39.2

[bug#62894] [PATCH core-updates 0/2] gnu: samba: Fix build on i686-linux.

[Maxim Cournoyer]

Hi,

I pushed this to master, fixing the graft at the same time (it was not
applied to 'samba').

I'll look for core-updates later.

-- 
Thanks,
Maxim

[bug#62894] [PATCH core-updates 0/2] gnu: samba: Fix build on i686-linux.

[Kaelyn via Guix-patches via]

Hi,

I've applied the two patches locally to my core-updates worktree and can confirm the patches allow me to once again build wine64 (post staging merge).

Cheers,
Kaelyn

bug#62894: [PATCH core-updates 0/2] gnu: samba: Fix build on i686-linux.

[John Kehayias via Guix-patches via]

On Tue, Apr 18, 2023 at 12:35 PM, Maxim Cournoyer wrote:

> Hi,
>
> I pushed this to master, fixing the graft at the same time (it was not
> applied to 'samba').
>
> I'll look for core-updates later.

Thanks. Since applied/merged so we're all set.

John