From patchwork Mon Apr 10 19:52:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 49062 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 664621748D; Mon, 10 Apr 2023 20:53:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 98CD817421 for ; Mon, 10 Apr 2023 20:53:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plxZb-0000z0-8D; Mon, 10 Apr 2023 15:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1plxZZ-0000yA-I7 for guix-patches@gnu.org; Mon, 10 Apr 2023 15:53:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plxZX-0006gp-3z for guix-patches@gnu.org; Mon, 10 Apr 2023 15:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plxZX-0003OP-0R for guix-patches@gnu.org; Mon, 10 Apr 2023 15:53:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62760] [PATCH 3/3] gnu: heimdal: Enable OpenLDAP support; converge inputs toward Debian packaging. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 Apr 2023 19:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62760@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 62760-submit@debbugs.gnu.org id=B62760.168115636212996 (code B ref 62760); Mon, 10 Apr 2023 19:53:02 +0000 Received: (at 62760) by debbugs.gnu.org; 10 Apr 2023 19:52:42 +0000 Received: from localhost ([127.0.0.1]:35998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plxZC-0003NX-Aa for submit@debbugs.gnu.org; Mon, 10 Apr 2023 15:52:42 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:39340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plxZ8-0003Mu-Gd for 62760@debbugs.gnu.org; Mon, 10 Apr 2023 15:52:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=JE/Qn3ThE/OOoaa ADgmvhxIq5bKee87XcmoK4LHfBgM=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=Pdw7VuXF7zjGJvpANqdM7TpQRji8zc8B9Bq3O8DO J9Y5+oXDcYN2m07HkpQYpiBx4iwldea/QBLr51cIm2qzGQTPewY5rqp7NcksLmu8br1YMe 6fzRHLevJwRgL0elNFv5LiAS2w1F0MIRvyo2+6clS4ZLUXsMP8FfJmWTIIf7w= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 2ba2b248 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 10 Apr 2023 19:52:37 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cc22c690; Mon, 10 Apr 2023 19:52:37 +0000 (UTC) Date: Mon, 10 Apr 2023 12:52:26 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This commit took several cues for the inputs from the Debian packaging for Heimdal. [1] First, it was not clear why the alternative implementation mit-krb5 should be supplied as an input to Heimdal. It was dropped. The other inputs were added to address detection attempts in ./configure that failed. They were evident from the build log. Also enables support for the OpenLDAP backend for the principals database. [1] https://tracker.debian.org/media/packages/h/heimdal/control-7.8.git20221117.28daf24dfsg-2 * gnu/packages/kerberos.scm (darktable)[inputs, native-inputs]: Enable OpenLDAP; converge inputs toward Debian packaging. --- gnu/packages/kerberos.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 0faf879e35..c9c86f9541 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -30,10 +30,12 @@ (define-module (gnu packages kerberos) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages dbm) + #:use-module (gnu packages flex) #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages gettext) @@ -41,6 +43,7 @@ (define-module (gnu packages kerberos) #:use-module (gnu packages libidn) #:use-module (gnu packages hurd) #:use-module (gnu packages linux) + #:use-module (gnu packages openldap) #:use-module (gnu packages pkg-config) #:use-module (gnu packages compression) #:use-module (gnu packages readline) @@ -249,16 +252,22 @@ (define-public heimdal (format #t "#!~a~%exit 1~%" (which "sh"))))))) ;; Tests fail when run in parallel. #:parallel-tests? #f)) - (native-inputs (list e2fsprogs ;for 'compile_et' + (native-inputs (list bison + e2fsprogs ;for 'compile_et' + flex + libcap-ng texinfo unzip ;for tests + openldap perl + pkg-config python)) (inputs (list readline bash-minimal bdb e2fsprogs ;for libcom_err - mit-krb5 + libcap-ng + openldap sqlite)) (home-page "http://www.h5l.org/") (synopsis "Kerberos 5 network authentication")