From patchwork Wed May 17 04:20:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50072 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 119F227BBE9; Wed, 17 May 2023 05:22:16 +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=unavailable 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 5A79327BBE2 for ; Wed, 17 May 2023 05:22:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pz8fr-0008G2-NY; Wed, 17 May 2023 00:22:03 -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 1pz8fq-0008EA-3a for guix-patches@gnu.org; Wed, 17 May 2023 00:22:02 -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 1pz8fp-0006oX-RR for guix-patches@gnu.org; Wed, 17 May 2023 00:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pz8fp-0004OO-Hh for guix-patches@gnu.org; Wed, 17 May 2023 00:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63545] [PATCH 1/3] gnu: heimdal: Build from Git. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 May 2023 04:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63545@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 63545-submit@debbugs.gnu.org id=B63545.168429726616781 (code B ref 63545); Wed, 17 May 2023 04:22:01 +0000 Received: (at 63545) by debbugs.gnu.org; 17 May 2023 04:21:06 +0000 Received: from localhost ([127.0.0.1]:48469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz8ev-0004MU-Dd for submit@debbugs.gnu.org; Wed, 17 May 2023 00:21:05 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:33608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz8et-0004MK-A8 for 63545@debbugs.gnu.org; Wed, 17 May 2023 00:21:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=9t70UJFpElPLKBV JE3igeyzlaALUjPTIKGHSJJDfZ+E=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=gbgAmIERhgdmZst7sqN7bugZHVWkib3QLYSfdMcL 2cXFbr32VBVlmlhW8lM5eiwkba+CCfzL7b3Bm4iitbUjcGe2qccrF8LlEOmm7gDL1Vfv7/ J1ozj15KJCV5BhLN3XUhf9RLsskj/j+dU1UwxvKBX9q6tridyMOCfy2E8ZZmM= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 04f4983f (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 17 May 2023 04:21:02 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6fe3c869; Wed, 17 May 2023 04:21:02 +0000 (UTC) Date: Tue, 16 May 2023 21:20:55 -0700 Message-Id: <2262ef65f5191b0c3d925ea6688c1bd8bf0587d0.1684296904.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 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 is in preparation to drop obsolete tools from the Automake files. The tarball comes with a ./configure script. It was not clear to the author what the best way was to run 'autoreconf -f -i' with the tarball in Guix's gnu-build-system. * gnu/packages/kerberos (heimdal): Build from Git; prepare to drop obsolete tools from Automake. --- gnu/packages/kerberos.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index c553f8180a..af67bff6c9 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -56,6 +56,7 @@ (define-module (gnu packages kerberos) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu)) @@ -171,26 +172,22 @@ (define-public shishi (license license:gpl3+))) (define-public heimdal + (let ((commit "a6cf94577c0d1e5bca5304342e4ddffb18255afe") + (revision "1")) (package (name "heimdal") - (version "7.8.0") + (version (git-version "7.8.0" revision commit)) (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/heimdal/heimdal/releases/download/" - "heimdal-" version "/" "heimdal-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/heimdal/heimdal") + (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "0f4dblav859p5hn7b2jdj1akw6d8p32as6bj6zym19kghh3s51zx")) + "0df646hzi10s0w07kqzj10aniv6jsbmlpx6j3lqjvpsjpmm9lww9")) (patches - (search-patches "heimdal-CVE-2022-45142.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "configure" - (("User=.*$") "User=Guix\n") - (("Host=.*$") "Host=GNU") - (("Date=.*$") "Date=2022\n")))))) + (search-patches "heimdal-CVE-2022-45142.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -224,6 +221,10 @@ (define-public heimdal (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "configure" + ;; Reproducible build date, etc. + (("User=.*$") "User=Guix\n") + (("Host=.*$") "Host=GNU") + (("Date=.*$") "Date=2022\n") ;; The e2fsprogs input is included for libcom_err, ;; let's use it even if cross-compiling. (("test \"\\$\\{krb_cv_com_err\\}\" = \"yes\"") @@ -255,12 +256,17 @@ (define-public heimdal (format #t "#!~a~%exit 1~%" (which "sh"))))))) ;; Tests fail when run in parallel. #:parallel-tests? #f)) - (native-inputs (list bison + (native-inputs (list autoconf + automake + bison e2fsprogs ;for 'compile_et' flex + libtool texinfo unzip ;for tests pkg-config + perl + perl-json python)) (inputs (list readline bash-minimal @@ -274,4 +280,5 @@ (define-public heimdal (description "Heimdal is an implementation of Kerberos 5 network authentication service.") - (license license:bsd-3))) + (license license:bsd-3)))) +