From: Marcin Krol Date: Sat, 24 Oct 2026 09:20:09 +0000 (+0200) Subject: - updated to 2.03.43 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;ds=sidebyside;p=packages%2Flvm2.git - updated to 2.03.43 --- diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch index 23a44ce..b10ad1a 100644 --- a/device-mapper-dmsetup-export.patch +++ b/device-mapper-dmsetup-export.patch @@ -1,7 +1,7 @@ -diff -urNpa LVM2.2.03.23.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.23/libdm/dm-tools/dmsetup.c ---- LVM2.2.03.23.orig/libdm/dm-tools/dmsetup.c 2023-12-03 19:56:43.002779419 +0100 -+++ LVM2.2.03.23/libdm/dm-tools/dmsetup.c 2023-12-03 19:56:52.195888521 +0100 -@@ -2565,6 +2565,116 @@ out: +diff -ur LVM2.2.03.43.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.43/libdm/dm-tools/dmsetup.c +--- LVM2.2.03.43.orig/libdm/dm-tools/dmsetup.c 2026-10-24 10:53:58.463670593 +0200 ++++ LVM2.2.03.43/libdm/dm-tools/dmsetup.c 2026-10-24 10:54:11.959710534 +0200 +@@ -2597,6 +2597,116 @@ return r; } @@ -118,7 +118,7 @@ diff -urNpa LVM2.2.03.23.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.23/libdm/dm-too /* Show target names and their version numbers */ static int _targets(CMD_ARGS) { -@@ -6286,6 +6396,7 @@ static struct command _dmsetup_commands[ +@@ -6252,6 +6362,7 @@ {"stats", " [] [...]", 1, -1, 1, 1, _stats}, {"status", "[...] [--noflush] [--target ]", 0, -1, 2, 0, _status}, {"table", "[...] [--concise] [--target ] [--showkeys]", 0, -1, 2, 0, _status}, @@ -126,9 +126,9 @@ diff -urNpa LVM2.2.03.23.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.23/libdm/dm-too {"wait", " [] [--noflush]", 0, 2, 0, 0, _wait}, {"mknodes", "[...]", 0, -1, 1, 0, _mknodes}, {"mangle", "[...]", 0, -1, 1, 0, _mangle}, -diff -urNpa LVM2.2.03.23.orig/man/dmsetup.8_main LVM2.2.03.23/man/dmsetup.8_main ---- LVM2.2.03.23.orig/man/dmsetup.8_main 2023-12-03 19:56:43.003779431 +0100 -+++ LVM2.2.03.23/man/dmsetup.8_main 2023-12-03 19:56:52.195888521 +0100 +diff -ur LVM2.2.03.43.orig/man/dmsetup.8_main LVM2.2.03.43/man/dmsetup.8_main +--- LVM2.2.03.43.orig/man/dmsetup.8_main 2026-10-24 10:53:58.467670605 +0200 ++++ LVM2.2.03.43/man/dmsetup.8_main 2026-10-24 10:54:11.959710534 +0200 @@ -117,6 +117,15 @@ .CMD_DEPS . @@ -145,7 +145,7 @@ diff -urNpa LVM2.2.03.23.orig/man/dmsetup.8_main LVM2.2.03.23/man/dmsetup.8_main .de CMD_HELP . CMS . BR help " "\c -@@ -718,6 +727,10 @@ +@@ -722,6 +731,10 @@ \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise). . .NTP diff --git a/lvm2-run-dir.patch b/lvm2-run-dir.patch index 38a9553..ab9dbe5 100644 --- a/lvm2-run-dir.patch +++ b/lvm2-run-dir.patch @@ -1,7 +1,7 @@ -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:08.846798150 +0100 -+++ LVM2.2.03.23/configure.ac 2023-12-03 19:58:22.952965549 +0100 -@@ -724,8 +724,7 @@ AC_ARG_WITH(ocfdir, +diff -ur LVM2.2.03.43.orig/configure.ac LVM2.2.03.43/configure.ac +--- LVM2.2.03.43.orig/configure.ac 2026-10-24 10:57:48.528351226 +0200 ++++ LVM2.2.03.43/configure.ac 2026-10-24 10:58:01.648390038 +0200 +@@ -742,8 +742,7 @@ ################################################################################ AC_MSG_CHECKING([for default run directory]) diff --git a/lvm2-thin.patch b/lvm2-thin.patch index a5bcff2..91b2869 100644 --- a/lvm2-thin.patch +++ b/lvm2-thin.patch @@ -1,6 +1,7 @@ ---- 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 @@ +diff -ur LVM2.2.03.43.orig/configure.ac LVM2.2.03.43/configure.ac +--- LVM2.2.03.43.orig/configure.ac 2026-10-24 10:59:05.940580233 +0200 ++++ LVM2.2.03.43/configure.ac 2026-10-24 10:59:18.840618390 +0200 +@@ -427,7 +427,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]), @@ -9,7 +10,7 @@ # Test if necessary thin tools are available # if not - use plain defaults and warn user -@@ -421,7 +421,7 @@ +@@ -456,7 +456,7 @@ AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found]) THIN_CHECK_VERSION_WARN="y" THIN_CHECK_NEEDS_CHECK="no" @@ -18,7 +19,7 @@ ]) # Empty value allows user to skip thin dumping AS_IF([test "$THIN_DUMP_CMD" = "autodetect"], [ -@@ -505,7 +505,7 @@ +@@ -540,7 +540,7 @@ AC_ARG_ENABLE(cache_check_needs_check, AS_HELP_STRING([--disable-cache_check_needs_check], [required if cache_check version is < 0.5]), @@ -27,7 +28,7 @@ # Test if necessary cache tools are available # if not - use plain defaults and warn user -@@ -520,7 +520,7 @@ +@@ -555,7 +555,7 @@ CACHE_CONFIGURE_WARN="y" ]) ]) @@ -36,7 +37,7 @@ "$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 @@ +@@ -580,7 +580,7 @@ AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2]) CACHE_CHECK_VERSION_WARN="y" ]) diff --git a/lvm2-tld_init.patch b/lvm2-tld_init.patch index ce89af4..bc08ab5 100644 --- a/lvm2-tld_init.patch +++ b/lvm2-tld_init.patch @@ -44,137 +44,6 @@ diff -urNpa LVM2.2.03.23.orig/scripts/blk_availability_init_red_hat.in LVM2.2.03 + exit 3 ;; esac -diff -urNpa LVM2.2.03.23.orig/scripts/cmirrord_init_red_hat.in LVM2.2.03.23/scripts/cmirrord_init_red_hat.in ---- LVM2.2.03.23.orig/scripts/cmirrord_init_red_hat.in 2023-12-03 19:57:35.811406112 +0100 -+++ LVM2.2.03.23/scripts/cmirrord_init_red_hat.in 2023-12-03 19:57:44.066504078 +0100 -@@ -2,7 +2,7 @@ - # - # chkconfig: - 22 78 - # description: Starts and stops cmirrord --# pidfile: @CMIRRORD_PIDFILE@ -+# pidfile: /var/run/cmirrord.pid - # - # For Red-Hat-based distributions such as Fedora, RHEL, CentOS. - # -@@ -16,95 +16,57 @@ - - . /etc/init.d/functions - --DAEMON=cmirrord -+DAEMON="cmirrord" - --usrsbindir="@USRSBINDIR@" -- --LOCK_FILE="@DEFAULT_SYS_LOCK_DIR@/subsys/$DAEMON" -+LOCK_FILE="/var/lock/subsys/$DAEMON" - - start() - { -- rtrn=0 -- if ! pidof "$DAEMON" > /dev/null -- then -- echo -n "Starting $DAEMON: " -- daemon "$usrsbindir/$DAEMON" -- rtrn=$? -- echo -- fi -- -- return $rtrn -+ if [ -f $LOCK_FILE ]; then -+ msg_already_running "$DAEMON" -+ return -+ fi -+ msg_starting "$DAEMON" -+ daemon /sbin/$DAEMON = 3.0-43 BuildRequires: libaio-devel BuildRequires: libblkid-devel >= 2.24 +BuildRequires: libnvme-devel >= 1.4 %{?with_selinux:BuildRequires: libselinux-devel >= 1.10} %{?with_selinux:BuildRequires: libsepol-devel} BuildRequires: ncurses-devel @@ -62,7 +63,6 @@ BuildRequires: rpmbuild(macros) >= 1.750 %{?with_sanlock:BuildRequires: sanlock-devel >= 3.3.0} BuildRequires: udev-devel >= 1:176 %if %{with cluster} -BuildRequires: corosync-devel BuildRequires: dlm-devel >= 3.99.5 %endif Requires(post,postun): /sbin/chkconfig @@ -95,32 +95,6 @@ and repairing logical volumes. Pakiet ten zawiera narzędzia do tworzenia, sprawdzania i naprawiania logicznych wolumenów dyskowych (LVM2). -%package cmirrord -Summary: Cluster mirror log daemon -Summary(pl.UTF-8): Demon śledzący log lustrzany w klastrze -Group: Applications/System -Requires: %{name} = %{version}-%{release} - -%description cmirrord -cmirrord is the daemon that tracks mirror log information in a -cluster. It is specific to device-mapper based mirrors (and by -extension, LVM cluster mirrors). Cluster mirrors are not possible -without this daemon running. - -This daemon relies on the cluster infrastructure provided by the -Cluster MANager (CMAN), which must be set up and running in order for -cmirrord to function. - -%description cmirrord -l pl.UTF-8 -cmirrord to demon śledzący informacje logu lustrzanego w klastrze. -Jest specyficzny dla klastrów lustrzanych opartych na device-mapperze -(oraz, poprzez rozszerzenie, klastrów lustrzanych LVM). W klastrach -lustrzanych ten demon jest niezbędny. - -Ten demon polega na infrastrukturze klastra dostarczanej przez CMAN -(Cluster MANager), który musi być skonfigurowany i działający, aby -działał cmirrord. - %package dbusd Summary: LVM2 D-Bus daemon Summary(pl.UTF-8): Demon LVM2 D-Bus @@ -263,9 +237,6 @@ Statyczna biblioteka devmapper zbudowana z dietlibc. %configure \ --enable-cache_check_needs_check \ --enable-cmdlib \ -%if %{with cluster} - --enable-cmirrord \ -%endif %{?with_lvmdbusd:--enable-dbus-service} \ %{?debug:--enable-debug} \ --enable-dmeventd \ @@ -523,14 +494,6 @@ fi %{_mandir}/man8/lvmpolld.8* %endif -%if %{with cluster} -%files cmirrord -%defattr(644,root,root,755) -%attr(755,root,root) %{_usrsbindir}/cmirrord -%attr(754,root,root) /etc/rc.d/init.d/cmirrord -%{_mandir}/man8/cmirrord.8* -%endif - %if %{with lvmdbusd} %files dbusd %defattr(644,root,root,755)