From patchwork Sun Oct 3 15:11:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 33591 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B251C27BBE3; Sun, 3 Oct 2021 16:16:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2E7FD27BBE1 for ; Sun, 3 Oct 2021 16:16:13 +0100 (BST) Received: from localhost ([::1]:49424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mX3Do-0002in-6h for patchwork@mira.cbaines.net; Sun, 03 Oct 2021 11:16:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mX3Ch-0002iE-3k for guix-patches@gnu.org; Sun, 03 Oct 2021 11:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mX3Cg-0004J7-Gl for guix-patches@gnu.org; Sun, 03 Oct 2021 11:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mX3Cg-00027j-9s for guix-patches@gnu.org; Sun, 03 Oct 2021 11:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50994] [PATCH] gnu: Add adcli. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Oct 2021 15:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50994@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16332740768110 (code B ref -1); Sun, 03 Oct 2021 15:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Oct 2021 15:14:36 +0000 Received: from localhost ([127.0.0.1]:34743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mX3C9-00026c-Ks for submit@debbugs.gnu.org; Sun, 03 Oct 2021 11:14:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:51856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mX3C5-00026S-NE for submit@debbugs.gnu.org; Sun, 03 Oct 2021 11:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mX3C5-00020u-Bk for guix-patches@gnu.org; Sun, 03 Oct 2021 11:14:25 -0400 Received: from araneo.si ([90.157.193.204]:53070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mX3C2-0003gt-55 for guix-patches@gnu.org; Sun, 03 Oct 2021 11:14:25 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 78a3b2ee for ; Sun, 3 Oct 2021 15:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=Kb4YCLwrqI3WZeVFbz6QX CBhxZU=; b=Pzpo2xLwfeeaeqLj1+Tyl6G9Lmvmv3UKtU9u0KVHl8vrmDHSTFfeg 52AEpncVZOOeTsAexyErhLi9KNsAGJoXpbfKVYfN0DHgWm7KkFd5NQscR6ouwmfN l8SM388ozurCLrS/ePWqbbrnOIHZogzRMLDdYZ9+WH2UcpLNJ0e7KGjs8twYRExc 0BdwORuP971N8/2njx7LaDDd5P0uX9QklTDXZhEqrkNGkNsJAWqq0LdyaTcaWWXs ZJN68fBebnSFBqN63oeqgEwJZic+F16jhfPtqoimmUI5rfg9nPl/hX0AXcdVBN52 NwnhfgpAVcCM/W9hKBaZ+//82/GKf+XJQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id c4e8547b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 3 Oct 2021 15:14:14 +0000 (UTC) From: Timotej Lazar Date: Sun, 3 Oct 2021 17:11:11 +0200 Message-Id: <20211003151110.16528-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Received-SPF: pass client-ip=90.157.193.204; envelope-from=timotej.lazar@araneo.si; helo=araneo.si X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 Timotej Lazar ;;; ;;; 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")