update to 2.03.12-1

1 files changed, 9 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b25abf40b94c..8b82eaceebc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,30 +7,26 @@
 # - disable udev in _CONFIGUREOPTS
 # - explicitly disable all udev options when building lvm2
 # - add 'provides' and 'conflicts' fields for packages
-# - lvm2_hook: add vgchange command
 
 pkgbase=lvm2-noudev
 pkgname=('lvm2-noudev' 'device-mapper-noudev')
-pkgver=2.02.187
-pkgrel=2
+_tag='e6809e10a27865fbd6d67980a348946a2867182d' # git rev-parse v${pkgver//./_}
+pkgver=2.03.12
+pkgrel=1
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
 makedepends=('git' 'thin-provisioning-tools')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17'  # Alasdair G Kergon <agk@redhat.com>
               'D501A478440AE2FD130A1BE8B9112431E509039F') # Marian Csontos <marian.csontos@gmail.com>
-source=("git+https://sourceware.org/git/lvm2.git#tag=v${pkgver//./_}?signed"
+source=("git+https://sourceware.org/git/lvm2.git#tag=${_tag}?signed"
         'lvm2_install'
-        'lvm2_hook'
         '11-dm-initramfs.rules')
 sha256sums=('SKIP'
-            'cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6'
-            'a6e88d4457ff49a1df5b1d243c5e245d33832855c8804e99c50b30c3e56a8a80'
+            'ed78acdec013bc22df253e51a474d4beab2f9204bbabde34b83d56149bb435d4'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
 _backports=(
-  # udev: remove unsupported OPTIONS+="event_timeout" rule
-  '125f27ac37bc9b93cc96f64052b9681b3d479ee1'
 )
 
 prepare() {
@@ -50,14 +46,11 @@ build() {
     --sbindir=/usr/bin
     --sysconfdir=/etc
     --localstatedir=/var
-    --enable-applib
     --enable-cmdlib
     --enable-dmeventd
-    --enable-lvmetad
     --enable-lvmpolld
     --enable-pkgconfig
     --enable-readline
-    --enable-use-lvmetad
     --with-cache=internal
     --with-default-dm-run-dir=/run
     --with-default-locking-dir=/run/lock/lvm
@@ -108,7 +101,9 @@ package_device-mapper-noudev() {
 
 package_lvm2-noudev() {
   pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'libutil-linux' 'readline' 'thin-provisioning-tools')
+  depends=('bash' "device-mapper>=${pkgver}"
+    'util-linux-libs' 'libblkid.so' 'readline' 'libreadline.so'
+    'thin-provisioning-tools')
   conflicts=('lvm' 'mkinitcpio<0.7' 'lvm2')
   provides=('lvm2')
   backup=('etc/lvm/lvm.conf'
@@ -118,13 +113,10 @@ package_lvm2-noudev() {
   cd lvm2/
 
   make DESTDIR="${pkgdir}" install_lvm2
-  # install applib
-  make -C liblvm DESTDIR="${pkgdir}" install
   # /etc directories
   install -d "${pkgdir}"/etc/lvm/{archive,backup}
   # mkinitcpio hook
-  install -D -m0644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
   install -D -m0644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
-  # extra udev rule for lvmetad in non-systemd initramfs
+  # extra udev rule for non-systemd initramfs
   install -D -m0644 "${srcdir}/lvm2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules"
 }