diff --git a/bfd08867-golang-Fix-path-to-include-guestfs.h..patch b/bfd08867-golang-Fix-path-to-include-guestfs.h..patch deleted file mode 100644 index 1187c23..0000000 --- a/bfd08867-golang-Fix-path-to-include-guestfs.h..patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: golang: Fix path to include/guestfs.h. -From: Richard W.M. Jones rjones@redhat.com Tue Oct 6 15:25:32 2020 +0100 -Date: Tue Oct 6 15:26:14 2020 +0100: -Git: bfd0886765fef19a8c7313402f882b543a7dfb6d - -Thanks: Martin Kletzander -Fixes: commit 75abec1f706e555cd6c9915be03c732b56a94596 - -diff --git a/run.in b/run.in -index 90552fb04..10844a651 100755 ---- a/run.in -+++ b/run.in -@@ -181,9 +181,9 @@ export GOLANG="@GOLANG@" - prepend GOPATH "$b/golang" - export GOPATH - if [ -z "$CGO_CFLAGS" ]; then -- CGO_CFLAGS="-I$s/lib" -+ CGO_CFLAGS="-I$s/include" - else -- CGO_CFLAGS="$CGO_CFLAGS -I$s/lib" -+ CGO_CFLAGS="$CGO_CFLAGS -I$s/include" - fi - export CGO_CFLAGS - if [ -z "$CGO_CFLAGS_ALLOW" ]; then diff --git a/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch b/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch deleted file mode 100644 index 7c1cc47..0000000 --- a/dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Subject: build: fix includedir in uninstalled libguestfs.pc -From: Pino Toscano ptoscano@redhat.com Tue Sep 22 18:12:05 2020 +0200 -Date: Tue Sep 22 18:12:05 2020 +0200: -Git: dbfab7d3b283181ec6ef685fff0862cdd4da76c0 - -Update includedir with the new directory that contains guestfs.h. - -Updates commit 75abec1f706e555cd6c9915be03c732b56a94596. - -diff --git a/lib/local/libguestfs.pc.in b/lib/local/libguestfs.pc.in -index 129682be8..46cef1e16 100644 ---- a/lib/local/libguestfs.pc.in -+++ b/lib/local/libguestfs.pc.in -@@ -26,7 +26,7 @@ - prefix=@abs_top_builddir@ - exec_prefix=@abs_top_builddir@ - libdir=@abs_top_builddir@/lib/.libs --includedir=@abs_top_srcdir@/lib -+includedir=@abs_top_srcdir@/include - - Name: libguestfs - Version: @VERSION@ diff --git a/libguestfs-1.43.2.tar.gz b/libguestfs-1.43.2.tar.gz deleted file mode 100644 index f12602d..0000000 --- a/libguestfs-1.43.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11e48a5630aba7779b9e3fe1bd08fa3a1a3ec3dda777214a844e0b8b1ff8bca9 -size 23320958 diff --git a/libguestfs-1.44.0.tar.gz b/libguestfs-1.44.0.tar.gz new file mode 100644 index 0000000..0bd5ad2 --- /dev/null +++ b/libguestfs-1.44.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21 +size 23469286 diff --git a/libguestfs.changes b/libguestfs.changes index 2ed946d..9456b62 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Mon Jan 11 11:42:51 MST 2021 - carnold@suse.com + +- Update to version 1.44.0 + * The minimum version of Python required is 3.6. + * Python bindings no longer use deprecated + "PyEval_ThreadsInitialized". + * Python bindings now include type hints (Sam Eiderman). + * Erlang bindings now use libei instead of liberl_interface + (Sergei Golovan). + * virt-get-kernel(1) can now find uncompressed kernels + (Pino Toscano). + * virt-sysprep(1) now regenerates the guest certificate store + when a certificate is removed from the guest (Pino Toscano). + * virt-sysprep(1) can now remove IPA enrollment files and + Kerberos keytabs + (Pino Toscano, Christian Heimes and François Cami). + * "cryptsetup-open" and "cryptsetup-close" replace "luks-open", + luks-open-ro and luks-close. The new APIs add support for + BitLocker encryption. + * "lvm-canonical-lv" no longer produces a noisy error message + when called with a non-LV parameter. + * Various other bug fixes +- Drop + bfd08867-golang-Fix-path-to-include-guestfs.h..patch + dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch + +------------------------------------------------------------------- +Tue Oct 20 14:01:16 MDT 2020 - carnold@suse.com + +- Drop is_opensuse references to remove differences between Leap + and SLES packaging + libguestfs.spec + ------------------------------------------------------------------- Tue Oct 6 14:07:12 MDT 2020 - carnold@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index e4292e0..621a850 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ # needsbinariesforbuild -Version: 1.43.2 +Version: 1.44.0 Release: 0 %{ocaml_preserve_bytecode} @@ -145,9 +145,6 @@ Summary: Compatibility package for guestfs-tools License: GPL-2.0-only Group: System/Filesystems -Patch1: dbfab7d3-build-fix-includedir-in-uninstalled-libguestfs.pc.patch -Patch2: bfd08867-golang-Fix-path-to-include-guestfs.h..patch - # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch @@ -442,9 +439,7 @@ Recommends: mkisofs Recommends: genisoimage %endif Recommends: ldmtool -%if ! 0%{?is_opensuse} Recommends: guestfs-winsupport -%endif Summary: Virtual machine needed for libguestfs License: GPL-2.0-only @@ -456,7 +451,6 @@ Obsoletes: libguestfs-data < %{version} libguestfs needs for it's run a virtual machine image. This package provides such an image, an initrd and a kernel. -%if ! 0%{?is_opensuse} %package -n guestfs-winsupport Summary: Windows guest support in libguestfs License: GPL-2.0-or-later @@ -469,8 +463,6 @@ BuildRequires: rsync %description -n guestfs-winsupport Provides the needed pieces for libguestfs to handle Windows guests. -%endif - %package devel Summary: Development files for libguestfs License: GPL-2.0-only @@ -546,8 +538,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts. : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 #%setup -q -a 1 -a 2 -a 789653 -%patch1 -p1 -%patch2 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -584,6 +574,14 @@ then export PYTHON_EXT_SUFFIX=.so fi +# Defines these if using --with-distro=SUSE with configure +export HAVE_RPM_TRUE= +export HAVE_RPM_FALSE="#" +export HAVE_DPKG_TRUE="#" +export HAVE_DPKG_FALSE="#" +export HAVE_PACMAN_TRUE="#" +export HAVE_PACMAN_FALSE="#" + #sed -i '1 s@^.*@#!/bin/sh -x@' configure %configure \ --docdir=%{guestfs_docdir} \ @@ -603,7 +601,8 @@ fi %{_configure_ruby} \ --disable-rpath \ --disable-static \ - --with-distro=SUSE + --with-distro=SUSE + #Workaround an autotools bug make -j1 -C builder index-parse.c # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir instead of the site dir @@ -669,16 +668,6 @@ touch %{name}.lang %find_lang %{name} # Appliance NTFS files -%if 0%{?is_opensuse} -mkdir -p %{buildroot}/tmp/etc/alternatives -pushd %{buildroot}/tmp/etc/alternatives -ln -s /sbin/mount.ntfs-3g mount.ntfs -popd -pushd %{buildroot}/tmp -tar -czf %{buildroot}/%{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz etc -popd -rm -rf %{buildroot}/tmp -%else # Just copy the content of the ntfs packages mkdir winsupport for pkg in $(rpm -qa | grep ntfs); do @@ -696,7 +685,6 @@ cat > %{buildroot}%{_libdir}/guestfs/supermin.d/zz-packages-winsupport << EOF libfuse2 hwinfo EOF -%endif mkdir -p %{buildroot}/tmp/usr/bin cp %{S:100} %{buildroot}/tmp/usr/bin @@ -731,14 +719,9 @@ rm %{buildroot}/%{_datadir}/virt-p2v/p2v.ks.in %{_libdir}/guestfs/supermin.d/packages %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz -%if 0%{?is_opensuse} -%{_libdir}/guestfs/supermin.d/zz-ntfs-symlink.tar.gz -%else - %files -n guestfs-winsupport %defattr(-,root,root) %{_libdir}/guestfs/supermin.d/zz-*winsupport* -%endif %if %{with ocaml_bindings} %files -n ocaml-libguestfs diff --git a/netconfig.patch b/netconfig.patch index 4d6ff78..b4db54a 100644 --- a/netconfig.patch +++ b/netconfig.patch @@ -1,8 +1,8 @@ -Index: libguestfs-1.42.0/appliance/packagelist.in +Index: libguestfs-1.44.0/appliance/packagelist.in =================================================================== ---- libguestfs-1.42.0.orig/appliance/packagelist.in -+++ libguestfs-1.42.0/appliance/packagelist.in -@@ -164,6 +164,7 @@ ifelse(SUSE,1, +--- libguestfs-1.44.0.orig/appliance/packagelist.in ++++ libguestfs-1.44.0/appliance/packagelist.in +@@ -130,6 +130,7 @@ ifelse(SUSE,1, ntfs-3g reiserfs squashfs