From patchwork Wed May 17 04:20:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50074 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 0F36827BBE9; Wed, 17 May 2023 05:22:29 +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 A61E627BBE2 for ; Wed, 17 May 2023 05:22:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pz8fs-0008GZ-Vk; Wed, 17 May 2023 00:22:04 -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-0008EZ-Tg 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 1pz8fq-0006oo-II for guix-patches@gnu.org; Wed, 17 May 2023 00:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pz8fq-0004Od-D3 for guix-patches@gnu.org; Wed, 17 May 2023 00:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63545] [PATCH 3/3] gnu: heimdal: Re-indent code; no functional change. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 May 2023 04:22:02 +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.168429727116808 (code B ref 63545); Wed, 17 May 2023 04:22:02 +0000 Received: (at 63545) by debbugs.gnu.org; 17 May 2023 04:21:11 +0000 Received: from localhost ([127.0.0.1]:48474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pz8f0-0004N0-Gw for submit@debbugs.gnu.org; Wed, 17 May 2023 00:21:11 -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 1pz8ev-0004MK-NZ for 63545@debbugs.gnu.org; Wed, 17 May 2023 00:21:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=VOyF+/bWe3rxv0C +QlXbgiidxx5qfVv3O43/lnTfcBo=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=Az8uNhHt3noXZw7UKpaYzq6c0VBQC8v1zc7w3gbW C8D9Y4QMuXXXvfsJ8zAjcSFRu6olfgoodZuzuT69z2dp+7CvJRnE+HIwCoTaXmqo2tlReH H5iOZfzNgi5funzH8TC36A683RXYyGHwyCodS/7k4Pd99kFiJgfeurPXPv05s= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id fbb20529 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 17 May 2023 04:21:04 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id a7f59a96; Wed, 17 May 2023 04:21:04 +0000 (UTC) Date: Tue, 16 May 2023 21:20:57 -0700 Message-Id: <28905e7dadc7acfe4abf335bdaf30d8925503570.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 * gnu/packages/kerberos (heimdal): Re-indent code; no functional change. --- gnu/packages/kerberos.scm | 198 +++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index cc5f3f9ef2..3bfeefd558 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -174,108 +174,108 @@ (define-public shishi (define-public heimdal (let ((commit "a6cf94577c0d1e5bca5304342e4ddffb18255afe") (revision "1")) - (package - (name "heimdal") - (version (git-version "7.8.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/heimdal/heimdal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0df646hzi10s0w07kqzj10aniv6jsbmlpx6j3lqjvpsjpmm9lww9")) - (patches - (search-patches "heimdal-CVE-2022-45142.patch")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - ,#~(list - ;; Avoid 7 MiB of .a files. - "--disable-static" + (package + (name "heimdal") + (version (git-version "7.8.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/heimdal/heimdal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0df646hzi10s0w07kqzj10aniv6jsbmlpx6j3lqjvpsjpmm9lww9")) + (patches + (search-patches "heimdal-CVE-2022-45142.patch")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + ,#~(list + ;; Avoid 7 MiB of .a files. + "--disable-static" - ;; Do not build libedit. - (string-append - "--with-readline-lib=" - (assoc-ref %build-inputs "readline") "/lib") - (string-append - "--with-readline-include=" - (assoc-ref %build-inputs "readline") "/include") + ;; Do not build libedit. + (string-append + "--with-readline-lib=" + (assoc-ref %build-inputs "readline") "/lib") + (string-append + "--with-readline-include=" + (assoc-ref %build-inputs "readline") "/include") - ;; Do not build sqlite. - (string-append - "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite")) + ;; Do not build sqlite. + (string-append + "--with-sqlite3=" + (assoc-ref %build-inputs "sqlite")) - #$@(if (%current-target-system) - ;; The configure script is too pessimistic. - ;; Setting this also resolves a linking error. - #~("ac_cv_func_getpwnam_r_posix=yes" - ;; Allow 'slc' and 'asn1_compile' to be found. - (string-append "--with-cross-tools=" - #+(file-append this-package - "/libexec/heimdal"))) - #~())) - #:phases (modify-phases %standard-phases - ;; Skip the appl folder as obsolete per message from Brian May - ;; - (add-after 'unpack 'drop-obsolete-executables - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("Makefile.am") - (("appl") "")))) - (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\"") - ":") - ;; Our 'compile_et' is not in --with-cross-tools, - ;; which confuses heimdal. - (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") - "ac_cv_PROG_COMPILE_ET=compile_et")) - (substitute* '("tools/Makefile.in") - (("/bin/sh") (which "sh"))))) - (add-before 'check 'pre-check - (lambda _ - ;; For 'getxxyyy-test'. - (setenv "USER" (passwd:name (getpwuid (getuid)))) + #$@(if (%current-target-system) + ;; The configure script is too pessimistic. + ;; Setting this also resolves a linking error. + #~("ac_cv_func_getpwnam_r_posix=yes" + ;; Allow 'slc' and 'asn1_compile' to be found. + (string-append "--with-cross-tools=" + #+(file-append this-package + "/libexec/heimdal"))) + #~())) + #:phases (modify-phases %standard-phases + ;; Skip the appl folder as obsolete per message from Brian May + ;; + (add-after 'unpack 'drop-obsolete-executables + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("Makefile.am") + (("appl") "")))) + (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\"") + ":") + ;; Our 'compile_et' is not in --with-cross-tools, + ;; which confuses heimdal. + (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") + "ac_cv_PROG_COMPILE_ET=compile_et")) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh"))))) + (add-before 'check 'pre-check + (lambda _ + ;; For 'getxxyyy-test'. + (setenv "USER" (passwd:name (getpwuid (getuid)))) - ;; Skip 'db' and 'kdc' tests for now. - ;; FIXME: figure out why 'kdc' tests fail. - (with-output-to-file "tests/db/have-db.in" - (lambda () - (format #t "#!~a~%exit 1~%" (which "sh"))))))) - ;; Tests fail when run in parallel. - #:parallel-tests? #f)) - (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 - bdb - e2fsprogs ;for libcom_err - libcap-ng - openldap - sqlite)) - (home-page "http://www.h5l.org/") - (synopsis "Kerberos 5 network authentication") - (description - "Heimdal is an implementation of Kerberos 5 network authentication + ;; Skip 'db' and 'kdc' tests for now. + ;; FIXME: figure out why 'kdc' tests fail. + (with-output-to-file "tests/db/have-db.in" + (lambda () + (format #t "#!~a~%exit 1~%" (which "sh"))))))) + ;; Tests fail when run in parallel. + #:parallel-tests? #f)) + (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 + bdb + e2fsprogs ;for libcom_err + libcap-ng + openldap + sqlite)) + (home-page "http://www.h5l.org/") + (synopsis "Kerberos 5 network authentication") + (description + "Heimdal is an implementation of Kerberos 5 network authentication service.") - (license license:bsd-3)))) + (license license:bsd-3))))