diff --git a/_service b/_service index 3ea9c1d..ea66971 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ sanlock - b820c63093c4ae85d7da4f719cf3026d7fca5d09 + 79b35bba8298f4444923c15e11bed38380cb18ee git disable https://pagure.io/sanlock diff --git a/harden_fence_sanlockd.service.patch b/harden_fence_sanlockd.service.patch index b287e6a..da04d98 100644 --- a/harden_fence_sanlockd.service.patch +++ b/harden_fence_sanlockd.service.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.5/init.d/fence_sanlockd.service +Index: sanlock-3.9.3/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.5.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.5/init.d/fence_sanlockd.service +--- sanlock-3.9.3.orig/init.d/fence_sanlockd.service ++++ sanlock-3.9.3/init.d/fence_sanlockd.service @@ -4,6 +4,17 @@ After=syslog.target wdmd.service sanlock Before=corosync.service diff --git a/harden_sanlk-resetd.service.patch b/harden_sanlk-resetd.service.patch index 64691e9..b4a880c 100644 --- a/harden_sanlk-resetd.service.patch +++ b/harden_sanlk-resetd.service.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.5/init.d/sanlk-resetd.service +Index: sanlock-3.9.3/init.d/sanlk-resetd.service =================================================================== ---- sanlock-3.8.5.orig/init.d/sanlk-resetd.service -+++ sanlock-3.8.5/init.d/sanlk-resetd.service +--- sanlock-3.9.3.orig/init.d/sanlk-resetd.service ++++ sanlock-3.9.3/init.d/sanlk-resetd.service @@ -4,6 +4,17 @@ After=wdmd.service sanlock.service Requires=wdmd.service sanlock.service diff --git a/sanlock-3.8.5.tar.xz b/sanlock-3.8.5.tar.xz deleted file mode 100644 index 18764ad..0000000 --- a/sanlock-3.8.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a8c2485d9246614d4fd7a87589d5ceaf6a65d1484b2077b5a83c2fce8dba079 -size 202724 diff --git a/sanlock-3.9.3.tar.xz b/sanlock-3.9.3.tar.xz new file mode 100644 index 0000000..ab1cf7d --- /dev/null +++ b/sanlock-3.9.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c08bdf5c62ae514281efc96063cf87dc96ca6247b580d5080d356060726e1c35 +size 208896 diff --git a/sanlock-SCHED_RESET_ON_FORK-undefined.patch b/sanlock-SCHED_RESET_ON_FORK-undefined.patch index fa418b6..0852ffa 100644 --- a/sanlock-SCHED_RESET_ON_FORK-undefined.patch +++ b/sanlock-SCHED_RESET_ON_FORK-undefined.patch @@ -17,7 +17,7 @@ Index: wdmd/main.c =================================================================== --- wdmd/main.c.orig +++ wdmd/main.c -@@ -41,6 +41,10 @@ +@@ -43,6 +43,10 @@ #define GNUC_UNUSED __attribute__((__unused__)) #endif diff --git a/sanlock.changes b/sanlock.changes index a1bd590..297fc67 100644 --- a/sanlock.changes +++ b/sanlock.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jun 3 22:54:40 UTC 2024 - James Fehlig + +- Update to sanlock 3.9.3 + - Make the watchdog timeout configurable + - wdmd: close watchdog when not used + - userstorage: replace by PyPI userstorage + - sanlock: skip short delay in delta lease reacquire + - sanlock: use product_uuid for host name + - wdmd: fix timing for iTCO_wdt + - sanlock: save client_id in token and report in status and use in -C + - sanlock: include startup message in syslog + - sanlock: improve repeated ballots in paxos_acquire + - sanlock: fix zero io timeout for direct requests + - sanlock: fix release writing zero dblock values + - sanlock: skip delay when same host acquires delta lease + ------------------------------------------------------------------- Mon Feb 26 13:04:34 UTC 2024 - Dominique Leuenberger diff --git a/sanlock.spec b/sanlock.spec index effc2b7..2851dec 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -40,7 +40,7 @@ %endif %define pname sanlock Name: %{pprefix}%{pname} -Version: 3.8.5 +Version: 3.9.3 Release: 0 %if ! %{with python} Summary: A shared disk lock manager diff --git a/suse-no-date-time.patch b/suse-no-date-time.patch index e537621..ad4faeb 100644 --- a/suse-no-date-time.patch +++ b/suse-no-date-time.patch @@ -1,8 +1,8 @@ -Index: sanlock-3.8.5/src/main.c +Index: sanlock-3.9.3/src/main.c =================================================================== ---- sanlock-3.8.5.orig/src/main.c -+++ sanlock-3.8.5/src/main.c -@@ -2209,8 +2209,8 @@ static int read_command_line(int argc, c +--- sanlock-3.9.3.orig/src/main.c ++++ sanlock-3.9.3/src/main.c +@@ -2334,8 +2334,8 @@ static int read_command_line(int argc, c } if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { @@ -13,10 +13,10 @@ Index: sanlock-3.8.5/src/main.c exit(EXIT_SUCCESS); } -Index: sanlock-3.8.5/fence_sanlock/fence_sanlockd.c +Index: sanlock-3.9.3/fence_sanlock/fence_sanlockd.c =================================================================== ---- sanlock-3.8.5.orig/fence_sanlock/fence_sanlockd.c -+++ sanlock-3.8.5/fence_sanlock/fence_sanlockd.c +--- sanlock-3.9.3.orig/fence_sanlock/fence_sanlockd.c ++++ sanlock-3.9.3/fence_sanlock/fence_sanlockd.c @@ -565,8 +565,7 @@ int main(int argc, char *argv[]) print_usage(); exit(0); diff --git a/suse-systemd.patch b/suse-systemd.patch index c508854..7a6c8a9 100644 --- a/suse-systemd.patch +++ b/suse-systemd.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.5/init.d/sanlock.service +Index: sanlock-3.9.3/init.d/sanlock.service =================================================================== ---- sanlock-3.8.5.orig/init.d/sanlock.service -+++ sanlock-3.8.5/init.d/sanlock.service +--- sanlock-3.9.3.orig/init.d/sanlock.service ++++ sanlock-3.9.3/init.d/sanlock.service @@ -5,8 +5,10 @@ Wants=wdmd.service [Service] @@ -15,16 +15,15 @@ Index: sanlock-3.8.5/init.d/sanlock.service [Install] WantedBy=multi-user.target -Index: sanlock-3.8.5/init.d/wdmd.service +Index: sanlock-3.9.3/init.d/wdmd.service =================================================================== ---- sanlock-3.8.5.orig/init.d/wdmd.service -+++ sanlock-3.8.5/init.d/wdmd.service -@@ -4,8 +4,10 @@ After=syslog.target - - [Service] +--- sanlock-3.9.3.orig/init.d/wdmd.service ++++ sanlock-3.9.3/init.d/wdmd.service +@@ -6,7 +6,10 @@ After=syslog.target Type=forking --ExecStart=/lib/systemd/systemd-wdmd start --ExecStop=/lib/systemd/systemd-wdmd stop + ExecStartPre=/lib/systemd/systemd-wdmd watchdog-check + ExecStart=/usr/sbin/wdmd +-SendSIGKILL=no +EnvironmentFile=-/etc/sysconfig/wdmd +ExecStart=/usr/sbin/wdmd $WDMDOPTS +ExecStop=/bin/kill -TERM $MAINPID @@ -32,10 +31,10 @@ Index: sanlock-3.8.5/init.d/wdmd.service [Install] WantedBy=multi-user.target -Index: sanlock-3.8.5/init.d/fence_sanlockd.service +Index: sanlock-3.9.3/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.5.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.5/init.d/fence_sanlockd.service +--- sanlock-3.9.3.orig/init.d/fence_sanlockd.service ++++ sanlock-3.9.3/init.d/fence_sanlockd.service @@ -5,8 +5,8 @@ Before=corosync.service [Service]