Accepting request 898905 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/898905
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sanlock?expand=0&rev=27

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="filename">sanlock</param>
-    <param name="revision">01b727adf1ce3c0ed5b95299d60f62bc66d98eb5</param>
+    <param name="revision">a181e951376d49a82eef17920c8ebedec80b4823</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://pagure.io/sanlock</param>

sanlock-3.8.2.tar.xz

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

sanlock-3.8.4.tar.xz

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

sanlock.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jun  9 19:58:35 UTC 2021 - James Fehlig <jfehlig@suse.com>
+
+- Update to sanlock 3.8.4
+  - sanlock: socket send and recv retries
+  - python: expose {get,set}_lvb
+  - sanlock: Shrink thread pool when there is no work
+  - config: Add max_worker_threads
+
 -------------------------------------------------------------------
 Fri Oct 23 20:58:29 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 

sanlock.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package sanlock
+# spec file
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 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.2
+Version:        3.8.4
 Release:        0
 %if ! %{with python}
 Summary:        A shared disk lock manager
@@ -245,6 +245,7 @@ getent passwd sanlock > /dev/null || useradd \
 %service_del_postun wdmd.service sanlock.service
 
 %postun -n libsanlock1 -p /sbin/ldconfig
+
 %postun -n fence-sanlock
 %service_del_postun fence_sanlockd.service
 
@@ -307,6 +308,7 @@ getent passwd sanlock > /dev/null || useradd \
 %endif
 
 %else
+
 %files %{python_files}
 %{python_sitearch}/sanlock*.so
 %{python_sitearch}/sanlock_python-%{version}*info

suse-no-date-time.patch

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

suse-systemd.patch

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