- updated to 2.03.41

diff --git a/lvm2-thin.patch b/lvm2-thin.patch
index ea210e67aed6e55f54b6c2bf01fa42a555dcd965..a5bcff2d0ee5e2a0a72424daca530b1e81687e8e 100644 (file)
--- a/lvm2-thin.patch
+++ b/lvm2-thin.patch
@@ -1,7 +1,6 @@
-diff -urNpa LVM2.2.03.23.orig/configure.ac LVM2.2.03.23/configure.ac
---- LVM2.2.03.23.orig/configure.ac     2023-12-03 19:58:43.179205581 +0100
-+++ LVM2.2.03.23/configure.ac  2023-12-03 19:59:54.935057131 +0100
-@@ -409,7 +409,7 @@ dnl -- thin_check needs-check flag
+--- LVM2.2.03.19/configure.ac.orig     2023-02-21 15:37:53.000000000 +0100
++++ LVM2.2.03.19/configure.ac  2023-02-22 10:52:41.267893915 +0100
+@@ -393,7 +393,7 @@

  AC_ARG_ENABLE(thin_check_needs_check,
              AS_HELP_STRING([--disable-thin_check_needs_check],
                             [required if thin_check version is < 0.3.0]),
  AC_ARG_ENABLE(thin_check_needs_check,
              AS_HELP_STRING([--disable-thin_check_needs_check],
                             [required if thin_check version is < 0.3.0]),


@@ -10,25 +9,16 @@ diff -urNpa LVM2.2.03.23.orig/configure.ac LVM2.2.03.23/configure.ac
  
  # Test if necessary thin tools are available
  # if not - use plain defaults and warn user
  
  # Test if necessary thin tools are available
  # if not - use plain defaults and warn user

-@@ -424,7 +424,7 @@ AS_CASE(["$THIN"],
-                       THIN_CONFIGURE_WARN="y"
-               ])
-       ])
--      AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"], [
-+      AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "autodetect" && test "$THIN_CONFIGURE_WARN" != "y"], [
-               THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null)
-               THIN_CHECK_VSN=${THIN_CHECK_VSN##* }  # trim away all before the first space
-               THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}')
-@@ -438,7 +438,7 @@ AS_CASE(["$THIN"],
+@@ -421,7 +421,7 @@

                        AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
                        THIN_CHECK_VERSION_WARN="y"
                        THIN_CHECK_NEEDS_CHECK="no"
 -              ])
 +              ], [ THIN_CHECK_NEEDS_CHECK="yes" ])
        ])
                        AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
                        THIN_CHECK_VERSION_WARN="y"
                        THIN_CHECK_NEEDS_CHECK="no"
 -              ])
 +              ], [ THIN_CHECK_NEEDS_CHECK="yes" ])
        ])

-       # Empty means a config way to ignore thin dumping
+       # Empty value allows user to skip thin dumping

        AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [
        AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [

-@@ -522,7 +522,7 @@ dnl -- cache_check needs-check flag
+@@ -505,7 +505,7 @@

  AC_ARG_ENABLE(cache_check_needs_check,
              AS_HELP_STRING([--disable-cache_check_needs_check],
                             [required if cache_check version is < 0.5]),
  AC_ARG_ENABLE(cache_check_needs_check,
              AS_HELP_STRING([--disable-cache_check_needs_check],
                             [required if cache_check version is < 0.5]),


@@ -37,12 +27,21 @@ diff -urNpa LVM2.2.03.23.orig/configure.ac LVM2.2.03.23/configure.ac
  
  # Test if necessary cache tools are available
  # if not - use plain defaults and warn user
  
  # Test if necessary cache tools are available
  # if not - use plain defaults and warn user

-@@ -562,7 +562,7 @@ AS_CASE(["$CACHE"],
+@@ -520,7 +520,7 @@
+                       CACHE_CONFIGURE_WARN="y"
+               ])
+       ])
+-      AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"], [
++      AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "autodetect" && test "$CACHE_CONFIGURE_WARN" != "y"], [
+               "$CACHE_CHECK_CMD" -V 2>/dev/null >conftest.tmp
+               read -r CACHE_CHECK_VSN < conftest.tmp
+               IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
+@@ -544,7 +544,7 @@

                                AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
                                AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])

