Accepting request 554610 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/554610
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sanlock?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2017-12-12 20:16:54 +00:00 committed by Git OBS Bridge
commit 5254a45602
7 changed files with 41 additions and 31 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:354f2c75f28fb5d4a20474579be415d2528cc65e53c273a74689953d9d97b4b4
size 219144

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

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

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Dec 5 18:53:41 UTC 2017 - jfehlig@suse.com
- Update to sanlock 3.6.0
- preserve dblock values when setting shared flag
- fix detection of shared lease
- fix release interference with paxos
- retry ballot when new lver is seen
- add a NOWAIT flag for convert
-------------------------------------------------------------------
Thu Nov 23 13:47:59 UTC 2017 - rbrown@suse.com

View File

@ -30,7 +30,7 @@
%endif
Name: sanlock
Version: 3.5.0
Version: 3.6.0
Release: 0
Summary: A shared disk lock manager
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+

View File

@ -1,7 +1,7 @@
Index: sanlock-3.5.0/fence_sanlock/Makefile
Index: sanlock-3.6.0/fence_sanlock/Makefile
===================================================================
--- sanlock-3.5.0.orig/fence_sanlock/Makefile
+++ sanlock-3.5.0/fence_sanlock/Makefile
--- sanlock-3.6.0.orig/fence_sanlock/Makefile
+++ sanlock-3.6.0/fence_sanlock/Makefile
@@ -35,7 +35,7 @@ CFLAGS += -DVERSION=\"$(VER)\" -I../src
CFLAGS += -fPIE -DPIE
@ -11,10 +11,10 @@ Index: sanlock-3.5.0/fence_sanlock/Makefile
all: $(TARGET1) $(TARGET2)
Index: sanlock-3.5.0/src/Makefile
Index: sanlock-3.6.0/src/Makefile
===================================================================
--- sanlock-3.5.0.orig/src/Makefile
+++ sanlock-3.5.0/src/Makefile
--- sanlock-3.6.0.orig/src/Makefile
+++ sanlock-3.6.0/src/Makefile
@@ -96,17 +96,16 @@ CFLAGS += -DVERSION=\"$(VER)\"
CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE
@ -37,10 +37,10 @@ Index: sanlock-3.5.0/src/Makefile
ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so
ln -sf $(LIBSO_ENTIRE_TARGET) $(LIB_ENTIRE_TARGET).so.$(SOMAJOR)
Index: sanlock-3.5.0/tests/Makefile
Index: sanlock-3.6.0/tests/Makefile
===================================================================
--- sanlock-3.5.0.orig/tests/Makefile
+++ sanlock-3.5.0/tests/Makefile
--- sanlock-3.6.0.orig/tests/Makefile
+++ sanlock-3.6.0/tests/Makefile
@@ -34,7 +34,7 @@ CFLAGS += -D_GNU_SOURCE -g \
-fasynchronous-unwind-tables \
-fdiagnostics-show-option
@ -50,10 +50,10 @@ Index: sanlock-3.5.0/tests/Makefile
all: $(TARGET1) $(TARGET2) $(TARGET3) $(TARGET4) $(TARGET5) $(TARGET6) $(TARGET7)
Index: sanlock-3.5.0/reset/Makefile
Index: sanlock-3.6.0/reset/Makefile
===================================================================
--- sanlock-3.5.0.orig/reset/Makefile
+++ sanlock-3.5.0/reset/Makefile
--- sanlock-3.6.0.orig/reset/Makefile
+++ sanlock-3.6.0/reset/Makefile
@@ -35,7 +35,7 @@ CFLAGS += -DVERSION=\"$(VER)\" -I../src
CFLAGS += -fPIE -DPIE

View File

@ -1,7 +1,7 @@
Index: sanlock-3.5.0/src/main.c
Index: sanlock-3.6.0/src/main.c
===================================================================
--- sanlock-3.5.0.orig/src/main.c
+++ sanlock-3.5.0/src/main.c
--- sanlock-3.6.0.orig/src/main.c
+++ sanlock-3.6.0/src/main.c
@@ -1904,8 +1904,8 @@ static int read_command_line(int argc, c
}
@ -13,10 +13,10 @@ Index: sanlock-3.5.0/src/main.c
exit(EXIT_SUCCESS);
}
Index: sanlock-3.5.0/fence_sanlock/fence_sanlockd.c
Index: sanlock-3.6.0/fence_sanlock/fence_sanlockd.c
===================================================================
--- sanlock-3.5.0.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.5.0/fence_sanlock/fence_sanlockd.c
--- sanlock-3.6.0.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.6.0/fence_sanlock/fence_sanlockd.c
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

View File

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