From 1c585277cdd121fb2c6870d085ed1ec050029590 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 20 Jan 2016 07:18:33 +0000 Subject: [PATCH] - updated to 2.02.140 --- device-mapper-dmsetup-export.patch | 45 ++++++++++++++---------------- lvm2-diet.patch | 10 +++---- lvm2.spec | 6 ++-- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch index 7ea1a4b..53c3ba7 100644 --- a/device-mapper-dmsetup-export.patch +++ b/device-mapper-dmsetup-export.patch @@ -7,35 +7,38 @@ 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 -@@ -19,6 +19,9 @@ dmsetup \(em low level logical volume ma - .IR options ] - .RI [ device_name ] +@@ -48,6 +48,14 @@ dmsetup \(em low level logical volume ma + . .HP -+.B dmsetup export -+.RI [ device_name ] + .B dmsetup ++.de CMD_EXPORT ++. BR export ++. RI [ device_name ] ++.. ++.CMD_EXPORT ++. +.HP - .B dmsetup help - .RB [ \-c | \-C | \-\-columns ] - .HP -@@ -309,6 +312,11 @@ device_name in subsequent dmsetup comman - \fBblkdevname\fP (block device name), ++.B dmsetup + .de CMD_HELP + . BR help + . RB [ \-c | \-C | \-\-columns ] +@@ -629,6 +637,11 @@ device. Device names on output can be cu \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise). + . .HP -+.B export -+.RI [ device_name ] ++.CMD_EXPORT +.br +Outputs information in key/value format to be imported by other programs. ++. +.HP - .B help - .RB [ \-c | \-C | \-\-columns ] + .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 -@@ -1706,10 +1706,97 @@ static int _status(CMD_ARGS) - out: - dm_task_destroy(dmt); +@@ -2194,6 +2194,93 @@ out: return r; } @@ -129,11 +132,7 @@ Index: LVM2.2.02.98/tools/dmsetup.c /* Show target names and their version numbers */ static int _targets(CMD_ARGS) { - int r = 0; - struct dm_task *dmt; -@@ -3056,10 +3143,11 @@ static struct command _commands[] = { - {"ls", "[--target ] [--exec ] [-o ] [--tree]", 0, 0, 0, 0, _ls}, - {"info", "[]", 0, -1, 1, 0, _info}, +@@ -5155,6 +5242,7 @@ static struct command _dmsetup_commands[ {"deps", "[-o ] []", 0, -1, 1, 0, _deps}, {"stats", " [] []", 1, -1, 1, 1, _stats}, {"status", "[] [--noflush] [--target ]", 0, -1, 1, 0, _status}, @@ -141,5 +140,3 @@ Index: LVM2.2.02.98/tools/dmsetup.c {"table", "[] [--target ] [--showkeys]", 0, -1, 1, 0, _status}, {"wait", " [] [--noflush]", 0, 2, 0, 0, _wait}, {"mknodes", "[]", 0, -1, 1, 0, _mknodes}, - {"mangle", "[]", 0, -1, 1, 0, _mangle}, - {"udevcreatecookie", "", 0, 0, 0, 0, _udevcreatecookie}, diff --git a/lvm2-diet.patch b/lvm2-diet.patch index 1799ebc..8ca191f 100644 --- a/lvm2-diet.patch +++ b/lvm2-diet.patch @@ -128,7 +128,7 @@ --- 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 -@@ -127,20 +127,20 @@ +@@ -128,20 +128,19 @@ CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX) @@ -138,10 +138,10 @@ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a - $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ -- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) +- -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 $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS) all: device-mapper CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS) @@ -153,7 +153,7 @@ $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic ifeq ("@BUILD_LVMETAD@", "yes") -@@ -148,7 +148,7 @@ +@@ -150,7 +149,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.spec b/lvm2.spec index 5cd551d..1c12838 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -39,12 +39,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.132 -Release: 4 +Version: 2.02.140 +Release: 1 License: GPL v2 and LGPL v2.1 Group: Applications/System Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz -# Source0-md5: 80af5af726949bbbb2aceb15b24b7d20 +# Source0-md5: f2191c4798c8927a6d31a96010b9f568 Source1: clvmd.sysconfig Patch0: %{name}-selinux.patch Patch1: %{name}-diet.patch -- 2.46.0