-                               CACHE_CHECK_VERSION_WARN=y
+                               CACHE_CHECK_VERSION_WARN="y"

                        ])
 -              ])
 +              ], [ CACHE_CHECK_NEEDS_CHECK="yes" ])
        ])
                        ])
 -              ])
 +              ], [ CACHE_CHECK_NEEDS_CHECK="yes" ])
        ])

-       # Empty means a config way to ignore cache dumping
+       # Empty value allows user to skip cache dumping

        AS_IF([test "$CACHE_DUMP_CMD" = "autodetect"], [
        AS_IF([test "$CACHE_DUMP_CMD" = "autodetect"], [

diff --git a/lvm2.spec b/lvm2.spec
index 076d8090809301433f27df0a3679a1e668ff0f94..4df942486656277b583d00d5f34fbf4269369d2c 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -25,12 +25,12 @@
 Summary:       The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
 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.03.38
+Version:       2.03.41

 Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sourceware.org/pub/lvm2/LVM2.%{version}.tgz
 Release:       1
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sourceware.org/pub/lvm2/LVM2.%{version}.tgz

-# Source0-md5: a661c55b5a1fcaa068b9e4a561c35f36
+# Source0-md5: 9696ce3b3844db1d90dae457f83b0306

 Patch0:                %{name}-selinux.patch
 Patch1:                device-mapper-dmsetup-export.patch
 Patch2:                %{name}-tld_init.patch
 Patch0:                %{name}-selinux.patch
 Patch1:                device-mapper-dmsetup-export.patch
 Patch2:                %{name}-tld_init.patch


@@ -428,6 +428,9 @@ fi
 %attr(755,root,root) %{_sbindir}/vgsplit
 %attr(755,root,root) %{_libexecdir}/lvresize_fs_helper
 %{_mandir}/man5/lvm.conf.5*
 %attr(755,root,root) %{_sbindir}/vgsplit
 %attr(755,root,root) %{_libexecdir}/lvresize_fs_helper
 %{_mandir}/man5/lvm.conf.5*

+%{_mandir}/man7/lvm-args.7.gz
+%{_mandir}/man7/lvm-categories.7.gz
+%{_mandir}/man7/lvm-index.7.gz

 %{_mandir}/man7/lvmautoactivation.7*
 %{_mandir}/man7/lvmcache.7*
 %{_mandir}/man7/lvmraid.7*
 %{_mandir}/man7/lvmautoactivation.7*
 %{_mandir}/man7/lvmcache.7*
 %{_mandir}/man7/lvmraid.7*


@@ -554,6 +557,7 @@ fi
 %attr(755,root,root) %{_sbindir}/dmfilemapd
 %attr(755,root,root) %{_sbindir}/dmsetup
 %attr(755,root,root) %{_sbindir}/dmstats
 %attr(755,root,root) %{_sbindir}/dmfilemapd
 %attr(755,root,root) %{_sbindir}/dmsetup
 %attr(755,root,root) %{_sbindir}/dmstats

+%attr(755,root,root) %{_sbindir}/dmvdostats

 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2mirror.so
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2raid.so
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2snapshot.so
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2mirror.so
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2raid.so
 %attr(755,root,root) %{_libdir}/libdevmapper-event-lvm2snapshot.so


@@ -565,10 +569,11 @@ fi
 %attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
 %attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
 %attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so
 %attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2snapshot.so
 %attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2thin.so
 %attr(755,root,root) %{_libdir}/device-mapper/libdevmapper-event-lvm2vdo.so

+%{_mandir}/man8/dmeventd.8*

 %{_mandir}/man8/dmfilemapd.8*
 %{_mandir}/man8/dmsetup.8*
 %{_mandir}/man8/dmstats.8*
 %{_mandir}/man8/dmfilemapd.8*
 %{_mandir}/man8/dmsetup.8*
 %{_mandir}/man8/dmstats.8*

-%{_mandir}/man8/dmeventd.8*
+%{_mandir}/man8/dmvdostats.8*

 
 %files -n device-mapper-libs
 %defattr(644,root,root,755)
 
 %files -n device-mapper-libs
 %defattr(644,root,root,755)