Accepting request 109771 from Virtualization

- Update to sanlock 2.1
  - python: release leases for other processes
  - python: add shared resource parameter to acquire
  - add a logrotate file
  - status for all shared tokens
  - retry transient sh failures
  - fix inquire state string

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

sanlock-1.9.tar.gz

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

sanlock-2.1.tar.bz2

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

sanlock-SCHED_RESET_ON_FORK-undefined.patch

@@ -2,9 +2,9 @@ Index: src/main.c
 ===================================================================
 --- src/main.c.orig
 +++ src/main.c
-@@ -50,6 +50,10 @@
- #include "client_cmd.h"
- #include "cmd.h"
+@@ -52,6 +52,10 @@
+ 
+ #define RELEASE_VERSION "2.1"
  
 +#ifndef SCHED_RESET_ON_FORK
 +#define SCHED_RESET_ON_FORK 0
@@ -19,7 +19,7 @@ Index: wdmd/main.c
 +++ wdmd/main.c
 @@ -43,6 +43,10 @@
  
- #define RELEASE_VERSION "1.9"
+ #define RELEASE_VERSION "2.1"
  
 +#ifndef SCHED_RESET_ON_FORK
 +#define SCHED_RESET_ON_FORK 0

sanlock.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar 13 12:04:11 MDT 2012 - jfehlig@suse.com
+
+- Update to sanlock 2.1
+  - python: release leases for other processes
+  - python: add shared resource parameter to acquire
+  - add a logrotate file
+  - status for all shared tokens
+  - retry transient sh failures
+  - fix inquire state string
+
 -------------------------------------------------------------------
 Wed Jan 25 11:03:43 MST 2012 - jfehlig@suse.com
 

sanlock.spec

@@ -15,22 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define with_systemd       0
 %if 0%{?suse_version} > 1140
 %define with_systemd       1
 %endif
 
-
 Name:           sanlock
-Version:        1.9
+Version:        2.1
 Release:        1%{?dist}
 Summary:        A shared disk lock manager
-
-Group:          System/Base
 License:        GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+
-URL:            https://fedorahosted.org/sanlock/
+Group:          System/Base
+
+Url:            https://fedorahosted.org/sanlock/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libblkid-devel libaio-devel python python-devel
+BuildRequires:  libaio-devel
+BuildRequires:  libblkid-devel
+BuildRequires:  python
+BuildRequires:  python-devel
 %if %{with_systemd}
 BuildRequires:  systemd
 %{?systemd_requires}
@@ -39,7 +42,7 @@ Requires(pre):  %insserv_prereq %fillup_prereq
 Requires:       %{name}-lib = %{version}-%{release}
 # Latest version available at
 # https://fedorahosted.org/releases/s/a/sanlock/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.bz2
 Source1:        sanlock.init
 Source2:        wdmd.init
 Source3:        sysconfig.sanlock

suse-no-date-time.patch

@@ -1,8 +1,8 @@
-Index: sanlock-1.9/src/main.c
+Index: sanlock-2.1/src/main.c
 ===================================================================
---- sanlock-1.9.orig/src/main.c
-+++ sanlock-1.9/src/main.c
-@@ -1430,8 +1430,7 @@ static int read_command_line(int argc, c
+--- sanlock-2.1.orig/src/main.c
++++ sanlock-2.1/src/main.c
+@@ -1439,8 +1439,7 @@ static int read_command_line(int argc, c
  
  	if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") ||
  	    !strcmp(arg1, "-V")) {

suse-systemd.patch

@@ -1,7 +1,7 @@
-Index: sanlock-1.9/init.d/sanlock.service
+Index: sanlock-2.1/init.d/sanlock.service
 ===================================================================
---- sanlock-1.9.orig/init.d/sanlock.service
-+++ sanlock-1.9/init.d/sanlock.service
+--- sanlock-2.1.orig/init.d/sanlock.service
++++ sanlock-2.1/init.d/sanlock.service
 @@ -3,8 +3,9 @@ After=syslog.target wdmd.service
  
  [Service]
@@ -14,10 +14,10 @@ Index: sanlock-1.9/init.d/sanlock.service
  
  [Install]
  WantedBy=multi-user.target
-Index: sanlock-1.9/init.d/wdmd.service
+Index: sanlock-2.1/init.d/wdmd.service
 ===================================================================
---- sanlock-1.9.orig/init.d/wdmd.service
-+++ sanlock-1.9/init.d/wdmd.service
+--- sanlock-2.1.orig/init.d/wdmd.service
++++ sanlock-2.1/init.d/wdmd.service
 @@ -3,8 +3,8 @@ After=syslog.target
  
  [Service]