From 968ec0a87032b10f2a81597b6ede7a511e43631f Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 27 Sep 2022 15:38:10 -0400
Subject: [PATCH 1/3] Revert "gnu: samba: Fix corrupted man pages."

This reverts commit 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a.  This caused a
half world rebuild (9K packages).
---
 gnu/packages/samba.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 35d15667b6..fdcd6ec991 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -275,7 +275,7 @@ external dependencies.")
            python-pyasn1                ;for krb5 tests
            ;; For generating man pages.
            docbook-xml-4.2
-           docbook-xsl-next             ;otherwise the man pages are corrupted
+           docbook-xsl
            libxslt
            libxml2))                    ;for XML_CATALOG_FILES
     (home-page "https://www.samba.org/")

From 2e5d79aca239c10074032b19dfa08da6dab7bd20 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 27 Sep 2022 15:43:20 -0400
Subject: [PATCH 2/3] gnu: samba/fixed: Do not inherit native-inputs.

* gnu/packages/samba.scm (samba/fixed): Add a FIXME comment.
[native-inputs]: Copy the complete native inputs from samba, to protect against
unintended changes in the inherited package.
---
 gnu/packages/samba.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index fdcd6ec991..739aeae369 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -290,6 +290,8 @@ Samba is an important component to seamlessly integrate Linux/Unix Servers and
 Desktops into Active Directory environments using the winbind daemon.")
     (license license:gpl3+)))
 
+;;; FIXME: Invert inheritance relationship; the "fixed" package shouldn't be
+;;; susceptible to changes in the free one.
 (define-public samba/fixed
   ;; Version that rarely changes, depended on by libsoup.
   (hidden-package
@@ -301,7 +303,21 @@ Desktops into Active Directory environments using the winbind daemon.")
         (uri (string-append "https://download.samba.org/pub/samba/stable/"
                             "samba-" version ".tar.gz"))
         (sha256
-         (base32 "1nrp85aya0pbbqdqjaqcw82cnzzys16yls37hi2h6mci8d09k4si")))))))
+         (base32 "1nrp85aya0pbbqdqjaqcw82cnzzys16yls37hi2h6mci8d09k4si"))))
+     (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)))))
 
 (define-public talloc
   (package

From 16f535713ed91c26817dc645a5b920b5e6f3d3f4 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 27 Sep 2022 15:45:29 -0400
Subject: [PATCH 3/3] Re-instate "gnu: samba: Fix corrupted man pages."

This reverts commit 968ec0a87, which was itself a revert of 62048ff9fc.
---
 gnu/packages/samba.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 739aeae369..7993b33f8c 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -275,7 +275,7 @@ external dependencies.")
            python-pyasn1                ;for krb5 tests
            ;; For generating man pages.
            docbook-xml-4.2
-           docbook-xsl
+           docbook-xsl-next             ;otherwise the man pages are corrupted
            libxslt
            libxml2))                    ;for XML_CATALOG_FILES
     (home-page "https://www.samba.org/")