update to 2.03.12-1

4 files changed, 19 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60a3a5de29a4..ceafcf7ecfbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,29 @@
 pkgbase = lvm2-noudev
-	pkgver = 2.02.187
-	pkgrel = 2
+	pkgver = 2.03.12
+	pkgrel = 1
 	url = https://sourceware.org/lvm2/
 	arch = x86_64
 	license = GPL2
 	license = LGPL2.1
 	makedepends = git
 	makedepends = thin-provisioning-tools
-	source = git+https://sourceware.org/git/lvm2.git#tag=v2_02_187?signed
+	source = git+https://sourceware.org/git/lvm2.git#tag=e6809e10a27865fbd6d67980a348946a2867182d?signed
 	source = lvm2_install
-	source = lvm2_hook
 	source = 11-dm-initramfs.rules
 	validpgpkeys = 88437EF5C077BD113D3B7224228191C1567E2C17
 	validpgpkeys = D501A478440AE2FD130A1BE8B9112431E509039F
 	sha256sums = SKIP
-	sha256sums = cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6
-	sha256sums = a6e88d4457ff49a1df5b1d243c5e245d33832855c8804e99c50b30c3e56a8a80
+	sha256sums = ed78acdec013bc22df253e51a474d4beab2f9204bbabde34b83d56149bb435d4
 	sha256sums = e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0
 
 pkgname = lvm2-noudev
 	pkgdesc = Logical Volume Manager 2 utilities
 	depends = bash
-	depends = device-mapper>=2.02.187
-	depends = libutil-linux
+	depends = device-mapper>=2.03.12
+	depends = util-linux-libs
+	depends = libblkid.so
 	depends = readline
+	depends = libreadline.so
 	depends = thin-provisioning-tools
 	provides = lvm2
 	conflicts = lvm
@@ -37,8 +37,7 @@ pkgname = device-mapper-noudev
 	pkgdesc = Device mapper userspace library and tools
 	url = http://sourceware.org/dm/
 	depends = glibc
-	provides = device-mapper=2.02.187
+	provides = device-mapper=2.03.12
 	provides = libdevmapper.so
 	provides = libdevmapper-event.so
 	conflicts = device-mapper
-
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"
 }
diff --git a/lvm2_hook b/lvm2_hook
deleted file mode 100644
index 1786fb585f81..000000000000
--- a/lvm2_hook
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    mkdir /run/lvm
-    lvmetad
-}
-
-run_hook() {
-    lvm vgchange -a y
-}
-
-# We are suffering a race condition in non-systemd initramfs: If lvmetad is
-# killed before pvscan processes finish we have stale processes and
-# uninitialized physical volumes. So wait for pvscan processes to finish.
-# Break after 10 seconds (50*0.2s) to avaid infinite loop.
-run_latehook() {
-    local i=50
-
-    while pgrep -f pvscan >/dev/null 2>/dev/null && [ $i -gt 0 ]; do
-        sleep 0.2
-        i=$((i - 1))
-    done
-}
-
-run_cleanuphook() {
-    kill $(cat /run/lvmetad.pid)
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/lvm2_install b/lvm2_install
index d7a63332a403..e4359b2f7997 100644
--- a/lvm2_install
+++ b/lvm2_install
@@ -11,7 +11,6 @@ build() {
 
     # binaries from lvm2
     add_binary "lvm"
-    add_binary "lvmetad"
 
     # beinaries from device-mapper
     add_binary "dmsetup"
@@ -30,8 +29,7 @@ build() {
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
     add_file "/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
     add_file "/etc/lvm/lvm.conf"
-
-    add_runscript
+    sed -i '/^\smonitoring =/s/1/0/' "${BUILDROOT}/etc/lvm/lvm.conf"
 }
 
 help() {
@@ -39,5 +37,3 @@ help() {
 This hook enables LVM2 volumes in initramfs.
 HELPEOF
 }
-
-# vim: set ft=sh ts=4 sw=4 et: