From: Hilko Bengen Date: Wed, 21 Aug 2024 18:34:14 +0000 (+0200) Subject: Import guestfs-tools_1.52.0-4.debian.tar.xz X-Git-Tag: archive/raspbian/1.52.3-1+rpi1^2^2^2^2^2~1^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0fc79eec3e5d4fb1eeb2db8eaf646a34af7ccbd2;p=guestfs-tools.git Import guestfs-tools_1.52.0-4.debian.tar.xz [dgit import tarball guestfs-tools 1.52.0-4 guestfs-tools_1.52.0-4.debian.tar.xz] --- 0fc79eec3e5d4fb1eeb2db8eaf646a34af7ccbd2 diff --git a/changelog b/changelog new file mode 100644 index 0000000..3c77d09 --- /dev/null +++ b/changelog @@ -0,0 +1,124 @@ +guestfs-tools (1.52.0-4) unstable; urgency=medium + + * Apply upstream patch to remove sparsify test (Closes: #1078282) + + -- Hilko Bengen Wed, 21 Aug 2024 20:34:14 +0200 + +guestfs-tools (1.52.0-3) unstable; urgency=medium + + * rpi kernel as armel build dependency. + Thanks to Peter Green (Closes: #1072980) + + -- Hilko Bengen Tue, 11 Jun 2024 13:07:24 +0200 + +guestfs-tools (1.52.0-2) unstable; urgency=medium + + * Disable tests that use the network + + -- Hilko Bengen Tue, 09 Jan 2024 01:35:38 +0100 + +guestfs-tools (1.52.0-1) unstable; urgency=medium + + * New upstream version 1.52.0 + * Ensure that package can be rebuilt from source after successful build + (Closes: #1045072) + + -- Hilko Bengen Sun, 07 Jan 2024 22:42:07 +0100 + +guestfs-tools (1.50.1-4) unstable; urgency=medium + + * Disable tests on i386 for now + + -- Hilko Bengen Thu, 29 Jun 2023 10:00:45 +0200 + +guestfs-tools (1.50.1-3) unstable; urgency=medium + + * Make tests verbose: dump log on test failure + + -- Hilko Bengen Thu, 29 Jun 2023 00:58:11 +0200 + +guestfs-tools (1.50.1-2) unstable; urgency=medium + + * Disable tests that fail on some architectures + + -- Hilko Bengen Wed, 28 Jun 2023 15:44:14 +0200 + +guestfs-tools (1.50.1-1) unstable; urgency=medium + + * New upstream version 1.50.1 + * Drop patch + * Update build-dependencies + + -- Hilko Bengen Mon, 12 Jun 2023 14:49:18 +0200 + +guestfs-tools (1.48.3-4) unstable; urgency=medium + + * Disable test-virt-resize.pl + * Add libguestfs-common patch, fixing CVE-2022-2211. Closes: #1014764 + + -- Hilko Bengen Mon, 10 Apr 2023 14:18:02 +0200 + +guestfs-tools (1.48.3-3) unstable; urgency=medium + + * Remove s390x from test architectures + + -- Hilko Bengen Mon, 20 Mar 2023 01:07:58 +0100 + +guestfs-tools (1.48.3-2) unstable; urgency=medium + + * Disable test-virt-builder.sh (Closes: ##1031471) + * Replace obsolete libtinfo-dev build-dependency + + -- Hilko Bengen Tue, 21 Feb 2023 01:06:21 +0100 + +guestfs-tools (1.48.3-1) unstable; urgency=medium + + * New upstream version 1.48.3 + * Update Lintian overriides (syntax) + + -- Hilko Bengen Thu, 12 Jan 2023 10:56:31 +0100 + +guestfs-tools (1.48.2-1) unstable; urgency=medium + + * New upstream version 1.48.2 + + -- Hilko Bengen Fri, 27 May 2022 13:49:43 +0200 + +guestfs-tools (1.48.1-1) unstable; urgency=medium + + * New upstream version 1.48.1 + + -- Hilko Bengen Mon, 16 May 2022 16:23:12 +0200 + +guestfs-tools (1.48.0-1) unstable; urgency=medium + + * New upstream version 1.48.0 + * Run tests on more architectures: ppc64el, s390x + * Fix watch file + + -- Hilko Bengen Tue, 15 Mar 2022 11:10:37 +0100 + +guestfs-tools (1.46.1-4) unstable; urgency=medium + + * Add missing build-dependencies + + -- Hilko Bengen Sat, 15 Jan 2022 17:37:11 +0100 + +guestfs-tools (1.46.1-3) unstable; urgency=medium + + * Attempt to fix FTBFS on non-x86 architectures + + -- Hilko Bengen Fri, 14 Jan 2022 16:17:32 +0100 + +guestfs-tools (1.46.1-2) unstable; urgency=medium + + * Add gbp.conf file + * Fix debian/copyright file + + -- Hilko Bengen Sat, 08 Jan 2022 14:34:10 +0100 + +guestfs-tools (1.46.1-1) unstable; urgency=medium + + * Initial release (Closes: #1002577) + + -- Hilko Bengen Sat, 25 Dec 2021 12:37:58 +0100 diff --git a/clean b/clean new file mode 100644 index 0000000..3fec32c --- /dev/null +++ b/clean @@ -0,0 +1 @@ +tmp/ diff --git a/control b/control new file mode 100644 index 0000000..57d6dc7 --- /dev/null +++ b/control @@ -0,0 +1,75 @@ +Source: guestfs-tools +Section: utils +Priority: optional +Maintainer: Hilko Bengen +Build-Depends: debhelper-compat (= 13), + pkg-config, + libguestfs-dev (>> 1:1.49), + libguestfs-ocaml-dev (>> 1:1.49), + libguestfs-perl (>> 1:1.49), + ocaml-nox, ocaml-findlib, + libgettext-ocaml-dev, + libounit-ocaml-dev , + libvirt-ocaml-dev, + libjansson-dev, + liblzma-dev, + libncurses-dev, + libosinfo-1.0-dev, + libpcre2-dev, + libvirt-dev, + libxml2-dev, + libmodule-build-perl, + libintl-perl, + gettext, + po4a, + bison, + flex, + sqlite3, + xorriso, + xz-utils, + bash-completion, + guestfish (>> 1:1.46) , + ipxe-qemu , + libxml2-utils , + linux-image-alpha-generic [alpha] , + linux-image-rpi [armel] | linux-image-marvell [armel] | linux-image-versatile [armel] , + linux-image-armmp [armhf] , + linux-image-arm64 [arm64] , + linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel] , + linux-image-5kc-malta [mips64 mips64el] , + linux-image-s390x [s390x] , + linux-image-parisc [hppa] , + linux-image-powerpc [powerpc] , + linux-image-powerpc64 [ppc64] , + linux-image-powerpc64le [ppc64el] , + linux-image-sparc64 [sparc sparc64] , + linux-image-amd64 [amd64 x32] , + linux-image-686-pae [i386] | linux-image-586 [i386] | linux-image-486 [i386] , + linux-image-riscv64 [riscv64] , + linux-image-itanium [ia64] | linux-image-mckinley [ia64] , +Standards-Version: 4.6.0 +Homepage: https://libguestfs.org +Vcs-Browser: https://salsa.debian.org/libvirt-team/guestfs-tools +Vcs-Git: https://salsa.debian.org/libvirt-team/guestfs-tools.git +Rules-Requires-Root: no + +Package: guestfs-tools +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, + libguestfs-perl, + libintl-perl, + libstring-shellquote-perl, + libsys-virt-perl, + libwin-hivex-perl, + curl, +Recommends: virt-p2v, gnupg, libguestfs-tools (>= 1:1.46), +Breaks: libguestfs-tools (<< 1:1.46) +Replaces: libguestfs-tools (<< 1:1.46) +Description: guest disk image management system - tools + The libguestfs library allows accessing and modifying guest disk + images. + . + This package contains the guestfish interactive shell and various + virtualization tools, including virt-cat, virt-df, virt-edit, + virt-filesystems, virt-inspector, virt-ls, virt-make-fs, virt-rescue, + virt-resize, virt-tar, and virt-win-reg. diff --git a/copyright b/copyright new file mode 100644 index 0000000..8fea43d --- /dev/null +++ b/copyright @@ -0,0 +1,91 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: guestfs-tools +Source: + +Files: * +Copyright: Red Hat Inc. +License: GPL-2.0+ + +Files: sysprep/virt-sysprep.pod +Copyright: Red Hat Inc + Fujitsu Ltd. +License: GPL-2.0+ + +Files: sysprep/sysprep_operation_sssd_db_log.ml + sysprep/sysprep_operation_net_hostname.ml + sysprep/sysprep_operation_abrt_data.ml + sysprep/sysprep_operation_flag_reconfiguration.ml + sysprep/sysprep_operation_samba_db_log.ml + sysprep/sysprep_operation_pam_data.ml + sysprep/sysprep_operation_tmp_files.ml + sysprep/sysprep_operation_pacct_log.ml + sysprep/sysprep_operation_puppet_data_log.ml + sysprep/sysprep_operation_kerberos_data.ml + sysprep/sysprep_operation_dovecot_data.ml + sysprep/sysprep_operation_package_manager_cache.ml + sysprep/sysprep_operation_ca_certificates.ml + sysprep/sysprep_operation_ssh_userdir.ml + sysprep/sysprep_operation_crash_data.ml + sysprep/sysprep_operation_bash_history.ml + sysprep/sysprep_operation_blkid_tab.ml + sysprep/sysprep_operation_machine_id.ml + sysprep/sysprep_operation_firewall_rules.ml + sysprep/sysprep_operation_user_account.ml +Copyright: Fujitsu Ltd. +License: GPL-2.0+ + +Files: common/mlxml/xml.ml common/mlxml/xml-c.c +Copyright: Red Hat Inc. + SUSE Inc. +License: GPL-2.0+ + +Files: builder/virt-builder-repository.* + builder/repository_main.* +Copyright: SUSE Inc. +License: GPL-2.0+ + +Files: gnulib/lib/human.h gnulib/lib/xstrtol.* gnulib/lib/human.c gnulib/lib/argmatch.c gnulib/lib/xstrtol.h gnulib/lib/argmatch.h +Copyright: Free Software Foundation, Inc. +License: GPL-2.0+ + +Files: gnulib/lib/getprogname.h gnulib/lib/ignore-value.h gnulib/lib/bitrotate.h gnulib/lib/hash.c gnulib/lib/xalloc-oversized.h gnulib/lib/c-ctype.h gnulib/lib/hash.h +Copyright: Free Software Foundation, Inc. +License: LGPL-2.0+ + +Files: debian/* +Copyright: 2021 Hilko Bengen +License: GPL-2.0+ + +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: LGPL-2.0+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2". diff --git a/gbp.conf b/gbp.conf new file mode 100644 index 0000000..90eb8d6 --- /dev/null +++ b/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = debian/master +[pq] +patch-numbers = false diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..4e34407 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch diff --git a/patches/sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch b/patches/sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch new file mode 100644 index 0000000..092295b --- /dev/null +++ b/patches/sparsify-Remove-test-virt-sparsify-in-place-fstrim-unsupp.patch @@ -0,0 +1,118 @@ +From: "Richard W.M. Jones" +Date: Tue, 20 Aug 2024 11:19:59 +0100 +Subject: sparsify: Remove test-virt-sparsify-in-place-fstrim-unsupported.sh + +With kernel 6.11.0 this test suddenly started to work, as if the minix +filesystem in this kernel suddenly supports trimming. I checked the +kernel source and I can't find anything relevant so I'm not sure what +happened. In any case this test is of very marginal utility so just +delete it. +--- + sparsify/Makefile.am | 4 +- + ...st-virt-sparsify-in-place-fstrim-unsupported.sh | 75 ---------------------- + 2 files changed, 1 insertion(+), 78 deletions(-) + delete mode 100755 sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh + +diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am +index 5fb0461..ae922d1 100644 +--- a/sparsify/Makefile.am ++++ b/sparsify/Makefile.am +@@ -22,7 +22,6 @@ EXTRA_DIST = \ + test-virt-sparsify.sh \ + test-virt-sparsify-docs.sh \ + test-virt-sparsify-in-place.sh \ +- test-virt-sparsify-in-place-fstrim-unsupported.sh \ + virt-sparsify.pod + + SOURCES_MLI = \ +@@ -141,8 +140,7 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test + TESTS = \ + test-virt-sparsify-docs.sh \ + test-virt-sparsify.sh \ +- test-virt-sparsify-in-place.sh \ +- test-virt-sparsify-in-place-fstrim-unsupported.sh ++ test-virt-sparsify-in-place.sh + + check-valgrind: + $(MAKE) VG="@VG@" check +diff --git a/sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh b/sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh +deleted file mode 100755 +index 91e87dd..0000000 +--- a/sparsify/test-virt-sparsify-in-place-fstrim-unsupported.sh ++++ /dev/null +@@ -1,75 +0,0 @@ +-#!/bin/bash - +-# libguestfs virt-sparsify --in-place test script +-# Copyright (C) 2011-2023 Red Hat Inc. +-# +-# This program is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or +-# (at your option) any later version. +-# +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- +-# Test that we do the right thing for filesystems where the fstrim +-# operation is not supported. +-# +-# https://bugzilla.redhat.com/show_bug.cgi?id=1364347 +-# +-# This test assumes that the kernel minix driver does not support +-# fstrim. It might become supported in a future kernel version in +-# which case we could use a different filesystem for this test, or +-# delete the test if we are confident that all common filesystems are +-# supported. +- +-set -e +-set -x +- +-$TEST_FUNCTIONS +-skip_if_skipped +-skip_unless_filesystem_available minix +- +-img=test-virt-sparsify-in-place-fstrim-unsupported.img +-log=test-virt-sparsify-in-place-fstrim-unsupported.log +-rm -f $img $log +- +-# Create a test filesystem with a single minix filesystem. +-guestfish -N $img=fs:minix exit +- +-# This should warn. +-virt-sparsify --in-place $img |& tee $log +- +-# Check the warning was emitted. +-grep "warning:.*fstrim" $log +- +-# This should ignore the filesystem and not warn. +-virt-sparsify --in-place --ignore /dev/sda1 $img |& tee $log +- +-if grep "warning:.*fstrim.*not supported" $log; then +- echo "$0: filesystem /dev/sda1 was not ignored" +- exit 1 +-fi +- +-# Create a test filesystem with minix and ext4 filesystems. +-guestfish -N $img=bootroot:minix:ext4 exit +- +-# This should warn. +-virt-sparsify --in-place $img |& tee $log +- +-# Check the warning was emitted. +-grep "warning:.*fstrim" $log +- +-# This should ignore the filesystem and not warn. +-virt-sparsify --in-place --ignore /dev/sda1 $img |& tee $log +- +-if grep "warning:.*fstrim.*not supported" $log; then +- echo "$0: filesystem /dev/sda1 was not ignored" +- exit 1 +-fi +- +-rm $img $log diff --git a/rules b/rules new file mode 100755 index 0000000..ca91754 --- /dev/null +++ b/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE = 1 + +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +include /usr/share/dpkg/architecture.mk + +# Disable because the test seems to hang. +export SKIP_RHBZ1285847_SH=1 +export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1 +export SKIP_TEST_VIRT_BUILDER_SH=1 +export SKIP_TEST_VIRT_DIFF_SH=1 # failed on i386, riscv64 +export SKIP_TEST_VIRT_FILESYSTEMS_SH=1 # failed on ppc64 +export SKIP_TEST_VIRT_RESIZE_PL=1 + +# Disable because the tests use the network +export SKIP_TEST_VIRT_BUILDER_CACHEALL_SH=1 +export SKIP_TEST_VIRT_BUILDER_LIST_SH=1 +export SKIP_TEST_VIRT_BUILDER_LIST_SIMPLESTREAMS_SH=1 + +TEST_ARCHITECTURES := amd64 arm64 riscv64 ppc64el + +%: + dh $@ + +override_dh_auto_test: +ifneq "" "$(findstring $(DEB_HOST_ARCH),$(TEST_ARCHITECTURES))" + printenv + unset XDG_RUNTIME_DIR; \ + if ! test -w /dev/kvm; then \ + export LIBGUESTFS_BACKEND_SETTINGS=force_tcg; \ + fi; \ + export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1; \ + $(MAKE) check VERBOSE=1 +endif + +override_dh_auto_install: + dh_auto_install + sed -i -e '1s,.*,#!/usr/bin/perl,' debian/guestfs-tools/usr/bin/virt-win-reg diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 0000000..702b4e7 --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1,5 @@ +# See test-data/binaries/README +guestfs-tools source: source-is-missing [test-data/binaries/bin-*-dynamic] +guestfs-tools source: source-is-missing [test-data/binaries/lib-*.so] +guestfs-tools source: source-contains-prebuilt-windows-binary [test-data/binaries/*.exe] +guestfs-tools source: source-contains-prebuilt-windows-binary [test-data/binaries/*.dll] diff --git a/source/options b/source/options new file mode 100644 index 0000000..f923974 --- /dev/null +++ b/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "(website/.*[.]html$|builder/templates/index$|inspector/.*[.]xml$|sysprep/.*[.]pod$)" diff --git a/watch b/watch new file mode 100644 index 0000000..e9d1716 --- /dev/null +++ b/watch @@ -0,0 +1,3 @@ +version=4 + +https://download.libguestfs.org/guestfs-tools/([\d\.]*)-stable/guestfs-tools-([\d\.]*)\.tar\.gz