From ce168696cace3c8d011e121b9ef5e8d573d9f9a0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 2 Sep 2020 21:05:42 +0100 Subject: [PATCH 01/36] Bump release and rebuild. --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 220d490..ed05870 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,6 @@ Name: ocaml-libvirt Version: 0.6.1.5 -Release: 14%{?dist} +Release: 14%{?dist}.1 Summary: OCaml binding for libvirt License: LGPLv2+ @@ -89,6 +89,9 @@ make install-byte %changelog +* Wed Sep 02 2020 Richard W.M. Jones - 0.6.1.5-14.1 +- Bump release and rebuild. + * Tue Sep 01 2020 Richard W.M. Jones - 0.6.1.5-14 - OCaml 4.11.1 rebuild From e2bf930c94164749d6ec3bc3299f6327bc80f1db Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 06:15:39 +0000 Subject: [PATCH 02/36] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ocaml-libvirt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 220d490..09579b2 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -16,6 +16,7 @@ Patch2: 0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch Patch3: 0002-String_val-returns-const-char-in-OCaml-4.10.patch Patch4: 0003-Don-t-try-to-memcpy-into-a-String_val.patch +BuildRequires: make BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel From 14f557057a12cec5ab06f24b7e1cbdcc7837f6a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:59:33 +0000 Subject: [PATCH 03/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 09579b2..f469de9 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,6 @@ Name: ocaml-libvirt Version: 0.6.1.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -90,6 +90,9 @@ make install-byte %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.1.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Sep 01 2020 Richard W.M. Jones - 0.6.1.5-14 - OCaml 4.11.1 rebuild From df44ea55bb5b503439d8ed4ea17d78cc2ec5cc0d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 14:31:56 +0000 Subject: [PATCH 04/36] OCaml 4.12.0 build --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index f469de9..2f3f14f 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,6 @@ Name: ocaml-libvirt Version: 0.6.1.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -90,6 +90,9 @@ make install-byte %changelog +* Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 0.6.1.5-16 +- OCaml 4.12.0 build + * Tue Jan 26 2021 Fedora Release Engineering - 0.6.1.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 67f74114e15c4e06f029a759dfe147a552af9530 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:40:04 +0000 Subject: [PATCH 05/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 2f3f14f..f322cb6 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,6 @@ Name: ocaml-libvirt Version: 0.6.1.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -90,6 +90,9 @@ make install-byte %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.1.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Mar 1 14:31:55 GMT 2021 Richard W.M. Jones - 0.6.1.5-16 - OCaml 4.12.0 build From fd2db4795c3f353285ba0d3c7294f5f0770e0aad Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:20:47 +0100 Subject: [PATCH 06/36] OCaml 4.13.1 build --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index f322cb6..a5d7133 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,6 @@ Name: ocaml-libvirt Version: 0.6.1.5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -90,6 +90,9 @@ make install-byte %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 0.6.1.5-18 +- OCaml 4.13.1 build + * Thu Jul 22 2021 Fedora Release Engineering - 0.6.1.5-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From bea379f6854cacc062a01b9955505ee38ca82dc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:46:29 +0000 Subject: [PATCH 07/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index a5d7133..fdaaf70 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,6 @@ Name: ocaml-libvirt Version: 0.6.1.5 -Release: 18%{?dist} +Release: 19%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -90,6 +90,9 @@ make install-byte %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.1.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 04 2021 Richard W.M. Jones - 0.6.1.5-18 - OCaml 4.13.1 build From ae6cbb045a95ea7cadb0dd61d907b6e44ac0489b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 13:02:35 +0000 Subject: [PATCH 08/36] OCaml 4.13.1 rebuild to remove package notes --- ocaml-libvirt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index fdaaf70..3b8a025 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,6 +1,7 @@ +%undefine _package_note_flags Name: ocaml-libvirt Version: 0.6.1.5 -Release: 19%{?dist} +Release: 20%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -90,6 +91,9 @@ make install-byte %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 0.6.1.5-20 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Jan 20 2022 Fedora Release Engineering - 0.6.1.5-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 482c6aa384d4eac68347c465ae643afc827799e5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 28 Apr 2022 15:22:53 +0100 Subject: [PATCH 09/36] New upstream version 0.6.1.6 Remove patches which are all upstream. --- ...the-return-value-of-caml_named_value.patch | 38 ------ ...ory_peek-Use-bytes-for-return-buffer.patch | 74 ------------ ...val-returns-const-char-in-OCaml-4.10.patch | 113 ------------------ ...on-t-try-to-memcpy-into-a-String_val.patch | 68 ----------- ocaml-libvirt.spec | 22 ++-- sources | 2 +- 6 files changed, 11 insertions(+), 306 deletions(-) delete mode 100644 0001-Make-const-the-return-value-of-caml_named_value.patch delete mode 100644 0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch delete mode 100644 0002-String_val-returns-const-char-in-OCaml-4.10.patch delete mode 100644 0003-Don-t-try-to-memcpy-into-a-String_val.patch diff --git a/0001-Make-const-the-return-value-of-caml_named_value.patch b/0001-Make-const-the-return-value-of-caml_named_value.patch deleted file mode 100644 index c8b7aee..0000000 --- a/0001-Make-const-the-return-value-of-caml_named_value.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 75b13978f85b32c7a121aa289d8ebf41ba14ee5a Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Thu, 5 Sep 2019 09:57:09 +0200 -Subject: [PATCH] Make const the return value of caml_named_value() - -With OCaml >= 4.09 caml_named_value() returns a const value *, so keep -the constness to build also in this case. - -Signed-off-by: Pino Toscano ---- - libvirt/libvirt_c_oneoffs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index 6f56f10..e23c0db 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -1207,7 +1207,7 @@ ocaml_libvirt_event_run_default_impl (value unitv) - #define DOMAIN_CALLBACK_BEGIN(NAME) \ - value connv, domv, callback_id, result; \ - connv = domv = callback_id = result = Val_int(0); \ -- static value *callback = NULL; \ -+ static const value *callback = NULL; \ - caml_leave_blocking_section(); \ - if (callback == NULL) \ - callback = caml_named_value(NAME); \ -@@ -1433,7 +1433,7 @@ timeout_callback(int timer, void *opaque) - { - value callback_id, result; - callback_id = result = Val_int(0); -- static value *callback = NULL; -+ static const value *callback = NULL; - caml_leave_blocking_section(); - if (callback == NULL) - callback = caml_named_value("Libvirt.timeout_callback"); --- -2.23.0 - diff --git a/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch b/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch deleted file mode 100644 index f3b93af..0000000 --- a/0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 29709872404fad20a9822c43a831f30b7b09f34a Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 19 Jan 2020 12:58:17 +0000 -Subject: [PATCH 1/3] block_peek, memory_peek: Use bytes for return buffer. - -Strings are immutable in modern OCaml. ---- - libvirt/libvirt.ml | 4 ++-- - libvirt/libvirt.mli | 4 ++-- - libvirt/libvirt_c_oneoffs.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml -index 7f9d0e4..bdb9460 100644 ---- a/libvirt/libvirt.ml -+++ b/libvirt/libvirt.ml -@@ -731,8 +731,8 @@ struct - external migrate : [>`W] t -> [>`W] Connect.t -> migrate_flag list -> ?dname:string -> ?uri:string -> ?bandwidth:int -> unit -> rw t = "ocaml_libvirt_domain_migrate_bytecode" "ocaml_libvirt_domain_migrate_native" - external block_stats : [>`R] t -> string -> block_stats = "ocaml_libvirt_domain_block_stats" - external interface_stats : [>`R] t -> string -> interface_stats = "ocaml_libvirt_domain_interface_stats" -- external block_peek : [>`W] t -> string -> int64 -> int -> string -> int -> unit = "ocaml_libvirt_domain_block_peek_bytecode" "ocaml_libvirt_domain_block_peek_native" -- external memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> string -> int -> unit = "ocaml_libvirt_domain_memory_peek_bytecode" "ocaml_libvirt_domain_memory_peek_native" -+ external block_peek : [>`W] t -> string -> int64 -> int -> bytes -> int -> unit = "ocaml_libvirt_domain_block_peek_bytecode" "ocaml_libvirt_domain_block_peek_native" -+ external memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> bytes -> int -> unit = "ocaml_libvirt_domain_memory_peek_bytecode" "ocaml_libvirt_domain_memory_peek_native" - - external get_all_domain_stats : [>`R] Connect.t -> stats_type list -> get_all_domain_stats_flag list -> domain_stats_record array = "ocaml_libvirt_domain_get_all_domain_stats" - -diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli -index 0d74199..7900392 100644 ---- a/libvirt/libvirt.mli -+++ b/libvirt/libvirt.mli -@@ -708,7 +708,7 @@ sig - val interface_stats : [>`R] t -> string -> interface_stats - (** Returns network interface stats. *) - -- val block_peek : [>`W] t -> string -> int64 -> int -> string -> int -> unit -+ val block_peek : [>`W] t -> string -> int64 -> int -> bytes -> int -> unit - (** [block_peek dom path offset size buf boff] reads [size] bytes at - [offset] in the domain's [path] block device. - -@@ -717,7 +717,7 @@ sig - - See also {!max_peek}. *) - val memory_peek : [>`W] t -> memory_flag list -> int64 -> int -> -- string -> int -> unit -+ bytes -> int -> unit - (** [memory_peek dom Virtual offset size] reads [size] bytes - at [offset] in the domain's virtual memory. - -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index 40384e8..8468c73 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -1057,7 +1057,7 @@ ocaml_libvirt_domain_block_peek_native (value domv, value pathv, value offsetv, - const char *path = String_val (pathv); - unsigned long long offset = Int64_val (offsetv); - size_t size = Int_val (sizev); -- char *buffer = String_val (bufferv); -+ unsigned char *buffer = Bytes_val (bufferv); - int boff = Int_val (boffv); - int r; - -@@ -1089,7 +1089,7 @@ ocaml_libvirt_domain_memory_peek_native (value domv, value flagsv, value offsetv - int flags = 0; - unsigned long long offset = Int64_val (offsetv); - size_t size = Int_val (sizev); -- char *buffer = String_val (bufferv); -+ unsigned char *buffer = Bytes_val (bufferv); - int boff = Int_val (boffv); - int r; - --- -2.24.1 - diff --git a/0002-String_val-returns-const-char-in-OCaml-4.10.patch b/0002-String_val-returns-const-char-in-OCaml-4.10.patch deleted file mode 100644 index 4f547cb..0000000 --- a/0002-String_val-returns-const-char-in-OCaml-4.10.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 3705b9bdcd04dc86474c62e1c8dd8759669842bc Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 19 Jan 2020 12:59:09 +0000 -Subject: [PATCH 2/3] String_val returns const char * in OCaml 4.10. - -This should be compatible with earlier versions of OCaml -too since we are just assigning a char * to a const char *. ---- - libvirt/generator.pl | 14 +++++++------- - libvirt/libvirt_c_oneoffs.c | 6 +++--- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/libvirt/generator.pl b/libvirt/generator.pl -index ac3dd65..aff371b 100755 ---- a/libvirt/generator.pl -+++ b/libvirt/generator.pl -@@ -593,7 +593,7 @@ sub gen_c_code - } elsif ($sig =~ /^(\w+), string : unit$/) { - "\ - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - int r; - - NONBLOCKING (r = $c_name ($1, str)); -@@ -605,7 +605,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - int r; - - NONBLOCKING (r = $c_name ($1, str, 0)); -@@ -618,7 +618,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str)); -@@ -633,7 +633,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str, 0)); -@@ -648,7 +648,7 @@ sub gen_c_code - "\ - CAMLlocal1 (rv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - unsigned int u = Int_val (uv); - $c_ret_type r; - -@@ -735,7 +735,7 @@ sub gen_c_code - "\ - CAMLlocal2 (rv, connv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str)); -@@ -751,7 +751,7 @@ sub gen_c_code - "\ - CAMLlocal2 (rv, connv); - " . gen_unpack_args ($1) . " -- char *str = String_val (strv); -+ const char *str = String_val (strv); - $c_ret_type r; - - NONBLOCKING (r = $c_name ($1, str, 0)); -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index 8468c73..fc2ac13 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -601,7 +601,7 @@ ocaml_libvirt_domain_set_scheduler_parameters (value domv, value paramsv) - int nparams = Wosize_val (paramsv); - virSchedParameterPtr params; - int r, i; -- char *name; -+ const char *name; - - params = malloc (sizeof (*params) * nparams); - if (params == NULL) -@@ -1005,7 +1005,7 @@ ocaml_libvirt_domain_block_stats (value domv, value pathv) - CAMLparam2 (domv, pathv); - CAMLlocal2 (rv,v); - virDomainPtr dom = Domain_val (domv); -- char *path = String_val (pathv); -+ const char *path = String_val (pathv); - struct _virDomainBlockStats stats; - int r; - -@@ -1028,7 +1028,7 @@ ocaml_libvirt_domain_interface_stats (value domv, value pathv) - CAMLparam2 (domv, pathv); - CAMLlocal2 (rv,v); - virDomainPtr dom = Domain_val (domv); -- char *path = String_val (pathv); -+ const char *path = String_val (pathv); - struct _virDomainInterfaceStats stats; - int r; - --- -2.24.1 - diff --git a/0003-Don-t-try-to-memcpy-into-a-String_val.patch b/0003-Don-t-try-to-memcpy-into-a-String_val.patch deleted file mode 100644 index 720787f..0000000 --- a/0003-Don-t-try-to-memcpy-into-a-String_val.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3d3d6af425d369200a7a62a127adf640d94a38a3 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sun, 19 Jan 2020 13:02:16 +0000 -Subject: [PATCH 3/3] Don't try to memcpy into a String_val. - -In OCaml 4.10 String_val returns const char *, so we cannot use it as -the destination for memcpy. Use Bytes_val instead. ---- - libvirt/generator.pl | 2 +- - libvirt/libvirt_c_oneoffs.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libvirt/generator.pl b/libvirt/generator.pl -index aff371b..463a19b 100755 ---- a/libvirt/generator.pl -+++ b/libvirt/generator.pl -@@ -440,7 +440,7 @@ sub gen_c_code - - /* UUIDs are byte arrays with a fixed length. */ - rv = caml_alloc_string (VIR_UUID_BUFLEN); -- memcpy (String_val (rv), uuid, VIR_UUID_BUFLEN); -+ memcpy (Bytes_val (rv), uuid, VIR_UUID_BUFLEN); - CAMLreturn (rv); - " - } elsif ($sig =~ /^(\w+) : uuid string$/) { -diff --git a/libvirt/libvirt_c_oneoffs.c b/libvirt/libvirt_c_oneoffs.c -index fc2ac13..e8472b7 100644 ---- a/libvirt/libvirt_c_oneoffs.c -+++ b/libvirt/libvirt_c_oneoffs.c -@@ -394,7 +394,7 @@ ocaml_libvirt_connect_call_auth_default_callback (value listv) - elemv = caml_alloc (2, 0); - if (cred->result != NULL && cred->resultlen > 0) { - v = caml_alloc_string (cred->resultlen); -- memcpy (String_val (v), cred->result, cred->resultlen); -+ memcpy (Bytes_val (v), cred->result, cred->resultlen); - optv = caml_alloc (1, 0); - Store_field (optv, 0, v); - } else -@@ -715,7 +715,7 @@ ocaml_libvirt_domain_get_vcpus (value domv, value maxinfov, value maplenv) - - /* Copy the bitmap. */ - strv = caml_alloc_string (maxinfo * maplen); -- memcpy (String_val (strv), cpumaps, maxinfo * maplen); -+ memcpy (Bytes_val (strv), cpumaps, maxinfo * maplen); - - /* Allocate the tuple and return it. */ - rv = caml_alloc_tuple (3); -@@ -900,7 +900,7 @@ ocaml_libvirt_domain_get_all_domain_stats (value connv, - */ - v = caml_alloc_string (VIR_UUID_BUFLEN); - virDomainGetUUID (rstats[i]->dom, uuid); -- memcpy (String_val (v), uuid, VIR_UUID_BUFLEN); -+ memcpy (Bytes_val (v), uuid, VIR_UUID_BUFLEN); - Store_field (dsv, 0, v); - - tpv = caml_alloc (rstats[i]->nparams, 0); /* typed_param array */ -@@ -1646,7 +1646,7 @@ ocaml_libvirt_secret_get_value (value secv) - CHECK_ERROR (secval == NULL, "virSecretGetValue"); - - rv = caml_alloc_string (size); -- memcpy (String_val (rv), secval, size); -+ memcpy (Bytes_val (rv), secval, size); - free (secval); - - CAMLreturn (rv); --- -2.24.1 - diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 3b8a025..be46822 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,21 +1,15 @@ %undefine _package_note_flags Name: ocaml-libvirt -Version: 0.6.1.5 -Release: 20%{?dist} +Version: 0.6.1.6 +Release: 1%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ URL: http://libvirt.org/ocaml/ -Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz - -# Fixes build with OCaml >= 4.09. -# Upstream commit 75b13978f85b32c7a121aa289d8ebf41ba14ee5a. -Patch1: 0001-Make-const-the-return-value-of-caml_named_value.patch - -# Fixes for OCaml 4.10, sent upstream 2020-01-19. -Patch2: 0001-block_peek-memory_peek-Use-bytes-for-return-buffer.patch -Patch3: 0002-String_val-returns-const-char-in-OCaml-4.10.patch -Patch4: 0003-Don-t-try-to-memcpy-into-a-String_val.patch +#Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz +# The tarball was not uploaded to the website at the time of packaging +# so I built this using "make dist" in the source repo. +Source0: %{name}-%{version}.tar.gz BuildRequires: make BuildRequires: ocaml >= 3.10.0 @@ -91,6 +85,10 @@ make install-byte %changelog +* Thu Apr 28 2022 Richard W.M. Jones - 0.6.1.6-1 +- New upstream version 0.6.1.6 +- Remove patches which are all upstream. + * Fri Feb 04 2022 Richard W.M. Jones - 0.6.1.5-20 - OCaml 4.13.1 rebuild to remove package notes diff --git a/sources b/sources index 46a2bdf..c95b0bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-libvirt-0.6.1.5.tar.gz) = 7862732348932049994d06b5212486984408627c4cf510c6048489e846435e393392241dd342fdc57bc0b077a80aa1efda843547b141e226c9770c21afd4da53 +SHA512 (ocaml-libvirt-0.6.1.6.tar.gz) = 9846b75f2107368eef1d538c5accbc5ac9472f59dd5e0e1e404c3a417e6f25fae4b076a912ff396f2211fda1fd1ef936f6d039e865c015747a79722addec9ab1 From 7fb0cf27932d1d49416ced558eb4042a6d67b0c4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:40:47 +0100 Subject: [PATCH 10/36] OCaml 4.14.0 rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index be46822..a874a46 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,7 +1,7 @@ %undefine _package_note_flags Name: ocaml-libvirt Version: 0.6.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -85,6 +85,9 @@ make install-byte %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 0.6.1.6-2 +- OCaml 4.14.0 rebuild + * Thu Apr 28 2022 Richard W.M. Jones - 0.6.1.6-1 - New upstream version 0.6.1.6 - Remove patches which are all upstream. From 12fc31125c7d8abab5a11b4d1c64c2167d36da3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:17:13 +0000 Subject: [PATCH 11/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index a874a46..bb46f1e 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,7 +1,7 @@ %undefine _package_note_flags Name: ocaml-libvirt Version: 0.6.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -85,6 +85,9 @@ make install-byte %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.6.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jun 18 2022 Richard W.M. Jones - 0.6.1.6-2 - OCaml 4.14.0 rebuild From e33a0b778f072d1cd1111a50647e034e9d2a46c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:10:41 +0000 Subject: [PATCH 12/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index bb46f1e..719b5b9 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,7 +1,7 @@ %undefine _package_note_flags Name: ocaml-libvirt Version: 0.6.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -85,6 +85,9 @@ make install-byte %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 0.6.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 84a4a14f291753b0e2dd0b29563846b15a59a7c4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 09:04:06 +0000 Subject: [PATCH 13/36] Rebuild OCaml packages for F38 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 719b5b9..a32573b 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,7 +1,7 @@ %undefine _package_note_flags Name: ocaml-libvirt Version: 0.6.1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ @@ -85,6 +85,9 @@ make install-byte %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 0.6.1.6-5 +- Rebuild OCaml packages for F38 + * Thu Jan 19 2023 Fedora Release Engineering - 0.6.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2559c77a711c7d82aef5110e4dada3adf653444c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Feb 2023 17:13:41 +0000 Subject: [PATCH 14/36] New upstream version 0.6.1.7 --- ocaml-libvirt.spec | 32 +++++++++++++++++--------------- sources | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index a32573b..c8c80fb 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,17 +1,18 @@ %undefine _package_note_flags + Name: ocaml-libvirt -Version: 0.6.1.6 -Release: 5%{?dist} +Version: 0.6.1.7 +Release: 1%{?dist} Summary: OCaml binding for libvirt License: LGPLv2+ URL: http://libvirt.org/ocaml/ -#Source0: http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz +#Source0: http://libvirt.org/sources/ocaml/%%{name}-%%{version}.tar.gz # The tarball was not uploaded to the website at the time of packaging # so I built this using "make dist" in the source repo. Source0: %{name}-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel @@ -41,11 +42,10 @@ developing applications that use %{name}. %build +# Parallel builds do not work. +unset MAKEFLAGS %configure -make all doc -%ifarch %{ocaml_native_compiler} -make opt -%endif +make %install @@ -54,15 +54,11 @@ export DESTDIR=$RPM_BUILD_ROOT export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} -%ifarch %{ocaml_native_compiler} -make install-opt -%else -make install-byte -%endif +make install %files -%doc COPYING.LIB README ChangeLog +%doc COPYING.LIB README %{_libdir}/ocaml/libvirt %ifarch %{ocaml_native_compiler} %exclude %{_libdir}/ocaml/libvirt/*.a @@ -75,7 +71,7 @@ make install-byte %files devel -%doc COPYING.LIB README TODO.libvirt ChangeLog html/* +%doc COPYING.LIB README TODO.libvirt %ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/libvirt/*.a %{_libdir}/ocaml/libvirt/*.cmxa @@ -85,6 +81,12 @@ make install-byte %changelog +* Mon Feb 13 2023 Richard W.M. Jones - 0.6.1.7-1 +- New upstream version 0.6.1.7 +- Do not try parallel builds. +- Upstream now uses automake. +- Remove ChangeLog file and HTML docs, dropped upstream. + * Tue Jan 24 2023 Richard W.M. Jones - 0.6.1.6-5 - Rebuild OCaml packages for F38 diff --git a/sources b/sources index c95b0bf..e9a0020 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-libvirt-0.6.1.6.tar.gz) = 9846b75f2107368eef1d538c5accbc5ac9472f59dd5e0e1e404c3a417e6f25fae4b076a912ff396f2211fda1fd1ef936f6d039e865c015747a79722addec9ab1 +SHA512 (ocaml-libvirt-0.6.1.7.tar.gz) = ec4ebb69701b15a0c258e78f0e9eb9b1f2a75a86384392e8622ad7f4c85dfc598d51d95698835a2ea401b5647b3ad325ff820cbb7d0e524551ff07c26a54de2b From 65172ea03312fe3ae69295e3f920c5654ad1cdd4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 15:29:12 -0600 Subject: [PATCH 15/36] OCaml 5.0.0 rebuild Other changes: - New project URL - Convert License tag to SPDX - Fix build on bytecode-only architectures - Use %license macro - Use new OCaml macros --- ocaml-libvirt.spec | 57 +++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index c8c80fb..2ec26b5 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,12 +1,10 @@ -%undefine _package_note_flags - Name: ocaml-libvirt Version: 0.6.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml binding for libvirt -License: LGPLv2+ +License: LGPL-2.1-or-later -URL: http://libvirt.org/ocaml/ +URL: https://ocaml.libvirt.org/ #Source0: http://libvirt.org/sources/ocaml/%%{name}-%%{version}.tar.gz # The tarball was not uploaded to the website at the time of packaging # so I built this using "make dist" in the source repo. @@ -19,7 +17,11 @@ BuildRequires: ocaml-findlib-devel BuildRequires: libvirt-devel >= 0.2.1 BuildRequires: perl-interpreter -BuildRequires: gawk +BuildRequires: python3 + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description @@ -28,7 +30,7 @@ OCaml binding for libvirt. %package devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -40,6 +42,13 @@ developing applications that use %{name}. %setup -q %autopatch -p1 +# Fix detection of ocamlopt and ocamldoc +# https://gitlab.com/libvirt/libvirt-ocaml/-/merge_requests/27 +sed -i '/AM_CONDITIONAL/s/"x"/"xno"/' configure.ac + +# Regenerate the configure script +autoreconf -fi -I m4 . + %build # Parallel builds do not work. @@ -55,32 +64,28 @@ export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs mkdir -p $RPM_BUILD_ROOT%{_bindir} make install +%ocaml_files -%files -%doc COPYING.LIB README -%{_libdir}/ocaml/libvirt -%ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/libvirt/*.a -%exclude %{_libdir}/ocaml/libvirt/*.cmxa -%exclude %{_libdir}/ocaml/libvirt/*.cmx -%endif -%exclude %{_libdir}/ocaml/libvirt/*.mli -%{_libdir}/ocaml/stublibs/*.so -%{_libdir}/ocaml/stublibs/*.so.owner +%files -f .ofiles +%doc README +%license COPYING.LIB -%files devel -%doc COPYING.LIB README TODO.libvirt -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/libvirt/*.a -%{_libdir}/ocaml/libvirt/*.cmxa -%{_libdir}/ocaml/libvirt/*.cmx -%endif -%{_libdir}/ocaml/libvirt/*.mli +%files devel -f .ofiles-devel +%doc README TODO.libvirt +%license COPYING.LIB %changelog +* Mon Jul 10 2023 Jerry James - 0.6.1.7-2 +- OCaml 5.0.0 rebuild +- New project URL +- Convert License tag to SPDX +- Fix build on bytecode-only architectures +- Use %%license macro +- Use new OCaml macros + * Mon Feb 13 2023 Richard W.M. Jones - 0.6.1.7-1 - New upstream version 0.6.1.7 - Do not try parallel builds. From b03849dd26d0bf8e4c9dba8b5751cad02a7368da Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 11:36:24 +0100 Subject: [PATCH 16/36] ExcludeArch i686 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SPML7CUBSZNI36NLXGVHEG7DNHU3EWOJ/) --- ocaml-libvirt.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 2ec26b5..4328dbf 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -1,3 +1,6 @@ +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + Name: ocaml-libvirt Version: 0.6.1.7 Release: 2%{?dist} From 984e6de7eec46527bee169a825a06accb3acdeed Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 23:04:40 +0100 Subject: [PATCH 17/36] OCaml 5.0 rebuild for Fedora 39 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 4328dbf..5c5232e 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -81,6 +81,9 @@ make install %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 0.6.1.7-3 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 0.6.1.7-2 - OCaml 5.0.0 rebuild - New project URL From af63c868e9aa866c083186381766979c0f2ff437 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:20:13 +0000 Subject: [PATCH 18/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 5c5232e..29e8ec4 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -81,6 +81,9 @@ make install %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.6.1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 0.6.1.7-3 - OCaml 5.0 rebuild for Fedora 39 From b755839d6ff9a5717e9e7257b2b8590da4e850db Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 21 Sep 2023 14:07:50 +0200 Subject: [PATCH 19/36] Fix Source0 The release tarballs for the last couple of releases have now been uploaded. Take the opportunity to switch to the canonical format for the download URL. Signed-off-by: Andrea Bolognani --- ocaml-libvirt.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 29e8ec4..e8482fe 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -8,10 +8,7 @@ Summary: OCaml binding for libvirt License: LGPL-2.1-or-later URL: https://ocaml.libvirt.org/ -#Source0: http://libvirt.org/sources/ocaml/%%{name}-%%{version}.tar.gz -# The tarball was not uploaded to the website at the time of packaging -# so I built this using "make dist" in the source repo. -Source0: %{name}-%{version}.tar.gz +Source0: https://download.libvirt.org/ocaml/%{name}-%{version}.tar.gz BuildRequires: make BuildRequires: ocaml >= 3.10.0 From 0182ee57dee8c0460fcb90df60959e93565668aa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Oct 2023 21:29:01 -0600 Subject: [PATCH 20/36] BR ocaml-rpm-macros instead of python3 --- ocaml-libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index e8482fe..112d26b 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -14,10 +14,10 @@ BuildRequires: make BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel +BuildRequires: ocaml-rpm-macros BuildRequires: libvirt-devel >= 0.2.1 BuildRequires: perl-interpreter -BuildRequires: python3 BuildRequires: autoconf BuildRequires: automake From 274382e3abd0ae44761c22bd93a551b0790095e8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 14:32:56 +0100 Subject: [PATCH 21/36] OCaml 5.1 rebuild for Fedora 40 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 112d26b..8e728e4 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 0.6.1.7-5 +- OCaml 5.1 rebuild for Fedora 40 + * Thu Jul 20 2023 Fedora Release Engineering - 0.6.1.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d47ef3a20830c7114b8c9864fe040fae98791ff5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 09:35:21 +0000 Subject: [PATCH 22/36] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 8e728e4..3a2f7e7 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 0.6.1.7-6 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Oct 05 2023 Richard W.M. Jones - 0.6.1.7-5 - OCaml 5.1 rebuild for Fedora 40 From 2df1a133c12bfa4a9caac3edb382742045a987e7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 13:34:53 +0000 Subject: [PATCH 23/36] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 3a2f7e7..3624907 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 0.6.1.7-7 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 0.6.1.7-6 - OCaml 5.1.1 rebuild for Fedora 40 From 5d317cde353eb35aef7707aadc3461bd7411f64b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:18:44 +0000 Subject: [PATCH 24/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 3624907..0ba8dca 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.6.1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 18 2023 Richard W.M. Jones - 0.6.1.7-7 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 From fdd5c47f0e2fb077f041a9d5e81ac14bf083e266 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 10:04:09 +0000 Subject: [PATCH 25/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 0ba8dca..8be0f9b 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.6.1.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.6.1.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6dbcf545e4bc97533cdb17dad9f86d7129ad964e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 17:43:41 +0100 Subject: [PATCH 26/36] OCaml 5.2.0 for Fedora 41 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 8be0f9b..f3c2437 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Wed May 29 2024 Richard W.M. Jones - 0.6.1.7-10 +- OCaml 5.2.0 for Fedora 41 + * Thu Jan 25 2024 Fedora Release Engineering - 0.6.1.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 884e9fffe7b265d4f582c63e10a27c9bda8c382e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 09:36:52 +0100 Subject: [PATCH 27/36] Add RHEL gating test --- gating.yaml | 6 ++++++ tests/basic-test.sh | 8 ++++++++ tests/tests.yml | 13 +++++++++++++ 3 files changed, 27 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..2c7ed80 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..2b0ad08 --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,8 @@ +#!/bin/bash - +set -e +set -x + +# Compile trivial libvirt program. +echo 'print_endline Libvirt_version.version' > virttest.ml +ocamlfind ocamlopt -package libvirt virttest.ml -linkpkg -o virttest +./virttest diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..6337afb --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - ocaml + - ocaml-findlib + - ocaml-libvirt-devel + tests: + - simple: + dir: . + run: ./basic-test.sh From 7350e8ca77c834c97c112e89c9f2a35af603ae29 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 11:56:19 +0100 Subject: [PATCH 28/36] OCaml 5.2.0 ppc64le fix --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index f3c2437..9ef9fe9 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 0.6.1.7-11 +- OCaml 5.2.0 ppc64le fix + * Wed May 29 2024 Richard W.M. Jones - 0.6.1.7-10 - OCaml 5.2.0 for Fedora 41 From b3d9695f86843d3cd8bb5a38d0923669275b4c78 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 22:09:48 +0100 Subject: [PATCH 29/36] tests: Add libvirt-devel for -lvirt --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index 6337afb..c74ad77 100755 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -7,6 +7,7 @@ - ocaml - ocaml-findlib - ocaml-libvirt-devel + - libvirt-devel tests: - simple: dir: . From 61bf93c6c6e57b03cd4a567406be755daf3962fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:09:54 +0000 Subject: [PATCH 30/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 9ef9fe9..d3d0b9f 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.6.1.7-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 0.6.1.7-11 - OCaml 5.2.0 ppc64le fix From 52a188de97776693613b8cd97f3b4ef34dea07ff Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 11:28:08 -0700 Subject: [PATCH 31/36] OCaml 5.3.0 rebuild for Fedora 42 --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index d3d0b9f..8a19dbf 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 12%{?dist} +Release: 13%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Thu Jan 9 2025 Jerry James - 0.6.1.7-13 +- OCaml 5.3.0 rebuild for Fedora 42 + * Thu Jul 18 2024 Fedora Release Engineering - 0.6.1.7-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ced748950f27b8bd335409ee3862b2da7e5c1f92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:53:13 +0000 Subject: [PATCH 32/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 8a19dbf..c98fa3f 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.6.1.7-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 0.6.1.7-13 - OCaml 5.3.0 rebuild for Fedora 42 From 6a27c0a53cde3e722db2d4b40d12abc00336df2b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 13:45:37 -0600 Subject: [PATCH 33/36] Rebuild to fix OCaml dependencies --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index c98fa3f..13f8b54 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Fri Jul 11 2025 Jerry James - 0.6.1.7-15 +- Rebuild to fix OCaml dependencies + * Fri Jan 17 2025 Fedora Release Engineering - 0.6.1.7-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e406be29aadf7a7a871d494672d727d465c2ffbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:12:32 +0000 Subject: [PATCH 34/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 13f8b54..b99ae25 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 15%{?dist} +Release: 16%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.6.1.7-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 0.6.1.7-15 - Rebuild to fix OCaml dependencies From 1937a21fa19cd5f7e3b4c2d2caa91a0512251c05 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 18:22:54 +0100 Subject: [PATCH 35/36] OCaml 5.4.0 rebuild --- ocaml-libvirt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index b99ae25..b351191 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -3,7 +3,7 @@ ExcludeArch: %{ix86} Name: ocaml-libvirt Version: 0.6.1.7 -Release: 16%{?dist} +Release: 17%{?dist} Summary: OCaml binding for libvirt License: LGPL-2.1-or-later @@ -78,6 +78,9 @@ make install %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 0.6.1.7-17 +- OCaml 5.4.0 rebuild + * Thu Jul 24 2025 Fedora Release Engineering - 0.6.1.7-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1c129ff6ffd1ab63e2b223d9308e5548166124b0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 17:07:47 -0700 Subject: [PATCH 36/36] Fix a changelog entry --- ocaml-libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index b351191..770ea0b 100644 --- a/ocaml-libvirt.spec +++ b/ocaml-libvirt.spec @@ -84,7 +84,7 @@ make install * Thu Jul 24 2025 Fedora Release Engineering - 0.6.1.7-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 0.6.1.7-15 +* Fri Jul 11 2025 Jerry James - 0.6.1.7-15 - Rebuild to fix OCaml dependencies * Fri Jan 17 2025 Fedora Release Engineering - 0.6.1.7-14