[packages/multipath-tools] - updated to 0.9.5
qboosh
qboosh at pld-linux.org
Wed Jul 19 19:24:00 CEST 2023
commit 9b61a87a789b78d6ffec5c734b91dd0424fa1a87
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Jul 19 18:56:40 2023 +0200
- updated to 0.9.5
multipath-tools-paths.patch | 33 ++++++++++++++++----------------
multipath-tools-types.patch | 46 ++++++++++++++++++++++-----------------------
multipath-tools.spec | 19 +++++++++++++------
3 files changed, 53 insertions(+), 45 deletions(-)
---
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 0bdd64c..1e75d40 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -5,13 +5,13 @@
Summary: Tools to manage multipathed devices with the device-mapper
Summary(pl.UTF-8): Implementacja wielotrasowego dostępu do zasobów przy użyciu device-mappera
Name: multipath-tools
-Version: 0.8.9
+Version: 0.9.5
Release: 1
License: GPL v2
Group: Base
#Source0Download: https://github.com/opensvc/multipath-tools/tags
Source0: https://github.com/opensvc/multipath-tools/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: deb447e23b5ecaf87928ec396c75f1e9
+# Source0-md5: 4a2bb51973e962d653578063a6da14e9
Source100: branch.sh
Source1: multipathd.init
Source2: multipathd.sysconfig
@@ -50,7 +50,6 @@ Requires: systemd-units >= 38
Requires: udev-core >= 1:127
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define skip_post_check_so libmultipath.so.0 libmpathpersist.so.0
%define _sbindir /sbin
%description
@@ -135,9 +134,10 @@ cp -p %{SOURCE4} .
%endif
%{__make} -j1 \
+ CC="%{__cc}" \
LIB=%{_lib} \
OPTFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -Wunused -Wstrict-prototypes %{?debug:-DDEBUG=1}" \
- CC="%{__cc}"
+ V=1
%install
rm -rf $RPM_BUILD_ROOT
@@ -146,6 +146,7 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_sysconfdir}/multipath
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT \
LIB=%{_lib} \
+ V=1 \
libudevdir=/lib/udev \
unitdir=%{systemdunitdir} \
usr_prefix=%{_prefix}
@@ -157,9 +158,10 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/multipath/bindings
# devel files in /usr
install -d $RPM_BUILD_ROOT%{_libdir}
-%{__rm} $RPM_BUILD_ROOT/%{_lib}/{libmpathcmd,libmpathpersist,libmpathvalid,libmultipath}.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/{libmpathcmd,libmpathpersist,libmpathutil,libmpathvalid,libmultipath}.so
ln -sf /%{_lib}/libmpathpersist.so.0 $RPM_BUILD_ROOT%{_libdir}/libmpathpersist.so
ln -sf /%{_lib}/libmpathcmd.so.0 $RPM_BUILD_ROOT%{_libdir}/libmpathcmd.so
+ln -sf /%{_lib}/libmpathutil.so.0 $RPM_BUILD_ROOT%{_libdir}/libmpathutil.so
ln -sf /%{_lib}/libmpathvalid.so.0 $RPM_BUILD_ROOT%{_libdir}/libmpathvalid.so
ln -sf /%{_lib}/libmultipath.so.0 $RPM_BUILD_ROOT%{_libdir}/libmultipath.so
@@ -189,9 +191,10 @@ fi
%files
%defattr(644,root,root,755)
-%doc README.alua README.md multipath.conf.defaults
+%doc README.md multipath.conf.defaults
%attr(755,root,root) %{_sbindir}/mpathpersist
%attr(755,root,root) %{_sbindir}/multipath
+%attr(755,root,root) %{_sbindir}/multipathc
%attr(755,root,root) %{_sbindir}/multipathd
%dir /%{_lib}/multipath
%attr(755,root,root) /%{_lib}/multipath/libcheck*.so
@@ -209,15 +212,18 @@ fi
#/usr/lib/modules-load.d/multipath.conf
%{systemdunitdir}/multipathd.service
%{systemdunitdir}/multipathd.socket
+%{systemdtmpfilesdir}/multipath.conf
%{_mandir}/man5/multipath.conf.5*
%{_mandir}/man8/mpathpersist.8*
%{_mandir}/man8/multipath.8*
+%{_mandir}/man8/multipathc.8*
%{_mandir}/man8/multipathd.8*
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) /%{_lib}/libmpathcmd.so.0
%attr(755,root,root) /%{_lib}/libmpathpersist.so.0
+%attr(755,root,root) /%{_lib}/libmpathutil.so.0
%attr(755,root,root) /%{_lib}/libmpathvalid.so.0
%attr(755,root,root) /%{_lib}/libmultipath.so.0
%attr(755,root,root) %{_libdir}/libdmmp.so.0.2.0
@@ -227,6 +233,7 @@ fi
%attr(755,root,root) %{_libdir}/libdmmp.so
%attr(755,root,root) %{_libdir}/libmpathcmd.so
%attr(755,root,root) %{_libdir}/libmpathpersist.so
+%attr(755,root,root) %{_libdir}/libmpathutil.so
%attr(755,root,root) %{_libdir}/libmpathvalid.so
%attr(755,root,root) %{_libdir}/libmultipath.so
%{_includedir}/libdmmp
diff --git a/multipath-tools-paths.patch b/multipath-tools-paths.patch
index be9400e..0775b18 100644
--- a/multipath-tools-paths.patch
+++ b/multipath-tools-paths.patch
@@ -19,31 +19,32 @@
IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}"
ENV{DM_TYPE}=="?*", ENV{DM_SERIAL}=="?*", \
---- multipath-tools-0.7.9-5c67a8b/multipath/multipath.rules.orig 2018-11-14 08:37:05.000000000 +0100
-+++ multipath-tools-0.7.9-5c67a8b/multipath/multipath.rules 2018-12-01 21:55:31.350903723 +0100
+--- multipath-tools-0.9.5/multipath/multipath.rules.in.orig 2023-04-06 08:47:48.000000000 +0200
++++ multipath-tools-0.9.5/multipath/multipath.rules.in 2023-07-19 18:36:02.578378364 +0200
@@ -2,7 +2,7 @@
SUBSYSTEM!="block", GOTO="end_mpath"
KERNEL!="sd*|dasd*|nvme*", GOTO="end_mpath"
- ACTION=="remove", TEST=="/dev/shm/multipath/find_multipaths/$major:$minor", \
-- RUN+="/usr/bin/rm -f /dev/shm/multipath/find_multipaths/$major:$minor"
-+ RUN+="/bin/rm -f /dev/shm/multipath/find_multipaths/$major:$minor"
+ ACTION=="remove", TEST=="@RUNTIME_DIR@/multipath/find_multipaths/$major:$minor", \
+- RUN+="/usr/bin/rm -f @RUNTIME_DIR@/multipath/find_multipaths/$major:$minor"
++ RUN+="/bin/rm -f @RUNTIME_DIR@/multipath/find_multipaths/$major:$minor"
ACTION!="add|change", GOTO="end_mpath"
IMPORT{cmdline}="nompath"
-@@ -71,7 +71,7 @@
+@@ -72,7 +72,7 @@ ENV{.SAVED_FM_WAIT_UNTIL}=="?*", GOTO="p
#
# We must trigger an "add" event because LVM2 will only act on those.
--RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Wants=multipathd.service --property After=multipathd.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /usr/bin/udevadm trigger --action=add $sys$devpath"
-+RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Wants=multipathd.service --property After=multipathd.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /sbin/udevadm trigger --action=add $sys$devpath"
+-RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property Conflicts=initrd-cleanup.service --timer-property Before=initrd-cleanup.service --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Conflicts=initrd-cleanup.service --property Before=initrd-cleanup.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /usr/bin/udevadm trigger --action=add $sys$devpath"
++RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description 'cancel waiting for multipath siblings of $kernel' --no-block --timer-property DefaultDependencies=no --timer-property Conflicts=shutdown.target --timer-property Before=shutdown.target --timer-property Conflicts=initrd-cleanup.service --timer-property Before=initrd-cleanup.service --timer-property AccuracySec=500ms --property DefaultDependencies=no --property Conflicts=shutdown.target --property Before=shutdown.target --property Conflicts=initrd-cleanup.service --property Before=initrd-cleanup.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /sbin/udevadm trigger --action=add $sys$devpath"
LABEL="pretend_mpath"
ENV{DM_MULTIPATH_DEVICE_PATH}="1"
-@@ -86,6 +86,6 @@
- ENV{FIND_MULTIPATHS_WAIT_UNTIL}=="?*", \
- ENV{FIND_MULTIPATHS_WAIT_UNTIL}!="0", \
- ENV{FIND_MULTIPATHS_WAIT_CANCELLED}="1", \
-- RUN+="/usr/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
-+ RUN+="/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
-
- LABEL="end_mpath"
+@@ -88,7 +88,7 @@ ENV{FIND_MULTIPATHS_WAIT_UNTIL}!="?*", G
+ ENV{FIND_MULTIPATHS_WAIT_UNTIL}=="0", GOTO="end_mpath"
+
+ ENV{FIND_MULTIPATHS_WAIT_CANCELLED}="1"
+-RUN+="/usr/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
++RUN+="/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
+
+ # If "multipath -u" failed, no values are imported from the program,
+ # and we are still using the values for DM_MULTIPATH_DEVICE_PATH and
diff --git a/multipath-tools-types.patch b/multipath-tools-types.patch
index 0db847b..f5a1b85 100644
--- a/multipath-tools-types.patch
+++ b/multipath-tools-types.patch
@@ -9,8 +9,8 @@
fprintf(stderr, "%s | ", buff);
}
fprintf(stderr, "libdevmapper: %s(%i): ", file, line);
---- multipath-tools-0.8.8/libmultipath/debug.c.orig 2021-12-06 07:42:30.000000000 +0100
-+++ multipath-tools-0.8.8/libmultipath/debug.c 2022-02-19 20:41:56.899486226 +0100
+--- multipath-tools-0.9.5/libmpathutil/debug.c.orig 2023-04-06 08:47:48.000000000 +0200
++++ multipath-tools-0.9.5/libmpathutil/debug.c 2023-07-19 18:38:54.094115850 +0200
@@ -33,7 +33,7 @@ void dlog(int prio, const char * fmt, ..
get_monotonic_time(&ts);
safe_sprintf(buff, "%ld.%06ld",
@@ -31,27 +31,27 @@
else if (wait == FIND_MULTIPATHS_WAIT_DONE)
printf("FIND_MULTIPATHS_WAIT_UNTIL=\"0\"\n");
printf("DM_MULTIPATH_DEVICE_PATH=\"%d\"\n",
---- multipath-tools-0.8.8/multipathd/main.c.orig 2021-12-06 07:42:30.000000000 +0100
-+++ multipath-tools-0.8.8/multipathd/main.c 2022-02-19 20:56:29.801390068 +0100
-@@ -2550,7 +2550,7 @@ checkerloop (void *ap)
- if (start_time.tv_sec && last_time.tv_sec) {
- timespecsub(&start_time, &last_time, &diff_time);
- condlog(4, "tick (%ld.%06lu secs)",
-- (long)diff_time.tv_sec, diff_time.tv_nsec / 1000);
-+ (long)diff_time.tv_sec, (unsigned long)(diff_time.tv_nsec / 1000));
- last_time = start_time;
- ticks = diff_time.tv_sec;
- } else {
-@@ -2610,7 +2610,7 @@ checkerloop (void *ap)
- condlog(4, "checked %d path%s in %ld.%06lu secs",
- num_paths, num_paths > 1 ? "s" : "",
- (long)diff_time.tv_sec,
-- diff_time.tv_nsec / 1000);
-+ (unsigned long)(diff_time.tv_nsec / 1000));
- conf = get_multipath_config();
- max_checkint = conf->max_checkint;
- put_multipath_config(conf);
-@@ -2646,7 +2646,7 @@ checkerloop (void *ap)
+--- multipath-tools-0.9.5/multipathd/main.c.orig 2023-04-06 08:47:48.000000000 +0200
++++ multipath-tools-0.9.5/multipathd/main.c 2023-07-19 18:37:52.197784505 +0200
+@@ -2640,7 +2640,7 @@ checkerloop (void *ap)
+ get_monotonic_time(&start_time);
+ timespecsub(&start_time, &last_time, &diff_time);
+ condlog(4, "tick (%ld.%06lu secs)",
+- (long)diff_time.tv_sec, diff_time.tv_nsec / 1000);
++ (long)diff_time.tv_sec, (unsigned long)(diff_time.tv_nsec / 1000));
+ last_time = start_time;
+ ticks = diff_time.tv_sec;
+ #ifdef USE_SYSTEMD
+@@ -2740,7 +2740,7 @@ unlock:
+ condlog(4, "checked %d path%s in %ld.%06lu secs",
+ num_paths, num_paths > 1 ? "s" : "",
+ (long)diff_time.tv_sec,
+- diff_time.tv_nsec / 1000);
++ (unsigned long)(diff_time.tv_nsec / 1000));
+ conf = get_multipath_config();
+ max_checkint = conf->max_checkint;
+ put_multipath_config(conf);
+@@ -2773,7 +2773,7 @@ unlock:
condlog(3, "waiting for %ld.%06lu secs",
(long)diff_time.tv_sec,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/multipath-tools.git/commitdiff/9b61a87a789b78d6ffec5c734b91dd0424fa1a87
More information about the pld-cvs-commit
mailing list