Hello community,
here is the log from the commit of package sanlock for openSUSE:Factory checked
in at 2019-03-26 15:36:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sanlock (Old)
and /work/SRC/openSUSE:Factory/.sanlock.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sanlock"
Tue Mar 26 15:36:13 2019 rev:19 rq:687477 version:3.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/sanlock/sanlock.changes 2018-03-30
11:59:32.810821312 +0200
+++ /work/SRC/openSUSE:Factory/.sanlock.new.25356/sanlock.changes
2019-03-26 15:36:15.796401246 +0100
@@ -1,0 +2,13 @@
+Thu Mar 21 20:27:25 UTC 2019 - Jim Fehlig <jfeh...@suse.com>
+
+- Update to sanlock 3.7.0
+ - Allow setting max_sectors_kb
+ - Configurable sector size and align size
+ - Support SANLOCK_RUN_DIR and SANLOCK_PRIVILEGED environment
+ variables
+ - Revert upstream commit forcing use of python2
+ revert-5d535c0d-py2.patch
+ - Dropped patches:
+ sanlock-old_blkid.patch, suse-fix-link-errors.patch
+
+-------------------------------------------------------------------
Old:
----
sanlock-3.6.0.tar.gz
sanlock-old_blkid.patch
suse-fix-link-errors.patch
New:
----
revert-5d535c0d-py2.patch
sanlock-3.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sanlock.spec ++++++
--- /var/tmp/diff_new_pack.Mja3c1/_old 2019-03-26 15:36:16.740400850 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new 2019-03-26 15:36:16.740400850 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sanlock
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
%endif
%bcond_without python2
Name: sanlock
-Version: 3.6.0
+Version: 3.7.0
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
@@ -40,14 +40,12 @@
Source3: fence_sanlockd.init
# Upstream patches
# SUSE patches
-Patch100: sanlock-SCHED_RESET_ON_FORK-undefined.patch
-Patch101: sanlock-python-prefix.patch
-Patch102: sanlock-old_blkid.patch
+Patch100: revert-5d535c0d-py2.patch
+Patch101: sanlock-SCHED_RESET_ON_FORK-undefined.patch
+Patch102: sanlock-python-prefix.patch
Patch103: suse-systemd.patch
Patch104: suse-no-date-time.patch
-# bsc#1030060
-Patch105: suse-fix-link-errors.patch
-Patch106: sanlock-python3.patch
+Patch105: sanlock-python3.patch
BuildRequires: %{python_module devel}
BuildRequires: libaio-devel
BuildRequires: pkgconfig
@@ -129,13 +127,12 @@
%prep
%setup -q
-%patch100
+%patch100 -p1
%patch101
%patch102
%patch103 -p1
%patch104 -p1
%patch105 -p1
-%patch106 -p1
%build
# upstream does not require configure
++++++ revert-5d535c0d-py2.patch ++++++
commit d4fc2914b1847202d9dc26df89954766b27921d6
Author: Jim Fehlig <jfeh...@suse.com>
Date: Thu Mar 21 11:20:29 2019 -0600
Revert "python: Fix build on Fedora 29"
This reverts commit 5d535c0d800a84665879f6dc50c87915cf6657da. We
don't want it on SUSE where there is no python2.
Index: sanlock-3.7.0/python/Makefile
===================================================================
--- sanlock-3.7.0.orig/python/Makefile
+++ sanlock-3.7.0/python/Makefile
@@ -5,13 +5,13 @@
# of the GNU General Public License v.2.
all:
- python2 setup.py build
+ python setup.py build
inplace:
- python2 setup.py build_ext --inplace
+ python setup.py build_ext --inplace
install:
- python2 setup.py install --root=$(DESTDIR)
+ python setup.py install --root=$(DESTDIR)
clean:
rm -rf build
++++++ sanlock-3.6.0.tar.gz -> sanlock-3.7.0.tar.gz ++++++
++++ 9964 lines of diff (skipped)
++++++ sanlock-python-prefix.patch ++++++
--- /var/tmp/diff_new_pack.Mja3c1/_old 2019-03-26 15:36:16.872400795 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new 2019-03-26 15:36:16.872400795 +0100
@@ -2,8 +2,8 @@
===================================================================
--- python/Makefile.orig
+++ python/Makefile
-@@ -8,7 +8,7 @@ all:
- python setup.py build
+@@ -11,7 +11,7 @@ inplace:
+ python setup.py build_ext --inplace
install:
- python setup.py install --root=$(DESTDIR)
++++++ sanlock-python3.patch ++++++
--- /var/tmp/diff_new_pack.Mja3c1/_old 2019-03-26 15:36:16.884400790 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new 2019-03-26 15:36:16.884400790 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-3.6.0/python/sanlock.c
+Index: sanlock-3.7.0/python/sanlock.c
===================================================================
---- sanlock-3.6.0.orig/python/sanlock.c
-+++ sanlock-3.6.0/python/sanlock.c
+--- sanlock-3.7.0.orig/python/sanlock.c
++++ sanlock-3.7.0/python/sanlock.c
@@ -12,6 +12,10 @@
#include <sanlock_admin.h>
#include <sanlock_direct.h>
@@ -31,7 +31,7 @@
/* Functions prototypes */
static void __set_exception(int en, char *msg) __sets_exception;
static int __parse_resource(PyObject *obj, struct sanlk_resource **res_ret)
__neg_sets_exception;
-@@ -102,14 +117,27 @@ __parse_resource(PyObject *obj, struct s
+@@ -103,14 +118,27 @@ __parse_resource(PyObject *obj, struct s
path = PyTuple_GetItem(tuple, 0);
offset = PyTuple_GetItem(tuple, 1);
@@ -59,7 +59,7 @@
}
if (p == NULL) {
-@@ -122,7 +150,11 @@ __parse_resource(PyObject *obj, struct s
+@@ -123,7 +151,11 @@ __parse_resource(PyObject *obj, struct s
if (offset == NULL) {
res->disks[i].offset = 0;
} else {
@@ -71,7 +71,7 @@
}
}
-@@ -149,7 +181,11 @@ __hosts_to_list(struct sanlk_host *hss,
+@@ -150,7 +182,11 @@ __hosts_to_list(struct sanlk_host *hss,
goto exit_fail;
/* fill the dictionary information: host_id */
@@ -83,7 +83,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "host_id", ls_value);
Py_DECREF(ls_value);
-@@ -157,7 +193,11 @@ __hosts_to_list(struct sanlk_host *hss,
+@@ -158,7 +194,11 @@ __hosts_to_list(struct sanlk_host *hss,
goto exit_fail;
/* fill the dictionary information: generation */
@@ -95,7 +95,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "generation", ls_value);
Py_DECREF(ls_value);
-@@ -165,7 +205,11 @@ __hosts_to_list(struct sanlk_host *hss,
+@@ -166,7 +206,11 @@ __hosts_to_list(struct sanlk_host *hss,
goto exit_fail;
/* fill the dictionary information: timestamp */
@@ -107,7 +107,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "timestamp", ls_value);
Py_DECREF(ls_value);
-@@ -173,7 +217,11 @@ __hosts_to_list(struct sanlk_host *hss,
+@@ -174,7 +218,11 @@ __hosts_to_list(struct sanlk_host *hss,
goto exit_fail;
/* fill the dictionary information: io_timeout */
@@ -119,7 +119,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "io_timeout", ls_value);
Py_DECREF(ls_value);
-@@ -181,7 +229,11 @@ __hosts_to_list(struct sanlk_host *hss,
+@@ -182,7 +230,11 @@ __hosts_to_list(struct sanlk_host *hss,
goto exit_fail;
/* fill the dictionary information: flags */
@@ -131,7 +131,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "flags", ls_value);
Py_DECREF(ls_value);
-@@ -220,7 +272,11 @@ py_register(PyObject *self __unused, PyO
+@@ -225,7 +277,11 @@ py_register(PyObject *self __unused, PyO
return NULL;
}
@@ -143,7 +143,7 @@
}
/* get_alignment */
-@@ -253,7 +309,11 @@ py_get_alignment(PyObject *self __unused
+@@ -258,7 +314,11 @@ py_get_alignment(PyObject *self __unused
return NULL;
}
@@ -155,7 +155,7 @@
}
/* init_lockspace */
-@@ -439,7 +499,11 @@ py_read_lockspace(PyObject *self __unuse
+@@ -456,7 +516,11 @@ py_read_lockspace(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: lockspace */
@@ -167,7 +167,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_info, "lockspace", ls_entry);
Py_DECREF(ls_entry);
-@@ -447,7 +511,11 @@ py_read_lockspace(PyObject *self __unuse
+@@ -464,7 +528,11 @@ py_read_lockspace(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: iotimeout */
@@ -179,7 +179,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_info, "iotimeout", ls_entry);
Py_DECREF(ls_entry);
-@@ -515,7 +583,11 @@ py_read_resource(PyObject *self __unused
+@@ -538,7 +606,11 @@ py_read_resource(PyObject *self __unused
goto exit_fail;
/* fill the dictionary information: lockspace */
@@ -191,7 +191,7 @@
goto exit_fail;
rv = PyDict_SetItemString(rs_info, "lockspace", rs_entry);
Py_DECREF(rs_entry);
-@@ -523,7 +595,11 @@ py_read_resource(PyObject *self __unused
+@@ -546,7 +618,11 @@ py_read_resource(PyObject *self __unused
goto exit_fail;
/* fill the dictionary information: resource */
@@ -203,7 +203,7 @@
goto exit_fail;
rv = PyDict_SetItemString(rs_info, "resource", rs_entry);
Py_DECREF(rs_entry);
-@@ -804,7 +880,11 @@ py_get_lockspaces(PyObject *self __unuse
+@@ -832,7 +908,11 @@ py_get_lockspaces(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: lockspace */
@@ -215,7 +215,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "lockspace", ls_value);
Py_DECREF(ls_value);
-@@ -812,7 +892,11 @@ py_get_lockspaces(PyObject *self __unuse
+@@ -840,7 +920,11 @@ py_get_lockspaces(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: host_id */
@@ -227,7 +227,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "host_id", ls_value);
Py_DECREF(ls_value);
-@@ -820,7 +904,11 @@ py_get_lockspaces(PyObject *self __unuse
+@@ -848,7 +932,11 @@ py_get_lockspaces(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: path */
@@ -239,7 +239,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "path", ls_value);
Py_DECREF(ls_value);
-@@ -828,7 +916,11 @@ py_get_lockspaces(PyObject *self __unuse
+@@ -856,7 +944,11 @@ py_get_lockspaces(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: offset */
@@ -251,7 +251,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "offset", ls_value);
Py_DECREF(ls_value);
-@@ -836,7 +928,11 @@ py_get_lockspaces(PyObject *self __unuse
+@@ -864,7 +956,11 @@ py_get_lockspaces(PyObject *self __unuse
goto exit_fail;
/* fill the dictionary information: flags */
@@ -263,7 +263,7 @@
goto exit_fail;
rv = PyDict_SetItemString(ls_entry, "flags", ls_value);
Py_DECREF(ls_value);
-@@ -958,7 +1054,11 @@ py_acquire(PyObject *self __unused, PyOb
+@@ -986,7 +1082,11 @@ py_acquire(PyObject *self __unused, PyOb
/* prepare the resource version */
if (version != Py_None) {
res->flags |= SANLK_RES_LVER;
@@ -275,7 +275,7 @@
if (res->lver == -1) {
__set_exception(EINVAL, "Unable to convert the version value");
goto exit_fail;
-@@ -1074,7 +1174,11 @@ py_request(PyObject *self __unused, PyOb
+@@ -1102,7 +1202,11 @@ py_request(PyObject *self __unused, PyOb
flags = SANLK_REQUEST_NEXT_LVER;
} else {
res->flags |= SANLK_RES_LVER;
@@ -287,7 +287,7 @@
if (res->lver == -1) {
__set_exception(EINVAL, "Unable to convert the version value");
goto exit_fail;
-@@ -1189,7 +1293,11 @@ py_killpath(PyObject *self __unused, PyO
+@@ -1217,7 +1321,11 @@ py_killpath(PyObject *self __unused, PyO
size_t arg_len;
item = PyList_GetItem(argslist, i);
@@ -299,7 +299,7 @@
if (p == NULL) {
__set_exception(EINVAL, "Killpath argument not a string");
-@@ -1578,32 +1686,83 @@ exit_fail:
+@@ -1606,32 +1714,83 @@ exit_fail:
return excp;
}
@@ -386,8 +386,8 @@
/* lockspaces list flags */
PYSNLK_INIT_ADD_CONSTANT(SANLK_LSF_ADD, "LSFLAG_ADD");
-@@ -1628,4 +1787,8 @@ initsanlock(void)
- PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_ALL_HOSTS, "SETEV_ALL_HOSTS");
+@@ -1664,4 +1823,8 @@ initsanlock(void)
+ PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN8M, "SANLK_RES_ALIGN8M");
#undef PYSNLK_INIT_ADD_CONSTANT
+
++++++ suse-no-date-time.patch ++++++
--- /var/tmp/diff_new_pack.Mja3c1/_old 2019-03-26 15:36:16.892400786 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new 2019-03-26 15:36:16.896400785 +0100
@@ -1,8 +1,8 @@
-Index: sanlock-3.6.0/src/main.c
+Index: sanlock-3.7.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
+--- sanlock-3.7.0.orig/src/main.c
++++ sanlock-3.7.0/src/main.c
+@@ -2126,8 +2126,8 @@ static int read_command_line(int argc, c
}
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {
@@ -13,10 +13,10 @@
exit(EXIT_SUCCESS);
}
-Index: sanlock-3.6.0/fence_sanlock/fence_sanlockd.c
+Index: sanlock-3.7.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
+--- sanlock-3.7.0.orig/fence_sanlock/fence_sanlockd.c
++++ sanlock-3.7.0/fence_sanlock/fence_sanlockd.c
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);
++++++ suse-systemd.patch ++++++
--- /var/tmp/diff_new_pack.Mja3c1/_old 2019-03-26 15:36:16.904400782 +0100
+++ /var/tmp/diff_new_pack.Mja3c1/_new 2019-03-26 15:36:16.904400782 +0100
@@ -1,7 +1,7 @@
-Index: sanlock-3.6.0/init.d/sanlock.service
+Index: sanlock-3.7.0/init.d/sanlock.service
===================================================================
---- sanlock-3.6.0.orig/init.d/sanlock.service
-+++ sanlock-3.6.0/init.d/sanlock.service
+--- sanlock-3.7.0.orig/init.d/sanlock.service
++++ sanlock-3.7.0/init.d/sanlock.service
@@ -5,8 +5,10 @@ Wants=wdmd.service
[Service]
@@ -15,10 +15,10 @@
[Install]
WantedBy=multi-user.target
-Index: sanlock-3.6.0/init.d/wdmd.service
+Index: sanlock-3.7.0/init.d/wdmd.service
===================================================================
---- sanlock-3.6.0.orig/init.d/wdmd.service
-+++ sanlock-3.6.0/init.d/wdmd.service
+--- sanlock-3.7.0.orig/init.d/wdmd.service
++++ sanlock-3.7.0/init.d/wdmd.service
@@ -4,8 +4,10 @@ After=syslog.target
[Service]
@@ -32,10 +32,10 @@
[Install]
WantedBy=multi-user.target
-Index: sanlock-3.6.0/init.d/fence_sanlockd.service
+Index: sanlock-3.7.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
+--- sanlock-3.7.0.orig/init.d/fence_sanlockd.service
++++ sanlock-3.7.0/init.d/fence_sanlockd.service
@@ -5,8 +5,8 @@ Before=corosync.service
[Service]
