From ca7e74e31387c80b442800c63ec3b403997602dc18933c06e50ee88663bb2bc0 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 8 Jan 2024 15:18:16 +0000 Subject: [PATCH 1/3] Accepting request 1133020 from home:olh:branches:Virtualization - Use ocaml-rpm-macros to track OCaml ABI - Remove unused perl_gen_filelist sync changes file from SLE15 OBS-URL: https://build.opensuse.org/request/show/1133020 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=559 --- libguestfs.changes | 10 +++++++++- libguestfs.spec | 22 +++++----------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index adfd160..8d09081 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -26,6 +26,12 @@ Thu Jan 4 13:10:51 MST 2024 - carnold@suse.com * In guestmount(1) avoid calling fclose(NULL) on error paths, which might have caused a crash on some platforms. +------------------------------------------------------------------- +Tue Dec 12 12:12:12 UTC 2023 - ohering@suse.de + +- Use ocaml-rpm-macros to track OCaml ABI +- Remove unused perl_gen_filelist + ------------------------------------------------------------------- Mon Dec 11 12:39:30 MST 2023 - carnold@suse.com @@ -75,6 +81,8 @@ Thu Mar 23 15:49:09 UTC 2023 - Martin Liška ------------------------------------------------------------------- Wed Mar 15 07:33:43 UTC 2023 - Vasily Ulyanov +- bsc#1213243 - KubeVirt needs libguestfs with the support of qcow2 + appliances - Configure with --enable-appliance-format-auto to allow qcow2-format fixed appliances. @@ -133,7 +141,7 @@ Thu Feb 9 12:55:46 MST 2023 - carnold@suse.com Fri Dec 16 09:08:08 UTC 2022 - Dominique Leuenberger - Fix build with RPM 4.18: rpm wants to do a proper cleanup, and - fails on the design choice to have /usr/lib65 without write + fails on the design choice to have /usr/lib64 without write permission. As we already tar'ed the content up, we can simply change the permissions of winsupport's content to allow proper erasing. diff --git a/libguestfs.spec b/libguestfs.spec index f948661..b231396 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -47,6 +47,7 @@ BuildRequires: po4a BuildRequires: readline-devel BuildRequires: supermin >= 5.1.18 BuildRequires: zstd +BuildRequires: ocaml-rpm-macros BuildRequires: ocaml(ocaml_base_version) >= 4.07 BuildRequires: ocamlfind(findlib) BuildRequires: perl(Getopt::Long) @@ -202,11 +203,9 @@ cp %{S:5} %{buildroot}/etc/profile.d # Perl find %{buildroot}/ -name "*.bs" -size 0c -print -delete %perl_process_packlist -%perl_gen_filelist -# The macro above packages everything, here only the perl files are desired -grep "%perl_vendorarch/" %{name}.files | tee t -mv t %{name}.files +# OCaml +%ocaml_create_file_list # Supermin pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d @@ -630,21 +629,10 @@ for %{name}. %files inspect-icons # no files -%files -n ocaml-%{name} -%{_libdir}/ocaml/guestfs -%exclude %{_libdir}/ocaml/guestfs/*.a -%exclude %{_libdir}/ocaml/guestfs/*.cmxa -%exclude %{_libdir}/ocaml/guestfs/*.cmx -%exclude %{_libdir}/ocaml/guestfs/*.mli -%{_libdir}/ocaml/stublibs/dllmlguestfs.so -%{_libdir}/ocaml/stublibs/dllmlguestfs.so.owner +%files -n ocaml-%{name} -f %name.files -%files -n ocaml-%{name}-devel +%files -n ocaml-%{name}-devel -f %name.files.devel %doc ocaml/examples/*.ml ocaml/html -%{_libdir}/ocaml/guestfs/*.a -%{_libdir}/ocaml/guestfs/*.cmxa -%{_libdir}/ocaml/guestfs/*.cmx -%{_libdir}/ocaml/guestfs/*.mli %{_mandir}/man3/guestfs-ocaml.3* %files -n perl-Sys-Guestfs From b051018cfa56e59fa125afc1c92dd23a40729f06f59530477773e4891810f505 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 8 Jan 2024 15:49:08 +0000 Subject: [PATCH 2/3] Accepting request 1133981 from home:bmwiedemann:branches:Virtualization Provide a tar-wrapper that creates bit-reproducible output (boo#1218191) Note: needs testing that everything still works as expected. OBS-URL: https://build.opensuse.org/request/show/1133981 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=560 --- libguestfs.changes | 5 +++++ libguestfs.spec | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libguestfs.changes b/libguestfs.changes index 8d09081..0f4ff93 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -26,6 +26,11 @@ Thu Jan 4 13:10:51 MST 2024 - carnold@suse.com * In guestmount(1) avoid calling fclose(NULL) on error paths, which might have caused a crash on some platforms. +------------------------------------------------------------------- +Tue Dec 19 09:00:54 UTC 2023 - Bernhard Wiedemann + +- Provide a tar-wrapper that creates bit-reproducible output (boo#1218191) + ------------------------------------------------------------------- Tue Dec 12 12:12:12 UTC 2023 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index b231396..3f11f78 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -91,8 +91,23 @@ schemes, qcow, qcow2, vmdk. %autosetup -p1 sed -i 's|RPMVSF_MASK_NOSIGNATURES|_RPMVSF_NOSIGNATURES|' daemon/rpm-c.c +sed -i 's/tar zcf/tar -zcf/' appliance/Makefile.am %build +# provide a wrapper to tar that creates bit-reproducible output (boo#1218191) +# used in supermin for base.tar.gz, in %install for zz-winsupport.tar.gz zz-scripts.tar.gz and in appliance/Makefile.am for 3 more .tar.gz files +SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-$(date -r %{SOURCE0} +%%s)} +mkdir ~/bin ; cat >~/bin/tar < %{buildroot}%{_libdir}/guestfs/supermin.d/zz-packages-winsupport << EOF From 2f9c3e0503c58783e53b31a0e2bd753e1bcf1d7857b64f8520e41d1736c900db Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 8 Jan 2024 15:51:35 +0000 Subject: [PATCH 3/3] - Update to version 1.52.0 (jsc#PED-6305) OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=561 --- libguestfs.changes | 2 +- libguestfs.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index 0f4ff93..f90cb8a 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Jan 4 13:10:51 MST 2024 - carnold@suse.com -- Update to version 1.52.0 +- Update to version 1.52.0 (jsc#PED-6305) * The Python bindings now use bytes (instead of str) for the event callback message, since it may contain arbitrary 8 bit data diff --git a/libguestfs.spec b/libguestfs.spec index 3f11f78..9d3a73a 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -43,11 +43,11 @@ BuildRequires: gperf BuildRequires: libtool BuildRequires: ocaml-augeas-devel BuildRequires: ocaml-hivex-devel +BuildRequires: ocaml-rpm-macros BuildRequires: po4a BuildRequires: readline-devel BuildRequires: supermin >= 5.1.18 BuildRequires: zstd -BuildRequires: ocaml-rpm-macros BuildRequires: ocaml(ocaml_base_version) >= 4.07 BuildRequires: ocamlfind(findlib) BuildRequires: perl(Getopt::Long)