From 8bb7790de7c799734289d983f7697a2b196681a7f85ccd91cf796620745b4506 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 18 Oct 2022 17:46:53 +0000 Subject: [PATCH] Accepting request 1029797 from home:jfehlig:branches:Virtualization - Update to sanlock 3.8.5 - python: Replace distutils with setuptools - sanlock: fix memory leak of lockspace renewal_history - sanlock: fix pthread_create error check - sanlock: use helper to set max_sectors_kb OBS-URL: https://build.opensuse.org/request/show/1029797 OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=68 --- _service | 2 +- harden_fence_sanlockd.service.patch | 6 +++--- harden_sanlk-resetd.service.patch | 6 +++--- sanlock-3.8.4.tar.xz | 3 --- sanlock-3.8.5.tar.xz | 3 +++ sanlock.changes | 9 +++++++++ sanlock.spec | 7 ++++--- suse-no-date-time.patch | 14 +++++++------- suse-systemd.patch | 18 +++++++++--------- 9 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 sanlock-3.8.4.tar.xz create mode 100644 sanlock-3.8.5.tar.xz diff --git a/_service b/_service index eb2a124..3ea9c1d 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ sanlock - a181e951376d49a82eef17920c8ebedec80b4823 + b820c63093c4ae85d7da4f719cf3026d7fca5d09 git disable https://pagure.io/sanlock diff --git a/harden_fence_sanlockd.service.patch b/harden_fence_sanlockd.service.patch index 924b2fa..b287e6a 100644 --- a/harden_fence_sanlockd.service.patch +++ b/harden_fence_sanlockd.service.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.4/init.d/fence_sanlockd.service +Index: sanlock-3.8.5/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.4/init.d/fence_sanlockd.service +--- sanlock-3.8.5.orig/init.d/fence_sanlockd.service ++++ sanlock-3.8.5/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 f0898e5..64691e9 100644 --- a/harden_sanlk-resetd.service.patch +++ b/harden_sanlk-resetd.service.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.4/init.d/sanlk-resetd.service +Index: sanlock-3.8.5/init.d/sanlk-resetd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/sanlk-resetd.service -+++ sanlock-3.8.4/init.d/sanlk-resetd.service +--- sanlock-3.8.5.orig/init.d/sanlk-resetd.service ++++ sanlock-3.8.5/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.4.tar.xz b/sanlock-3.8.4.tar.xz deleted file mode 100644 index 1f0a57e..0000000 --- a/sanlock-3.8.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34cd7a27b59006904e40ee1146e0c6fb4006284f6bdb1a21ae69e612bd19fc90 -size 201988 diff --git a/sanlock-3.8.5.tar.xz b/sanlock-3.8.5.tar.xz new file mode 100644 index 0000000..18764ad --- /dev/null +++ b/sanlock-3.8.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a8c2485d9246614d4fd7a87589d5ceaf6a65d1484b2077b5a83c2fce8dba079 +size 202724 diff --git a/sanlock.changes b/sanlock.changes index 592337f..4232e65 100644 --- a/sanlock.changes +++ b/sanlock.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Oct 18 14:27:20 UTC 2022 - James Fehlig + +- Update to sanlock 3.8.5 + - python: Replace distutils with setuptools + - sanlock: fix memory leak of lockspace renewal_history + - sanlock: fix pthread_create error check + - sanlock: use helper to set max_sectors_kb + ------------------------------------------------------------------- Tue Nov 16 14:08:25 UTC 2021 - Johannes Segitz diff --git a/sanlock.spec b/sanlock.spec index b63b278..e352901 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,7 +1,7 @@ # -# spec file for package sanlock +# spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ %endif %define pname sanlock Name: %{pprefix}%{pname} -Version: 3.8.4 +Version: 3.8.5 Release: 0 %if ! %{with python} Summary: A shared disk lock manager @@ -65,6 +65,7 @@ Patch103: suse-no-date-time.patch Patch104: harden_fence_sanlockd.service.patch Patch105: harden_sanlk-resetd.service.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: libaio-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros diff --git a/suse-no-date-time.patch b/suse-no-date-time.patch index 6dda1a7..e537621 100644 --- a/suse-no-date-time.patch +++ b/suse-no-date-time.patch @@ -1,8 +1,8 @@ -Index: sanlock-3.8.4/src/main.c +Index: sanlock-3.8.5/src/main.c =================================================================== ---- sanlock-3.8.4.orig/src/main.c -+++ sanlock-3.8.4/src/main.c -@@ -2208,8 +2208,8 @@ static int read_command_line(int argc, 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 } if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { @@ -13,10 +13,10 @@ Index: sanlock-3.8.4/src/main.c exit(EXIT_SUCCESS); } -Index: sanlock-3.8.4/fence_sanlock/fence_sanlockd.c +Index: sanlock-3.8.5/fence_sanlock/fence_sanlockd.c =================================================================== ---- sanlock-3.8.4.orig/fence_sanlock/fence_sanlockd.c -+++ sanlock-3.8.4/fence_sanlock/fence_sanlockd.c +--- sanlock-3.8.5.orig/fence_sanlock/fence_sanlockd.c ++++ sanlock-3.8.5/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 09ba7c7..c508854 100644 --- a/suse-systemd.patch +++ b/suse-systemd.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.4/init.d/sanlock.service +Index: sanlock-3.8.5/init.d/sanlock.service =================================================================== ---- sanlock-3.8.4.orig/init.d/sanlock.service -+++ sanlock-3.8.4/init.d/sanlock.service +--- sanlock-3.8.5.orig/init.d/sanlock.service ++++ sanlock-3.8.5/init.d/sanlock.service @@ -5,8 +5,10 @@ Wants=wdmd.service [Service] @@ -15,10 +15,10 @@ Index: sanlock-3.8.4/init.d/sanlock.service [Install] WantedBy=multi-user.target -Index: sanlock-3.8.4/init.d/wdmd.service +Index: sanlock-3.8.5/init.d/wdmd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/wdmd.service -+++ sanlock-3.8.4/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] @@ -32,10 +32,10 @@ Index: sanlock-3.8.4/init.d/wdmd.service [Install] WantedBy=multi-user.target -Index: sanlock-3.8.4/init.d/fence_sanlockd.service +Index: sanlock-3.8.5/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.4.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.4/init.d/fence_sanlockd.service +--- sanlock-3.8.5.orig/init.d/fence_sanlockd.service ++++ sanlock-3.8.5/init.d/fence_sanlockd.service @@ -5,8 +5,8 @@ Before=corosync.service [Service]