[Debian-ha-commits] [sbd] 03/09: debian/patches: refresh for new version

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository sbd.

commit 85fdcfe44836cb58c2426390dee5740948370bbe
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Nov 8 21:36:13 2017 +0100

    debian/patches: refresh for new version
---
 debian/patches/regression_test-exit.patch          | 22 --------------
 debian/patches/sbd-init.patch                      | 18 ++++++-----
 .../patches/sbd-service_sysconfig-vs-default.patch | 35 ----------------------
 debian/patches/sbd.service.in-kill-path            | 22 --------------
 debian/patches/series                              |  3 --
 debian/rules                                       |  2 +-
 6 files changed, 12 insertions(+), 90 deletions(-)

diff --git a/debian/patches/regression_test-exit.patch b/debian/patches/regression_test-exit.patch
deleted file mode 100644
index d3cfc39..0000000
--- a/debian/patches/regression_test-exit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tests/regressions.sh b/tests/regressions.sh
-index 9db1c15..3870002 100755
---- a/tests/regressions.sh
-+++ b/tests/regressions.sh
-@@ -63,7 +63,7 @@ _ok() {
- 	rc=$?
- 	if [ $rc -ne 0 ]; then
- 		echo "$@ failed with $rc"
--		exit
-+		exit 1
- 	fi
- }
- 
-@@ -73,7 +73,7 @@ _no() {
- 	rc=$?
- 	if [ $rc -eq 0 ]; then
- 		echo "$@ did NOT fail ($rc)"
--		exit
-+		exit 1
- 	fi
- 	return 0
- }
diff --git a/debian/patches/sbd-init.patch b/debian/patches/sbd-init.patch
index 04de9df..833be71 100644
--- a/debian/patches/sbd-init.patch
+++ b/debian/patches/sbd-init.patch
@@ -1,6 +1,6 @@
---- a/src/sbd.sh
-+++ b/src/sbd.sh
-@@ -16,10 +16,25 @@
+--- a/src/sbd.sh.in
++++ b/src/sbd.sh.in
+@@ -16,10 +16,30 @@
  # with this program; if not, write to the Free Software Foundation, Inc.,
  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  #
@@ -15,11 +15,15 @@
 +# Default-Start:        2 3 4 5
 +# Default-Stop:         0 1 6
 +# Short-Description:    Shared-storage based fencing daemon
-+# Description:          Shared-storage based fencing daemon
++# Description:          SBD provides a node fencing mechanism for
++#                       Pacemaker-based clusters through the exchange of
++#                       messages via shared block storage such as for
++#                       example a SAN, iSCSI, FCoE. It can be used as
++#                       a STONITH mechanism in all configurations that
++#                       have reliable shared storage.
 +### END INIT INFO
  
--SBD_CONFIG=/etc/sysconfig/sbd
-+SBD_CONFIG=/etc/default/sbd
+ SBD_CONFIG=@CONFIGDIR@/sbd
  SBD_BIN="/usr/sbin/sbd"
  
 +. /lib/lsb/init-functions
@@ -27,7 +31,7 @@
  test -x $SBD_BIN || exit 1
  test -f $SBD_CONFIG || exit 1
  
-@@ -87,8 +102,10 @@
+@@ -87,8 +107,10 @@
  case "$1" in
  start|stop)
  	$1 ;;
diff --git a/debian/patches/sbd-service_sysconfig-vs-default.patch b/debian/patches/sbd-service_sysconfig-vs-default.patch
deleted file mode 100644
index 2534b26..0000000
--- a/debian/patches/sbd-service_sysconfig-vs-default.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Change defaults directory from sysconfig to default.
---- a/src/sbd.service.in
-+++ b/src/sbd.service.in
-@@ -9,7 +9,7 @@
- [Service]
- Type=forking
- PIDFile=@localstatedir@/run/sbd.pid
--EnvironmentFile=- at sysconfdir@/sysconfig/sbd
-+EnvironmentFile=- at sysconfdir@/default/sbd
- ExecStart=@sbindir@/sbd $SBD_OPTS -p @localstatedir@/run/sbd.pid watch 
- ExecStop=/bin/kill -TERM $MAINPID
- 
---- a/src/sbd_remote.service.in
-+++ b/src/sbd_remote.service.in
-@@ -8,7 +8,7 @@
- [Service]
- Type=forking
- PIDFile=/var/run/sbd.pid
--EnvironmentFile=-/etc/sysconfig/sbd
-+EnvironmentFile=-/etc/default/sbd
- ExecStart=/usr/sbin/sbd $SBD_OPTS -p /var/run/sbd.pid watch
- ExecStop=/bin/kill -TERM $MAINPID
- 
---- a/agent/sbd
-+++ b/agent/sbd
-@@ -25,6 +25,9 @@
- 	if [ -f /etc/sysconfig/sbd ]; then
- 		source /etc/sysconfig/sbd
- 		sbd_device=$SBD_DEVICE
-+	elif [ -f /etc/default/sbd ]; then
-+		source /etc/default/sbd
-+		sbd_device=$SBD_DEVICE
- 	fi
- fi
- 
diff --git a/debian/patches/sbd.service.in-kill-path b/debian/patches/sbd.service.in-kill-path
deleted file mode 100644
index eb5a17b..0000000
--- a/debian/patches/sbd.service.in-kill-path
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/sbd.service.in
-+++ b/src/sbd.service.in
-@@ -11,7 +11,7 @@
- PIDFile=@localstatedir@/run/sbd.pid
- EnvironmentFile=- at sysconfdir@/sysconfig/sbd
- ExecStart=@sbindir@/sbd $SBD_OPTS -p @localstatedir@/run/sbd.pid watch 
--ExecStop=@bindir@/kill -TERM $MAINPID
-+ExecStop=/bin/kill -TERM $MAINPID
- 
- # Could this benefit from exit codes for restart?
- # Does this need to be set to msgwait * 1.2?
---- a/src/sbd_remote.service.in
-+++ b/src/sbd_remote.service.in
-@@ -10,7 +10,7 @@
- PIDFile=/var/run/sbd.pid
- EnvironmentFile=-/etc/sysconfig/sbd
- ExecStart=/usr/sbin/sbd $SBD_OPTS -p /var/run/sbd.pid watch
--ExecStop=/usr/bin/kill -TERM $MAINPID
-+ExecStop=/bin/kill -TERM $MAINPID
- 
- # Could this benefit from exit codes for restart?
- # Does this need to be set to msgwait * 1.2?
diff --git a/debian/patches/series b/debian/patches/series
index c3b2ba9..d8ffb20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-sbd.service.in-kill-path
-sbd-service_sysconfig-vs-default.patch
-regression_test-exit.patch
 sbd-init.patch
diff --git a/debian/rules b/debian/rules
index ff3dbbb..a94a6fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 # We need to override the libdir, otherwise it will be installed
 # within /usr/lib/${DEB_HOST_MULTIARCH} and pacemaker will not be
 # able to find the external/sbd agent.
-	dh_auto_configure -- --libdir=/usr/lib
+	dh_auto_configure -- --libdir=/usr/lib --bindir=/bin --with-configdir=/etc/default
 
 override_dh_missing:
 	dh_missing --fail-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/sbd.git