- updated to 2.02.162, partial PLD merge (patches)

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 53c3ba7bc4b390f457b6987f12b4b97d23cca944..029e8fabf0688b5a275654afcc5b9cbe6abe7971 100644 (file)
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -3,11 +3,9 @@
  tools/dmsetup.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 95 insertions(+)
 
-Index: LVM2.2.02.98/man/dmsetup.8.in
-===================================================================
---- LVM2.2.02.116.orig/man/dmsetup.8.in        2015-01-30 16:19:53.000000000 +0000
-+++ LVM2.2.02.116/man/dmsetup.8.in     2015-02-03 21:05:01.635601115 +0000
-@@ -48,6 +48,14 @@ dmsetup \(em low level logical volume ma
+--- 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
+@@ -48,6 +48,14 @@
  .
  .HP
  .B dmsetup
@@ -22,23 +20,19 @@ Index: LVM2.2.02.98/man/dmsetup.8.in
  .de CMD_HELP
  .  BR help
  .  RB [ \-c | \-C | \-\-columns ]
-@@ -629,6 +637,11 @@ device. Device names on output can be cu
+@@ -629,6 +637,9 @@
  \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
  .
  .HP
 +.CMD_EXPORT
-+.br
 +Outputs information in key/value format to be imported by other programs.
-+.
 +.HP
  .CMD_HELP
  .br
  Outputs a summary of the commands available, optionally including
-Index: LVM2.2.02.98/tools/dmsetup.c
-===================================================================
---- LVM2.2.02.98.orig/tools/dmsetup.c
-+++ LVM2.2.02.98/tools/dmsetup.c
-@@ -2194,6 +2194,93 @@ out:
+--- 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 @@
        return r;
  }
  
