mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-18 20:47:55 +00:00
37f04e2855
- Revert gnupg toolstack version bump to prior of #1661 merge (2.4.2 -> 2.4.0). Version bump not needed for reproducibility. - Investigation and upstream discussions will take their time resolving invalid time issue introduced by between 2.4.0 and latest gnupg, fix regression first under master) - oem-factory-reset - Adding DO_WITH_DEBUG to oem-factory-reset for all its gpg calls. If failing in debug mode, /tmp/debug.txt contains calls and errors - Wipe keyrings only (*.gpg, *.kbx) not conf files under gpg homedir (keep initrd/.gnupg/*.conf) - flake.nix - switch build derivative from qemu and qemu_kvm to qemu_full to have qemu-img tool which was missing to run qemu boards (v0.1.8 docker) - add gnupg so that qemu boards can call inject_gpg to inject public key in absence of flashrom+pflash support for internal flashing - flake.lock: Updated nix pinned package list under flake.lock with 'nix flake update' so qemu_full builds - README.md: have consistent docker testing + release (push) notes - .circleci/config.yml: depend on docker v0.1.8 (qemu_full built with canokey-qemu lib support, diffoscopeMinimal and gnupg for proper qemu testing) TODO: - some fd2 instead of fd1?! - oem-factory-resest has whiptail_or_die which sets whiptail box to HEIGHT 0. This doesn't show a scrolling window on gpg errors which is problematic with fbwhiptail, not whiptail Signed-off-by: Thierry Laurion <insurgo@riseup.net>
24 lines
740 B
Diff
24 lines
740 B
Diff
diff -u --recursive gnupg-2.4.0/configure gnupg-2.4.0/configure
|
|
--- gnupg-2.4.0/configure 2016-08-17 09:20:25.000000000 -0400
|
|
+++ gnupg-2.4.0/configure 2018-01-20 16:55:14.502067084 -0500
|
|
@@ -572,7 +572,7 @@
|
|
ac_clean_files=
|
|
ac_config_libobj_dir=.
|
|
LIBOBJS=
|
|
-cross_compiling=no
|
|
+cross_compiling=yes
|
|
subdirs=
|
|
MFLAGS=
|
|
MAKEFLAGS=
|
|
--- gnupg-2.4.0/common/ttyio.c.orig 2023-03-24 02:37:40.384435064 +0100
|
|
+++ gnupg-2.4.0/common/ttyio.c 2023-03-24 02:38:21.825961221 +0100
|
|
@@ -186,7 +186,7 @@
|
|
SetConsoleMode (con.out, DEF_OUTMODE);
|
|
|
|
#else /* Unix */
|
|
- ttyfp = batchmode? stderr : fopen (tty_get_ttyname (), "r+");
|
|
+ ttyfp = stderr;
|
|
if (!ttyfp)
|
|
{
|
|
log_error ("cannot open '%s': %s\n", tty_get_ttyname (), strerror(errno));
|