diff --git a/0001-fix-systemd-service-files.patch b/0001-fix-systemd-service-files.patch deleted file mode 100644 index 11044c4..0000000 --- a/0001-fix-systemd-service-files.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 337c30353d650bd02bd1203b7859124926dfef71 Mon Sep 17 00:00:00 2001 -From: David Teigland -Date: Mon, 5 Nov 2012 15:53:40 -0600 -Subject: [PATCH] fix systemd service files - -add [Unit] and disable the cgroup stuff to avoid -the set_scheduler failures - -Signed-off-by: David Teigland ---- - init.d/fence_sanlockd.service | 1 + - init.d/sanlock.service | 2 ++ - init.d/wdmd.service | 2 ++ - 3 files changed, 5 insertions(+) - -diff --git a/init.d/fence_sanlockd.service b/init.d/fence_sanlockd.service -index 873da59..f2d655b 100644 ---- a/init.d/fence_sanlockd.service -+++ b/init.d/fence_sanlockd.service -@@ -1,3 +1,4 @@ -+[Unit] - Description=daemon for fence_sanlock agent - After=syslog.target wdmd.service sanlock.service - Before=corosync.service -diff --git a/init.d/sanlock.service b/init.d/sanlock.service -index ff4a3e7..f026fe0 100644 ---- a/init.d/sanlock.service -+++ b/init.d/sanlock.service -@@ -1,8 +1,10 @@ -+[Unit] - Description=Shared Storage Lease Manager - After=syslog.target wdmd.service - - [Service] - Type=forking -+ControlGroup=cpu:/ - ExecStart=/lib/systemd/systemd-sanlock start - ExecStop=/lib/systemd/systemd-sanlock stop - -diff --git a/init.d/wdmd.service b/init.d/wdmd.service -index 88d00b6..efe46bf 100644 ---- a/init.d/wdmd.service -+++ b/init.d/wdmd.service -@@ -1,8 +1,10 @@ -+[Unit] - Description=Watchdog Multiplexing Daemon - After=syslog.target - - [Service] - Type=forking -+ControlGroup=cpu:/ - ExecStart=/lib/systemd/systemd-wdmd start - ExecStop=/lib/systemd/systemd-wdmd stop - --- -1.7.10.1.362.g242cab3 - diff --git a/sanlock-2.6.tar.bz2 b/sanlock-2.6.tar.bz2 deleted file mode 100644 index dcad72c..0000000 --- a/sanlock-2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29272ccbf4f93f70afa08abd3036e449a75271115132745039dc74fe539ffef9 -size 109332 diff --git a/sanlock-3.0.1.tar.bz2 b/sanlock-3.0.1.tar.bz2 new file mode 100644 index 0000000..f6d7883 --- /dev/null +++ b/sanlock-3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed4e8b0355fe14bb79d346f8be36e99889c3a585a61d0cacc0f349c239559071 +size 120154 diff --git a/sanlock-SCHED_RESET_ON_FORK-undefined.patch b/sanlock-SCHED_RESET_ON_FORK-undefined.patch index b47a135..b53f613 100644 --- a/sanlock-SCHED_RESET_ON_FORK-undefined.patch +++ b/sanlock-SCHED_RESET_ON_FORK-undefined.patch @@ -2,7 +2,7 @@ Index: src/main.c =================================================================== --- src/main.c.orig +++ src/main.c -@@ -56,6 +56,10 @@ +@@ -58,6 +58,10 @@ #define SIGRUNPATH 100 /* anything that's not SIGTERM/SIGKILL */ diff --git a/sanlock.changes b/sanlock.changes index afd43df..0def66b 100644 --- a/sanlock.changes +++ b/sanlock.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 1 16:42:24 MDT 2013 - jfehlig@suse.com + +- Update to sanlock 3.0.1 + - Add lvb feature + - Various bug fixes and improvements + - Drop upstream patch 0001-fix-systemd-service-files.patch + ------------------------------------------------------------------- Fri Mar 1 06:25:28 UTC 2013 - coolo@suse.com diff --git a/sanlock.spec b/sanlock.spec index a1cc2e5..fccccaf 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -24,7 +24,7 @@ %endif Name: sanlock -Version: 2.6 +Version: 3.0.1 Release: 1%{?dist} Summary: A shared disk lock manager License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ @@ -52,7 +52,6 @@ Source3: wdmd.init Source4: sysconfig.wdmd Source5: fence_sanlockd.init # Upstream patches -Patch0: 0001-fix-systemd-service-files.patch # SUSE patches Patch100: sanlock-SCHED_RESET_ON_FORK-undefined.patch Patch101: sanlock-python-prefix.patch @@ -69,7 +68,6 @@ access to the shared disks. %prep %setup -q -%patch0 -p1 %patch100 %patch101 %patch102 diff --git a/suse-no-date-time.patch b/suse-no-date-time.patch index bdaba75..92f9dc5 100644 --- a/suse-no-date-time.patch +++ b/suse-no-date-time.patch @@ -1,8 +1,8 @@ -Index: sanlock-2.6/src/main.c +Index: sanlock-3.0.1/src/main.c =================================================================== ---- sanlock-2.6.orig/src/main.c -+++ sanlock-2.6/src/main.c -@@ -1841,8 +1841,8 @@ static int read_command_line(int argc, c +--- sanlock-3.0.1.orig/src/main.c ++++ sanlock-3.0.1/src/main.c +@@ -1863,8 +1863,8 @@ static int read_command_line(int argc, c if (!strcmp(arg1, "version") || !strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { diff --git a/suse-systemd.patch b/suse-systemd.patch index 295d6bf..5bcd53f 100644 --- a/suse-systemd.patch +++ b/suse-systemd.patch @@ -1,8 +1,8 @@ -Index: sanlock-2.6/init.d/sanlock.service +Index: sanlock-3.0.1/init.d/sanlock.service =================================================================== ---- sanlock-2.6.orig/init.d/sanlock.service -+++ sanlock-2.6/init.d/sanlock.service -@@ -5,8 +5,10 @@ After=syslog.target wdmd.service +--- sanlock-3.0.1.orig/init.d/sanlock.service ++++ sanlock-3.0.1/init.d/sanlock.service +@@ -6,8 +6,10 @@ Wants=wdmd.service [Service] Type=forking ControlGroup=cpu:/ @@ -15,10 +15,10 @@ Index: sanlock-2.6/init.d/sanlock.service [Install] WantedBy=multi-user.target -Index: sanlock-2.6/init.d/wdmd.service +Index: sanlock-3.0.1/init.d/wdmd.service =================================================================== ---- sanlock-2.6.orig/init.d/wdmd.service -+++ sanlock-2.6/init.d/wdmd.service +--- sanlock-3.0.1.orig/init.d/wdmd.service ++++ sanlock-3.0.1/init.d/wdmd.service @@ -5,8 +5,10 @@ After=syslog.target [Service] Type=forking