[packages/lvm2] - updated to 2.02.170 - updated device-mapper-dmsetup-export,sd_notify patches

[qboosh]

commit b73184470c116fcc1aa4f0f4bcda6f81381f8f1a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 16 14:16:43 2017 +0200

    - updated to 2.02.170
    - updated device-mapper-dmsetup-export,sd_notify patches

 device-mapper-dmsetup-export.patch | 22 +++++++++++-----------
 lvm2-sd_notify.patch               |  2 +-
 lvm2.spec                          | 17 +++++++++--------
 3 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index c40d725..0a30b2d 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -58,12 +58,12 @@
 Summary:	The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
-Version:	2.02.166
-Release:	2
+Version:	2.02.170
+Release:	1
 License:	GPL v2 and LGPL v2.1
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	c5a54ee0b86703daaad6e856439e115a
+# Source0-md5:	135c2c86e0c63c8c32bdc4cd0335b54f
 Source2:	clvmd.service
 Source3:	clvmd.sysconfig
 Patch0:		%{name}-selinux.patch
@@ -96,7 +96,7 @@ BuildRequires:	python3-pyudev
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.647
 %{?with_sanlock:BuildRequires:	sanlock-devel >= 3.3.0}
-BuildRequires:	systemd-devel >= 1:205
+BuildRequires:	systemd-devel >= 1:221
 BuildRequires:	udev-devel >= 1:176
 %if %{with initrd}
 %if %{with dietlibc}
@@ -510,8 +510,11 @@ unset CC
 	--with-udev-prefix=/ \
 	--with-usrlibdir=%{_libdir}
 
-%{__make} -j1
-%{__make} -j1 -C libdm LIB_STATIC=libdevmapper.a
+# use bash because of "set -o pipefail"
+%{__make} -j1 \
+	SHELL=/bin/bash
+%{__make} -j1 -C libdm \
+	LIB_STATIC=libdevmapper.a
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -652,7 +655,6 @@ fi
 %attr(755,root,root) %{_sbindir}/lvdisplay
 %attr(755,root,root) %{_sbindir}/lvextend
 %attr(755,root,root) %{_sbindir}/lvm
-%attr(755,root,root) %{_sbindir}/lvmchange
 %attr(755,root,root) %{_sbindir}/lvmconf
 %attr(755,root,root) %{_sbindir}/lvmconfig
 %attr(755,root,root) %{_sbindir}/lvmdiskscan
@@ -711,7 +713,6 @@ fi
 %{_mandir}/man8/lvm-fullreport.8*
 %{_mandir}/man8/lvm-lvpoll.8*
 %{_mandir}/man8/lvm.8*
-%{_mandir}/man8/lvmchange.8*
 %{_mandir}/man8/lvmconf.8*
 %{_mandir}/man8/lvmconfig.8*
 %{_mandir}/man8/lvmdiskscan.8*
diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 029e8fa..d160fc4 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -3,8 +3,8 @@
  tools/dmsetup.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 95 insertions(+)
 
---- LVM2.2.02.149/man/dmsetup.8.in.orig	2016-04-05 22:16:49.848604442 +0200
-+++ LVM2.2.02.149/man/dmsetup.8.in	2016-04-06 15:59:35.582595117 +0200
+--- LVM2.2.02.149/man/dmsetup.8_main.orig	2016-04-05 22:16:49.848604442 +0200
++++ LVM2.2.02.149/man/dmsetup.8_main	2016-04-06 15:59:35.582595117 +0200
 @@ -48,6 +48,14 @@
  .
  .HP
@@ -30,9 +30,9 @@
  .CMD_HELP
  .br
  Outputs a summary of the commands available, optionally including
---- LVM2.2.02.130/tools/dmsetup.c.orig	2015-09-09 18:44:39.471523160 +0200
-+++ LVM2.2.02.130/tools/dmsetup.c	2015-09-09 18:48:33.918179988 +0200
-@@ -2189,6 +2189,93 @@
+--- LVM2.2.02.170/tools/dmsetup.c.orig	2017-04-16 11:01:12.135929163 +0200
++++ LVM2.2.02.170/tools/dmsetup.c	2017-04-16 11:13:43.259253920 +0200
+@@ -2248,6 +2248,93 @@
  	return r;
  }
  
@@ -126,11 +126,11 @@
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -5139,6 +5226,7 @@
- 	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
- 	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
- 	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
+@@ -5921,6 +6008,7 @@
+ 	{"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats},
+ 	{"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
+ 	{"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
 +	{"export", "[<device>]", 0, 1, 1, 0, _export},
  	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
- 	{"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
- 	{"mangle", "[<device>]", 0, -1, 1, 0, _mangle},
+ 	{"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
+ 	{"mangle", "[<device>...]", 0, -1, 1, 0, _mangle},
diff --git a/lvm2-sd_notify.patch b/lvm2-sd_notify.patch
index 144523b..2dbfbe0 100644
--- a/lvm2-sd_notify.patch
+++ b/lvm2-sd_notify.patch
@@ -5,7 +5,7 @@ diff -dur LVM2.2.02.98.orig/daemons/clvmd/Makefile.in LVM2.2.02.98/daemons/clvmd
  DEFS += -D_REENTRANT
  CFLAGS += -fno-strict-aliasing
  
-+LIBS += `pkg-config --libs libsystemd-daemon`
++LIBS += `pkg-config --libs libsystemd`
 +
  INSTALL_TARGETS = \
  	install_clvmd
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lvm2.git/commitdiff/b73184470c116fcc1aa4f0f4bcda6f81381f8f1a