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
This commit is contained in:
parent
28c58ae561
commit
8bb7790de7
2
_service
2
_service
@ -1,7 +1,7 @@
|
|||||||
<services>
|
<services>
|
||||||
<service name="tar_scm" mode="disabled">
|
<service name="tar_scm" mode="disabled">
|
||||||
<param name="filename">sanlock</param>
|
<param name="filename">sanlock</param>
|
||||||
<param name="revision">a181e951376d49a82eef17920c8ebedec80b4823</param>
|
<param name="revision">b820c63093c4ae85d7da4f719cf3026d7fca5d09</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="submodules">disable</param>
|
<param name="submodules">disable</param>
|
||||||
<param name="url">https://pagure.io/sanlock</param>
|
<param name="url">https://pagure.io/sanlock</param>
|
||||||
|
@ -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.5.orig/init.d/fence_sanlockd.service
|
||||||
+++ sanlock-3.8.4/init.d/fence_sanlockd.service
|
+++ sanlock-3.8.5/init.d/fence_sanlockd.service
|
||||||
@@ -4,6 +4,17 @@ After=syslog.target wdmd.service sanlock
|
@@ -4,6 +4,17 @@ After=syslog.target wdmd.service sanlock
|
||||||
Before=corosync.service
|
Before=corosync.service
|
||||||
|
|
||||||
|
@ -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.5.orig/init.d/sanlk-resetd.service
|
||||||
+++ sanlock-3.8.4/init.d/sanlk-resetd.service
|
+++ sanlock-3.8.5/init.d/sanlk-resetd.service
|
||||||
@@ -4,6 +4,17 @@ After=wdmd.service sanlock.service
|
@@ -4,6 +4,17 @@ After=wdmd.service sanlock.service
|
||||||
Requires=wdmd.service sanlock.service
|
Requires=wdmd.service sanlock.service
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:34cd7a27b59006904e40ee1146e0c6fb4006284f6bdb1a21ae69e612bd19fc90
|
|
||||||
size 201988
|
|
3
sanlock-3.8.5.tar.xz
Normal file
3
sanlock-3.8.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6a8c2485d9246614d4fd7a87589d5ceaf6a65d1484b2077b5a83c2fce8dba079
|
||||||
|
size 202724
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 18 14:27:20 UTC 2022 - James Fehlig <jfehlig@suse.com>
|
||||||
|
|
||||||
|
- 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 <jsegitz@suse.com>
|
Tue Nov 16 14:08:25 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
|
||||||
|
|
||||||
|
@ -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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -40,7 +40,7 @@
|
|||||||
%endif
|
%endif
|
||||||
%define pname sanlock
|
%define pname sanlock
|
||||||
Name: %{pprefix}%{pname}
|
Name: %{pprefix}%{pname}
|
||||||
Version: 3.8.4
|
Version: 3.8.5
|
||||||
Release: 0
|
Release: 0
|
||||||
%if ! %{with python}
|
%if ! %{with python}
|
||||||
Summary: A shared disk lock manager
|
Summary: A shared disk lock manager
|
||||||
@ -65,6 +65,7 @@ Patch103: suse-no-date-time.patch
|
|||||||
Patch104: harden_fence_sanlockd.service.patch
|
Patch104: harden_fence_sanlockd.service.patch
|
||||||
Patch105: harden_sanlk-resetd.service.patch
|
Patch105: harden_sanlk-resetd.service.patch
|
||||||
BuildRequires: %{python_module devel}
|
BuildRequires: %{python_module devel}
|
||||||
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: libaio-devel
|
BuildRequires: libaio-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
|
@ -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.5.orig/src/main.c
|
||||||
+++ sanlock-3.8.4/src/main.c
|
+++ sanlock-3.8.5/src/main.c
|
||||||
@@ -2208,8 +2208,8 @@ static int read_command_line(int argc, c
|
@@ -2209,8 +2209,8 @@ static int read_command_line(int argc, c
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {
|
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {
|
||||||
@ -13,10 +13,10 @@ Index: sanlock-3.8.4/src/main.c
|
|||||||
exit(EXIT_SUCCESS);
|
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.5.orig/fence_sanlock/fence_sanlockd.c
|
||||||
+++ sanlock-3.8.4/fence_sanlock/fence_sanlockd.c
|
+++ sanlock-3.8.5/fence_sanlock/fence_sanlockd.c
|
||||||
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
|
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
|
||||||
print_usage();
|
print_usage();
|
||||||
exit(0);
|
exit(0);
|
||||||
|
@ -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.5.orig/init.d/sanlock.service
|
||||||
+++ sanlock-3.8.4/init.d/sanlock.service
|
+++ sanlock-3.8.5/init.d/sanlock.service
|
||||||
@@ -5,8 +5,10 @@ Wants=wdmd.service
|
@@ -5,8 +5,10 @@ Wants=wdmd.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
@ -15,10 +15,10 @@ Index: sanlock-3.8.4/init.d/sanlock.service
|
|||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
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.5.orig/init.d/wdmd.service
|
||||||
+++ sanlock-3.8.4/init.d/wdmd.service
|
+++ sanlock-3.8.5/init.d/wdmd.service
|
||||||
@@ -4,8 +4,10 @@ After=syslog.target
|
@@ -4,8 +4,10 @@ After=syslog.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
@ -32,10 +32,10 @@ Index: sanlock-3.8.4/init.d/wdmd.service
|
|||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
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.5.orig/init.d/fence_sanlockd.service
|
||||||
+++ sanlock-3.8.4/init.d/fence_sanlockd.service
|
+++ sanlock-3.8.5/init.d/fence_sanlockd.service
|
||||||
@@ -5,8 +5,8 @@ Before=corosync.service
|
@@ -5,8 +5,8 @@ Before=corosync.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
Loading…
Reference in New Issue
Block a user