Date: Friday, April 29, 2022 @ 06:44:45 Author: arojas Revision: 1191765
archrelease: copy trunk to community-staging-x86_64 Added: libguestfs/repos/community-staging-x86_64/PKGBUILD (from rev 1191764, libguestfs/trunk/PKGBUILD) libguestfs/repos/community-staging-x86_64/libguestfs-1.48.1-disable_php_tests.patch (from rev 1191764, libguestfs/trunk/libguestfs-1.48.1-disable_php_tests.patch) libguestfs/repos/community-staging-x86_64/libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch (from rev 1191764, libguestfs/trunk/libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch) Deleted: libguestfs/repos/community-staging-x86_64/PKGBUILD libguestfs/repos/community-staging-x86_64/libguestfs-1.48.1-disable_php_tests.patch libguestfs/repos/community-staging-x86_64/libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch --------------------------------------------------------+ PKGBUILD | 171 +++++++-------- libguestfs-1.48.1-disable_php_tests.patch | 16 - libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch | 54 ++-- 3 files changed, 121 insertions(+), 120 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-04-29 06:44:19 UTC (rev 1191764) +++ PKGBUILD 2022-04-29 06:44:45 UTC (rev 1191765) @@ -1,85 +0,0 @@ -# Maintainer: Robin Broda <coderobe @ archlinux.org> -# Contributor: Peter Wu <pe...@lekensteyn.nl> -# Contributor: Evaggelos Balaskas <eblaskas _AT_ ebalaskas _DOT_ gr> -# Contributor: Xiao-Long Chen <chenxiaol...@cxl.epac.to> -# Contributor: Nikos Skalkotos <skalkoto (at) Gmail.com> - -pkgname=libguestfs -pkgver=1.48.1 -pkgrel=1 -pkgdesc="Access and modify virtual machine disk images" -arch=('x86_64') -url="https://libguestfs.org/" -license=('GPL2' 'LGPL2.1') -_appliancedeps=('iproute2' 'mdadm' 'lvm2' 'libldm' 'btrfs-progs' 'dosfstools' 'gptfdisk' 'procps-ng' 'psmisc' - 'rsync' 'xfsprogs' 'dhcpcd' 'iputils' 'ntfs-3g' 'vim' 'systemd-sysvcompat' 'openssh' - 'f2fs-tools' 'jfsutils' 'lsscsi' 'lsof' 'lzop' 'pciutils' 'squashfs-tools' - 'strace' 'syslinux' 'debootstrap' 'exfatprogs' 'grub' 'lrzip' 'mtools' - 'multipath-tools' 'nilfs-utils' 'reiserfsprogs' 'yara') -# 'scrub' 'zerofree' 'hfsprogs') -depends=('augeas' 'libvirt' 'jansson' 'fuse2' 'hivex' 'sleuthkit' 'supermin' 'qemu' 'libconfig' - 'perl-libintl-perl' "${_appliancedeps[@]}") -makedepends=('ocaml' 'ocaml-findlib' 'gperf' 'cdrtools' 'perl-module-build' 'python' - 'gobject-introspection' 'vala' 'bash-completion' 'cpio' 'java-environment' - 'php' 'lua' 'ruby-rake' 'ruby-rdoc' 'ruby' 'rust') -# 'go' 'ghc' 'erlang-nox') -checkdepends=('linux' ruby-test-unit) -optdepends=( - 'gobject-introspection: GObject-Introspection Bindings' - 'java-runtime: for Java bindings' - 'ocaml: OCaml Bindings' - 'php: for PHP module' - 'python: Python Bindings' - 'ruby: for Ruby bindings' -) -provides=('libguestfs.so' 'libguestfs-gobject-1.0.so') -backup=('etc/libguestfs-tools.conf' - 'etc/xdg/virt-builder/repos.d/libguestfs.conf' - 'etc/xdg/virt-builder/repos.d/libguestfs.gpg' - 'etc/xdg/virt-builder/repos.d/opensuse.conf' - 'etc/xdg/virt-builder/repos.d/opensuse.gpg') -options=(debug) -source=( - "http://download.libguestfs.org/${pkgver%.*}-stable/$pkgname-$pkgver.tar.gz"{,.sig} - $pkgname-1.48.1-disable_php_tests.patch - $pkgname-1.48.1-test_isoinfo_device_0_as_cdrom.patch -) -sha256sums=('4c3e84ae257b48fa6628734c8b305e3a0b8653928aef02caa423341413a90f1f' - 'SKIP' - '151d7ab43e7150c7d645eb0bad9681ce5ecc59cae44f254f08ef617ce3d9932f' - 'c94e07adc1c8d34b2bf852362159671c35cde1ffa7b031686b1b48984da61636') -validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjo...@redhat.com> - -prepare() { - # disable php tests, as missing arginfo definition makes them fail: https://github.com/libguestfs/libguestfs/issues/78 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.48.1-disable_php_tests.patch - # isoinfo_device for some reason adds iso_volume_id as CDROM, not ISOIMAGE (and tests fail): https://github.com/libguestfs/libguestfs/issues/79 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.48.1-test_isoinfo_device_0_as_cdrom.patch - - cd "$pkgname-$pkgver" - autoreconf -vi -} - -build() { - cd "$pkgname-$pkgver" - # TODO: build haskell bindings - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --disable-static \ - --disable-haskell \ - --with-extra-packages="libldm systemd-sysvcompat openssh qemu" \ - --with-guestfs-path=/usr/lib/guestfs - - make -} - -check() { - LIBGUESTFS_TRACE=1 make -k check -C $pkgname-$pkgver -} - -package() { - cd "$pkgname-$pkgver" - make INSTALLDIRS=vendor DESTDIR="$pkgdir" install -} Copied: libguestfs/repos/community-staging-x86_64/PKGBUILD (from rev 1191764, libguestfs/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-04-29 06:44:45 UTC (rev 1191765) @@ -0,0 +1,86 @@ +# Maintainer: Robin Broda <coderobe @ archlinux.org> +# Contributor: Peter Wu <pe...@lekensteyn.nl> +# Contributor: Evaggelos Balaskas <eblaskas _AT_ ebalaskas _DOT_ gr> +# Contributor: Xiao-Long Chen <chenxiaol...@cxl.epac.to> +# Contributor: Nikos Skalkotos <skalkoto (at) Gmail.com> + +pkgname=libguestfs +pkgver=1.48.1 +pkgrel=2 +pkgdesc="Access and modify virtual machine disk images" +arch=('x86_64') +url="https://libguestfs.org/" +license=('GPL2' 'LGPL2.1') +_appliancedeps=('iproute2' 'mdadm' 'lvm2' 'libldm' 'btrfs-progs' 'dosfstools' 'gptfdisk' 'procps-ng' 'psmisc' + 'rsync' 'xfsprogs' 'dhcpcd' 'iputils' 'ntfs-3g' 'vim' 'systemd-sysvcompat' 'openssh' + 'f2fs-tools' 'jfsutils' 'lsscsi' 'lsof' 'lzop' 'pciutils' 'squashfs-tools' + 'strace' 'syslinux' 'debootstrap' 'exfatprogs' 'grub' 'lrzip' 'mtools' + 'multipath-tools' 'nilfs-utils' 'reiserfsprogs' 'yara') +# 'scrub' 'zerofree' 'hfsprogs') +depends=('augeas' 'libvirt' 'jansson' 'fuse2' 'hivex' 'sleuthkit' 'supermin' 'qemu' 'libconfig' + 'perl-libintl-perl' "${_appliancedeps[@]}") +makedepends=('ocaml' 'ocaml-findlib' 'gperf' 'cdrtools' 'perl-module-build' 'python' + 'gobject-introspection' 'vala' 'bash-completion' 'cpio' 'java-environment' + 'php' 'lua' 'ruby-rake' 'ruby-rdoc' 'ruby' 'rust') +# 'go' 'ghc' 'erlang-nox') +checkdepends=('linux' ruby-test-unit) +optdepends=( + 'gobject-introspection: GObject-Introspection Bindings' + 'java-runtime: for Java bindings' + 'ocaml: OCaml Bindings' + 'php: for PHP module' + 'python: Python Bindings' + 'ruby: for Ruby bindings' +) +provides=('libguestfs.so' 'libguestfs-gobject-1.0.so') +backup=('etc/libguestfs-tools.conf' + 'etc/xdg/virt-builder/repos.d/libguestfs.conf' + 'etc/xdg/virt-builder/repos.d/libguestfs.gpg' + 'etc/xdg/virt-builder/repos.d/opensuse.conf' + 'etc/xdg/virt-builder/repos.d/opensuse.gpg') +options=(debug) +source=( + "http://download.libguestfs.org/${pkgver%.*}-stable/$pkgname-$pkgver.tar.gz"{,.sig} + $pkgname-1.48.1-disable_php_tests.patch + $pkgname-1.48.1-test_isoinfo_device_0_as_cdrom.patch +) +sha256sums=('4c3e84ae257b48fa6628734c8b305e3a0b8653928aef02caa423341413a90f1f' + 'SKIP' + '151d7ab43e7150c7d645eb0bad9681ce5ecc59cae44f254f08ef617ce3d9932f' + 'c94e07adc1c8d34b2bf852362159671c35cde1ffa7b031686b1b48984da61636') +validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjo...@redhat.com> + +prepare() { + # disable php tests, as missing arginfo definition makes them fail: https://github.com/libguestfs/libguestfs/issues/78 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.48.1-disable_php_tests.patch + # isoinfo_device for some reason adds iso_volume_id as CDROM, not ISOIMAGE (and tests fail): https://github.com/libguestfs/libguestfs/issues/79 + patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-1.48.1-test_isoinfo_device_0_as_cdrom.patch + + cd "$pkgname-$pkgver" + autoreconf -vi +} + +build() { + cd "$pkgname-$pkgver" + # TODO: build haskell bindings + CFLAGS+=" -ffat-lto-objects" \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --disable-static \ + --disable-haskell \ + --with-extra-packages="libldm systemd-sysvcompat openssh qemu" \ + --with-guestfs-path=/usr/lib/guestfs + + make +} + +check() { + LIBGUESTFS_TRACE=1 make -k check -C $pkgname-$pkgver +} + +package() { + cd "$pkgname-$pkgver" + make INSTALLDIRS=vendor DESTDIR="$pkgdir" install +} Deleted: libguestfs-1.48.1-disable_php_tests.patch =================================================================== --- libguestfs-1.48.1-disable_php_tests.patch 2022-04-29 06:44:19 UTC (rev 1191764) +++ libguestfs-1.48.1-disable_php_tests.patch 2022-04-29 06:44:45 UTC (rev 1191765) @@ -1,8 +0,0 @@ -diff -ruN a/php/run-php-tests.sh b/php/run-php-tests.sh ---- a/php/run-php-tests.sh 2021-12-10 10:56:32.192663714 +0100 -+++ b/php/run-php-tests.sh 2022-04-27 21:24:44.062657934 +0200 -@@ -32,4 +32,3 @@ - TESTS=$(echo tests/guestfs_*.phpt) - echo TESTS: $TESTS - --${MAKE:-make} test TESTS="$TESTS" PHP_EXECUTABLE="$PWD/php-for-tests.sh" REPORT_EXIT_STATUS=1 TEST_TIMEOUT=300 Copied: libguestfs/repos/community-staging-x86_64/libguestfs-1.48.1-disable_php_tests.patch (from rev 1191764, libguestfs/trunk/libguestfs-1.48.1-disable_php_tests.patch) =================================================================== --- libguestfs-1.48.1-disable_php_tests.patch (rev 0) +++ libguestfs-1.48.1-disable_php_tests.patch 2022-04-29 06:44:45 UTC (rev 1191765) @@ -0,0 +1,8 @@ +diff -ruN a/php/run-php-tests.sh b/php/run-php-tests.sh +--- a/php/run-php-tests.sh 2021-12-10 10:56:32.192663714 +0100 ++++ b/php/run-php-tests.sh 2022-04-27 21:24:44.062657934 +0200 +@@ -32,4 +32,3 @@ + TESTS=$(echo tests/guestfs_*.phpt) + echo TESTS: $TESTS + +-${MAKE:-make} test TESTS="$TESTS" PHP_EXECUTABLE="$PWD/php-for-tests.sh" REPORT_EXIT_STATUS=1 TEST_TIMEOUT=300 Deleted: libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch =================================================================== --- libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch 2022-04-29 06:44:19 UTC (rev 1191764) +++ libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch 2022-04-29 06:44:45 UTC (rev 1191765) @@ -1,27 +0,0 @@ -diff -ruN a/generator/actions_core.ml b/generator/actions_core.ml ---- a/generator/actions_core.ml 2022-03-09 10:28:02.397896774 +0100 -+++ b/generator/actions_core.ml 2022-04-27 18:45:42.691484853 +0200 -@@ -6829,7 +6829,7 @@ - tests = [ - InitNone, Always, TestResult ( - [["isoinfo_device"; "/dev/sdd"]], -- "STREQ (ret->iso_volume_id, \"ISOIMAGE\") && "^ -+ "STREQ (ret->iso_volume_id, \"CDROM\") && "^ - "STREQ (ret->iso_volume_set_id, \"\") && "^ - "ret->iso_volume_set_size == 1 && "^ - "ret->iso_volume_sequence_number == 1 && "^ -diff -ruN a/tests/c-api/tests.c b/tests/c-api/tests.c ---- a/tests/c-api/tests.c 2022-04-14 16:31:43.202811561 +0200 -+++ b/tests/c-api/tests.c 2022-04-27 15:03:59.821806995 +0200 -@@ -17739,9 +17739,9 @@ - ret = guestfs_isoinfo_device (g, arg1943); - if (ret == NULL) - return -1; -- if (! (STREQ (ret->iso_volume_id, "ISOIMAGE") && STREQ (ret->iso_volume_set_id, "") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048)) { -+ if (! (STREQ (ret->iso_volume_id, "CDROM") && STREQ (ret->iso_volume_set_id, "") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048)) { - fprintf (stderr, "%s: test failed: expression false: %s\n", -- "test_isoinfo_device_0", "STREQ (ret->iso_volume_id, \"ISOIMAGE\") && STREQ (ret->iso_volume_set_id, \"\") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048"); -+ "test_isoinfo_device_0", "STREQ (ret->iso_volume_id, \"CDROM\") && STREQ (ret->iso_volume_set_id, \"\") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048"); - if (!guestfs_get_trace (g)) - fprintf (stderr, "Set LIBGUESTFS_TRACE=1 to see values returned from API calls.\n"); - return -1; Copied: libguestfs/repos/community-staging-x86_64/libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch (from rev 1191764, libguestfs/trunk/libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch) =================================================================== --- libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch (rev 0) +++ libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch 2022-04-29 06:44:45 UTC (rev 1191765) @@ -0,0 +1,27 @@ +diff -ruN a/generator/actions_core.ml b/generator/actions_core.ml +--- a/generator/actions_core.ml 2022-03-09 10:28:02.397896774 +0100 ++++ b/generator/actions_core.ml 2022-04-27 18:45:42.691484853 +0200 +@@ -6829,7 +6829,7 @@ + tests = [ + InitNone, Always, TestResult ( + [["isoinfo_device"; "/dev/sdd"]], +- "STREQ (ret->iso_volume_id, \"ISOIMAGE\") && "^ ++ "STREQ (ret->iso_volume_id, \"CDROM\") && "^ + "STREQ (ret->iso_volume_set_id, \"\") && "^ + "ret->iso_volume_set_size == 1 && "^ + "ret->iso_volume_sequence_number == 1 && "^ +diff -ruN a/tests/c-api/tests.c b/tests/c-api/tests.c +--- a/tests/c-api/tests.c 2022-04-14 16:31:43.202811561 +0200 ++++ b/tests/c-api/tests.c 2022-04-27 15:03:59.821806995 +0200 +@@ -17739,9 +17739,9 @@ + ret = guestfs_isoinfo_device (g, arg1943); + if (ret == NULL) + return -1; +- if (! (STREQ (ret->iso_volume_id, "ISOIMAGE") && STREQ (ret->iso_volume_set_id, "") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048)) { ++ if (! (STREQ (ret->iso_volume_id, "CDROM") && STREQ (ret->iso_volume_set_id, "") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048)) { + fprintf (stderr, "%s: test failed: expression false: %s\n", +- "test_isoinfo_device_0", "STREQ (ret->iso_volume_id, \"ISOIMAGE\") && STREQ (ret->iso_volume_set_id, \"\") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048"); ++ "test_isoinfo_device_0", "STREQ (ret->iso_volume_id, \"CDROM\") && STREQ (ret->iso_volume_set_id, \"\") && ret->iso_volume_set_size == 1 && ret->iso_volume_sequence_number == 1 && ret->iso_logical_block_size == 2048"); + if (!guestfs_get_trace (g)) + fprintf (stderr, "Set LIBGUESTFS_TRACE=1 to see values returned from API calls.\n"); + return -1;