Date: Thursday, August 4, 2022 @ 21:46:38 Author: dvzrv Revision: 1260287
upgpkg: libguestfs 1.48.4-1: Upgrade to 1.48.4. Sort dependencies alpabetically for better overview. Also include erlang-nox, ghc and go in makedepends. Remove now included patch for broken test. Remove unnecessary quotes and curly braces. Simplify calls to make. Update maintainer info. Added: libguestfs/trunk/keys/ libguestfs/trunk/keys/pgp/ libguestfs/trunk/keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc Modified: libguestfs/trunk/PKGBUILD Deleted: libguestfs/trunk/libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch --------------------------------------------------------+ PKGBUILD | 119 ++++++++++----- keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc | 1 libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch | 27 --- 3 files changed, 87 insertions(+), 60 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-04 21:42:50 UTC (rev 1260286) +++ PKGBUILD 2022-08-04 21:46:38 UTC (rev 1260287) @@ -1,3 +1,4 @@ +# Maintainer: David Runge <dv...@archlinux.org> # Maintainer: Robin Broda <coderobe @ archlinux.org> # Contributor: Peter Wu <pe...@lekensteyn.nl> # Contributor: Evaggelos Balaskas <eblaskas _AT_ ebalaskas _DOT_ gr> @@ -5,25 +6,86 @@ # Contributor: Nikos Skalkotos <skalkoto (at) Gmail.com> pkgname=libguestfs -pkgver=1.48.1 -pkgrel=4 +pkgver=1.48.4 +pkgrel=1 pkgdesc="Access and modify virtual machine disk images" -arch=('x86_64') +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) +license=(GPL2 LGPL2.1) +# NOTE: see appliance/packagelist.in +_appliancedeps=( + btrfs-progs + debootstrap + dhcpcd + dosfstools + exfatprogs + f2fs-tools + gptfdisk + grub + iproute2 + iputils + jfsutils + libldm + lrzip + lsof + lsscsi + lvm2 + lzop + mdadm + mtools + multipath-tools + nilfs-utils + ntfs-3g + openssh + pciutils + procps-ng + psmisc + reiserfsprogs + rsync + squashfs-tools + strace + syslinux + systemd-sysvcompat + vim + xfsprogs + yara +) +depends=( + augeas + fuse2 + hivex + jansson + sleuthkit + libconfig + libvirt + perl-libintl-perl + qemu + supermin + "${_appliancedeps[@]}" +) +makedepends=( + bash-completion + cdrtools + cpio + erlang-nox + ghc + go + gobject-introspection + gperf + ocaml + ocaml-findlib + perl-module-build + python + java-environment + lua + php + ruby + ruby-rake + ruby-rdoc + rust + vala +) +checkdepends=(linux ruby-test-unit) optdepends=( 'gobject-introspection: GObject-Introspection Bindings' 'java-runtime: for Java bindings' @@ -32,32 +94,24 @@ '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') +provides=(libguestfs.so libguestfs-gobject-1.0.so) +backup=(etc/libguestfs-tools.conf) options=(debug) source=( - "http://download.libguestfs.org/${pkgver%.*}-stable/$pkgname-$pkgver.tar.gz"{,.sig} + 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' +sha256sums=('9dc22b6c5a45f19c2cba911a37b3a8d86f62744521b10eb53c3d3907e5080312' 'SKIP' - '151d7ab43e7150c7d645eb0bad9681ce5ecc59cae44f254f08ef617ce3d9932f' - 'c94e07adc1c8d34b2bf852362159671c35cde1ffa7b031686b1b48984da61636') + '151d7ab43e7150c7d645eb0bad9681ce5ecc59cae44f254f08ef617ce3d9932f') 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 + autoreconf -fiv } build() { @@ -81,6 +135,5 @@ } package() { - cd "$pkgname-$pkgver" - make INSTALLDIRS=vendor DESTDIR="$pkgdir" install + make INSTALLDIRS=vendor DESTDIR="$pkgdir" install -C $pkgname-$pkgver } Added: keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc =================================================================== (Binary files differ) Index: libguestfs/trunk/keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc =================================================================== --- keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc 2022-08-04 21:42:50 UTC (rev 1260286) +++ keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc 2022-08-04 21:46:38 UTC (rev 1260287) Property changes on: libguestfs/trunk/keys/pgp/F7774FB1AD074A7E8C8767EA91738F73E1B768A0.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Deleted: libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch =================================================================== --- libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch 2022-08-04 21:42:50 UTC (rev 1260286) +++ libguestfs-1.48.1-test_isoinfo_device_0_as_cdrom.patch 2022-08-04 21:46:38 UTC (rev 1260287) @@ -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;