[arch-commits] Commit in lvm2/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Tuesday, June 16, 2015 @ 21:47:44
  Author: bpiotrowski
Revision: 240961

upgpkg: lvm2 2.02.121-1

new upstream release

Modified:
  lvm2/trunk/PKGBUILD
Deleted:
  lvm2/trunk/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch

-----------------------------------------------------------------+
 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch |   29 ----------
 PKGBUILD                                                        |   15 +----
 2 files changed, 5 insertions(+), 39 deletions(-)

Deleted: 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch
===================================================================
--- 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch	2015-06-16 19:40:13 UTC (rev 240960)
+++ 0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch	2015-06-16 19:47:44 UTC (rev 240961)
@@ -1,29 +0,0 @@
-From f8bf6410954fcf82bf28852e0dba015c6b7f19dc Mon Sep 17 00:00:00 2001
-From: Ondrej Kozina <okozina at redhat.com>
-Date: Fri, 22 May 2015 14:48:28 +0200
-Subject: [PATCH] lvmetad.c: ignore lvmetad global handle on disconnect
-
-do not unset lvmetad global handle on disconnect. This is
-hotfix for issue described in:
-https://www.redhat.com/archives/linux-lvm/2015-May/msg00008.html
-
-Reported-by: Christian Hesse <list at eworm.de>
----
- lib/cache/lvmetad.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
-index 68162b6..73a382c 100644
---- a/lib/cache/lvmetad.c
-+++ b/lib/cache/lvmetad.c
-@@ -39,7 +39,6 @@ void lvmetad_disconnect(void)
- 	if (_lvmetad_connected)
- 		daemon_close(_lvmetad);
- 	_lvmetad_connected = 0;
--	_lvmetad_cmd = NULL;
- }
- 
- void lvmetad_init(struct cmd_context *cmd)
--- 
-2.4.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-16 19:40:13 UTC (rev 240960)
+++ PKGBUILD	2015-06-16 19:47:44 UTC (rev 240961)
@@ -4,8 +4,8 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.120
-pkgrel=2
+pkgver=2.02.121
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -16,16 +16,14 @@
         lvm2_hook
         sd-lvm2_install
         11-dm-initramfs.rules
-        lvm2-make-sockets-static.patch
-        0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch)
-sha1sums=('34f015ee90316c1afc72f715a468028e0f89b705'
+        lvm2-make-sockets-static.patch)
+sha1sums=('618b94b01a719afa9ba1714f584c912658211615'
           'SKIP'
           '40ef991650555b904e73bcc3f344d736722e27ca'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
-          '4506a6d149430009ecd949c9413b5cf4b28899af')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17')
 
 prepare() {
@@ -36,9 +34,6 @@
 
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
-
-  # pvscan segfaults in initramfs
-  patch -p1 -i "${srcdir}/0001-lvmetad.c-ignore-lvmetad-global-handle-on-disconnect.patch"
 }
 
 build() {