Accepting request 828552 from home:jfehlig:branches:Virtualization

- Update to sanlock 3.8.2 - Remove extra link args - Add write_init_io_timeout - Disable high_priority SCHED_RR by default - Dropped patches: sanlock-lto-disable-fpie.patch - Add tar_scm source service and use xz compression OBS-URL: https://build.opensuse.org/request/show/828552 OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=61
2020-08-21 17:07:44 +00:00 · 2020-08-21 17:07:44 +00:00 · 6bcd7e7869
commit 6bcd7e7869
parent 64349bd16a
8 changed files with 48 additions and 38 deletions
--- a/17
+++ b/17
@ -0,0 +1,17 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="filename">sanlock</param>
+    <param name="revision">01b727adf1ce3c0ed5b95299d60f62bc66d98eb5</param>
+    <param name="scm">git</param>
+    <param name="submodules">disable</param>
+    <param name="url">https://pagure.io/sanlock</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">^sanlock[-]?(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>
--- a/sanlock-3.8.1.tar.gz
+++ b/sanlock-3.8.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:943eb570d4cd9d24a63beae9d85d0a6f2127c04750ae9de6bb9fc6ed8c2fce6a
-size 272945
--- a/sanlock-3.8.2.tar.xz
+++ b/sanlock-3.8.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0a2235309b513bcec38fb773a0d96cbed55d5fcd7ba95862efdd043059f2439
+size 199544
--- a/sanlock-lto-disable-fpie.patch
+++ b/sanlock-lto-disable-fpie.patch
@ -1,16 +0,0 @@
-Do not mix -fPIC and -FPIE, it is causing issue in LTO mode
-(boo#1138836).
-
-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)
- 
- version = None
--- a/sanlock.changes
+++ b/sanlock.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Aug 18 22:48:21 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- Update to sanlock 3.8.2
+  - Remove extra link args
+  - Add write_init_io_timeout
+  - Disable high_priority SCHED_RR by default
+  - Dropped patches:
+    sanlock-lto-disable-fpie.patch
+- Add tar_scm source service and use xz compression
+
 -------------------------------------------------------------------
 Mon Jul 13 21:39:12 UTC 2020 - James Fehlig <jfehlig@suse.com>

--- a/sanlock.spec
+++ b/sanlock.spec
@ -28,13 +28,13 @@
 %endif
 %bcond_without python2
 Name:           sanlock
-Version:        3.8.1
+Version:        3.8.2
 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
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        sysconfig.sanlock
 Source2:        sysconfig.wdmd
 Source3:        fence_sanlockd.init
@ -44,7 +44,6 @@ Patch100:       sanlock-SCHED_RESET_ON_FORK-undefined.patch
 Patch101:       sanlock-python-prefix.patch
 Patch102:       suse-systemd.patch
 Patch103:       suse-no-date-time.patch
-Patch104:       sanlock-lto-disable-fpie.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  libaio-devel
 BuildRequires:  pkgconfig
@ -131,7 +130,6 @@ common sanlock lockspace.
 %patch101
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1

 %build
 # upstream does not require configure
--- a/suse-no-date-time.patch
+++ b/suse-no-date-time.patch
@ -1,7 +1,7 @@
-Index: sanlock-3.8.1/src/main.c
+Index: sanlock-3.8.2/src/main.c
 ===================================================================
--- sanlock-3.8.1.orig/src/main.c
-+++ sanlock-3.8.1/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
 	}
 
@ -13,10 +13,10 @@ Index: sanlock-3.8.1/src/main.c
 		exit(EXIT_SUCCESS);
 	}
 
-Index: sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.8.2/fence_sanlock/fence_sanlockd.c
 ===================================================================
--- sanlock-3.8.1.orig/fence_sanlock/fence_sanlockd.c
-+++ sanlock-3.8.1/fence_sanlock/fence_sanlockd.c
+--- sanlock-3.8.2.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.8.2/fence_sanlock/fence_sanlockd.c
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
 			print_usage();
 			exit(0);
--- a/suse-systemd.patch
+++ b/suse-systemd.patch
@ -1,7 +1,7 @@
-Index: sanlock-3.8.1/init.d/sanlock.service
+Index: sanlock-3.8.2/init.d/sanlock.service
 ===================================================================
--- sanlock-3.8.1.orig/init.d/sanlock.service
-+++ sanlock-3.8.1/init.d/sanlock.service
+--- sanlock-3.8.2.orig/init.d/sanlock.service
+++ sanlock-3.8.2/init.d/sanlock.service
@@ -5,8 +5,10 @@ Wants=wdmd.service
 
 [Service]
@ -15,10 +15,10 @@ Index: sanlock-3.8.1/init.d/sanlock.service
 
 [Install]
 WantedBy=multi-user.target
-Index: sanlock-3.8.1/init.d/wdmd.service
+Index: sanlock-3.8.2/init.d/wdmd.service
 ===================================================================
--- sanlock-3.8.1.orig/init.d/wdmd.service
-+++ sanlock-3.8.1/init.d/wdmd.service
+--- sanlock-3.8.2.orig/init.d/wdmd.service
+++ sanlock-3.8.2/init.d/wdmd.service
@@ -4,8 +4,10 @@ After=syslog.target
 
 [Service]
@ -32,10 +32,10 @@ Index: sanlock-3.8.1/init.d/wdmd.service
 
 [Install]
 WantedBy=multi-user.target
-Index: sanlock-3.8.1/init.d/fence_sanlockd.service
+Index: sanlock-3.8.2/init.d/fence_sanlockd.service
 ===================================================================
--- sanlock-3.8.1.orig/init.d/fence_sanlockd.service
-+++ sanlock-3.8.1/init.d/fence_sanlockd.service
+--- sanlock-3.8.2.orig/init.d/fence_sanlockd.service
+++ sanlock-3.8.2/init.d/fence_sanlockd.service
@@ -5,8 +5,8 @@ Before=corosync.service
 
 [Service]