From patchwork Mon May 29 00:19:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50415 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 5418F27BBE9; Mon, 29 May 2023 01:20:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 66F3227BBE2 for ; Mon, 29 May 2023 01:20:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q3QcF-0000f2-I5; Sun, 28 May 2023 20:20: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 1q3QcE-0000eg-JF for guix-patches@gnu.org; Sun, 28 May 2023 20:20: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 1q3QcE-00046x-AV for guix-patches@gnu.org; Sun, 28 May 2023 20:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q3QcD-0007oe-Sh for guix-patches@gnu.org; Sun, 28 May 2023 20:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63545] [PATCH v2 1/2] gnu: heimdal: Run autoreconf. References: In-Reply-To: Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 May 2023 00:20: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: Josselin Poiret , Felix Lechner Received: via spool by 63545-submit@debbugs.gnu.org id=B63545.168531958430005 (code B ref 63545); Mon, 29 May 2023 00:20:01 +0000 Received: (at 63545) by debbugs.gnu.org; 29 May 2023 00:19:44 +0000 Received: from localhost ([127.0.0.1]:56668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Qbv-0007nt-LE for submit@debbugs.gnu.org; Sun, 28 May 2023 20:19:43 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:60618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q3Qbt-0007ni-RC for 63545@debbugs.gnu.org; Sun, 28 May 2023 20:19:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=VafNrJYQCYncgVP KIXAhrLXbhDf6nRRZyPUBiczHpgc=; h=date:subject:cc:to:from; d=lease-up.com; b=Jb0aJRmXY/u5MJRaXNoYmrc3B5WdsY59YWhGF/6Z6foDJU275iPG c4k19ZThj8NZso6r4YEc8CJOucKE/jc40p3+akzPv+EWTPlEGKtWY5YNE6PB+ZcwRTkmvY 33gFf+D6ToS6NlkNEyDWGR/XQIwO3fq559958CMmVE262C1MY= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id a174531d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 29 May 2023 00:19:40 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e3649568; Mon, 29 May 2023 00:19:39 +0000 (UTC) Date: Sun, 28 May 2023 17:19:17 -0700 Message-Id: <700bdb497cd0431ea9f3d71516f4168f55882ce4.1685319429.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 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 * gnu/packages/kerberos.scm (heimdal): Run autoreconf. --- Hi Josselin, Thanks for your review! I sidestepped your suggestions by continuing to build from the tarball, and running 'autoreconf.' Kind regards Felix gnu/packages/kerberos.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) base-commit: d64d6ea2cf5a1be801be355031fb2cfa5901a92a diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index c553f8180a..f06410b8f8 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -183,14 +183,7 @@ (define-public heimdal (base32 "0f4dblav859p5hn7b2jdj1akw6d8p32as6bj6zym19kghh3s51zx")) (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 @@ -223,7 +216,12 @@ (define-public heimdal #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) + (invoke (search-input-file inputs "bin/autoreconf") "--install" "--force") (substitute* "configure" + ;; Reproducible build date, etc. + (("User=.*$") "User=Guix\n") + (("Host=.*$") "Host=GNU\n") + (("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 +253,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