search for: gpghome

...and ‘'curl' -q --config > '/tmp/virt-builder.sVjrSV/guestfscurl53f9ac.conf'’ exited with error 56 Possibly a problem reaching http://builder.libguestfs.org/ ? It might be blocked in some countries. > this is detailed: > /usr/bin/gpg2 --homedir /tmp/virt-builder.sVjrSV/vb.gpghome.1AUiGm --verify --status-file '/tmp/virt-builder.sVjrSV/vbstatc04e44.txt' '/tmp/virt-builder.sVjrSV/vbcache1f47e5.txt' > gpg: Signature made Tue 16 Jun 2020 07:48:27 PM CST using RSA key ID E1B768A0 > gpg: Good signature from "Richard W.M. Jones <rjones@redhat.com&...

...peration_script.ml | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml > index c35d2da..08efa5d 100644 > --- a/builder/sigchecker.ml > +++ b/builder/sigchecker.ml > @@ -54,7 +54,7 @@ let import_keyfile ~gpg ~gpghome ~verbose keyfile = > > let rec create ~verbose ~gpg ~gpgkey ~check_signature = > (* Create a temporary directory for gnupg. *) > - let tmpdir = Mkdtemp.mkdtemp (Filename.temp_dir_name // "vb.gpghome.XXXXXX") in > + let tmpdir = Mkdtemp.temp_dir "vb.gpghome.&quo...

...q --config &gt; '/tmp/virt-builder.sVjrSV/guestfscurl53f9ac.conf'’ exited with error 56 Possibly a problem reaching http://builder.libguestfs.org/ ? It might be blocked in some countries. &gt;&nbsp; this is detailed: &gt; /usr/bin/gpg2 --homedir /tmp/virt-builder.sVjrSV/vb.gpghome.1AUiGm --verify --status-file '/tmp/virt-builder.sVjrSV/vbstatc04e44.txt' '/tmp/virt-builder.sVjrSV/vbcache1f47e5.txt' &gt; gpg: Signature made Tue 16 Jun 2020 07:48:27 PM CST using RSA key ID E1B768A0 &gt; gpg: Good signature from "Richard W.M. Jones <rjones@redhat....

...ch combination. *) let name_arch_map = List.map ( diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index c1cc1f3..4c0d78e 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -30,12 +30,12 @@ type t = { subkeys_fingerprints : string list; check_signature : bool; gpghome : string; + tmpdir : string; } (* Import the specified key file. *) -let import_keyfile ~gpg ~gpghome ?(trust = true) keyfile = - let status_file = Filename.temp_file "vbstat" ".txt" in - unlink_on_exit status_file; +let import_keyfile ~gpg ~gpghome ~tmpdir ?(trust = true...

...ch combination. *) let name_arch_map = List.map ( diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index c1cc1f3..4c0d78e 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -30,12 +30,12 @@ type t = { subkeys_fingerprints : string list; check_signature : bool; gpghome : string; + tmpdir : string; } (* Import the specified key file. *) -let import_keyfile ~gpg ~gpghome ?(trust = true) keyfile = - let status_file = Filename.temp_file "vbstat" ".txt" in - unlink_on_exit status_file; +let import_keyfile ~gpg ~gpghome ~tmpdir ?(trust = true...

Add a simple function to ease the usage of Mkdtemp.mkdtemp. --- mllib/mkdtemp.ml | 5 +++++ mllib/mkdtemp.mli | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/mllib/mkdtemp.ml b/mllib/mkdtemp.ml index 2e64862..353b04b 100644 --- a/mllib/mkdtemp.ml +++ b/mllib/mkdtemp.ml @@ -16,4 +16,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) +open Common_utils +

...--- builder/sigchecker.ml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 0c292fb..a1a4220 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -43,7 +43,17 @@ let import_keyfile ~gpg ~gpghome ~verbose keyfile = let r = Sys.command cmd in if r <> 0 then error (f_"could not import public key\nUse the '-v' option and look for earlier error messages."); - status_file + let status = read_whole_file status_file in + let status = string_nsplit "\n&quo...

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 10 ++++++---- mllib/curl.mli | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..baa75ec 100644 --- a/mllib/curl.ml +++

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 16 +++++++++++----- mllib/curl.mli | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..7d07125 100644 --- a/mllib/curl.ml

...-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index cb9144f..06c60ae 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -27,6 +27,7 @@ open Unix type t = { gpg : string; fingerprint : string; + subkeys_fingerprints : string list; check_signature : bool; gpghome : string; } @@ -63,7 +64,34 @@ let import_keyfile ~gpg ~gpghome ?(trust = true) keyfile = if r <> 0 then error (f_"GPG failure: could not trust the imported key\nUse the '-v' option and look for earlier error messages."); ); - !fingerprint + let subkeys = +...

Much similar to unlink_on_exit, but recursively cleaning directories. --- mllib/common_utils.ml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 3943417..f49ede6 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -386,6 +386,35 @@ let unlink_on_exit = registered_handlers := true )

