search for: gpgkey_typ

...ilder/list_entries.mli index ce012c4..520eb33 100644 --- a/builder/list_entries.mli +++ b/builder/list_entries.mli @@ -16,4 +16,4 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:(string * Sigchecker.gpgkey_type * Downloader.proxy_mode) list -> Index_parser.index -> unit +val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:(string * Utils.gpgkey_type * Downloader.proxy_mode) list -> Index_parser.index -> unit diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml inde...

...wnloader ~sigchecker source ) sources ) in let index = remove_duplicates index in diff --git a/builder/sources.ml b/builder/sources.ml index b774762..b21e8fc 100644 --- a/builder/sources.ml +++ b/builder/sources.ml @@ -27,7 +27,10 @@ type source = { uri : string; gpgkey : Utils.gpgkey_type; proxy : Downloader.proxy_mode; + format : source_format; } +and source_format = +| FormatNative module StringSet = Set.Make (String) @@ -75,8 +78,21 @@ let parse_conf file = ) with Not_found -> Downloader.SystemProxy in + let format = +...

...rectories, to configure all the available sources of indexes used. This also removes the hardcoded default location, replaced now with a configuration file (which may be not used at all). Thanks, Pino Toscano (8): builder: allow "no key" as key in Sigchecker builder: use Sigchecker.gpgkey_type for the fingerprint builder: add functions to read XDG_CONFIG_DIRS and XDG_CONFIG_PATH builder: extract the default key to file builder: switch sources to .conf files builder: remove VIRT_BUILDER_SOURCE and VIRT_BUILDER_FINGERPRINT builder: remove the default fingerprint/pubkey builder...

...quot;%s --homedir %s %s%s --status-file %s %s" t.gpg t.gpghome diff --git a/builder/sigchecker.mli b/builder/sigchecker.mli index ac57072..bba2b6d 100644 --- a/builder/sigchecker.mli +++ b/builder/sigchecker.mli @@ -18,7 +18,7 @@ type t -val create : gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> t +val create : gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> tmpdir:string -> t val verifying_signatures : t -> bool (** Return whether signatures are being verified by this diff --git a/builder/simplestreams_parser.ml b/buil...

...quot;%s --homedir %s %s%s --status-file %s %s" t.gpg t.gpghome diff --git a/builder/sigchecker.mli b/builder/sigchecker.mli index ac57072..bba2b6d 100644 --- a/builder/sigchecker.mli +++ b/builder/sigchecker.mli @@ -18,7 +18,7 @@ type t -val create : gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> t +val create : gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> tmpdir:string -> t val verifying_signatures : t -> bool (** Return whether signatures are being verified by this diff --git a/builder/simplestreams_parser.ml b/buil...

...i in if delete_tmpfile then unlink_on_exit tmpfile; let file = diff --git a/builder/sources.ml b/builder/sources.ml index 4c8d6c7..9255702 100644 --- a/builder/sources.ml +++ b/builder/sources.ml @@ -26,7 +26,7 @@ type source = { name : string; uri : string; gpgkey : Utils.gpgkey_type; - proxy : Downloader.proxy_mode; + proxy : Curl.proxy option; format : source_format; } and source_format = @@ -67,12 +67,12 @@ let parse_conf file = let proxy = try (match (List.assoc ("proxy", None) fields) with - | "no" | &...

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 +++

...t filename = if t.check_signature then ( let args = quote filename in diff --git a/builder/sigchecker.mli b/builder/sigchecker.mli index 47bf2a3..f233514 100644 --- a/builder/sigchecker.mli +++ b/builder/sigchecker.mli @@ -20,6 +20,10 @@ type t val create : gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> t +val verifying_signatures : t -> bool +(** Return whether signatures are being verified by this + Sigchecker.t. *) + val verify : t -> string -> unit (** Verify the file is signed (if check_signature is true). *) -- 2.1.0

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

...b/builder/list_entries.mli index 520eb33..4765f67 100644 --- a/builder/list_entries.mli +++ b/builder/list_entries.mli @@ -16,4 +16,4 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *) -val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:(string * Utils.gpgkey_type * Downloader.proxy_mode) list -> Index_parser.index -> unit +val list_entries : list_format:([ `Short | `Long | `Json ]) -> sources:Sources.source list -> Index_parser.index -> unit -- 1.9.3

...t; -> eprintf (f_"%s: cannot parse 'revision' field for '%s'\n") prog n; corrupt_file () in diff --git a/builder/utils.ml b/builder/utils.ml index a6628eb..986bf68 100644 --- a/builder/utils.ml +++ b/builder/utils.ml @@ -26,5 +26,12 @@ type gpgkey_type = | No_Key | Fingerprint of string | KeyFile of string +and revision = + | Rev_int of int + | Rev_string of string let quote = Filename.quote + +let string_of_revision = function + | Rev_int n -> string_of_int n + | Rev_string s -> s -- 2.1.0

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

Move the Curl wrapper module from virt-v2v to mllib. Use the module when virt-builder issues curl calls. Rich.

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: - check the pasted metadata: listing and creating images works, so most of the current metadata is correct - possibly wait

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

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. Thanks, Pino Toscano (4): builder: add non-int revisions builder: add simple libyajl binding build: expose HAVE_YAJL to automake

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

...ould not run sha512sum command to verify checksum"); diff --git a/builder/sigchecker.mli b/builder/sigchecker.mli index 4eb7a88..b670957 100644 --- a/builder/sigchecker.mli +++ b/builder/sigchecker.mli @@ -18,7 +18,7 @@ type t -val create : verbose:bool -> gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> t +val create : gpg:string -> gpgkey:Utils.gpgkey_type -> check_signature:bool -> t val verify : t -> string -> unit (** Verify the file is signed (if check_signature is true). *) diff --git a/builder/sources.ml b/builder/sources.ml index cec4a04...