@@ -132,11 +126,11 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -5155,6 +5242,7 @@ static struct command _dmsetup_commands[
-       {"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
+@@ -5139,6 +5226,7 @@
        {"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
        {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
-+      {"export", "[<device>]", 0, 1, 1, 0, _export},
        {"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},

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index 8ca191f8e5947018047d238bf7339cc2245037ab..cece1b84dde818817ca75f17702a5df0fec25527 100644 (file)
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -126,25 +126,25 @@
  /* FIXME Unused so far */
  #undef HAVE_SYS_STATVFS_H
 
---- LVM2.2.02.105/tools/Makefile.in.orig       2014-01-26 18:33:51.531497416 +0100
-+++ LVM2.2.02.105/tools/Makefile.in    2014-01-26 19:14:42.264728615 +0100
-@@ -128,20 +128,19 @@
+--- LVM2.2.02.149/tools/Makefile.in.orig       2016-04-05 22:05:48.151965546 +0200
++++ LVM2.2.02.149/tools/Makefile.in    2016-04-05 22:16:22.108605605 +0200
+@@ -128,12 +128,12 @@
  CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
  
  dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
 -      $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
-+      $(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm $(EXTRA_EXEC_LDFLAGS) $(LDFLAGS) \
++      $(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \
              -o $@ dmsetup.o -ldevmapper $(LIBS)
  
  dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
 -      $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
 -            -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
--
 +      $(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
-+              -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS)
++            -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
+ 
  all: device-mapper
  
- CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
+@@ -141,7 +141,7 @@
  CFLAGS_lvmcmdline.o += $(VALGRIND_CFLAGS)
  
  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
@@ -153,7 +153,7 @@
                $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
  
  ifeq ("@BUILD_LVMETAD@", "yes")
-@@ -150,7 +149,7 @@
+@@ -150,7 +150,7 @@
  
  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
        $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \

diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch
index 8acc383e5025a888f039d62d1896dd6c5b76b800..d8ee8b6739a101ce90d2702c173088fd339db6d5 100644 (file)
--- a/lvm2-tld_init.patch
+++ b/lvm2-tld_init.patch
@@ -1,6 +1,6 @@
-diff -ur LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.132/scripts/blk_availability_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in        2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/blk_availability_init_red_hat.in     2015-10-05 12:31:30.991042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.162/scripts/blk_availability_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/blk_availability_init_red_hat.in        2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/blk_availability_init_red_hat.in     2016-08-04 16:26:04.886554000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -13,9 +13,9 @@ diff -ur LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.1
  
 -sbindir=@sbindir@
 -script=blkdeactivate
--options="-u -l wholevg"
+-options="-u -l wholevg -m disablequeueing"
 +DAEMON="blkdeactivate"
-+OPTIONS="-u -l wholevg"
++OPTIONS="-u -l wholevg -m disablequeueing"
  
  LOCK_FILE="/var/lock/subsys/blk-availability"
  
@@ -44,9 +44,9 @@ diff -ur LVM2.2.02.132.orig/scripts/blk_availability_init_red_hat.in LVM2.2.02.1
 +      exit 3
        ;;
  esac
-diff -ur LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.132/scripts/clvmd_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in   2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/clvmd_init_red_hat.in        2015-10-05 19:20:56.249042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.162/scripts/clvmd_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/clvmd_init_red_hat.in   2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/clvmd_init_red_hat.in        2016-08-04 16:22:09.076554000 +0000
 @@ -18,15 +18,12 @@
  
  . /etc/rc.d/init.d/functions
@@ -243,9 +243,9 @@ diff -ur LVM2.2.02.132.orig/scripts/clvmd_init_red_hat.in LVM2.2.02.132/scripts/
 -
 -exit $rtrn
 +exit $RETVAL
-diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/scripts/lvm2_lvmetad_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in    2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/lvm2_lvmetad_init_red_hat.in 2015-10-06 06:06:01.799042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.162/scripts/lvm2_lvmetad_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/lvm2_lvmetad_init_red_hat.in    2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/lvm2_lvmetad_init_red_hat.in 2016-08-04 16:22:09.077554000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -379,9 +379,9 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmetad_init_red_hat.in LVM2.2.02.132/s
 -
 -exit $rtrn
 +exit $RETVAL
-diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/scripts/lvm2_lvmpolld_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in   2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/lvm2_lvmpolld_init_red_hat.in        2015-10-06 06:07:04.889042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.162/scripts/lvm2_lvmpolld_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/lvm2_lvmpolld_init_red_hat.in   2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/lvm2_lvmpolld_init_red_hat.in        2016-08-04 16:22:09.077554000 +0000
 @@ -1,6 +1,6 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -528,9 +528,9 @@ diff -ur LVM2.2.02.132.orig/scripts/lvm2_lvmpolld_init_red_hat.in LVM2.2.02.132/
 -
 -exit $rtrn
 +exit $RETVAL
-diff -ur LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.132/scripts/lvm2_monitoring_init_red_hat.in
---- LVM2.2.02.132.orig/scripts/lvm2_monitoring_init_red_hat.in 2015-09-22 15:00:59.000000000 +0000
-+++ LVM2.2.02.132/scripts/lvm2_monitoring_init_red_hat.in      2015-10-05 12:32:01.204042000 +0000
+diff -ur LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in LVM2.2.02.162/scripts/lvm2_monitoring_init_red_hat.in
+--- LVM2.2.02.162.orig/scripts/lvm2_monitoring_init_red_hat.in 2016-07-28 18:50:18.000000000 +0000
++++ LVM2.2.02.162/scripts/lvm2_monitoring_init_red_hat.in      2016-08-04 16:22:09.078554000 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh

diff --git a/lvm2.spec b/lvm2.spec
index 1b1a4f9afeaa022ca46c502a828fe2a0e98d529b..b0c06d4ae38d1307bd54cedefbdb6d7e9bf490f0 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -40,12 +40,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.146
+Version:       2.02.162
 Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 0c922e4c450515fe2d68a946ad04e73b
+# Source0-md5: cc108c19b1e1b5b2002fb0a9bcb2d077
 Source1:       clvmd.sysconfig
 Patch0:                %{name}-selinux.patch
 Patch1:                %{name}-diet.patch