...5,38 @@ ZvXkQ3FVJwZoLmHw47vvlVpLD/4gi1SuHWieRvZ+UdDq00E348pm > =neBW > -----END PGP PUBLIC KEY BLOCK----- > " > -let key_imported = ref false > > type t = { > debug : bool; > gpg : string; > fingerprint : string; > check_signature : bool; > + gpghome : string; > + mutable key_imported : bool; > } > > let create ~debug ~gpg ~fingerprint ~check_signature = > + (* Create a temporary directory for gnupg. *) > + let tmpdir = Mkdtemp.mkdtemp (Filename.temp_dir_name // "vb.gpghome.XXXXXX") in > + rmdir_on_exit tm...

...ure(8) manpage for repository creation and user configuration details. OK, that fits the advice about secure apt in Johannes's page so: root at DebianAdvent:/etc/apt# apt-key adv --keyserver keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF' Executing: /tmp/apt-key-gpghome.qC3CUffAEm/gpg.1.sh --keyserver keys.gnupg.net --recv-key E19F5F87128899B192B1A2C2AD5F960A256A04AF gpg: failed to start the dirmngr '/usr/bin/dirmngr': No such file or directory gpg: connecting dirmngr at '/tmp/apt-key-gpghome.qC3CUffAEm/S.dirmngr' failed: No such file or director...

...if r <> 0 then error (f_"curl (download) command failed downloading '%s'") uri; diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 77dc36a..2b77193 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -39,7 +39,7 @@ let import_keyfile ~gpg ~gpghome ?(trust = true) keyfile = let cmd = sprintf "%s --homedir %s --status-file %s --import %s%s" gpg gpghome (quote status_file) (quote keyfile) (if verbose () then "" else " >/dev/null 2>&1") in - if verbose () then printf "%s\n%!" cmd; +...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

...n error (f_"unexpected output from curl command, enable debug and look at previous messages"); diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 2b77193..39a2766 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -69,7 +69,6 @@ let import_keyfile ~gpg ~gpghome ?(trust = true) keyfile = * fingerprint of the subkeys. *) let cmd = sprintf "%s --homedir %s --with-colons --with-fingerprint --with-fingerprint --list-keys %s" gpg gpghome !fingerprint in - debug "%s" cmd; let lines = external_command cmd in let...

...etion(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index b54977f..29f271b 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -159,7 +159,7 @@ and do_verify t args = let cmd = sprintf "%s --homedir %s --verify%s --status-file %s %s" t.gpg t.gpghome - (if t.verbose then "" else " -q --logger-file /dev/null") + (if t.verbose then "" else " --batch -q --logger-file /dev/null") (quote status_file) args in if t.verbose then printf "%s\n%!" cmd; let r = Sys.command cmd i...

...only = true) t args = let status_file = Filename.temp_file "vbstat" ".txt" in unlink_on_exit status_file; let cmd = - sprintf "%s --homedir %s --verify%s --status-file %s %s" + sprintf "%s --homedir %s %s%s --status-file %s %s" t.gpg t.gpghome + (if verify_only then "--verify" else "") (if verbose () then "" else " --batch -q --logger-file /dev/null") (quote status_file) args in if verbose () then printf "%s\n%!" cmd; diff --git a/builder/sigchecker.mli b/build...

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - a bit more testing: listing and creating images works, so the current metadata is correct - handle revisions, so newer

...let dirs = List.filter (fun x -> x <> "") dirs in List.map (fun x -> x // prog) dirs diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 42d55cd..77dc36a 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -44,12 +44,12 @@ let import_keyfile ~gpg ~gpghome ?(trust = true) keyfile = if r <> 0 then error (f_"could not import public key\nUse the '-v' option and look for earlier error messages."); let status = read_whole_file status_file in - let status = string_nsplit "\n" status in + let status = String.ns...