- merged update to 2.02.107 from PLD

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index be3c96b719674eda513999e69cac0a4bbeef2d10..abf8df35c1459d5db9d4d451cc894490b91e117e 100644 (file)
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -13,19 +13,6 @@
  #ifdef INTL_PACKAGE
        bindtextdomain(INTL_PACKAGE, LOCALEDIR);
  #endif
---- LVM2.2.02.45/lib/locking/file_locking.c    2008-11-12 10:30:52.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/locking/file_locking.c       2009-03-18 12:18:52.000000000 +0100
-@@ -30,6 +30,10 @@
- #include <fcntl.h>
- #include <signal.h>
- 
-+#ifdef __dietlibc__
-+typedef void (*sig_t) (int);
-+#endif
-+
- struct lock_list {
-       struct dm_list list;
-       int lf;
 --- LVM2.2.02.45/libdm/libdevmapper.h  2008-11-04 16:07:45.000000000 +0100
 +++ LVM2.2.02.45-diet/libdm/libdevmapper.h     2009-03-18 12:17:27.000000000 +0100
 @@ -160,6 +160,10 @@

diff --git a/lvm2-wrapper.patch b/lvm2-wrapper.patch
deleted file mode 100644 (file)
index 04ee115..0000000
--- a/lvm2-wrapper.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- LVM2.2.02.94/lib/misc/lvm-wrappers.h~      2011-04-22 14:00:00.000000000 +0200
-+++ LVM2.2.02.94/lib/misc/lvm-wrappers.h       2012-03-04 10:43:46.032807285 +0100
-@@ -33,7 +34,8 @@
-  */
- int read_urandom(void *buf, size_t len);
- 
--#  ifndef HAVE_SIGINTERRUPT
-+#ifndef HAVE_SIGINTERRUPT
-+#include <signal.h>
- #    define siginterrupt(sig, flag) \
-       do { \
-               int ret; \
-@@ -45,7 +47,7 @@
-                       act.sa_flags |= SA_RESTART; \
-               ret = sigaction(sig, &act, NULL); \
-               return ret; \
--      while (0)
--#  endif
-+      } while (0);
-+#endif
- 
- #endif

diff --git a/lvm2.spec b/lvm2.spec
index 99442aabd6d6080ba63b9676d20193c0cd7f1d68..15907e89003998f071a48df53d3163f6ebb0c3b2 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -33,12 +33,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.106
+Version:       2.02.107
 Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 77f84279fb649b3dc4edad1c6d1a1b0e
+# Source0-md5: efa5b0ff0245cbccf53aec1f3d8840ba
 Source1:       %{name}-tmpfiles.conf
 Source2:       clvmd.service
 Source3:       clvmd.sysconfig
@@ -47,7 +47,6 @@ Patch1:               %{name}-diet.patch
 Patch2:                device-mapper-dmsetup-export.patch
 Patch3:                %{name}-pld_init.patch
 Patch4:                dl-dlsym.patch
-Patch5:                %{name}-wrapper.patch
 Patch6:                %{name}-lvm_path.patch
 Patch7:                %{name}-sd_notify.patch
 Patch8:                %{name}-clvmd_cmd_timeout.patch
@@ -275,7 +274,6 @@ potrzeby initrd.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -488,7 +486,9 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}/lvm
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
 %attr(750,root,root) %dir %{_sysconfdir}/lvm/profile
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/default.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/command_profile_template.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/metadata_profile_template.profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/thin-generic.profile
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/profile/thin-performance.profile
 %if %{with lvmetad}
 /lib/udev/rules.d/69-dm-lvm-metad.rules