Update to 2.02.185-1

3 files changed, 26 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5a4d84a3af4..a51ed5a74ae3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lvm2-noudev
-	pkgver = 2.02.184
-	pkgrel = 4
+	pkgver = 2.02.185
+	pkgrel = 1
 	url = https://sourceware.org/lvm2/
 	arch = x86_64
 	groups = base
@@ -8,7 +8,7 @@ pkgbase = lvm2-noudev
 	license = LGPL2.1
 	makedepends = git
 	makedepends = thin-provisioning-tools
-	source = git+https://sourceware.org/git/lvm2.git#tag=v2_02_184?signed
+	source = git+https://sourceware.org/git/lvm2.git#tag=v2_02_185?signed
 	source = lvm2_install
 	source = lvm2_hook
 	source = 11-dm-initramfs.rules
@@ -16,14 +16,13 @@ pkgbase = lvm2-noudev
 	validpgpkeys = D501A478440AE2FD130A1BE8B9112431E509039F
 	sha256sums = SKIP
 	sha256sums = cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6
-	sha256sums = 2ecaabfa13dd09d0e3d7b3439147fbd93e3c87a418b676fa55647f9319ada667
+	sha256sums = a6e88d4457ff49a1df5b1d243c5e245d33832855c8804e99c50b30c3e56a8a80
 	sha256sums = e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0
 
 pkgname = lvm2-noudev
 	pkgdesc = Logical Volume Manager 2 utilities
 	depends = bash
-	depends = device-mapper>=2.02.184
-	depends = libeudev
+	depends = device-mapper>=2.02.185
 	depends = libutil-linux
 	depends = readline
 	depends = thin-provisioning-tools
@@ -39,6 +38,6 @@ pkgname = device-mapper-noudev
 	pkgdesc = Device mapper userspace library and tools
 	url = http://sourceware.org/dm/
 	depends = glibc
-	provides = device-mapper=2.02.184
+	provides = device-mapper=2.02.185
 	conflicts = device-mapper
 
diff --git a/PKGBUILD b/PKGBUILD
index d300b7f8be09..d4ae8f5c0354 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,13 @@
 # - disable eudev dependency
 # - disable udev in _CONFIGUREOPTS
 # - explicitly disable all udev options when building lvm2
-# - enable options only for udev rules
 # - add 'provides' and 'conflicts' fields for packages
 # - lvm2_hook: add vgchange command
 
 pkgbase=lvm2-noudev
 pkgname=('lvm2-noudev' 'device-mapper-noudev')
-pkgver=2.02.184
-pkgrel=4
+pkgver=2.02.185
+pkgrel=1
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
@@ -27,9 +26,22 @@ source=("git+https://sourceware.org/git/lvm2.git#tag=v${pkgver//./_}?signed"
         '11-dm-initramfs.rules')
 sha256sums=('SKIP'
             'cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6'
-            '2ecaabfa13dd09d0e3d7b3439147fbd93e3c87a418b676fa55647f9319ada667'
+            'a6e88d4457ff49a1df5b1d243c5e245d33832855c8804e99c50b30c3e56a8a80'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
+_backports=(
+)
+
+prepare() {
+  cd lvm2/
+
+  local _c
+  for _c in "${_backports[@]}"; do
+    git log --oneline -1 "${_c}"
+    git show "${_c}" -- ':(exclude)WHATS_NEW' | git apply
+  done
+}
+
 build() {
   local _CONFIGUREOPTS=(
     --prefix=/usr
@@ -58,12 +70,12 @@ build() {
 
   cd lvm2/
 
-  ./configure "${_CONFIGUREOPTS[@]}" --enable-udev-systemd-background-jobs=no --enable-udev_rules=no --enable-udev_sync=no --enable-udev-rule-exec-detection=no
+  ./configure "${_CONFIGUREOPTS[@]}" --enable-udev-systemd-background-jobs=no
   make
 
   # Build legacy udev rule for initramfs
   cd ../lvm2-initramfs
-  ./configure "${_CONFIGUREOPTS[@]}" --enable-udev-systemd-background-jobs=no --enable-udev_rules --enable-udev_sync
+  ./configure "${_CONFIGUREOPTS[@]}" --enable-udev-systemd-background-jobs=no
   cd udev
   make 69-dm-lvm-metad.rules
 }
@@ -84,7 +96,7 @@ package_device-mapper-noudev() {
 
 package_lvm2-noudev() {
   pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'libeudev' 'libutil-linux' 'readline' 'thin-provisioning-tools')
+  depends=('bash' "device-mapper>=${pkgver}" 'libutil-linux' 'readline' 'thin-provisioning-tools')
   conflicts=('lvm' 'mkinitcpio<0.7' 'lvm2')
   provides=('lvm2')
   backup=('etc/lvm/lvm.conf'
diff --git a/lvm2_hook b/lvm2_hook
index 2c94630738bf..1786fb585f81 100644
--- a/lvm2_hook
+++ b/lvm2_hook
@@ -8,6 +8,7 @@ run_earlyhook() {
 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.