pool/sanlock
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 820767 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to sanlock 3.8.1
  - python: add flake8 env
  - Add client debug logging
  _ Add per command debug logging
  - Misc bug fixes and improvements

OBS-URL: https://build.opensuse.org/request/show/820767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=59
This commit is contained in:
James Fehlig 2020-07-13 22:36:18 +00:00 committed by Git OBS Bridge
parent ba55dc992e
commit 64349bd16a
7 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sanlock-3.8.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7710b4cbf1faeacbfa7363d2e64284b3e190f5fe648db70b58db999f1a706064
size 262077

3
sanlock-3.8.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:943eb570d4cd9d24a63beae9d85d0a6f2127c04750ae9de6bb9fc6ed8c2fce6a
size 272945

12
sanlock-lto-disable-fpie.patch
View File

@ -1,14 +1,14 @@
Do not mix -fPIC and -FPIE, it is causing issue in LTO mode
(boo#1138836).
diff --git a/python/setup.py b/python/setup.py
index 91311a8..91b8b2f 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -11,7 +11,7 @@ sanlock = Extension(name='sanlock',
sources=['sanlock.c'],
Index: sanlock-3.8.1/python/setup.py
===================================================================
--- sanlock-3.8.1.orig/python/setup.py
+++ sanlock-3.8.1/python/setup.py
@@ -12,7 +12,7 @@ sanlock = Extension(name='sanlock',
include_dirs=['../src'],
library_dirs=['../src'],
extra_compile_args=["-std=c99"],
- extra_link_args=['-fPIE', '-Wl,-z,relro,-z,now'],
+ extra_link_args=['-Wl,-z,relro,-z,now'],
libraries=sanlocklib)

9
sanlock.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jul 13 21:39:12 UTC 2020 - James Fehlig <jfehlig@suse.com>
- Update to sanlock 3.8.1
- python: add flake8 env
- Add client debug logging
_ Add per command debug logging
- Misc bug fixes and improvements
-------------------------------------------------------------------
Fri Aug 16 07:37:30 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

6
sanlock.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package sanlock
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -28,12 +28,12 @@
%endif
%bcond_without python2
Name: sanlock
Version: 3.8.0
Version: 3.8.1
Release: 0
Summary: A shared disk lock manager
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Base
Url: https://pagure.io/sanlock
URL: https://pagure.io/sanlock
Source0: %{name}-%{version}.tar.gz
Source1: sysconfig.sanlock
Source2: sysconfig.wdmd

14
suse-no-date-time.patch
View File

@ -1,8 +1,8 @@
Index: sanlock-3.8.0/src/main.c
Index: sanlock-3.8.1/src/main.c
===================================================================
--- sanlock-3.8.0.orig/src/main.c
+++ sanlock-3.8.0/src/main.c
@@ -2126,8 +2126,8 @@ static int read_command_line(int argc, c
--- sanlock-3.8.1.orig/src/main.c
+++ sanlock-3.8.1/src/main.c
@@ -2183,8 +2183,8 @@ static int read_command_line(int argc, c
}
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {
@ -13,10 +13,10 @@ Index: sanlock-3.8.0/src/main.c
exit(EXIT_SUCCESS);
}
Index: sanlock-3.8.0/fence_sanlock/fence_sanlockd.c
Index: sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
===================================================================
--- sanlock-3.8.0.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.8.0/fence_sanlock/fence_sanlockd.c
--- sanlock-3.8.1.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

18
suse-systemd.patch
View File

@ -1,7 +1,7 @@
Index: sanlock-3.8.0/init.d/sanlock.service
Index: sanlock-3.8.1/init.d/sanlock.service
===================================================================
--- sanlock-3.8.0.orig/init.d/sanlock.service
+++ sanlock-3.8.0/init.d/sanlock.service
--- sanlock-3.8.1.orig/init.d/sanlock.service
+++ sanlock-3.8.1/init.d/sanlock.service
@@ -5,8 +5,10 @@ Wants=wdmd.service
[Service]
@ -15,10 +15,10 @@ Index: sanlock-3.8.0/init.d/sanlock.service
[Install]
WantedBy=multi-user.target
Index: sanlock-3.8.0/init.d/wdmd.service
Index: sanlock-3.8.1/init.d/wdmd.service
===================================================================
--- sanlock-3.8.0.orig/init.d/wdmd.service
+++ sanlock-3.8.0/init.d/wdmd.service
--- sanlock-3.8.1.orig/init.d/wdmd.service
+++ sanlock-3.8.1/init.d/wdmd.service
@@ -4,8 +4,10 @@ After=syslog.target
[Service]
@ -32,10 +32,10 @@ Index: sanlock-3.8.0/init.d/wdmd.service
[Install]
WantedBy=multi-user.target
Index: sanlock-3.8.0/init.d/fence_sanlockd.service
Index: sanlock-3.8.1/init.d/fence_sanlockd.service
===================================================================
--- sanlock-3.8.0.orig/init.d/fence_sanlockd.service
+++ sanlock-3.8.0/init.d/fence_sanlockd.service
--- sanlock-3.8.1.orig/init.d/fence_sanlockd.service
+++ sanlock-3.8.1/init.d/fence_sanlockd.service
@@ -5,8 +5,8 @@ Before=corosync.service
[Service]