[bug#60173] [PATCH 1/2] gnu: samba: Update to 4.17.4.

[bug#60173] [PATCH 1/2] gnu: samba: Update to 4.17.4.

[Liliana Marie Prikler]

* gnu/packages/samba.scm (samba): Update to 4.17.4.
---
 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 2a01279161..64f821abc0 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -187,7 +187,7 @@ (define (install dir)
 (define-public samba
   (package
     (name "samba")
-    (version "4.16.4")
+    (version "4.17.4")
     (source
      ;; For updaters: the current PGP fingerprint is
      ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
@@ -196,7 +196,7 @@ (define-public samba
        (uri (string-append "https://download.samba.org/pub/samba/stable/"
                            "samba-" version ".tar.gz"))
        (sha256
-        (base32 "0bvhqinxwpbwp4ayhd9q8ga0w89gnkl1m3nrwpj1fnhjzd4ghclm"))))
+        (base32 "0ds53yz2d8s5yvkka1z9ysnb6bkbppmqmhd4rry71b2cvdwj0lf0"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.38.1

[bug#60173] [PATCH v2 1/2] gnu: samba: Update to 4.16.8.

[Liliana Marie Prikler]

* gnu/packages/samba.scm (samba): Update to 4.16.8.
---
 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 2a01279161..2fe75d0c1a 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -187,7 +187,7 @@ (define (install dir)
 (define-public samba
   (package
     (name "samba")
-    (version "4.16.4")
+    (version "4.16.8")
     (source
      ;; For updaters: the current PGP fingerprint is
      ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
@@ -196,7 +196,7 @@ (define-public samba
        (uri (string-append "https://download.samba.org/pub/samba/stable/"
                            "samba-" version ".tar.gz"))
        (sha256
-        (base32 "0bvhqinxwpbwp4ayhd9q8ga0w89gnkl1m3nrwpj1fnhjzd4ghclm"))))
+        (base32 "11a1vikbijaq7csg49h5ivn25gx84v6wx8z8kgsj1wmkhsf9bcmv"))))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.38.1

[bug#60173] [PATCH 2/2] gnu: samba/fixed: Update to 4.15.13.

[Liliana Marie Prikler]

* gnu/packages/samba.scm (samba/fixed-patched): New variable.
(samba/fixed): Add replacement for samba/fixed-patched.
---
 gnu/packages/samba.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 64f821abc0..1f2a231596 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -295,7 +295,9 @@ (define-public samba
 (define-public samba/fixed
   ;; Version that rarely changes, depended on by libsoup.
   (hidden-package
-   (package/inherit samba
+   (package
+     (inherit samba)
+     (replacement samba/fixed-patched)
      (version "4.15.3")
      (source
       (origin
@@ -319,6 +321,18 @@ (define-public samba/fixed
             libxslt
             libxml2)))))
 
+(define-public samba/fixed-patched
+  (package
+    (inherit samba/fixed)
+    (version "4.15.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.samba.org/pub/samba/stable/"
+                           "samba-" version ".tar.gz"))
+       (sha256
+        (base32 "0s29vzn5f42vjhx6h25c7v67n14ymqxn8glqa97d0rajd99y64n4"))))))
+
 (define-public talloc
   (package
     (name "talloc")
-- 
2.38.1

[bug#60173] [PATCH v2 2/2] gnu: samba/fixed: Update to 4.15.13.

[Liliana Marie Prikler]

* gnu/packages/samba.scm (samba/fixed-patched): New variable.
(samba/fixed): Add replacement for samba/fixed-patched.
---
 gnu/packages/samba.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 2fe75d0c1a..b6cb0a5941 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -295,7 +295,9 @@ (define-public samba
 (define-public samba/fixed
   ;; Version that rarely changes, depended on by libsoup.
   (hidden-package
-   (package/inherit samba
+   (package
+     (inherit samba)
+     (replacement samba/fixed-patched)
      (version "4.15.3")
      (source
       (origin
@@ -319,6 +321,18 @@ (define-public samba/fixed
             libxslt
             libxml2)))))
 
+(define-public samba/fixed-patched
+  (package
+    (inherit samba/fixed)
+    (version "4.15.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.samba.org/pub/samba/stable/"
+                           "samba-" version ".tar.gz"))
+       (sha256
+        (base32 "0s29vzn5f42vjhx6h25c7v67n14ymqxn8glqa97d0rajd99y64n4"))))))
+
 (define-public talloc
   (package
     (name "talloc")
-- 
2.38.1

[bug#60173] [PATCH 0/2] Update samba

[Liliana Marie Prikler]

Hi Guix,

this series updates samba to the latest version and grafts
samba/fixed (used by libsoup) to the latest patch within the
4.15.13 branch.

Cheers

Liliana Marie Prikler (2):
  gnu: samba: Update to 4.17.4.
  gnu: samba/fixed: Update to 4.15.13.

 gnu/packages/samba.scm | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

-- 
2.38.1

bug#60173: [PATCH v2 1/2] gnu: samba: Update to 4.16.8.

[Liliana Marie Prikler]

Am Sonntag, dem 18.12.2022 um 08:28 +0100 schrieb Liliana Marie
Prikler:
> * gnu/packages/samba.scm (samba): Update to 4.16.8.
> ---
QA didn't test this, but rather the older one, which updated to the
incompatible 4.17 line.  Pushed, because the offending package built
locally.

Cheers