[arch-commits] Commit in libguestfs/trunk (PKGBUILD)

[Robin Broda]

    Date: Wednesday, May 6, 2020 @ 15:22:51
  Author: coderobe
Revision: 625056

upgpkg: libguestfs 1.42.0-1: major fixes thanks to Toolybird

Modified:
  libguestfs/trunk/PKGBUILD

----------+
 PKGBUILD |  137 ++++++++++++++++++++++++++-----------------------------------
 1 file changed, 59 insertions(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-06 14:37:58 UTC (rev 625055)
+++ PKGBUILD	2020-05-06 15:22:51 UTC (rev 625056)
@@ -5,98 +5,79 @@
 # Contributor: Nikos Skalkotos <skalkoto (at) Gmail.com>
 
 pkgname=libguestfs
-pkgver=1.40.2
+pkgver=1.42.0
 _pkgver_short=${pkgver%.*}
-pkgrel=11
-pkgdesc="Access and modify virtual machine disk image"
-arch=("x86_64")
-url="http://libguestfs.org"
-license=("GPL2" "LGPL2.1")
-backup=("etc/libguestfs-tools.conf"
-        "etc/xdg/virt-builder/repos.d/libguestfs.conf"
-        "etc/xdg/virt-builder/repos.d/libguestfs.gpg"
-        "etc/php.d/guestfs_php.ini")
-_pythonver=2
-depends=("qemu-headless"
-         "augeas"
-         "hivex>=1.3.2"
-         "libconfig"
-         "libvirt"
-         "fuse"
-         "file"
-         "cpio"
-         "wget"
-         "perl"
-         "perl-string-shellquote"
-         "perl-libintl-perl"
-         "perl-sys-virt"
-         "jansson"
-         "supermin"
-         "sleuthkit"
-         "yara")
-makedepends=("pcre"
-             "cdrkit"
-             "libxml2"
-             "gperf"
-             "python${_pythonver}"
-             "lua"
-#             "ghc"
-#             "ruby"
-             "erlang"
-             "gjs"
-             "php"
-             "perl-module-build"
-             "gobject-introspection"
-             "ocaml-findlib"
-             "ocaml"
-             "go-pie"
-             "bash-completion"
-             "jdk8-openjdk")
-optdepends=("python${_pythonver}: Python bindings"
-#            "ruby: Ruby Bindings"
-            "gjs: Javascript Bindings for GNOME"
-            "php: PHP bindings"
-            "erlang: Erlang Bindings"
-#            "ghc: Haskell Bindings"
-            "lua: Lua Bindings"
-            "ocaml: Ocaml libs")
-provides=("guestfish=${pkgver}")
-source=("http://libguestfs.org/download/${_pkgver_short}-stable/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha512sums=('d288f15d5a70b4b87a4271ea2eb7dc0ec4f48fdb136b8f62003352a069f75573de873e1063763889f410fb1b99951252e9a48dd73bf0233047f21aae43ac6de2'
-            'SKIP')
+pkgrel=1
+pkgdesc="Access and modify virtual machine disk images"
+arch=('x86_64')
+url="http://libguestfs.org/"
+license=('GPL2' 'LGPL2.1')
+_appliancedeps=('iproute2' 'mdadm' 'lvm2' 'libldm' 'btrfs-progs' 'dosfstools' 'gdisk' 'procps' 'psmisc'
+                'rsync' 'xfsprogs' 'dhcpcd' 'iputils' 'ntfs-3g' 'vim' 'systemd-sysvcompat' 'openssh'
+                'f2fs-tools' 'jfsutils' 'lsscsi' 'lsof' 'lzop' 'pciutils' 'squashfs-tools'
+                'strace' 'syslinux' 'debootstrap' 'exfat-utils' 'grub' 'lrzip' 'mtools'
+                'multipath-tools' 'nilfs-utils' 'reiserfsprogs' 'yara')
+#               'scrub' 'zerofree' 'hfsprogs')
+depends=('augeas' 'libvirt' 'jansson' 'fuse' 'hivex' 'sleuthkit' 'supermin' 'qemu-headless' 'libconfig'
+         'perl-libintl-perl' "${_appliancedeps[@]}")
+makedepends=('ocaml' 'ocaml-findlib' 'gperf' 'cdrtools' 'perl-module-build' 'python'
+             'gobject-introspection' 'vala' 'bash-completion' 'cpio' 'java-environment'
+             'php' 'erlang-nox' 'lua' 'go' 'rust')
+# 'ghc' 'ruby')
+checkdepends=('linux')
+optdepends=('ocaml: OCaml Bindings'
+            'python: Python Bindings'
+            'gobject-introspection: GObject-Introspection 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')
+source=("http://download.libguestfs.org/$_pkgver_short-stable/$pkgname-$pkgver.tar.gz"{,.sig}
+        "libguestfs-01.patch::https://github.com/libguestfs/libguestfs/commit/31e6b187100626cae44bcb505db153088245155c.patch")
+sha256sums=('4fee192cf3aaa597f142afb21fa2d7f380fdabcf34d054e37090163e4a74f024'
+            'SKIP'
+            'f09ac113112011625cf6df204fa2e6c05577cf6977a1920fd8c40cc020152896')
 validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjones at redhat.com>
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 < ../libguestfs-01.patch
+  sed -i 's/ Sys::Virt / /g' m4/guestfs-perl.m4
+  autoreconf -v
+}
 
 build() {
-  cd "${pkgname}-${pkgver}"
-
+  cd "$pkgname-$pkgver"
   ./configure \
-    PYTHON=python$_pythonver \
     --prefix=/usr \
+    --sysconfdir=/etc \
     --sbindir=/usr/bin \
-    --libdir=/usr/lib \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
     --disable-static \
     --disable-haskell \
-    --disable-ruby
+    --disable-ruby \
+    --with-extra-packages="libldm systemd-sysvcompat openssh qemu-headless"
   # ^ haskell & ruby bindings do not build
-
   make
 }
 
+check() {
+  cd "$pkgname-$pkgver"
+  #tests require /dev/kvm to be available
+#  make quickcheck
+#  make -k check ||: takes ages
+}
+
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
+  make INSTALLDIRS=vendor DESTDIR="$pkgdir" install
+  find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chmod 644 {} +
+  find "$pkgdir/usr/lib/perl5" -name '*.bs' -exec rm -f {} +
 
-  make DESTDIR="${pkgdir}" install
-
-  # fix supermin package list
-  cat >> "${pkgdir}/usr/lib/guestfs/supermin.d/packages" <<-EOF
-libldm
-lvm2
-mdadm
-sqlite
-systemd-sysvcompat
-gptfdisk
-EOF
+  # Remove obsolete binaries (RHBZ#1213298).
+  rm -f "$pkgdir"/usr/bin/virt-list-{filesystems,partitions}
+  rm -f "$pkgdir"/usr/bin/virt-tar
+  rm -f "$pkgdir"/usr/share/man/man1/virt-list-{filesystems,partitions}.1*
+  rm -f "$pkgdir"/usr/share/man/man1/virt-tar.1*
 }