From: Felix Lechner via Guix-patches via <guix-patches@gnu.org>
To: 63545@debbugs.gnu.org
Cc: Josselin Poiret <dev@jpoiret.xyz>,
Felix Lechner <felix.lechner@lease-up.com>
Subject: [bug#63545] [PATCH v2 1/2] gnu: heimdal: Run autoreconf.
Date: Sun, 28 May 2023 17:19:17 -0700 [thread overview]
Message-ID: <700bdb497cd0431ea9f3d71516f4168f55882ce4.1685319429.git.felix.lechner@lease-up.com> (raw)
In-Reply-To: <cover.1684296904.git.felix.lechner@lease-up.com>
* 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(-)
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
base-commit: d64d6ea2cf5a1be801be355031fb2cfa5901a92a
--
2.40.1
next prev parent reply other threads:[~2023-05-29 0:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 4:19 [bug#63545] [PATCH 0/3] gnu: heimdal: Drop obsolete user tools Felix Lechner via Guix-patches via
2023-05-17 4:20 ` [bug#63545] [PATCH 1/3] gnu: heimdal: Build from Git Felix Lechner via Guix-patches via
2023-05-17 20:20 ` Josselin Poiret via Guix-patches via
2023-05-17 4:20 ` [bug#63545] [PATCH 2/3] gnu: heimdal: Drop obsolete and insecure user tools Felix Lechner via Guix-patches via
2023-05-17 4:20 ` [bug#63545] [PATCH 3/3] gnu: heimdal: Re-indent code; no functional change Felix Lechner via Guix-patches via
2023-05-29 0:19 ` Felix Lechner via Guix-patches via [this message]
2023-05-29 0:19 ` [bug#63545] [PATCH v2 2/2] gnu: heimdal: Drop obsolete and insecure user tools Felix Lechner via Guix-patches via
2023-06-04 9:39 ` bug#63545: [PATCH v2 1/2] gnu: heimdal: Run autoreconf Josselin Poiret via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=700bdb497cd0431ea9f3d71516f4168f55882ce4.1685319429.git.felix.lechner@lease-up.com \
--to=guix-patches@gnu.org \
--cc=63545@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=felix.lechner@lease-up.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.