Accepting request 1137599 from Virtualization

Update libguestfs to version 1.52.0 with adjustments for reproducible builds and other minor tweaks.

OBS-URL: https://build.opensuse.org/request/show/1137599
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libguestfs?expand=0&rev=99

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
@@ -26,6 +26,17 @@ 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 <bwiedemann@suse.com>
+
+- Provide a tar-wrapper that creates bit-reproducible output (boo#1218191)
+
+-------------------------------------------------------------------
+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 +86,8 @@ Thu Mar 23 15:49:09 UTC 2023 - Martin Liška <mliska@suse.cz>
 -------------------------------------------------------------------
 Wed Mar 15 07:33:43 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 
+- 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 +146,7 @@ Thu Feb  9 12:55:46 MST 2023 - carnold@suse.com
 Fri Dec 16 09:08:08 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
 - 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.

libguestfs.spec

@@ -43,6 +43,7 @@ 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
@@ -90,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 <<EOF
+#!/bin/sh
+exec /usr/bin/tar \
+  --sort=name --clamp-mtime --mtime=@$SOURCE_DATE_EPOCH \
+  --owner=0 --group=0 --numeric-owner \
+  --pax-option=exthdr.name=%%d/PaxHeaders/%%f,delete=atime,delete=ctime \
+  "\$@"
+EOF
+chmod a+x ~/bin/tar
+PATH=~/bin:$PATH
+
 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
 # use 'env LIBGUESTFS_HV=/path/to/kvm libguestfs-test-tool' to verify
 %define kvm_binary /bin/false
@@ -187,6 +203,7 @@ make \
 build_it %{?_smp_mflags} || build_it
 
 %install
+PATH=~/bin:$PATH
 %make_install \
 	INSTALLDIRS=vendor \
 	udevrulesdir=%{_udevrulesdir}
@@ -202,11 +219,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
 
@@ -252,7 +267,7 @@ done
 cp %{S:101} winsupport
 
 pushd winsupport
-tar zcf %{buildroot}%{_libdir}/guestfs/supermin.d/zz-winsupport.tar.gz .
+tar -czf %{buildroot}%{_libdir}/guestfs/supermin.d/zz-winsupport.tar.gz .
 popd
 
 cat > %{buildroot}%{_libdir}/guestfs/supermin.d/zz-packages-winsupport << EOF
@@ -630,21 +645,10 @@ for %{name}.
 %files inspect-icons
 # no files
 
-%files -n ocaml-%{name}
+%files -n ocaml-%{name} -f %name.files
-%{_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}-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