diff --git a/revert-5d535c0d-py2.patch b/revert-5d535c0d-py2.patch index 3fad9db..54b6b66 100644 --- a/revert-5d535c0d-py2.patch +++ b/revert-5d535c0d-py2.patch @@ -7,10 +7,10 @@ Date: Thu Mar 21 11:20:29 2019 -0600 This reverts commit 5d535c0d800a84665879f6dc50c87915cf6657da. We don't want it on SUSE where there is no python2. -Index: sanlock-3.7.0/python/Makefile +Index: sanlock-3.7.1/python/Makefile =================================================================== ---- sanlock-3.7.0.orig/python/Makefile -+++ sanlock-3.7.0/python/Makefile +--- sanlock-3.7.1.orig/python/Makefile ++++ sanlock-3.7.1/python/Makefile @@ -5,13 +5,13 @@ # of the GNU General Public License v.2. diff --git a/sanlock-3.7.0.tar.gz b/sanlock-3.7.0.tar.gz deleted file mode 100644 index 20d5df4..0000000 --- a/sanlock-3.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dd4cf17c5989d9110991261a6a6efee22e8e72a6fbde8a1690ed78590c64062 -size 250375 diff --git a/sanlock-3.7.1.tar.gz b/sanlock-3.7.1.tar.gz new file mode 100644 index 0000000..504f931 --- /dev/null +++ b/sanlock-3.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b04cd8547dc8fa681ca32d7aa3cad3eb54959b5ecad9029d3240ae97398a92af +size 268303 diff --git a/sanlock-python3.patch b/sanlock-python3.patch index 76bf8c2..79b94da 100644 --- a/sanlock-python3.patch +++ b/sanlock-python3.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.7.0/python/sanlock.c +Index: sanlock-3.7.1/python/sanlock.c =================================================================== ---- sanlock-3.7.0.orig/python/sanlock.c -+++ sanlock-3.7.0/python/sanlock.c +--- sanlock-3.7.1.orig/python/sanlock.c ++++ sanlock-3.7.1/python/sanlock.c @@ -12,6 +12,10 @@ #include #include diff --git a/sanlock.changes b/sanlock.changes index 5b21c48..7612ab8 100644 --- a/sanlock.changes +++ b/sanlock.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 9 22:17:12 UTC 2019 - Jim Fehlig + +- Update to sanlock 3.7.1 + - Fix bugs in read_resource_owners + ------------------------------------------------------------------- Thu Mar 21 20:27:25 UTC 2019 - Jim Fehlig diff --git a/sanlock.spec b/sanlock.spec index fb5f33a..fcbc3b5 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -28,7 +28,7 @@ %endif %bcond_without python2 Name: sanlock -Version: 3.7.0 +Version: 3.7.1 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 diff --git a/suse-no-date-time.patch b/suse-no-date-time.patch index 59313b1..4398fd9 100644 --- a/suse-no-date-time.patch +++ b/suse-no-date-time.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.7.0/src/main.c +Index: sanlock-3.7.1/src/main.c =================================================================== ---- sanlock-3.7.0.orig/src/main.c -+++ sanlock-3.7.0/src/main.c +--- sanlock-3.7.1.orig/src/main.c ++++ sanlock-3.7.1/src/main.c @@ -2126,8 +2126,8 @@ static int read_command_line(int argc, c } @@ -13,10 +13,10 @@ Index: sanlock-3.7.0/src/main.c exit(EXIT_SUCCESS); } -Index: sanlock-3.7.0/fence_sanlock/fence_sanlockd.c +Index: sanlock-3.7.1/fence_sanlock/fence_sanlockd.c =================================================================== ---- sanlock-3.7.0.orig/fence_sanlock/fence_sanlockd.c -+++ sanlock-3.7.0/fence_sanlock/fence_sanlockd.c +--- sanlock-3.7.1.orig/fence_sanlock/fence_sanlockd.c ++++ sanlock-3.7.1/fence_sanlock/fence_sanlockd.c @@ -565,8 +565,7 @@ int main(int argc, char *argv[]) print_usage(); exit(0); diff --git a/suse-systemd.patch b/suse-systemd.patch index 7ac28e8..0a63f29 100644 --- a/suse-systemd.patch +++ b/suse-systemd.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.7.0/init.d/sanlock.service +Index: sanlock-3.7.1/init.d/sanlock.service =================================================================== ---- sanlock-3.7.0.orig/init.d/sanlock.service -+++ sanlock-3.7.0/init.d/sanlock.service +--- sanlock-3.7.1.orig/init.d/sanlock.service ++++ sanlock-3.7.1/init.d/sanlock.service @@ -5,8 +5,10 @@ Wants=wdmd.service [Service] @@ -15,10 +15,10 @@ Index: sanlock-3.7.0/init.d/sanlock.service [Install] WantedBy=multi-user.target -Index: sanlock-3.7.0/init.d/wdmd.service +Index: sanlock-3.7.1/init.d/wdmd.service =================================================================== ---- sanlock-3.7.0.orig/init.d/wdmd.service -+++ sanlock-3.7.0/init.d/wdmd.service +--- sanlock-3.7.1.orig/init.d/wdmd.service ++++ sanlock-3.7.1/init.d/wdmd.service @@ -4,8 +4,10 @@ After=syslog.target [Service] @@ -32,10 +32,10 @@ Index: sanlock-3.7.0/init.d/wdmd.service [Install] WantedBy=multi-user.target -Index: sanlock-3.7.0/init.d/fence_sanlockd.service +Index: sanlock-3.7.1/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.7.0.orig/init.d/fence_sanlockd.service -+++ sanlock-3.7.0/init.d/fence_sanlockd.service +--- sanlock-3.7.1.orig/init.d/fence_sanlockd.service ++++ sanlock-3.7.1/init.d/fence_sanlockd.service @@ -5,8 +5,8 @@ Before=corosync.service [Service]