From: Hilko Bengen Date: Wed, 27 Nov 2024 20:31:37 +0000 (+0100) Subject: guestfs-tools (1.52.2-2) unstable; urgency=medium X-Git-Tag: archive/raspbian/1.52.3-1+rpi1^2^2^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3c55c6d250b77a9a7f728019e76e76949c01550;p=guestfs-tools.git guestfs-tools (1.52.2-2) unstable; urgency=medium [ Stefano Brivio ] * Introduce AppArmor profile (Closes: #1086844) [ Hilko Bengen ] * Add build-dependency for AppArmor profile [dgit import unpatched guestfs-tools 1.52.2-2] --- a3c55c6d250b77a9a7f728019e76e76949c01550 diff --cc debian/apparmor/guestfs-tools index 0000000,0000000..7099da2 new file mode 100644 --- /dev/null +++ b/debian/apparmor/guestfs-tools @@@ -1,0 -1,0 +1,52 @@@ ++@{GUESTFS_TOOLS}=virt-alignment-scan virt-builder virt-builder-repository \ ++ virt-cat virt-customize virt-df virt-diff virt-drivers virt-edit \ ++ virt-filesystems virt-format virt-get-kernel virt-index-validate \ ++ virt-inspector virt-log virt-ls virt-make-fs virt-resize virt-sparsify \ ++ virt-sysprep virt-tail virt-win-reg ++ ++abi , ++ ++include ++ ++profile guestfs-tools /usr/bin/@{GUESTFS_TOOLS} { ++ include ++ include ++ include ++ ++ # Full access to filesystem (we don't know where images are) ++ /** mrwlk, ++ # ...and to run QEMU and any sort of helper without a profile ++ /** ix, ++ unix, ++ ++ # These might be needed for disk images ++ capability dac_override, ++ capability dac_read_search, ++ ++ # ...and to preserve ownership and device nodes as we untar supermin(1) appliances ++ capability chown, ++ capability fowner, ++ capability mknod, ++ ++ # Receive any signal ++ signal (receive) peer=/usr/bin/@{GUESTFS_TOOLS}, ++ signal (receive) peer=@{GUESTFS_TOOLS}, ++ ++ # Network using passt(1) ++ /usr/bin/passt Cx -> passt, ++ profile passt { ++ /usr/bin/passt r, ++ ++ # passt needs to accept SIGTERM from any of the tools ++ signal (receive) set=("term") peer=/usr/bin/@{GUESTFS_TOOLS}, ++ signal (receive) set=("term") peer=@{GUESTFS_TOOLS}, ++ ++ # Possible paths for socket and PID files (as user and as root) ++ owner @{run}/user/[0-9]*/libguestfs*/passt.sock rw, ++ owner @{run}/user/[0-9]*/libguestfs*/passt[0-9]*.pid rw, ++ owner /tmp/libguestfs*/passt.sock rw, ++ owner /tmp/libguestfs*/passt[0-9].pid rw, ++ ++ include if exists ++ } ++} diff --cc debian/changelog index 0000000,0000000..ac3d4d4 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,144 @@@ ++guestfs-tools (1.52.2-2) unstable; urgency=medium ++ ++ [ Stefano Brivio ] ++ * Introduce AppArmor profile (Closes: #1086844) ++ ++ [ Hilko Bengen ] ++ * Add build-dependency for AppArmor profile ++ ++ -- Hilko Bengen Wed, 27 Nov 2024 21:31:37 +0100 ++ ++guestfs-tools (1.52.2-1) unstable; urgency=medium ++ ++ * New upstream version 1.52.2 ++ * Remove obsolete patch ++ * Update build-dependencies ++ * Remove obsolete lintian overrides ++ * Disable test ++ ++ -- Hilko Bengen Sat, 05 Oct 2024 22:35:42 +0200 ++ ++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 --cc debian/clean index 0000000,0000000..3fec32c new file mode 100644 --- /dev/null +++ b/debian/clean @@@ -1,0 -1,0 +1,1 @@@ ++tmp/ diff --cc debian/control index 0000000,0000000..8b76482 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,76 @@@ ++Source: guestfs-tools ++Section: utils ++Priority: optional ++Maintainer: Hilko Bengen ++Build-Depends: debhelper-compat (= 13), ++ dh-apparmor, ++ pkgconf, ++ 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 --cc debian/copyright index 0000000,0000000..8fea43d new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,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 --cc debian/gbp.conf index 0000000,0000000..90eb8d6 new file mode 100644 --- /dev/null +++ b/debian/gbp.conf @@@ -1,0 -1,0 +1,5 @@@ ++[DEFAULT] ++upstream-branch = upstream ++debian-branch = debian/master ++[pq] ++patch-numbers = false diff --cc debian/guestfs-tools.install index 0000000,0000000..9271919 new file mode 100644 --- /dev/null +++ b/debian/guestfs-tools.install @@@ -1,0 -1,0 +1,1 @@@ ++debian/apparmor/guestfs-tools etc/apparmor.d/ diff --cc debian/rules index 0000000,0000000..fe778c2 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,47 @@@ ++#!/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 ++ ++# Apparently fails on warning "program compiled against libxml 212 using older 209" ++export SKIP_TEST_MACHINE_READABLE_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 ++ dh_apparmor --profile-name=guestfs-tools -pguestfs-tools diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/lintian-overrides index 0000000,0000000..595b8b3 new file mode 100644 --- /dev/null +++ b/debian/source/lintian-overrides @@@ -1,0 -1,0 +1,3 @@@ ++# See test-data/binaries/README ++guestfs-tools source: source-is-missing [test-data/binaries/bin-*-dynamic] ++guestfs-tools source: source-contains-prebuilt-windows-binary [test-data/binaries/*.exe] diff --cc debian/source/options index 0000000,0000000..f923974 new file mode 100644 --- /dev/null +++ b/debian/source/options @@@ -1,0 -1,0 +1,1 @@@ ++extend-diff-ignore = "(website/.*[.]html$|builder/templates/index$|inspector/.*[.]xml$|sysprep/.*[.]pod$)" diff --cc debian/watch index 0000000,0000000..e9d1716 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,3 @@@ ++version=4 ++ ++https://download.libguestfs.org/guestfs-tools/([\d\.]*)-stable/guestfs-tools-([\d\.]*)\.tar\.gz