Accepting request 629481 from network:ha-clustering:Factory

OBS-URL: https://build.opensuse.org/request/show/629481
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=25

_service

@@ -5,10 +5,10 @@
     <param name="filename">drbd-utils</param>
 <!--
     build service using release drbd-utils atm.
-    <param name="version">9.4.0</param>
+    <param name="version">9.5.0</param>
     Using release tarball instead of git since need buildtag.c/h
 -->
-    <param name="versionformat">9.4.0+git.%h</param>
+    <param name="versionformat">9.5.0+git.%h</param>
     <param name="revision">master</param>
   </service>
 

drbd-utils-9.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c37b038dff854f3c643e26ca949beb0ce1142494791592338cf4c93c585352d
-size 1057601

drbd-utils-9.5.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3890fdf19ce7d08b6f293323ca272e67dbbdee83ed35296f8b9565b1c78f2244
+size 1058150

drbd-utils.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 23 03:05:33 UTC 2018 - nwang@suse.com
+
+- Update to 9.5.0
+ * drbdmon: allow to start in problems view (--problems)
+ * drbdadm,v9: fix always failing stacked handlers from kernel
+ * drbdadm,v9: adjust now hands over the information that a
+   diskfull->diskless change was intentional.
+ * drbdadm,v9: adjust verifies now IPs
+- Remove patch: fix_call_khelper_with_stack.patch in 60ec9fa68
+
 -------------------------------------------------------------------
 Thu May 10 09:11:09 UTC 2018 - nwang@suse.com
 

drbd-utils.spec

@@ -19,13 +19,13 @@
 %bcond_without drbdmon
 
 Name:           drbd-utils
-Version:        9.4.0
+Version:        9.5.0
 Release:        0
 Summary:        Distributed Replicated Block Device
 License:        GPL-2.0+
 Group:          Productivity/Clustering/HA
 Url:            http://www.drbd.org/
-Source:         http://www.drbd.org/download/drbd/utils/%{name}-%{version}.tar.gz
+Source:         http://www.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz
 
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         init-script-fixes.diff
@@ -33,9 +33,8 @@ Patch2:         fix-libdir-in-Makefile.patch
 Patch3:         fence-after-pacemaker-down.patch
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4:         0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
-Patch5:         fix_call_khelper_with_stack.patch
-Patch6:         move_fencing_from_disk_to_net_in_example.patch
-Patch7:         skip_sh-b-pri_in_v9.patch
+Patch5:         move_fencing_from_disk_to_net_in_example.patch
+Patch6:         skip_sh-b-pri_in_v9.patch
 
 Provides:       drbd-bash-completion = %{version}
 Provides:       drbd-pacemaker = %{version}
@@ -84,7 +83,6 @@ raid 1. It is a building block for setting up clusters.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

fix_call_khelper_with_stack.patch

@@ -1,33 +0,0 @@
-From 7ba13eefd22b1ab3c84bd115dded3e4dbbf5b5c8 Mon Sep 17 00:00:00 2001
-From: Nick Wang <nwang@suse.com>
-Date: Mon, 17 Jul 2017 16:41:08 +0800
-Subject: [PATCH] drbdadm: Fix handler called from kernel invalid return for
- stacking resource
-
-Handler like "before-resync-target" called from kernel
-space does not have "-S" option for stacking resource, it
-always return as invalid usage for stacking resource in
-normal mode, then the connection will be dropped. Add "-S"
-option for stacking resource automatically if the handler
-is called from kernel.
----
- user/v9/drbdadm_main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/user/v9/drbdadm_main.c b/user/v9/drbdadm_main.c
-index 3c6e2263..f6cd8b74 100644
---- a/user/v9/drbdadm_main.c
-+++ b/user/v9/drbdadm_main.c
-@@ -3472,6 +3472,9 @@ int main(int argc, char **argv)
- 					       rv = E_USAGE;
- 					continue;
- 				}
-+				if (3 == cmd->show_in_usage && ctx.res->stacked) {
-+					is_drbd_top = 1;
-+				}
- 				if (is_drbd_top != ctx.res->stacked && !is_dump) {
- 					err("'%s' is a %s resource, and not available in %s mode.\n",
- 					    ctx.res->name,
--- 
-2.12.0
-