Subject: bug#50994: closed (Re: bug#50994: [PATCH] gnu: Add adcli.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 06 Oct 2021 21:32:02 +0000

Your bug report

#50994: [PATCH] gnu: Add adcli.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
50994: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=50994
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#50994: [PATCH] gnu: Add adcli.
From: Ludovic Courtès <[email-masked]>
To: Timotej Lazar <[email-masked]>
Cc: [email-masked]
Date: Wed, 06 Oct 2021 23:31:20 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Timotej,

Timotej Lazar <[email-masked]> skribis:

> * gnu/packages/sssd.scm (adcli): New variable.

Applied, thanks!

Ludo’.

Subject: [PATCH] gnu: Add adcli.
From: Timotej Lazar <[email-masked]>
To: [email-masked]
Cc: Timotej Lazar <[email-masked]>
Date: Sun, 3 Oct 2021 17:11:11 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/sssd.scm (adcli): New variable.
---
Lint reports one overlong line, but I don’t think it would improve if
split. Thanks!

 gnu/packages/sssd.scm | 62 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index b2b5da96f8..9191440970 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016, 2017 Ricardo Wurmus <[email-masked]>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2020 Efraim Flashner <[email-masked]>
+;;; Copyright © 2021 Timotej Lazar <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,12 +23,14 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages adns)
   #:use-module (gnu packages augeas)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
@@ -50,6 +53,65 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xml))
 
+(define-public adcli
+  (package
+    (name "adcli")
+    (version "0.9.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/realmd/adcli.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1mwzd5vakdsssdvs6vljqpp8pw8i97n5lhxvmn9dn9720am7hfv7"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       ;; The net tool is used to update the stored machine key for samba.
+       (list (string-append "--with-samba-data-tool="
+                            (assoc-ref %build-inputs "samba") "/bin/net"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'use-local-docbook
+           ;; Patch Makefile and docs to use local docbook resources.
+           (lambda _
+             (let* ((docbook-xml (assoc-ref %build-inputs "docbook-xml"))
+                    (docbook-xsl (assoc-ref %build-inputs "docbook-xsl"))
+                    (xsldir (string-append docbook-xsl "/xml/xsl/docbook-xsl-"
+                                           ,(package-version docbook-xsl))))
+                    (with-directory-excursion "doc"
+                      (substitute*
+                          '("Makefile.am" "adcli.xml" "adcli-devel.xml" "adcli-docs.xml")
+                        (("http://docbook.sourceforge.net/release/xsl/current(/[^\"]*)" _ path)
+                         (string-append xsldir path))
+                        (("http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd")
+                         (string-append docbook-xml "/xml/dtd/docbook/docbookx.dtd")))
+                      (substitute* "Makefile.am"
+                        (("\\$\\(XMLTO\\)" xmlto)
+                         (string-append xmlto " --searchpath " xsldir "/html"))))))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("libtool" ,libtool)
+       ("libxslt" ,libxslt)
+       ("util-linux" ,util-linux) ; For `rev` command used in tests.
+       ("xmlto" ,xmlto)))
+    (inputs
+     `(("cyrus-sasl" ,cyrus-sasl)
+       ("mit-krb5" ,mit-krb5)
+       ("samba" ,samba)
+       ("openldap" ,openldap)))
+    (home-page "https://gitlab.freedesktop.org/realmd/adcli/")
+    (synopsis "Helper library and tools for Active Directory client operations")
+    (description "@command{adcli} is a command‐line tool to join a computer to
+an Active Directory domain.  It can also update the machine password and
+manage user, group and computer accounts for a domain.")
+    (license license:lgpl2.1+)))
+
 (define-public ding-libs
   (package
     (name "ding-libs")
-- 
2.33.0