subject:"commit drbd\-utils for openSUSE\:Factory"

commit drbd-utils for openSUSE:Factory

2020-10-14 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-10-14 15:38:47

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.3486 (New)


Package is "drbd-utils"

Wed Oct 14 15:38:47 2020 rev:41 rq:841558 version:9.14.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-09-12 
00:09:35.077046036 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.3486/drbd-utils.changes  
2020-10-14 15:39:27.534367993 +0200
@@ -1,0 +2,7 @@
+Mon Oct 12 12:12:12 UTC 2020 - oher...@suse.de
+
+- Move block-drbd back to /etc/xen/scripts (bsc#1177531)
+  The change in xen.spec was reverted, but the revert was not applied
+  to this pkg
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.WoNfdn/_old  2020-10-14 15:39:28.194368223 +0200
+++ /var/tmp/diff_new_pack.WoNfdn/_new  2020-10-14 15:39:28.198368224 +0200
@@ -117,20 +117,6 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
 %ifnarch %{ix86} x86_64
 rm -rf %{buildroot}%{_sysconfdir}/xen
-%else
-d=%{_libexecdir}/xen/scripts
-mkdir -p %{buildroot}$d
-mv %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd %{buildroot}$d
-%if 0%{?suse_version} > 1500
-rm -rf %{buildroot}%{_sysconfdir}/xen
-%else
-tee %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd <<_EOS_
-#!/bin/sh
-# SUSE versions up to SLE15 populated /etc with files.
-# This wrapper exists to remain compatible with their expected script path
-exec $d/block-drbd "\$@"
-_EOS_
-%endif
 %endif
 
 %pre
@@ -183,13 +169,10 @@
 /sbin/drbdmon
 %endif
 %ifarch %{ix86} x86_64
-%if 0%{?suse_version} <= 1500
 %dir %attr(700,root,root) %{_sysconfdir}/xen
 %dir %{_sysconfdir}/xen/scripts
 %attr(755,root,root) %{_sysconfdir}/xen/scripts/block-drbd
 %endif
-%{_libexecdir}/xen
-%endif
 %{_prefix}/lib/ocf/resource.d/linbit/drbd
 %{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh
 %{_udevrulesdir}/65-drbd.rules

commit drbd-utils for openSUSE:Factory

2020-09-11 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-09-12 00:09:14

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.4249 (New)


Package is "drbd-utils"

Sat Sep 12 00:09:14 2020 rev:40 rq:833606 version:9.14.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-09-07 
21:35:46.857392571 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.4249/drbd-utils.changes  
2020-09-12 00:09:35.077046036 +0200
@@ -1,0 +2,17 @@
+Fri Sep 11 02:35:49 UTC 2020 - nick wang 
+
+- bsc#1176436, update to 9.14.0
+ * pacemaker: various fixes/improvements for PM >=1.1.15
+   including the 2 series; crm-fence-peer.9.sh
+ * systemd dependency for drbd-proxy
+ * containers: multi-arch support, especially for s390x
+ * multipathd: blacklist drbd
+ * drbdsetup: code refactoring and improvements,
+   as well as tests for events2!
+   add "may_promote", "promotion_score". See man page.
+ * build: compile fixes for gcc-10; CI pipeline
+ * handlers: add "disconnected"
+- Remove patch crm-fence-peer-pacemaker2-issue2.patch (included)
+  Remove patch link-error-setup_option.patch (included)
+
+---

Old:

  crm-fence-peer-pacemaker2-issue2.patch
  drbd-utils-9.13.0.tar.gz
  link-error-setup_option.patch

New:

  drbd-utils-9.14.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.YlMvcE/_old  2020-09-12 00:09:37.025047900 +0200
+++ /var/tmp/diff_new_pack.YlMvcE/_new  2020-09-12 00:09:37.025047900 +0200
@@ -21,7 +21,7 @@
 # Only need po4a to build man from git source code
 %bcond_without prebuiltman
 Name:   drbd-utils
-Version:9.13.0
+Version:9.14.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0-or-later
@@ -34,8 +34,6 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
-Patch6: link-error-setup_option.patch
-Patch7: crm-fence-peer-pacemaker2-issue2.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -85,8 +83,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1
@@ -166,6 +162,7 @@
 %config(noreplace) %{_sysconfdir}/drbd.conf
 %config %{_sysconfdir}/bash_completion.d/drbdadm.sh
 %config(noreplace) %{_sysconfdir}/drbd.d/global_common.conf
+%config(noreplace) %{_sysconfdir}/multipath/conf.d/drbd.conf
 %{_tmpfilesdir}/drbd.conf
 %doc %{_mandir}/man5/drbd.*
 %doc %{_mandir}/man8/drbd*
@@ -177,6 +174,8 @@
 %doc ChangeLog
 %doc scripts/drbd.conf.example
 %dir %{_sysconfdir}/drbd.d
+%dir %{_sysconfdir}/multipath
+%dir %{_sysconfdir}/multipath/conf.d
 /sbin/drbdadm
 /sbin/drbdsetup
 /sbin/drbdmeta

++ drbd-utils-9.13.0.tar.gz -> drbd-utils-9.14.0.tar.gz ++
 5168 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2020-09-07 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-09-07 21:35:21

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.3399 (New)


Package is "drbd-utils"

Mon Sep  7 21:35:21 2020 rev:39 rq:832640 version:9.13.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-06-09 
00:09:19.862284055 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.3399/drbd-utils.changes  
2020-09-07 21:35:46.857392571 +0200
@@ -1,0 +2,6 @@
+Fri Sep  4 02:29:56 UTC 2020 - nick wang 
+
+- bsc#1176065, fail to get master id from cib xml in fence handler
+  Add patch crm-fence-peer-pacemaker2-issue2.patch
+
+---

New:

  crm-fence-peer-pacemaker2-issue2.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.VieYb0/_old  2020-09-07 21:35:47.513392875 +0200
+++ /var/tmp/diff_new_pack.VieYb0/_new  2020-09-07 21:35:47.517392876 +0200
@@ -35,6 +35,7 @@
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
 Patch6: link-error-setup_option.patch
+Patch7: crm-fence-peer-pacemaker2-issue2.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -85,6 +86,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ crm-fence-peer-pacemaker2-issue2.patch ++
error msg when using fence-handler:
sed: -e expression #1, char 28: unknown command: `\'
WARNING drbd-fencing could not determine the master id of drbd resource xxx

Either replace the '\\' to '\' or change back to the original "xxx"'
quotation could fix the error.
diff -Naur drbd-utils-9.13.0.orig/scripts/crm-fence-peer.9.sh 
drbd-utils-9.13.0/scripts/crm-fence-peer.9.sh
--- drbd-utils-9.13.0.orig/scripts/crm-fence-peer.9.sh  2020-09-04 
15:47:07.865987423 +0800
+++ drbd-utils-9.13.0/scripts/crm-fence-peer.9.sh   2020-09-04 
15:47:25.086005572 +0800
@@ -214,7 +214,7 @@
# or double check that it is in fact a promotable="true" clone...
# But in the real world, this is good enough.
: ${master_id=$(set +x; echo "$cib_xml" |
-   sed -ne '/<\(clone\|master\) /,/<\\/\(clone\|master\)>/ {
+   sed -ne '/<\(clone\|master\) /,/<\/\(clone\|master\)>/ {
   /<\(clone\|master\) / h;
 // {
+   sed -ne '/<\(clone\|master\) /,/<\/\(clone\|master\)>/ {
   /<\(clone\|master\) / h;
 /

commit drbd-utils for openSUSE:Factory

2020-06-08 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-06-09 00:07:05

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.3606 (New)


Package is "drbd-utils"

Tue Jun  9 00:07:05 2020 rev:38 rq:812516 version:9.13.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-05-12 
22:32:11.215851200 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.3606/drbd-utils.changes  
2020-06-09 00:09:19.862284055 +0200
@@ -1,0 +2,6 @@
+Mon Jun  8 08:11:04 UTC 2020 - nick wang 
+
+- bsc#1172641, fix the link error of setup_option.
+  Add patch link-error-setup_option.patch
+
+---

New:

  link-error-setup_option.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.USUIxF/_old  2020-06-09 00:09:21.830291037 +0200
+++ /var/tmp/diff_new_pack.USUIxF/_new  2020-06-09 00:09:21.830291037 +0200
@@ -20,7 +20,6 @@
 # Man pages are included in the released tarball.
 # Only need po4a to build man from git source code
 %bcond_without prebuiltman
-
 Name:   drbd-utils
 Version:9.13.0
 Release:0
@@ -28,7 +27,6 @@
 License:GPL-2.0-or-later
 URL:http://www.drbd.org/
 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
 Patch2: fix-libdir-in-Makefile.patch
@@ -36,6 +34,7 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
+Patch6: link-error-setup_option.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -47,8 +46,7 @@
 # and suse let drbd driver goes in-kernel
 # Provides:   drbd = 8.4.5
 # Obsoletes:  drbd < 8.4.5
-
-%ifarch %ix86 x86_64
+%ifarch %{ix86} x86_64
 Provides:   drbd-xen = %{version}
 Obsoletes:  drbd-xen < %{version}
 %endif
@@ -80,12 +78,13 @@
 raid 1. It is a building block for setting up clusters.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1
@@ -118,13 +117,13 @@
 %make_install
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
-%ifnarch %ix86 x86_64
+%ifnarch %{ix86} x86_64
 rm -rf %{buildroot}%{_sysconfdir}/xen
 %else
 d=%{_libexecdir}/xen/scripts
 mkdir -p %{buildroot}$d
 mv %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd %{buildroot}$d
-%if %{suse_version} > 1500
+%if 0%{?suse_version} > 1500
 rm -rf %{buildroot}%{_sysconfdir}/xen
 %else
 tee %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd <<_EOS_
@@ -171,7 +170,7 @@
 %doc %{_mandir}/man7/ocf_linbit_drbd.*
 %doc %{_mandir}/ja/man5/drbd.*
 %doc %{_mandir}/ja/man8/drbd*
-%doc COPYING
+%license COPYING
 %doc README.md
 %doc ChangeLog
 %doc scripts/drbd.conf.example
@@ -182,8 +181,8 @@
 %if %{with drbdmon}
 /sbin/drbdmon
 %endif
-%ifarch %ix86 x86_64
-%if %{suse_version} <= 1500
+%ifarch %{ix86} x86_64
+%if 0%{?suse_version} <= 1500
 %dir %attr(700,root,root) %{_sysconfdir}/xen
 %dir %{_sysconfdir}/xen/scripts
 %attr(755,root,root) %{_sysconfdir}/xen/scripts/block-drbd

++ link-error-setup_option.patch ++
diff -Naur drbd-utils-9.13.0.orig/user/v84/drbdadm.h 
drbd-utils-9.13.0/user/v84/drbdadm.h
--- drbd-utils-9.13.0.orig/user/v84/drbdadm.h   2020-06-08 16:00:20.166480137 
+0800
+++ drbd-utils-9.13.0/user/v84/drbdadm.h2020-06-08 16:00:42.930652069 
+0800
@@ -251,7 +251,7 @@
bool explicit;
char *option;
 };
-struct setup_option *setup_options;
+extern struct setup_option *setup_options;
 
 extern void add_setup_option(bool explicit, char *option);

commit drbd-utils for openSUSE:Factory

2020-05-12 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-05-12 22:30:04

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.2738 (New)


Package is "drbd-utils"

Tue May 12 22:30:04 2020 rev:37 rq:802686 version:9.13.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-03-11 
18:54:51.511661794 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.2738/drbd-utils.changes  
2020-05-12 22:32:11.215851200 +0200
@@ -1,0 +2,13 @@
+Sat May  9 01:17:31 UTC 2020 - nick wang 
+
+- bsc#1171419, Update to 9.13.0
+ * crm-fence-peer{,.9}.sh: detect Pacemaker 2 promotable clones
+ * submodules: switch to https, which makes it easier to clone
+   if you are behind some weird company firewalls.
+ * drbd.service: start pacemaker before drbd-proxy
+ * windrbd: various new commands including create-resource-from-url,
+   set-syslog-ip, scan-partitions-for-minor, install-bus-device,
+   remove-bus-device
+- Remove patch crm-fence-peer-pacemaker2.patch
+
+---

Old:

  crm-fence-peer-pacemaker2.patch
  drbd-utils-9.12.0.tar.gz

New:

  drbd-utils-9.13.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.0dKzD7/_old  2020-05-12 22:32:12.803854514 +0200
+++ /var/tmp/diff_new_pack.0dKzD7/_new  2020-05-12 22:32:12.807854521 +0200
@@ -22,7 +22,7 @@
 %bcond_without prebuiltman
 
 Name:   drbd-utils
-Version:9.12.0
+Version:9.13.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0-or-later
@@ -36,7 +36,6 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
-Patch6: crm-fence-peer-pacemaker2.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -87,7 +86,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ _service ++
--- /var/tmp/diff_new_pack.0dKzD7/_old  2020-05-12 22:32:12.855854622 +0200
+++ /var/tmp/diff_new_pack.0dKzD7/_new  2020-05-12 22:32:12.855854622 +0200
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.12.0+git.%h
+9.13.0+git.%h
 master
   
 

++ drbd-utils-9.12.0.tar.gz -> drbd-utils-9.13.0.tar.gz ++
 1809 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2020-03-11 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-03-11 18:51:52

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.3160 (New)


Package is "drbd-utils"

Wed Mar 11 18:51:52 2020 rev:36 rq:783590 version:9.12.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-02-25 
16:07:52.580657282 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.3160/drbd-utils.changes  
2020-03-11 18:54:51.511661794 +0100
@@ -1,0 +2,6 @@
+Tue Mar 10 09:10:40 UTC 2020 - nick wang 
+
+- bsc#1166200 ,fix crm-fence-peer regex issue with pacemaker 2.
+- Add patch crm-fence-peer-pacemaker2.patch
+
+---

New:

  crm-fence-peer-pacemaker2.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.E13Eke/_old  2020-03-11 18:54:52.451662214 +0100
+++ /var/tmp/diff_new_pack.E13Eke/_new  2020-03-11 18:54:52.455662216 +0100
@@ -36,6 +36,7 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
+Patch6: crm-fence-peer-pacemaker2.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -86,6 +87,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ crm-fence-peer-pacemaker2.patch ++
commit fd2eec6eca91e3d4d24852b5bac4dd61f9854e67
Author: Lars Ellenberg 
Date:   Mon Mar 2 14:12:55 2020 +0100

crm-fence-peer: detect pacemaker 2 "promotable clones"

The sed-script to guess the pacemaker xml-id to be used in location
constraints from the DRBD resource name expected ' tag
to decide between the two.

diff --git a/scripts/crm-fence-peer.9.sh b/scripts/crm-fence-peer.9.sh
index 94c32747..26b67b9e 100755
--- a/scripts/crm-fence-peer.9.sh
+++ b/scripts/crm-fence-peer.9.sh
@@ -197,15 +197,28 @@ fence_peer_init()
 {
# we know which instance we are: $OCF_RESOURCE_INSTANCE.
# but we do not know the xml ID of the  :(
+
+   # with Pacemaker 2, its "promotable clones" instead of the
+   # "master" (which was deemed a bad naming choice).
+   # detect older pacemaker by crm_feature_set < 3.1.0
+   local clone_or_master=clone
+   case $crm_feature_set in
+   3.0.*|[012].*)  : "pacemaker version < 2, master slave"
+   clone_or_master=master ;;
+   esac
+
# cibadmin -Ql --xpath \
# '//master[primitive[@type="drbd" and instance_attributes/nvpair[@name 
= "drbd_resource" and @value="r0"]]]/@id'
# but I'd have to pipe that through sed anyways, because @attribute
# xpath queries are not supported.
# and I'd be incompatible with older cibadmin not supporting --xpath.
-   # be cool, sed it out:
+   # be cool, sed it out.
+   # I could be more strict about primitive class:provider:type,
+   # or double check that it is in fact a promotable="true" clone...
+   # But in the real world, this is good enough.
: ${master_id=$(set +x; echo "$cib_xml" |
-   sed -ne '// {
-  // {
+  /<$clone_or_master / h;"'
 / :(
+
+   # with Pacemaker 2, its "promotable clones" instead of the
+   # "master" (which was deemed a bad naming choice).
+   # detect older pacemaker by crm_feature_set < 3.1.0
+   local clone_or_master=clone
+   case $crm_feature_set in
+   3.0.*|[012].*)  : "pacemaker version < 2, master slave"
+   clone_or_master=master ;;
+   esac
+
# cibadmin -Ql --xpath \
# '//master[primitive[@type="drbd" and instance_attributes/nvpair[@name 
= "drbd_resource" and @value="r0"]]]/@id'
# but I'd have to pipe that through sed anyways, because @attribute
# xpath queries are not supported.
# and I'd be incompatible with older cibadmin not supporting --xpath.
-   # be cool, sed it out:
+   # be cool, sed it out.
+   # I could be more strict about primitive class:provider:type,
+   # or double check that it is in fact a promotable="true" clone...
+   # But in the real world, this is good enough.
: ${master_id=$(set +x; echo "$cib_xml" |
-   sed -ne '// {
-  // {
+  /<$clone_or_master / h;"'
 /

commit drbd-utils for openSUSE:Factory

2020-02-25 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-02-25 16:07:20

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.26092 (New)


Package is "drbd-utils"

Tue Feb 25 16:07:20 2020 rev:35 rq:778995 version:9.12.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2020-02-20 
15:01:06.210961845 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.26092/drbd-utils.changes 
2020-02-25 16:07:52.580657282 +0100
@@ -1,0 +2,21 @@
+Tue Feb 25 06:18:56 UTC 2020 - nick wang 
+
+- Update to 9.12.0
+ * drbd.ocf: new wrc_timeout param, fail on attach failure,
+   remove_master_score_if_peer_primary param,
+   fail_promote_early_if_peer_primary param, improved helper logging
+   no error if wait-connect fails
+ * drbdadm,v9: fix dumping meta-disk in corner case
+ * crm-fence-peer.9.sh: fix Pacemaker 2 compat
+ * drbdsetup,v9: fixes for various json output corner cases
+ * drbdsetup,all: prepare for netlink changes (linux v5.2+)
+ * drbdadm,v9: fix a check for setting up connections multiple times
+ * init: setup file backed loop devices (mapping from LINSTOR)
+ * rr-conflict: add retry-connect option (>=drbd 9.0.20)
+ * drbdmon: 256/16 colors; events2 handler improvements
+ * drbdsetup,v9: new flag: force-resync (>=drbd 9.0.21)
+- Remove netlink-prepare-for-kernel-v5.2.patch
+  Remove netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
+  Remove cibadmin-return-code-convert.patch in 144c8cc1d
+
+---

Old:

  cibadmin-return-code-convert.patch
  drbd-utils-9.10.0.tar.gz
  netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
  netlink-prepare-for-kernel-v5.2.patch

New:

  drbd-utils-9.12.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.4Ut74L/_old  2020-02-25 16:07:53.608658265 +0100
+++ /var/tmp/diff_new_pack.4Ut74L/_new  2020-02-25 16:07:53.612658269 +0100
@@ -22,7 +22,7 @@
 %bcond_without prebuiltman
 
 Name:   drbd-utils
-Version:9.10.0
+Version:9.12.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0-or-later
@@ -36,10 +36,6 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
-# Bach port patch for kernel v5.2
-Patch6: netlink-prepare-for-kernel-v5.2.patch
-Patch7: netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
-Patch8: cibadmin-return-code-convert.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -90,9 +86,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1
@@ -175,6 +168,7 @@
 %{_tmpfilesdir}/drbd.conf
 %doc %{_mandir}/man5/drbd.*
 %doc %{_mandir}/man8/drbd*
+%doc %{_mandir}/man7/ocf_linbit_drbd.*
 %doc %{_mandir}/ja/man5/drbd.*
 %doc %{_mandir}/ja/man8/drbd*
 %doc COPYING

++ _service ++
--- /var/tmp/diff_new_pack.4Ut74L/_old  2020-02-25 16:07:53.640658295 +0100
+++ /var/tmp/diff_new_pack.4Ut74L/_new  2020-02-25 16:07:53.640658295 +0100
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.9.0+git.%h
+9.12.0+git.%h
 master
   
 

++ drbd-utils-9.10.0.tar.gz -> drbd-utils-9.12.0.tar.gz ++
 6081 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2020-02-20 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2020-02-20 15:01:00

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.26092 (New)


Package is "drbd-utils"

Thu Feb 20 15:01:00 2020 rev:34 rq:777678 version:9.10.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2019-09-23 
12:38:40.897597482 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.26092/drbd-utils.changes 
2020-02-20 15:01:06.210961845 +0100
@@ -1,0 +2,11 @@
+Mon Feb  3 12:26:16 UTC 2020 - Dominique Leuenberger 
+
+- BuildRequire pkgconfig(udev) instead of udev: allow OBS to
+  shortcut through the -mini flavors.
+
+---
+Thu Oct 17 17:49:08 UTC 2019 - Richard Brown 
+
+- Remove obsolete Groups tag (fate#326485)
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.1Jenaz/_old  2020-02-20 15:01:07.074963541 +0100
+++ /var/tmp/diff_new_pack.1Jenaz/_new  2020-02-20 15:01:07.074963541 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,8 +26,7 @@
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0-or-later
-Group:  Productivity/Clustering/HA
-Url:http://www.drbd.org/
+URL:http://www.drbd.org/
 Source: 
http://www.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz
 
 # PATCH-MISSING-TAG -- See 
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
@@ -67,8 +66,8 @@
 BuildRequires:  libxslt
 BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  udev
 BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(udev)
 %if %{with drbdmon}
 BuildRequires:  gcc-c++
 %endif

commit drbd-utils for openSUSE:Factory

2019-09-23 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2019-09-23 12:37:47

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.7948 (New)


Package is "drbd-utils"

Mon Sep 23 12:37:47 2019 rev:33 rq:732101 version:9.10.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2019-09-11 
10:41:58.715203114 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.7948/drbd-utils.changes  
2019-09-23 12:38:40.897597482 +0200
@@ -1,0 +2,6 @@
+Fri Sep 20 06:18:33 UTC 2019 - nick wang 
+
+- bsc#1145296, fix the wrong return code with cib_apply_diff
+  Add patch cibadmin-return-code-convert.patch
+
+---

New:

  cibadmin-return-code-convert.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.bQPz4U/_old  2019-09-23 12:38:41.313597414 +0200
+++ /var/tmp/diff_new_pack.bQPz4U/_new  2019-09-23 12:38:41.313597414 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,7 +25,7 @@
 Version:9.10.0
 Release:0
 Summary:Distributed Replicated Block Device
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Productivity/Clustering/HA
 Url:http://www.drbd.org/
 Source: 
http://www.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz
@@ -40,6 +40,7 @@
 # Bach port patch for kernel v5.2
 Patch6: netlink-prepare-for-kernel-v5.2.patch
 Patch7: netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
+Patch8: cibadmin-return-code-convert.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -66,8 +67,8 @@
 BuildRequires:  libxslt
 BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(systemd)
 BuildRequires:  udev
+BuildRequires:  pkgconfig(systemd)
 %if %{with drbdmon}
 BuildRequires:  gcc-c++
 %endif
@@ -92,6 +93,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ cibadmin-return-code-convert.patch ++
diff -Naur drbd-utils-9.6.0.orig/scripts/crm-fence-peer.9.sh 
drbd-utils-9.6.0/scripts/crm-fence-peer.9.sh
--- drbd-utils-9.6.0.orig/scripts/crm-fence-peer.9.sh   2019-09-03 
14:13:56.861585246 +0800
+++ drbd-utils-9.6.0/scripts/crm-fence-peer.9.sh2019-09-03 
14:17:42.478881632 +0800
@@ -146,7 +146,7 @@
break
;;
 
-   205): "205 aka pcmk_err_old_data ==> going to retry in a 
bit"
+   103): "103 CRM_EX_OLD, aka 205 pcmk_err_old_data in 
cib_apply_diff ==> going to retry in a bit"
(( $SECONDS >= $timeout )) && break
sleep 1
continue

commit drbd-utils for openSUSE:Factory

2019-09-11 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2019-09-11 10:41:19

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.7948 (New)


Package is "drbd-utils"

Wed Sep 11 10:41:19 2019 rev:32 rq:729995 version:9.10.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2019-09-05 
12:47:20.651471421 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.7948/drbd-utils.changes  
2019-09-11 10:41:58.715203114 +0200
@@ -1,0 +2,18 @@
+Mon Sep  6 08:57:04 UTC 2019 - nw...@suse.com
+
+- Support Kernel 5.2, bsc#1149945 and bsc#1144702
+- Add patch netlink-prepare-for-kernel-v5.2.patch
+  Add patch netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
+
+---
+Mon Sep  6 01:54:27 UTC 2019 - nw...@suse.com
+
+- Update to 9.10.0
+ * drbdmon: limit desplay lenght, minor fixes
+ * drbdsetup,v9: avoid underflow when resync regresses
+ * drbdmeta,v9: allow huge (~1PB volumes)
+ * drbdsetup,v9: add allow-remote-read flag(9.0.19)
+ * docker: switch to UBI images
+ * doc: update JA doc
+
+---

Old:

  drbd-utils-9.9.0.tar.gz

New:

  drbd-utils-9.10.0.tar.gz
  netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
  netlink-prepare-for-kernel-v5.2.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.nTM6Am/_old  2019-09-11 10:41:59.479202978 +0200
+++ /var/tmp/diff_new_pack.nTM6Am/_new  2019-09-11 10:41:59.479202978 +0200
@@ -22,7 +22,7 @@
 %bcond_without prebuiltman
 
 Name:   drbd-utils
-Version:9.9.0
+Version:9.10.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
@@ -37,6 +37,9 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch5: move_fencing_from_disk_to_net_in_example.patch
+# Bach port patch for kernel v5.2
+Patch6: netlink-prepare-for-kernel-v5.2.patch
+Patch7: netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -87,6 +90,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ drbd-utils-9.9.0.tar.gz -> drbd-utils-9.10.0.tar.gz ++
 2697 lines of diff (skipped)

++ netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch ++
>From 859151b228d3b3aacefb09d06d515a2589c22e35 Mon Sep 17 00:00:00 2001
From: He Zhe 
Date: Fri, 12 Jul 2019 15:07:27 +0800
Subject: [PATCH 2/2] netlink: Add NLA_F_NESTED flag to nested attribute

The mainline kernel v5.2 commit b424e432e770
("netlink: add validation of NLA_F_NESTED flag") imposes strict validation
against nested attribute as follow.

"
Add new validation flag NL_VALIDATE_NESTED which adds three consistency
checks of NLA_F_NESTED_FLAG:

  - the flag is set on attributes with NLA_NESTED{,_ARRAY} policy
  - the flag is not set on attributes with other policies except NLA_UNSPEC
  - the flag is set on attribute passed to nla_parse_nested()
"

Sending messages with nested attribute without NLA_F_NESTED would cause failed
validation. For example,

$ drbdsetup new-resource r0
Invalid argument

This patch adds NLA_F_NESTED flag to all nested attributes.

Signed-off-by: He Zhe 
---
 user/shared/libgenl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/shared/libgenl.h b/user/shared/libgenl.h
index 4e9888ca..d900a945 100644
--- a/user/shared/libgenl.h
+++ b/user/shared/libgenl.h
@@ -863,7 +863,7 @@ static inline struct nlattr *nla_nest_start(struct msg_buff 
*msg, int attrtype)
 {
struct nlattr *start = (struct nlattr *)msg->tail;
 
-   if (nla_put(msg, attrtype, 0, NULL) < 0)
+   if (nla_put(msg, attrtype | NLA_F_NESTED, 0, NULL) < 0)
return NULL;
 
return start;
-- 
2.12.3

++ netlink-prepare-for-kernel-v5.2.patch ++
>From 92ade5989027ee7ea5fbde38ad67cd234822afcf Mon Sep 17 00:00:00 2001
From: Roland Kammerer 
Date: Fri, 12 Jul 2019 13:36:50 +0200
Subject: [PATCH 1/2] netlink: prepare for kernel v5.2

---
 user/shared/libgenl.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/user/shared/libgenl.h b/user/shared/libgenl.h
index f649bc7d..4e9888ca 100644
--- a/user/shared/libgenl.h
+++ b/user/shared/libgenl.h
@@ -31,6 +31,10 @@
 #define SOL_NETLINK 270
 #endif
 
+#ifndef NLA_F_NESTED
+#define NLA_F_NESTED 0
+#endif
+
 #define DEBUG_LEVEL 1
 
 #define dbg(lvl, fmt, arg...)

commit drbd-utils for openSUSE:Factory

2019-09-05 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2019-09-05 12:47:15

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.7948 (New)


Package is "drbd-utils"

Thu Sep  5 12:47:15 2019 rev:31 rq:728449 version:9.9.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2019-06-12 
13:19:17.680551781 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.7948/drbd-utils.changes  
2019-09-05 12:47:20.651471421 +0200
@@ -1,0 +2,6 @@
+Thu Sep  5 07:42:21 UTC 2019 - oher...@suse.de
+
+- In our effort to make /etc fully admin controlled, move /etc/xen/scripts
+  to libexec/xen/scripts
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.4HQ7do/_old  2019-09-05 12:47:22.187471688 +0200
+++ /var/tmp/diff_new_pack.4HQ7do/_new  2019-09-05 12:47:22.191471689 +0200
@@ -121,6 +121,20 @@
 mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
 %ifnarch %ix86 x86_64
 rm -rf %{buildroot}%{_sysconfdir}/xen
+%else
+d=%{_libexecdir}/xen/scripts
+mkdir -p %{buildroot}$d
+mv %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd %{buildroot}$d
+%if %{suse_version} > 1500
+rm -rf %{buildroot}%{_sysconfdir}/xen
+%else
+tee %{buildroot}%{_sysconfdir}/xen/scripts/block-drbd <<_EOS_
+#!/bin/sh
+# SUSE versions up to SLE15 populated /etc with files.
+# This wrapper exists to remain compatible with their expected script path
+exec $d/block-drbd "\$@"
+_EOS_
+%endif
 %endif
 
 %pre
@@ -169,9 +183,12 @@
 /sbin/drbdmon
 %endif
 %ifarch %ix86 x86_64
+%if %{suse_version} <= 1500
 %dir %attr(700,root,root) %{_sysconfdir}/xen
 %dir %{_sysconfdir}/xen/scripts
-%{_sysconfdir}/xen/scripts/block-drbd
+%attr(755,root,root) %{_sysconfdir}/xen/scripts/block-drbd
+%endif
+%{_libexecdir}/xen
 %endif
 %{_prefix}/lib/ocf/resource.d/linbit/drbd
 %{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh

commit drbd-utils for openSUSE:Factory

2019-06-12 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2019-06-12 13:19:16

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.4811 (New)


Package is "drbd-utils"

Wed Jun 12 13:19:16 2019 rev:30 rq:709285 version:9.9.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2019-06-03 
18:51:08.360521328 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.4811/drbd-utils.changes  
2019-06-12 13:19:17.680551781 +0200
@@ -1,0 +2,6 @@
+Tue Jun 11 12:42:01 UTC 2019 - Dominique Leuenberger 
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+  shortcut the build queues by allowing usage of systemd-mini
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.Od71Gh/_old  2019-06-12 13:19:18.168551557 +0200
+++ /var/tmp/diff_new_pack.Od71Gh/_new  2019-06-12 13:19:18.172551556 +0200
@@ -63,7 +63,7 @@
 BuildRequires:  libxslt
 BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
 BuildRequires:  udev
 %if %{with drbdmon}
 BuildRequires:  gcc-c++

commit drbd-utils for openSUSE:Factory

2019-06-03 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2019-06-03 18:51:07

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.5148 (New)


Package is "drbd-utils"

Mon Jun  3 18:51:07 2019 rev:29 rq:706973 version:9.9.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2019-03-14 
14:55:01.239763821 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.5148/drbd-utils.changes  
2019-06-03 18:51:08.360521328 +0200
@@ -1,0 +2,11 @@
+Tue May 28 05:59:13 UTC 2019 - nw...@suse.com
+
+- Update to 9.9.0
+ * drbdadm,v9: do not ignore stacked/upper implicit paths.
+ * docker: provide initial integration.
+ * doc,v9: document transport keyword
+ * drbdmeta,v9: support for PMEM activity log format
+ * drbdadm: allow faking of drbdsetup show output
+ * drbdmeta,v9: fix forget-peer
+
+---

Old:

  drbd-utils-9.8.0.tar.gz

New:

  drbd-utils-9.9.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.no8jiU/_old  2019-06-03 18:51:09.480520943 +0200
+++ /var/tmp/diff_new_pack.no8jiU/_new  2019-06-03 18:51:09.488520940 +0200
@@ -22,7 +22,7 @@
 %bcond_without prebuiltman
 
 Name:   drbd-utils
-Version:9.8.0
+Version:9.9.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+

++ _service ++
--- /var/tmp/diff_new_pack.no8jiU/_old  2019-06-03 18:51:09.524520928 +0200
+++ /var/tmp/diff_new_pack.no8jiU/_new  2019-06-03 18:51:09.528520926 +0200
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.7.0+git.%h
+9.9.0+git.%h
 master
   
 

++ drbd-utils-9.8.0.tar.gz -> drbd-utils-9.9.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/drbd-utils-9.8.0/.filelist 
new/drbd-utils-9.9.0/.filelist
--- old/drbd-utils-9.8.0/.filelist  2019-01-16 13:23:36.0 +0100
+++ new/drbd-utils-9.9.0/.filelist  2019-05-27 14:30:02.0 +0200
@@ -1,333 +1,336 @@
-drbd-utils-9.8.0/COPYING
-drbd-utils-9.8.0/ChangeLog
-drbd-utils-9.8.0/Makefile.in
-drbd-utils-9.8.0/README-windrbd.md
-drbd-utils-9.8.0/README.md
-drbd-utils-9.8.0/autogen.sh
-drbd-utils-9.8.0/configure.ac
-drbd-utils-9.8.0/documentation/aspell.en.per
-drbd-utils-9.8.0/documentation/common/Makefile_v84_com.in
-drbd-utils-9.8.0/documentation/common/Makefile_v84_com_post
-drbd-utils-9.8.0/documentation/common/Makefile_v9_com.in
-drbd-utils-9.8.0/documentation/common/Makefile_v9_com_post
-drbd-utils-9.8.0/documentation/fencing-by-constraints.txt
-drbd-utils-9.8.0/documentation/ja/README.txt
-drbd-utils-9.8.0/documentation/ja/v84/Makefile
-drbd-utils-9.8.0/documentation/ja/v84/drbd.conf.xml.po
-drbd-utils-9.8.0/documentation/ja/v84/drbd.xml.po
-drbd-utils-9.8.0/documentation/ja/v84/drbdadm.xml.po
-drbd-utils-9.8.0/documentation/ja/v84/drbddisk.xml.po
-drbd-utils-9.8.0/documentation/ja/v84/drbdmeta.xml.po
-drbd-utils-9.8.0/documentation/ja/v84/drbdsetup.xml.po
-drbd-utils-9.8.0/documentation/ja/v84/xml-usage-to-docbook.xsl
-drbd-utils-9.8.0/documentation/ja/v9/Makefile
-drbd-utils-9.8.0/documentation/ja/v9/drbd.conf.xml.in.po
-drbd-utils-9.8.0/documentation/ja/v9/drbd.conf.xsl
-drbd-utils-9.8.0/documentation/ja/v9/drbd.xml.po
-drbd-utils-9.8.0/documentation/ja/v9/drbdadm.xml.po
-drbd-utils-9.8.0/documentation/ja/v9/drbdmeta.xml.po
-drbd-utils-9.8.0/documentation/ja/v9/drbdmon.xml.po
-drbd-utils-9.8.0/documentation/ja/v9/drbdsetup-options.xml.po
-drbd-utils-9.8.0/documentation/ja/v9/drbdsetup.xml.in.po
-drbd-utils-9.8.0/documentation/ja/v9/drbdsetup.xsl
-drbd-utils-9.8.0/documentation/ja/v9/xml-usage-to-docbook.xsl
-drbd-utils-9.8.0/documentation/v83/Makefile.in
-drbd-utils-9.8.0/documentation/v83/drbd.conf.xml
-drbd-utils-9.8.0/documentation/v83/drbd.xml
-drbd-utils-9.8.0/documentation/v83/drbdadm.xml
-drbd-utils-9.8.0/documentation/v83/drbddisk.xml
-drbd-utils-9.8.0/documentation/v83/drbdmeta.xml
-drbd-utils-9.8.0/documentation/v83/drbdsetup.xml
-drbd-utils-9.8.0/documentation/v84/Makefile
-drbd-utils-9.8.0/documentation/v84/drbd.conf.xml
-drbd-utils-9.8.0/documentation/v84/drbd.xml
-drbd-utils-9.8.0/documentation/v84/drbdadm.xml
-drbd-utils-9.8.0/documentation/v84/drbddisk.xml
-drbd-utils-9.8.0/documentation/v84/drbdmeta.xml
-drbd-utils-9.8.0/documentation/v84/drbdsetup.xml
-drbd-utils-9.8.0/documentation/v84/xml-usage-to-docbook.xsl
-drbd-utils-9.8.0/documentation/v9/Makefile
-drbd-utils-9.8.0/documentation/v9/drbd.conf.xml.in
-drbd-utils-9.8.0/documentation/v9/drbd.conf.xsl
-drbd-utils-9.8.0/documentation/v9/drbd.xml
-drbd-utils-9.8.0/documentation/v9/drbdadm.xml

commit drbd-utils for openSUSE:Factory

2019-03-14 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2019-03-14 14:54:56

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new.28833 (New)


Package is "drbd-utils"

Thu Mar 14 14:54:56 2019 rev:28 rq:684205 version:9.8.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-11-13 
17:08:28.222986232 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.28833/drbd-utils.changes 
2019-03-14 14:55:01.239763821 +0100
@@ -1,0 +2,31 @@
+Thu Jan 17 07:16:25 UTC 2019 - nw...@suse.com
+
+- Update to 9.8.0
+ * i18n: use propper po files
+ * v9,stacked: allow node-id in stacked section
+   but one should not use stacked with v9 anyways
+ * dry run: remove trailing white space
+   This eases test integration.
+   Mentioned here because strictly speaking output changed.
+ * regression tests: if at ./configure time "clitest" is detected,
+  one can run tests via "make test". Target is a noop otherwise.
+ * drbdsetup,v9: fix wait-for (same patch as in 9.7.1)
+ * doc,v9:  require-drbd-module-version-*, events2 --now --poll
+ * drbdadm,v9: allow stacked-on-top-of sections without address
+ * drbdadm,v9: bring up only the correct paths in multi-site scenaios.
+ * drbdadm,v9: fix parser segfault if node-id is missing.
+ * tests: require that they pass on release.
+ * drbdsetup,v9: fix key collision in show --json. 
+- bsc#1121794, use drbd9 man pages.
+
+---
+Wed Dec  5 09:01:02 UTC 2018 - nw...@suse.com
+
+- Update to 9.7.0 
+ * drbdadm,v9,v84: fix resync-after
+ * drbd.ocf: connect_only_after_promote, require kernel version
+ * drbdmon: display resync progress
+ * parser,v9: require-drbd-module-version
+ * windrbd: add WinDRBD support
+
+---

Old:

  drbd-utils-9.6.0.tar.gz

New:

  drbd-utils-9.8.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.il9Yl8/_old  2019-03-14 14:55:02.923763562 +0100
+++ /var/tmp/diff_new_pack.il9Yl8/_new  2019-03-14 14:55:02.971763555 +0100
@@ -17,9 +17,12 @@
 
 
 %bcond_without drbdmon
+# Man pages are included in the released tarball.
+# Only need po4a to build man from git source code
+%bcond_without prebuiltman
 
 Name:   drbd-utils
-Version:9.6.0
+Version:9.8.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
@@ -65,6 +68,9 @@
 %if %{with drbdmon}
 BuildRequires:  gcc-c++
 %endif
+%if %{without prebuiltman}
+BuildRequires: po4a
+%endif
 Provides:   drbd-control
 Provides:   drbdsetup
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -104,6 +110,7 @@
 --libdir=%{_prefix}/lib \
 --exec_prefix=%{_prefix}/lib \
 %{?with_drbdmon:   --with-drbdmon} \
+%{?with_prebuiltman: --with-prebuiltman} \
 --with-tmpfilesdir=%{_tmpfilesdir}
 
 make OPTFLAGS="%{optflags}" %{?_smp_mflags}
@@ -122,6 +129,18 @@
 %post
 %service_add_post drbd.service
 
+#May also overlap the $MAN_LINK in documentation/v9/Makefile.in
+for f in drbd drbdadm drbdmeta drbdsetup; do
+ln -sf $f-9.0.8.gz %{_mandir}/man8/$f.8.gz
+ln -sf $f-9.0.8.gz %{_mandir}/ja/man8/$f.8.gz
+done
+ln -sf drbd.conf-9.0.5.gz %{_mandir}/man5/drbd.conf.5.gz
+ln -sf drbd.conf-9.0.5.gz %{_mandir}/ja/man5/drbd.conf.5.gz
+%if %{with drbdmon}
+ln -sf drbdmon-9.0.8.gz %{_mandir}/man8/drbdmon.8.gz
+ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
+%endif
+
 %preun
 %service_del_preun drbd.service
 

++ _service ++
--- /var/tmp/diff_new_pack.il9Yl8/_old  2019-03-14 14:55:03.507763472 +0100
+++ /var/tmp/diff_new_pack.il9Yl8/_new  2019-03-14 14:55:03.523763469 +0100
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.6.0+git.%h
+9.7.0+git.%h
 master
   
 

++ drbd-utils-9.6.0.tar.gz -> drbd-utils-9.8.0.tar.gz ++
 35396 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2018-11-13 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-11-13 16:59:19

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Tue Nov 13 16:59:19 2018 rev:27 rq:648427 version:9.6.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-11-10 
17:01:03.983629760 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-11-13 17:08:28.222986232 +0100
@@ -4 +4 @@
-- Update to new upstream release 9.6.0
+- bsc#1115606. Update to new upstream release 9.6.0



Other differences:
--

commit drbd-utils for openSUSE:Factory

2018-11-10 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-11-10 16:58:59

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Sat Nov 10 16:58:59 2018 rev:26 rq:645963 version:9.6.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-08-18 
00:03:56.075045223 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-11-10 17:01:03.983629760 +0100
@@ -1,0 +2,18 @@
+Tue Oct 30 08:05:03 UTC 2018 - nw...@suse.com
+
+- Update to new upstream release 9.6.0
+ * usage-count: also count notty users if possible.
+ * drbd-overview: remove it, we have drbdtop/drbdmon. saves all the Perl deps.
+ * drbdmon: update frequency limiting, debug log for drbdevents, use
+   altbuffer,...
+ * drbdsetup show: on 9 allow json output.
+   mainly used in our CI, don't expect a stable field names yet.
+ * drbdsetup satus: on 9 fix json output to not include NaN/Infinity
+ * allow higher resync rates: first customers hit a limit. this requires an
+   updated kernel module as well (e.g., 9.0.16)
+ * init: fix some 8-only leftovers (sh-b-pri), sanitize the retry logic
+ * doc: document various 9 features that got forgotten (e.g., quorum-lost)
+ * build: various small fixes that popped up while playing with meson
+- Remove patch: skip_sh-b-pri_in_v9.patch fix in ace704aac
+
+---

Old:

  drbd-utils-9.5.0.tar.gz
  skip_sh-b-pri_in_v9.patch

New:

  drbd-utils-9.6.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.fQB1yz/_old  2018-11-10 17:01:05.039628470 +0100
+++ /var/tmp/diff_new_pack.fQB1yz/_new  2018-11-10 17:01:05.039628470 +0100
@@ -19,7 +19,7 @@
 %bcond_without drbdmon
 
 Name:   drbd-utils
-Version:9.5.0
+Version:9.6.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
@@ -34,7 +34,6 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.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}
@@ -82,7 +81,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1
@@ -148,7 +146,6 @@
 /sbin/drbdadm
 /sbin/drbdsetup
 /sbin/drbdmeta
-/sbin/drbd-overview
 %if %{with drbdmon}
 /sbin/drbdmon
 %endif

++ _service ++
--- /var/tmp/diff_new_pack.fQB1yz/_old  2018-11-10 17:01:05.067628435 +0100
+++ /var/tmp/diff_new_pack.fQB1yz/_new  2018-11-10 17:01:05.067628435 +0100
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.5.0+git.%h
+9.6.0+git.%h
 master
   
 

++ drbd-utils-9.5.0.tar.gz -> drbd-utils-9.6.0.tar.gz ++
 8580 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2018-08-17 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-08-18 00:03:54

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Sat Aug 18 00:03:54 2018 rev:25 rq:629481 version:9.5.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-06-02 
12:14:26.750933574 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-08-18 00:03:56.075045223 +0200
@@ -1,0 +2,11 @@
+Mon Jul 23 03:05:33 UTC 2018 - nw...@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
+
+---

Old:

  drbd-utils-9.4.0.tar.gz
  fix_call_khelper_with_stack.patch

New:

  drbd-utils-9.5.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.FZzsJm/_old  2018-08-18 00:03:56.643046921 +0200
+++ /var/tmp/diff_new_pack.FZzsJm/_new  2018-08-18 00:03:56.647046932 +0200
@@ -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 @@
 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 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ _service ++
--- /var/tmp/diff_new_pack.FZzsJm/_old  2018-08-18 00:03:56.671047004 +0200
+++ /var/tmp/diff_new_pack.FZzsJm/_new  2018-08-18 00:03:56.671047004 +0200
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.4.0+git.%h
+9.5.0+git.%h
 master
   
 

++ drbd-utils-9.4.0.tar.gz -> drbd-utils-9.5.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/drbd-utils-9.4.0/.filelist 
new/drbd-utils-9.5.0/.filelist
--- old/drbd-utils-9.4.0/.filelist  2018-05-09 15:50:58.0 +0200
+++ new/drbd-utils-9.5.0/.filelist  2018-06-26 15:06:20.0 +0200
@@ -1,285 +1,285 @@
-drbd-utils-9.4.0/COPYING
-drbd-utils-9.4.0/ChangeLog
-drbd-utils-9.4.0/Makefile.in
-drbd-utils-9.4.0/README.md
-drbd-utils-9.4.0/autogen.sh
-drbd-utils-9.4.0/configure.ac
-drbd-utils-9.4.0/documentation/aspell.en.per
-drbd-utils-9.4.0/documentation/fencing-by-constraints.txt
-drbd-utils-9.4.0/documentation/ja/README.txt
-drbd-utils-9.4.0/documentation/ja/v84/Makefile.in
-drbd-utils-9.4.0/documentation/ja/v84/drbd.conf.xml
-drbd-utils-9.4.0/documentation/ja/v84/drbd.xml
-drbd-utils-9.4.0/documentation/ja/v84/drbdadm.xml
-drbd-utils-9.4.0/documentation/ja/v84/drbddisk.xml
-drbd-utils-9.4.0/documentation/ja/v84/drbdmeta.xml
-drbd-utils-9.4.0/documentation/ja/v84/drbdsetup.xml
-drbd-utils-9.4.0/documentation/ja/v84/xml-usage-to-docbook.xsl
-drbd-utils-9.4.0/documentation/ja/v9/Makefile.in
-drbd-utils-9.4.0/documentation/ja/v9/drbd-overview.xml
-drbd-utils-9.4.0/documentation/ja/v9/drbd.conf.xml.in
-drbd-utils-9.4.0/documentation/ja/v9/drbd.conf.xsl
-drbd-utils-9.4.0/documentation/ja/v9/drbd.xml
-drbd-utils-9.4.0/documentation/ja/v9/drbdadm.xml
-drbd-utils-9.4.0/documentation/ja/v9/drbdmeta.xml
-drbd-utils-9.4.0/documentation/ja/v9/drbdmon.xml
-drbd-utils-9.4.0/documentation/ja/v9/drbdsetup-options.xml
-drbd-utils-9.4.0/documentation/ja/v9/drbdsetup.xml.in
-drbd-utils-9.4.0/documentation/ja/v9/drbdsetup.xsl
-drbd-utils-9.4.0/documentation/ja/v9/xml-usage-to-docbook.xsl
-drbd-utils-9.4.0/documentation/v83/Makefile.in

commit drbd-utils for openSUSE:Factory

2018-06-02 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-06-02 12:13:58

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Sat Jun  2 12:13:58 2018 rev:24 rq:613429 version:9.4.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-05-11 
09:17:29.892204180 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-06-02 12:14:26.750933574 +0200
@@ -10,0 +11,3 @@
+- Including fix for SLE12SP3:
+  bsc#1064402, remove hardcoded local5 of logfacility 
+  bsc#1037109, drbdmeta does not propagate full bitmap



Other differences:
--

commit drbd-utils for openSUSE:Factory

2018-05-11 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-05-11 09:17:24

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Fri May 11 09:17:24 2018 rev:23 rq:606123 version:9.4.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-04-19 
15:32:58.62246 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-05-11 09:17:29.892204180 +0200
@@ -1,0 +2,11 @@
+Thu May 10 09:11:09 UTC 2018 - nw...@suse.com
+
+- Update to 9.4.0
+ * drbdmeta: don't exit with negative return codes
+ * usage counts: only register if we know driver version
+ * drbdsetup,v9: expose detailed verify/resync statistics
+ * drbdsetup,v9,json: saner types for client/peer-client/quorum
+   on --json
+ * drbdsetup,v9: expose client/peer-client in status if !isatty()
+
+---

Old:

  drbd-utils-9.3.1.tar.gz

New:

  drbd-utils-9.4.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.T1kAb9/_old  2018-05-11 09:17:30.776172153 +0200
+++ /var/tmp/diff_new_pack.T1kAb9/_new  2018-05-11 09:17:30.780172008 +0200
@@ -19,7 +19,7 @@
 %bcond_without drbdmon
 
 Name:   drbd-utils
-Version:9.3.1
+Version:9.4.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+

++ _service ++
--- /var/tmp/diff_new_pack.T1kAb9/_old  2018-05-11 09:17:30.852169400 +0200
+++ /var/tmp/diff_new_pack.T1kAb9/_new  2018-05-11 09:17:30.852169400 +0200
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.3.1+git.%h
+9.4.0+git.%h
 master
   
 

++ drbd-utils-9.3.1.tar.gz -> drbd-utils-9.4.0.tar.gz ++
 1819 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2018-04-19 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-04-19 15:32:54

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Thu Apr 19 15:32:54 2018 rev:22 rq:598070 version:9.3.1

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-02-06 
16:47:29.776722898 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-04-19 15:32:58.62246 +0200
@@ -1,0 +2,16 @@
+Sun Apr  8 02:43:23 UTC 2018 - nw...@suse.com
+
+- bsc#1090167, Update to 9.3.1
+  * update to Japanese man pages
+  * fixes for stacking in drbd-9.0
+  * fixes for proxy support in drbd-9.0
+  * fix adjusting --bitmap=no peer to diskfull
+  * VCS: typos and fixes for stacked resources
+- Remove upstream patch Fix-no-bitmap-allocate-for-stacked-res.patch
+- Remove upstream patch Support-pass-force-to-dump-md.patch
+- Remove patch fix-segfault-up-stacked-resource.patch with
+  upstream fix 74b1cbb274
+- drbdadm v84: fixup for disable-write-same
+- Fix IPv4 & IPv6 address comparisons for 'drbdadm adjust'
+
+---

Old:

  Fix-no-bitmap-allocate-for-stacked-res.patch
  Support-pass-force-to-dump-md.patch
  drbd-utils-9.2.0.tar.gz
  fix-segfault-up-stacked-resource.patch

New:

  drbd-utils-9.3.1.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.pcSCSV/_old  2018-04-19 15:33:00.422381353 +0200
+++ /var/tmp/diff_new_pack.pcSCSV/_new  2018-04-19 15:33:00.426381188 +0200
@@ -19,7 +19,7 @@
 %bcond_without drbdmon
 
 Name:   drbd-utils
-Version:9.2.0
+Version:9.3.1
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
@@ -31,14 +31,11 @@
 Patch1: init-script-fixes.diff
 Patch2: fix-libdir-in-Makefile.patch
 Patch3: fence-after-pacemaker-down.patch
-Patch4: fix-segfault-up-stacked-resource.patch
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
-Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
-Patch6: fix_call_khelper_with_stack.patch
-Patch7: move_fencing_from_disk_to_net_in_example.patch
-Patch8: skip_sh-b-pri_in_v9.patch
-Patch9: Fix-no-bitmap-allocate-for-stacked-res.patch
-Patch10:Support-pass-force-to-dump-md.patch
+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
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -88,9 +85,6 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ _service ++
--- /var/tmp/diff_new_pack.pcSCSV/_old  2018-04-19 15:33:00.490378550 +0200
+++ /var/tmp/diff_new_pack.pcSCSV/_new  2018-04-19 15:33:00.490378550 +0200
@@ -5,10 +5,10 @@
 drbd-utils
 
-9.2.0+git.%h
+9.3.1+git.%h
 master
   
 

++ drbd-utils-9.2.0.tar.gz -> drbd-utils-9.3.1.tar.gz ++
 10760 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2018-02-06 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-02-06 16:47:28

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Tue Feb  6 16:47:28 2018 rev:21 rq:572491 version:9.2.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2018-01-22 
16:21:09.546523360 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-02-06 16:47:29.776722898 +0100
@@ -1,0 +2,9 @@
+Mon Feb  5 07:09:33 UTC 2018 - nw...@suse.com
+
+- bsc#1077176, pass the string to backend. 
+- bsc#1058770, fix kernel trace while starting
+  sync stacked drbd
+- Add patch Fix-no-bitmap-allocate-for-stacked-res.patch
+- Add patch Support-pass-force-to-dump-md.patch
+
+---

New:

  Fix-no-bitmap-allocate-for-stacked-res.patch
  Support-pass-force-to-dump-md.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.Tqaxy5/_old  2018-02-06 16:47:30.456691081 +0100
+++ /var/tmp/diff_new_pack.Tqaxy5/_new  2018-02-06 16:47:30.460690893 +0100
@@ -37,6 +37,8 @@
 Patch6: fix_call_khelper_with_stack.patch
 Patch7: move_fencing_from_disk_to_net_in_example.patch
 Patch8: skip_sh-b-pri_in_v9.patch
+Patch9: Fix-no-bitmap-allocate-for-stacked-res.patch
+Patch10:Support-pass-force-to-dump-md.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -87,6 +89,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 export WANT_DRBD_REPRODUCIBLE_BUILD=1

++ Fix-no-bitmap-allocate-for-stacked-res.patch ++
>From b5eab810ded459792c24a4bc5db5ce272ea1ee15 Mon Sep 17 00:00:00 2001
From: Philipp Reisner 
Date: Fri, 26 Jan 2018 16:09:01 +0100
Subject: [PATCH] v9,drbdadm,stacking: Fix setting the disk in stacked host
sections

This got broken on the long way from drbd-8.4 to 9.
---

diff --git a/user/v9/drbdadm_postparse.c b/user/v9/drbdadm_postparse.c
index 1cefd5c2..b9e90de8 100644
--- a/user/v9/drbdadm_postparse.c
+++ b/user/v9/drbdadm_postparse.c
@@ -493,9 +493,9 @@ void set_peer_in_resource(struct d_resource* res, int 
peer_required)
add_no_bitmap_opt(res);
 }
 
-void set_disk_in_res(struct d_resource *res)
+void set_stacked_disk_in_res(struct d_resource *res)
 {
-   struct d_host_info *host;
+   struct d_host_info *host, *lower_host;
struct d_volume *a, *b;
 
if (res->ignore)
@@ -505,41 +505,39 @@ void set_disk_in_res(struct d_resource *res)
if (!host->lower)
continue;
 
-   if (host->lower->ignore)
-   continue;
-
-   check_volume_sets_equal(res, host, host->lower->me);
-   if (!config_valid)
-   /* don't even bother for broken config. */
-   continue;
+   for_each_host(lower_host, >lower->all_hosts) {
+   check_volume_sets_equal(res, host, lower_host);
+   if (!config_valid)
+   /* don't even bother for broken config. */
+   continue;
 
-   /* volume lists are sorted on vnr */
-   a = STAILQ_FIRST(>volumes);
-   b = STAILQ_FIRST(>lower->me->volumes);
-   while (a) {
-   while (b && a->vnr > b->vnr) {
-   /* Lower resource has more volumes.
-* Probably unusual, but we decided
-* that it should be legal.
-* Skip those that do not match */
-   b = STAILQ_NEXT(b, link);
-   }
-   if (a && b && a->vnr == b->vnr) {
-   if (b->device)
-   m_asprintf(>disk, "%s", b->device);
-   else
-   m_asprintf(>disk, "/dev/drbd%u", 
b->device_minor);
-   /* stacked implicit volumes need internal meta 
data, too */
-   if (!a->meta_disk)
-   m_asprintf(>meta_disk, "internal");
-   if (!a->meta_index)
-   m_asprintf(>meta_index, "internal");
-   a = STAILQ_NEXT(a, link);
-   b = STAILQ_NEXT(b, link);
-   } else {
-

commit drbd-utils for openSUSE:Factory

2018-01-22 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2018-01-22 16:20:19

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Mon Jan 22 16:20:19 2018 rev:20 rq:568022 version:9.2.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-12-29 
18:52:22.095759630 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2018-01-22 16:21:09.546523360 +0100
@@ -1,0 +2,7 @@
+Mon Jan 22 05:02:12 UTC 2018 - nw...@suse.com
+
+- bsc#1076936, from bwiedem...@suse.com.
+  Reproducible builds support merged in upstream, but 
+  the changes in spec is lost.
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.Y4d0WU/_old  2018-01-22 16:21:10.554476215 +0100
+++ /var/tmp/diff_new_pack.Y4d0WU/_new  2018-01-22 16:21:10.558476028 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -89,6 +89,7 @@
 %patch8 -p1
 
 %build
+export WANT_DRBD_REPRODUCIBLE_BUILD=1
 ./autogen.sh
 PATH=/sbin:$PATH ./configure \
 --with-udev \

commit drbd-utils for openSUSE:Factory

2017-12-29 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-12-29 18:52:09

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Fri Dec 29 18:52:09 2017 rev:19 rq:560269 version:9.2.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-10-17 
01:53:35.931396969 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-12-29 18:52:22.095759630 +0100
@@ -1,0 +2,13 @@
+Wed Dec  6 07:19:50 UTC 2017 - nw...@suse.com
+
+- bsc#1074169, Update to 9.2.0
+ * Japanese man pages
+ * initial vertias cluster agent support
+ * quorum integration (including agents)
+ * improve drbd9 (mesh)/drbd-proxy integration
+ * pull fixups from 9.1.1 branch
+ * switch to github
+ * drbdmon: page naviagation
+ * debian: add mount as dependency
+
+---
@@ -7,0 +21,18 @@
+
+---
+Fri Sep  1 08:13:38 UTC 2017 - nw...@suse.com
+
+- Update to 9.1.0
+ * allow events2 --now polling
+ * fix ambiguous inheritance for peer-device-options
+ * fixup fallback path for BLKZEROOUT for older kernels
+ * fix v9 proxy support
+ * modernized XEN scripts
+ * reproducible builds support
+ * create-md --force for v8.4 (for compat to v9)
+ * fix cstate output
+ * resize: give resize more time (same as attach)
+ * drbdmon: peer-device status, version info, node name
+ * "drbdadm status" for v8.4
+ * set peer-device-options only once
+- Remove Update-block-drbd-script-to-support-xen.patch 

Old:

  Update-block-drbd-script-to-support-xen.patch
  drbd-utils-9.0.0.tar.gz

New:

  drbd-utils-9.2.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.Fg78hu/_old  2017-12-29 18:52:22.987503513 +0100
+++ /var/tmp/diff_new_pack.Fg78hu/_new  2017-12-29 18:52:22.991502365 +0100
@@ -19,7 +19,7 @@
 %bcond_without drbdmon
 
 Name:   drbd-utils
-Version:9.0.0
+Version:9.2.0
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
@@ -35,9 +35,8 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch6: fix_call_khelper_with_stack.patch
-Patch7: Update-block-drbd-script-to-support-xen.patch
-Patch8: move_fencing_from_disk_to_net_in_example.patch
-Patch9: skip_sh-b-pri_in_v9.patch
+Patch7: move_fencing_from_disk_to_net_in_example.patch
+Patch8: skip_sh-b-pri_in_v9.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -79,7 +78,7 @@
 raid 1. It is a building block for setting up clusters.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -88,7 +87,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %build
 ./autogen.sh
@@ -143,8 +141,10 @@
 %{_tmpfilesdir}/drbd.conf
 %doc %{_mandir}/man5/drbd.*
 %doc %{_mandir}/man8/drbd*
+%doc %{_mandir}/ja/man5/drbd.*
+%doc %{_mandir}/ja/man8/drbd*
 %doc COPYING
-%doc README
+%doc README.md
 %doc ChangeLog
 %doc scripts/drbd.conf.example
 %dir %{_sysconfdir}/drbd.d

++ _service ++
--- /var/tmp/diff_new_pack.Fg78hu/_old  2017-12-29 18:52:23.035489731 +0100
+++ /var/tmp/diff_new_pack.Fg78hu/_new  2017-12-29 18:52:23.039488583 +0100
@@ -1,13 +1,14 @@
 
   
-git://git.linbit.com/drbd-utils.git
+https://github.com/LINBIT/drbd-utils.git
 git
 drbd-utils
 
-9.0.0+git.%h
+9.2.0+git.%h
 master
   
 

++ drbd-utils-9.0.0.tar.gz -> drbd-utils-9.2.0.tar.gz ++
 13297 lines of diff (skipped)

commit drbd-utils for openSUSE:Factory

2017-10-16 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-10-17 01:53:30

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Tue Oct 17 01:53:30 2017 rev:18 rq:534178 version:9.0.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-08-28 
15:17:25.910478307 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-10-17 01:53:35.931396969 +0200
@@ -1,0 +2,8 @@
+Mon Oct 16 09:38:35 UTC 2017 - nw...@suse.com
+
+- bsc#1061145, fencing is moved from disk secion to net
+  Add move_fencing_from_disk_to_net_in_example.patch 
+- bsc#1061147, skip running drbdadm sh-b-pri in drbd9
+  Add skip_sh-b-pri_in_v9.patch
+
+---

New:

  move_fencing_from_disk_to_net_in_example.patch
  skip_sh-b-pri_in_v9.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.1a2YFF/_old  2017-10-17 01:53:37.075343390 +0200
+++ /var/tmp/diff_new_pack.1a2YFF/_new  2017-10-17 01:53:37.079343202 +0200
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %bcond_without drbdmon
 
 Name:   drbd-utils
@@ -35,6 +36,8 @@
 Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch6: fix_call_khelper_with_stack.patch
 Patch7: Update-block-drbd-script-to-support-xen.patch
+Patch8: move_fencing_from_disk_to_net_in_example.patch
+Patch9: skip_sh-b-pri_in_v9.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -84,6 +87,8 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 ./autogen.sh

++ move_fencing_from_disk_to_net_in_example.patch ++
diff -Naur drbd-utils-9.0.0.orig/scripts/global_common.conf 
drbd-utils-9.0.0/scripts/global_common.conf
--- drbd-utils-9.0.0.orig/scripts/global_common.conf2017-10-16 
17:02:55.715528259 +0800
+++ drbd-utils-9.0.0/scripts/global_common.conf 2017-10-16 17:07:49.755636558 
+0800
@@ -47,10 +47,10 @@
}
 
disk {
-   # size on-io-error fencing disk-barrier disk-flushes
+   # on-io-error disk-barrier disk-flushes
# disk-drain md-flushes resync-rate resync-after al-extents
-# c-plan-ahead c-delay-target c-fill-target c-max-rate
-# c-min-rate disk-timeout
+   # c-plan-ahead c-delay-target c-fill-target c-max-rate
+   # c-min-rate disk-timeout
}
 
net {
@@ -60,6 +60,6 @@
# after-sb-1pri after-sb-2pri always-asbp rr-conflict
# ping-timeout data-integrity-alg tcp-cork on-congestion
# congestion-fill congestion-extents csums-alg verify-alg
-   # use-rle
+   # use-rle fencing
}
 }
++ skip_sh-b-pri_in_v9.patch ++
diff -Naur drbd-utils-9.0.0.orig/scripts/drbd drbd-utils-9.0.0/scripts/drbd
--- drbd-utils-9.0.0.orig/scripts/drbd  2017-10-16 17:02:55.707528280 +0800
+++ drbd-utils-9.0.0/scripts/drbd   2017-10-16 17:34:02.134427141 +0800
@@ -55,6 +55,13 @@
 . /lib/lsb/init-functions
 fi
 
+local DRBD_VERSION DRBD_IS_V9=false
+DRBD_VERSION="$($DRBDADM --version 2>/dev/null | grep DRBD_KERNEL_VERSION_CODE 
| cut -d '=' -f 2)"
+if (( $DRBD_VERSION >= 0x09 ))
+then
+DRBD_IS_V9=true
+fi
+
 assure_module_is_loaded()
 {
 [ -e "$PROC_DRBD" ] && return
@@ -191,7 +198,8 @@
# Become primary if configured
# Currently, this is necessary for drbd8
# drbd9 supports automatic promote and removes the "sh-b-pri" command.
-   $DRBDADM sh-b-pri all || true
+   # Do not run "$DRBDADM sh-b-pri all" in v8
+   $DRBD_IS_V9 || $DRBDADM sh-b-pri all || true
log_end_msg 0
 
# Now handle stacked devices, if any
@@ -218,7 +226,7 @@
done
done
$DRBDADM -S wait-con-int # User interruptible version of 
wait-connect all
-   $DRBDADM -S sh-b-pri all || true
+   $DRBD_IS_V9 || $DRBDADM -S sh-b-pri all || true
log_end_msg 0
fi
fi

commit drbd-utils for openSUSE:Factory

2017-08-28 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-08-28 15:16:01

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Mon Aug 28 15:16:01 2017 rev:17 rq:518658 version:9.0.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-08-13 
14:59:15.232252863 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-08-28 15:17:25.910478307 +0200
@@ -1,0 +2,5 @@
+Fri Aug 25 06:45:36 UTC 2017 - nw...@suse.com
+
+- fate#323392, enable drbdmon which imported in 8.9.10 
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.8M3SPy/_old  2017-08-28 15:17:27.362274302 +0200
+++ /var/tmp/diff_new_pack.8M3SPy/_new  2017-08-28 15:17:27.374272617 +0200
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%bcond_without drbdmon
 
 Name:   drbd-utils
 Version:9.0.0
@@ -62,6 +63,9 @@
 BuildRequires:  pkgconfig
 BuildRequires:  systemd
 BuildRequires:  udev
+%if %{with drbdmon}
+BuildRequires: gcc-c++
+%endif
 Provides:   drbd-control
 Provides:   drbdsetup
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
@@ -101,6 +105,7 @@
 --datadir=%{_datadir} \
 --libdir=%{_prefix}/lib \
 --exec_prefix=%{_prefix}/lib \
+%{?with_drbdmon:   --with-drbdmon} \
 --with-tmpfilesdir=%{_tmpfilesdir}
 
 make OPTFLAGS="%{optflags}" %{?_smp_mflags}
@@ -142,6 +147,9 @@
 /sbin/drbdsetup
 /sbin/drbdmeta
 /sbin/drbd-overview
+%if %{with drbdmon}
+/sbin/drbdmon
+%endif
 %ifarch %ix86 x86_64
 %dir %attr(700,root,root) %{_sysconfdir}/xen
 %dir %{_sysconfdir}/xen/scripts

commit drbd-utils for openSUSE:Factory

2017-08-13 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-08-13 14:59:13

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Sun Aug 13 14:59:13 2017 rev:16 rq:516055 version:9.0.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-07-26 
13:05:10.499113079 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-08-13 14:59:15.232252863 +0200
@@ -1,0 +2,6 @@
+Fri Aug 11 06:09:20 UTC 2017 - nw...@suse.com
+
+- bsc#1052352, support block drbd for legacy format.
+- Add Update-block-drbd-script-to-support-xen.patch 
+
+---

New:

  Update-block-drbd-script-to-support-xen.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.SlvEys/_old  2017-08-13 14:59:16.316100754 +0200
+++ /var/tmp/diff_new_pack.SlvEys/_new  2017-08-13 14:59:16.340097386 +0200
@@ -33,6 +33,7 @@
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 Patch6: fix_call_khelper_with_stack.patch
+Patch7: Update-block-drbd-script-to-support-xen.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -78,6 +79,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 ./autogen.sh

++ Update-block-drbd-script-to-support-xen.patch ++
The xm/xend toolstack has long been removed from Xen and replaced
with xl/libxl. The legacy xmdomain.cfg(5) configuration format is
still supported for backward compatibility, but xl.cfg(5) format
is preferred. Update the script documenation to reflect this.

When the legacy format is used, libxl places the entire target
string in $XENBUS_PATH/params, e.g. 'drbd:myresource'. To ensure
the script continues to work with the legacy configuration format,
strip any 'drbd:' prefix from the resource identifier read from
xenstore.

Signed-off-by: Jim Fehlig 
Signed-off-by: Nick Wang 

---
diff -Naur drbd-utils-9.0.0.orig/scripts/block-drbd 
drbd-utils-9.0.0/scripts/block-drbd
--- drbd-utils-9.0.0.orig/scripts/block-drbd2017-08-11 14:04:56.456929623 
+0800
+++ drbd-utils-9.0.0/scripts/block-drbd 2017-08-11 14:06:50.625342048 +0800
@@ -5,12 +5,16 @@
 #
 # This script implements the "drbd" VBD type. To use a DRBD resource
 # as a virtual block device, include a line similar to this in your
-# domU configuration:
+# domain xl.cfg(5) configuration:
 #
-# disk = [ 'drbd:myresource,xvda1,w' ]
+# disk = [ "vdev=vda,access=rw,script=block-drbd,target=myresource" ]
+#
+# The legacy xmdomain.cfg(5) configuration format is also supported
+#
+# disk = [ 'drbd:myresource,xvda,w' ]
 #
 # This will direct Xen to put the DRBD resource named 'myresource'
-# into the Primary role, and configure it as device xvda1 in your
+# into the Primary role, and configure it as device xvda in your
 # domU. You may use as many DRBD resources as you like. If you are
 # using DRBD in dual-Primary mode (available in DRBD versions 8.0 and
 # up), your DRBD-backed domU will be live migration capable. 
@@ -34,7 +38,6 @@
 #   made available read-only to multiple domU's, or be mounted
 #   read-only in the dom0 and be made available read-only to
 #   domU's. This is not supported by the 'drbd' VBD type.
-# - Tested, thus far, only on Debian etch with Xen 3.0.3.
 #
 # For more information about DRBD, visit http://www.drbd.org/.
 #   
@@ -246,6 +249,7 @@
 if [ -n "$t" ]
 then
   p=$(xenstore_read "$XENBUS_PATH/params")
+  p=${p#drbd:}
   mode=$(xenstore_read "$XENBUS_PATH/mode")
 fi
 
@@ -280,7 +284,7 @@
 case $t in 
   drbd|phy)
 p=$(xenstore_read "$XENBUS_PATH/params")
-drbd_resource=$p
+drbd_resource=${p#drbd:}
 drbd_role="$(drbdadm role $drbd_resource)"
 drbd_lrole="${drbd_role%%/*}"
 drbd_dev="$(drbdadm sh-dev $drbd_resource)"

commit drbd-utils for openSUSE:Factory

2017-07-26 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-07-26 13:05:03

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Wed Jul 26 13:05:03 2017 rev:15 rq:512457 version:9.0.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-06-23 
09:18:46.818912430 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-07-26 13:05:10.499113079 +0200
@@ -1,0 +2,7 @@
+Tue Jul 25 08:35:18 UTC 2017 - nw...@suse.com
+
+- bsc#1048671, Fix handler called from kernel always invalid 
+  for stacking resource
+- Add fix_call_khelper_with_stack.patch 
+
+---

New:

  fix_call_khelper_with_stack.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.61YP3o/_old  2017-07-26 13:05:15.866355857 +0200
+++ /var/tmp/diff_new_pack.61YP3o/_new  2017-07-26 13:05:15.870355292 +0200
@@ -32,6 +32,7 @@
 Patch4: fix-segfault-up-stacked-resource.patch
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
+Patch6: fix_call_khelper_with_stack.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -76,6 +77,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 ./autogen.sh

++ fix_call_khelper_with_stack.patch ++
>From 7ba13eefd22b1ab3c84bd115dded3e4dbbf5b5c8 Mon Sep 17 00:00:00 2001
From: Nick Wang 
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

commit drbd-utils for openSUSE:Factory

2017-06-23 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-06-23 09:18:19

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Fri Jun 23 09:18:19 2017 rev:14 rq:505631 version:9.0.0

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-04-28 
09:14:21.757119801 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-06-23 09:18:46.818912430 +0200
@@ -1,0 +2,13 @@
+Wed Jun  7 08:13:07 UTC 2017 - nw...@suse.com
+
+- Update to v9.0.0 
+ * drbd udev: fix inconsistent inheritance of implicit volumes
+ * Fix regressions of the out-of-the-box DRBD 8.4 experience
+ * DrbdMon: can now focus on "problem" resources
+ * v9: support new option on_no_quorum
+ * drbdadm: fix segfaults, improve error reporting
+ * adjust: fix deleting unrelated peer(s) on "adjust resource:specific-peer"
+ * drbdmeta create-md/convert: fix check for existing external meta-data
+- Merged into upstream, remove Pass-md_index-information-to-detect_md.patch
+
+---

Old:

  Pass-md_index-information-to-detect_md.patch
  drbd-utils-8.9.11.tar.gz

New:

  _service
  drbd-utils-9.0.0.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.QH1Xwb/_old  2017-06-23 09:18:47.350837268 +0200
+++ /var/tmp/diff_new_pack.QH1Xwb/_new  2017-06-23 09:18:47.350837268 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,16 +16,14 @@
 #
 
 
-%define real_version 8.9.11
-
 Name:   drbd-utils
-Version:8.9.11rc2
+Version:9.0.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}-%{real_version}.tar.gz
+Source: 
http://www.drbd.org/download/drbd/utils/%{name}-%{version}.tar.gz
 
 # PATCH-MISSING-TAG -- See 
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1: init-script-fixes.diff
@@ -34,8 +32,6 @@
 Patch4: fix-segfault-up-stacked-resource.patch
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
-# Patch will be merged to upstream in 8.9.12 (bsc#1032074)
-Patch6: Pass-md_index-information-to-detect_md.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -61,7 +57,7 @@
 BuildRequires:  glibc-devel
 BuildRequires:  libxslt
 BuildRequires:  make
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  systemd
 BuildRequires:  udev
 Provides:   drbd-control
@@ -74,13 +70,12 @@
 raid 1. It is a building block for setting up clusters.
 
 %prep
-%setup -q -n %{name}-%{real_version}
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 ./autogen.sh
@@ -92,16 +87,16 @@
 --with-xen \
 --with-bashcompletion \
 --with-initscripttype=systemd \
---with-systemdunitdir=/usr/lib/systemd/system \
+--with-systemdunitdir=%{_prefix}/lib/systemd/system \
 --prefix=/ \
 --sbindir=/sbin \
---libdir=/usr/lib \
+--libdir=%{_prefix}/lib \
 --mandir=%{_mandir} \
 --sysconfdir=%{_sysconfdir} \
---datarootdir=/usr/share \
---datadir=/usr/share \
---libdir=/usr/lib \
---exec_prefix=/usr/lib \
+--datarootdir=%{_datadir} \
+--datadir=%{_datadir} \
+--libdir=%{_prefix}/lib \
+--exec_prefix=%{_prefix}/lib \
 --with-tmpfilesdir=%{_tmpfilesdir}
 
 make OPTFLAGS="%{optflags}" %{?_smp_mflags}
@@ -152,10 +147,10 @@
 %{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh
 %{_udevrulesdir}/65-drbd.rules
 %{_unitdir}/drbd.service
-/usr/lib/systemd/system/drbd.service
+%{_prefix}/lib/systemd/system/drbd.service
 %defattr(-, root, root)
 %{_localstatedir}/lib/drbd
-/usr/lib/drbd
+%{_prefix}/lib/drbd
 /lib/drbd
 /lib/drbd/drbd*
 %dir %{_prefix}/lib/ocf

++ 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch ++
--- /var/tmp/diff_new_pack.QH1Xwb/_old  2017-06-23 09:18:47.382832747 +0200
+++ /var/tmp/diff_new_pack.QH1Xwb/_new  2017-06-23 09:18:47.386832182 +0200
@@ -1,26 +1,11 @@
-From

commit drbd-utils for openSUSE:Factory

2017-04-28 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-04-28 09:14:20

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Fri Apr 28 09:14:20 2017 rev:13 rq:491412 version:8.9.11rc2

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2017-04-12 
18:03:31.749593361 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-04-28 09:14:21.757119801 +0200
@@ -1,0 +2,7 @@
+Thu Apr 27 06:19:24 UTC 2017 - nw...@suse.com
+
+- bsc#1032074, fix Inconsistent metadata after upgrade
+- Add Pass-md_index-information-to-detect_md.patch
+  * will be merged into upstream in v8.9.12
+
+---

New:

  Pass-md_index-information-to-detect_md.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.Wsw1hE/_old  2017-04-28 09:14:22.612999107 +0200
+++ /var/tmp/diff_new_pack.Wsw1hE/_new  2017-04-28 09:14:22.616998543 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,8 @@
 Patch4: fix-segfault-up-stacked-resource.patch
 # PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
 Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
+# Patch will be merged to upstream in 8.9.12 (bsc#1032074)
+Patch6: Pass-md_index-information-to-detect_md.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -78,6 +80,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 ./autogen.sh

++ Pass-md_index-information-to-detect_md.patch ++
detect_md() assumes that the metadata index format is
DRBD_MD_INDEX_FLEX_INT, but in fact it can also be
DRBD_MD_INDEX_FLEX_EXT.

[lge: Actually, it could even be old-style indexed fixed size meta data,
but that can be fixed an other day, or worked around with dump/restore.

Thanks for noticing and fixing a regression when trying to detect and
"convert" external meta data.  We introduced said regression likely in
late 2011, even before 8.4 came out.]

Signed-off-by: Kristoffer Grönlund 
Signed-off-by: Lars Ellenberg 
---
 user/shared/drbdmeta.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/user/shared/drbdmeta.c b/user/shared/drbdmeta.c
index 649076e1..2a79264c 100644
--- a/user/shared/drbdmeta.c
+++ b/user/shared/drbdmeta.c
@@ -4348,25 +4348,25 @@ void check_for_existing_data(struct format *cfg)
 }
 
 /* tries to guess what is in the on_disk_buffer */
-enum md_format detect_md(struct md_cpu *md, const uint64_t ll_size)
+enum md_format detect_md(struct md_cpu *md, const uint64_t ll_size, int 
index_format)
 {
struct md_cpu md_test;
enum md_format have = DRBD_UNKNOWN;
 
md_disk_07_to_cpu(_test, (struct md_on_disk_07*)on_disk_buffer);
-   if (is_valid_md(DRBD_V07, _test, DRBD_MD_INDEX_FLEX_INT, ll_size)) {
+   if (is_valid_md(DRBD_V07, _test, index_format, ll_size)) {
have = DRBD_V07;
*md = md_test;
}
 
md_disk_08_to_cpu(_test, (struct md_on_disk_08*)on_disk_buffer);
-   if (is_valid_md(DRBD_V08, _test, DRBD_MD_INDEX_FLEX_INT, ll_size)) {
+   if (is_valid_md(DRBD_V08, _test, index_format, ll_size)) {
have = DRBD_V08;
*md = md_test;
}
 
md_disk_09_to_cpu(_test, (struct 
meta_data_on_disk_9*)on_disk_buffer);
-   if (is_valid_md(DRBD_V09, _test, DRBD_MD_INDEX_FLEX_INT, ll_size)) {
+   if (is_valid_md(DRBD_V09, _test, index_format, ll_size)) {
have = DRBD_V09;
*md = md_test;
}
@@ -4406,7 +4406,7 @@ void check_internal_md_flavours(struct format * cfg) {
 
if (have == DRBD_UNKNOWN) {
PREAD(cfg, on_disk_buffer, 4096, flex_offset);
-   have = detect_md(_now, cfg->bd_size);
+   have = detect_md(_now, cfg->bd_size, DRBD_MD_INDEX_FLEX_INT);
}
 
if (have == DRBD_UNKNOWN)
@@ -4515,7 +4515,7 @@ void check_external_md_flavours(struct format * cfg) {
}
 
PREAD(cfg, on_disk_buffer, 4096, cfg->md_offset);
-   have = detect_md(_now, cfg->bd_size);
+   have = detect_md(_now, cfg->bd_size, DRBD_MD_INDEX_FLEX_EXT);
 
if (have ==

commit drbd-utils for openSUSE:Factory

2017-04-12 Thread root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2017-04-12 17:34:45

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Wed Apr 12 17:34:45 2017 rev:12 rq:485221 version:8.9.11rc2

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2016-12-08 
00:31:01.0 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2017-04-12 18:03:31.749593361 +0200
@@ -1,0 +2,45 @@
+Tue Apr  4 12:21:55 UTC 2017 - kgronl...@suse.com
+
+- Update to v8.9.11
+  * No source changes from v8.9.11rc1
+
+---
+Tue Apr  4 09:25:09 UTC 2017 - kgronl...@suse.com
+
+- Disable quorum in default configuration (bsc#1032142)
+- Add 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch 
+
+---
+Fri Mar 24 07:06:02 UTC 2017 - nw...@suse.com
+
+- Update to v8.9.11rc1
+- OCF resource agent and crm-fence-peer for drbd9
+  introduce quorum support
+  JSON output fixes
+  set bitmap to 0 on metadata creation
+- Remove patch support-drbd9-ra.patch
+  Remove patch initialize-node-id-when-create-md.patch
+- Corresponding user space change of bsc#1031299
+
+---
+Wed Mar 22 09:10:59 UTC 2017 - nw...@suse.com
+
+- Update to v8.9.10 for drbd9.0.6 and drbdmanage
+- new drbdmon tool
+  drbdadm parser got faster
+  send SIGKILL to childs if parent drbdadm dies
+  compat fixes for linux kernel
+
+---
+Mon Feb 20 16:30:37 CET 2017 - ku...@suse.de
+
+- Remove obsolete Requires for pre/post install sections
+
+---
+Tue Feb 14 07:36:34 UTC 2017 - nw...@suse.com
+
+- bsc#1025585, update to v8.9.8
+- Remove patch zeroout-discard-devices.patch
+  Remove patch service-mod.patch
+
+---

Old:

  drbd-utils-8.9.6.tar.gz
  initialize-node-id-when-create-md.patch
  service-mod.patch
  support-drbd9-ra.patch
  zeroout-discard-devices.patch

New:

  0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
  drbd-utils-8.9.11.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.V6g7DD/_old  2017-04-12 18:03:32.285517587 +0200
+++ /var/tmp/diff_new_pack.V6g7DD/_new  2017-04-12 18:03:32.285517587 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,24 +16,24 @@
 #
 
 
+%define real_version 8.9.11
+
 Name:   drbd-utils
-Version:8.9.6
+Version:8.9.11rc2
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
 Group:  Productivity/Clustering/HA
 Url:http://www.drbd.org/
-Source: http://oss.linbit.com/drbd/%{name}-%{version}.tar.gz
+Source: 
http://www.drbd.org/download/drbd/utils/%{name}-%{real_version}.tar.gz
 
 # PATCH-MISSING-TAG -- See 
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1: init-script-fixes.diff
 Patch2: fix-libdir-in-Makefile.patch
-Patch3: zeroout-discard-devices.patch
-Patch4: service-mod.patch
-Patch5: fence-after-pacemaker-down.patch
-Patch6: support-drbd9-ra.patch
-Patch7: fix-segfault-up-stacked-resource.patch
-Patch8: initialize-node-id-when-create-md.patch
+Patch3: fence-after-pacemaker-down.patch
+Patch4: fix-segfault-up-stacked-resource.patch
+# PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
+Patch5: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -65,9 +65,6 @@
 Provides:   drbd-control
 Provides:   drbdsetup
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Requires(post): %insserv_prereq %fillup_prereq
-Requires(preun): %insserv_prereq %fillup_prereq
-Requires(postun): %insserv_prereq fileutils
 
 %description
 Drbd is a distributed replicated block device. It mirrors a block
@@ -75,15 +72,12 @@
 raid 1. It is a building block for setting up clusters.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{real_version}
 %patch1 -p1
 %patch2 -p1

commit drbd-utils for openSUSE:Factory

2016-12-07 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2016-12-08 00:31:00

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2016-08-05 
18:17:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2016-12-08 00:31:01.0 +0100
@@ -1,0 +2,6 @@
+Tue Dec  6 08:06:00 UTC 2016 - nw...@suse.com
+
+- bsc#1006105, initialize node id when creating md. 
+- Add patch initialize-node-id-when-create-md.patch
+
+---

New:

  initialize-node-id-when-create-md.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.VfiuaO/_old  2016-12-08 00:31:02.0 +0100
+++ /var/tmp/diff_new_pack.VfiuaO/_new  2016-12-08 00:31:02.0 +0100
@@ -33,6 +33,7 @@
 Patch5: fence-after-pacemaker-down.patch
 Patch6: support-drbd9-ra.patch
 Patch7: fix-segfault-up-stacked-resource.patch
+Patch8: initialize-node-id-when-create-md.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -82,6 +83,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 ./autogen.sh

++ initialize-node-id-when-create-md.patch ++
---
 user/shared/drbdmeta.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user/shared/drbdmeta.c b/user/shared/drbdmeta.c
index fd8cc17..e8089f8 100644
--- a/user/shared/drbdmeta.c
+++ b/user/shared/drbdmeta.c
@@ -3845,6 +3845,7 @@ void md_convert_08_to_09(struct format *cfg)
 
cfg->md.flags &= ~(MDF_CONNECTED_IND | MDF_FULL_SYNC | 
MDF_PEER_OUT_DATED);
 
+   cfg->md.node_id = -1;
cfg->md.magic = DRBD_MD_MAGIC_09;
re_initialize_md_offsets(cfg);
 
-- 
1.8.5.6

commit drbd-utils for openSUSE:Factory

2016-08-05 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2016-08-05 18:17:35

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2016-07-01 
10:00:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2016-08-05 18:17:38.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug  3 03:39:18 UTC 2016 - nw...@suse.com
+
+- bsc#990834, remove the warning with experimental.
+- Add warning when using multiple nodes.
+
+---



Other differences:
--
++ support-drbd9-ra.patch ++
--- /var/tmp/diff_new_pack.28lci4/_old  2016-08-05 18:17:39.0 +0200
+++ /var/tmp/diff_new_pack.28lci4/_new  2016-08-05 18:17:39.0 +0200
@@ -1,8 +1,7 @@
-diff --git a/scripts/drbd.ocf b/scripts/drbd.ocf
-index 632e16e..91990fc 100755
 a/scripts/drbd.ocf
-+++ b/scripts/drbd.ocf
-@@ -328,6 +328,23 @@ remove_master_score() {
+diff -Naur drbd-utils-8.9.6.orig/scripts/drbd.ocf 
drbd-utils-8.9.6/scripts/drbd.ocf
+--- drbd-utils-8.9.6.orig/scripts/drbd.ocf 2016-08-03 11:01:39.334765566 
+0800
 drbd-utils-8.9.6/scripts/drbd.ocf  2016-08-03 11:31:40.801931986 +0800
+@@ -328,6 +328,23 @@
do_cmd ${HA_SBIN_DIR}/crm_master -l reboot -D
  }
  
@@ -26,7 +25,7 @@
  _sh_status_process() {
# _volume not present should not happen,
# but may help make this agent work even if it talks to drbd 8.3.
-@@ -335,11 +352,36 @@ _sh_status_process() {
+@@ -335,11 +352,36 @@
# not-yet-created volumes are reported as -1
(( _volume >= 0 )) || _volume=$[1 << 16]
DRBD_ROLE_LOCAL[$_volume]=${_role:-Unconfigured}
@@ -66,7 +65,7 @@
  drbd_set_status_variables() {
# drbdsetup sh-status prints these values to stdout,
# and then prints _sh_status_process.
-@@ -352,6 +394,15 @@ drbd_set_status_variables() {
+@@ -352,6 +394,15 @@
local _resynced_percent
local out
  
@@ -82,7 +81,7 @@
DRBD_ROLE_LOCAL=()
DRBD_ROLE_REMOTE=()
DRBD_CSTATE=()
-@@ -369,16 +420,20 @@ drbd_set_status_variables() {
+@@ -369,16 +420,20 @@
# if there was no output at all, or a weird output
# make sure the status arrays won't be empty.
[[ ${#DRBD_ROLE_LOCAL[@]}!= 0 ]] || DRBD_ROLE_LOCAL=(Unconfigured)
@@ -108,7 +107,7 @@
: == DEBUG == DRBD_DSTATE_REMOTE == ${DRBD_DSTATE_REMOTE[@]} ==
  }
  
-@@ -414,6 +469,9 @@ maybe_outdate_self()
+@@ -414,6 +469,9 @@
ocf_is_true $OCF_RESKEY_stop_outdates_secondary || return 1
  
local host stop_uname
@@ -118,7 +117,7 @@
# We ignore $OCF_RESKEY_CRM_meta_notify_promote_uname here
# because: if demote and promote for a _stacked_ resource
# (or a "floating" one, where DRBD sits on top of some SAN)
-@@ -437,6 +495,29 @@ maybe_outdate_self()
+@@ -437,6 +495,29 @@
return 1
done
  
@@ -148,7 +147,7 @@
# e.g. post/promote of some other peer.
# Should not happen, fencing constraints should take care of that.
# But in case it does, scream out loud.
-@@ -993,6 +1074,7 @@ drbd_validate_all () {
+@@ -993,6 +1074,7 @@
DRBDADM="drbdadm"
DRBDSETUP="drbdsetup"
DRBD_HAS_MULTI_VOLUME=false
@@ -156,7 +155,7 @@
  
# these will _exit_ if they don't find the binaries
check_binary $DRBDADM
-@@ -1015,18 +1097,23 @@ drbd_validate_all () {
+@@ -1015,18 +1097,28 @@
modinfo -F version drbd |
sed -ne 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1 
\2 \3/p'))
fi
@@ -164,7 +163,6 @@
 +  if (( $DRBD_KERNEL_VERSION_CODE >= 0x09 )); then
 +  DRBD_HAS_MULTI_VOLUME=true
 +  DRBD_VERSION_9=true
-+  ocf_log warn "RA for DRBD version 9 is in experiment, do not 
using multiple primaries in DRBD9.0"
 +  elif (( $DRBD_KERNEL_VERSION_CODE >= 0x080400 )); then
DRBD_HAS_MULTI_VOLUME=true
 -  elif (( $DRBD_KERNEL_VERSION_CODE >= 0x09 )) ; then
@@ -179,27 +177,36 @@
 +  if ! $DRBD_VERSION_9 ; then
 +  meta_expect clone-max -le 2
 +  fi
++
++  if [ ${OCF_RESKEY_CRM_meta_clone_max} -gt 2 ]
++  then
++  ocf_log warn "SUSE only supports two nodes, although it is 
technically feasible to use more than two."
++  fi
++
meta_expect clone-node-max = 1
meta_expect master-node-max = 1
 +  # With current DRBD-9.0 version more than two primaries at the same 
time is not support.
meta_expect master-max -le 2

commit drbd-utils for openSUSE:Factory

2016-07-01 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2016-07-01 09:59:57

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2016-04-12 
19:36:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2016-07-01 10:00:01.0 +0200
@@ -1,0 +2,11 @@
+Wed Jun 29 01:54:54 UTC 2016 - nw...@suse.com
+
+- bsc#986215, fix segfault of up a DRBD9 stacked resource.
+- Add patch fix-segfault-up-stacked-resource.patch
+
+---
+Wed Jun 29 01:53:49 UTC 2016 - nw...@suse.com
+
+- bsc#986784, fix DRBD9 stacked resource could not started by RA.
+
+---

New:

  fix-segfault-up-stacked-resource.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.pJ2Gum/_old  2016-07-01 10:00:02.0 +0200
+++ /var/tmp/diff_new_pack.pJ2Gum/_new  2016-07-01 10:00:02.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,6 +32,7 @@
 Patch4: service-mod.patch
 Patch5: fence-after-pacemaker-down.patch
 Patch6: support-drbd9-ra.patch
+Patch7: fix-segfault-up-stacked-resource.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -80,6 +81,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 ./autogen.sh

++ fix-segfault-up-stacked-resource.patch ++
diff -Naur drbd-utils-8.9.6.orig/user/v9/drbdadm.h 
drbd-utils-8.9.6/user/v9/drbdadm.h
--- drbd-utils-8.9.6.orig/user/v9/drbdadm.h 2016-06-23 18:20:40.608796513 
+0800
+++ drbd-utils-8.9.6/user/v9/drbdadm.h  2016-06-23 18:21:18.828684887 +0800
@@ -388,6 +388,7 @@
 extern void global_validate_maybe_expand_die_if_invalid(int expand, enum 
pp_flags flags);
 extern struct d_option *new_opt(char *name, char *value);
 extern int hostname_in_list(const char *name, struct names *names);
+extern bool hostnames_equal(const char *a, const char *b);
 extern char *_names_to_str(char* buffer, struct names *names);
 extern char *_names_to_str_c(char* buffer, struct names *names, char c);
 #define NAMES_STR_SIZE 255
diff -Naur drbd-utils-8.9.6.orig/user/v9/drbdadm_postparse.c 
drbd-utils-8.9.6/user/v9/drbdadm_postparse.c
--- drbd-utils-8.9.6.orig/user/v9/drbdadm_postparse.c   2016-06-23 
18:20:40.608796513 +0800
+++ drbd-utils-8.9.6/user/v9/drbdadm_postparse.c2016-06-23 
18:21:13.644700061 +0800
@@ -98,6 +98,21 @@
}
 }
 
+struct d_host_info *find_host_info_by_fakename(struct d_resource* res, char 
*name)
+{
+   struct d_host_info *host;
+   char *concat_name;
+
+   for_each_host(host, >all_hosts) {
+   concat_name = strdup(names_to_str_c(>on_hosts, '_'));
+   if (hostnames_equal(name, concat_name))
+   return host;
+   }
+
+   return NULL;
+}
+
+
 struct d_host_info *find_host_info_by_name(struct d_resource* res, char *name)
 {
struct d_host_info *host;
@@ -403,7 +418,11 @@
if (conn->peer) {
host_info = conn->peer;
} else {
-   host_info = find_host_info_by_name(res, 
candidate->name);
+   if (candidate->faked_hostname) {
+   host_info = 
find_host_info_by_fakename(res, candidate->name);
+   } else {
+   host_info = find_host_info_by_name(res, 
candidate->name);
+   }
conn->peer = host_info;
}
path->peer_address = candidate->address.addr ? 
>address : _info->address;

commit drbd-utils for openSUSE:Factory

2016-04-12 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2016-04-12 19:36:20

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2016-03-17 
16:47:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2016-04-12 19:36:22.0 +0200
@@ -1,0 +2,6 @@
+Fri Apr  8 13:04:00 UTC 2016 - lchiqui...@suse.de
+
+- bsc#972886, add pkg-config as build requirement to ensure udev's
+  rules directory will be detected at build time
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.488hXh/_old  2016-04-12 19:36:23.0 +0200
+++ /var/tmp/diff_new_pack.488hXh/_new  2016-04-12 19:36:23.0 +0200
@@ -57,6 +57,7 @@
 BuildRequires:  glibc-devel
 BuildRequires:  libxslt
 BuildRequires:  make
+BuildRequires:  pkg-config
 BuildRequires:  systemd
 BuildRequires:  udev
 Provides:   drbd-control
@@ -112,12 +113,6 @@
 rm -rf %{buildroot}%{_sysconfdir}/xen
 %endif
 
-mkdir -p %{buildroot}/usr/lib/udev/rules.d
-if [ -f "%{buildroot}/lib/udev/rules.d/65-drbd.rules" ]
-then
-mv %{buildroot}/lib/udev/rules.d/65-drbd.rules* 
%{buildroot}/usr/lib/udev/rules.d/65-drbd.rules
-fi
-
 %pre
 %service_add_pre drbd.service
 
@@ -153,9 +148,7 @@
 %{_sysconfdir}/xen/scripts/block-drbd
 %endif
 %{_prefix}/lib/ocf/resource.d/linbit/drbd
-%dir /usr/lib/udev
-%dir /usr/lib/udev/rules.d
-/usr/lib/udev/rules.d/65-drbd.rules
+%{_udevrulesdir}/65-drbd.rules
 %{_unitdir}/drbd.service
 /usr/lib/systemd/system/drbd.service
 %defattr(-, root, root)

commit drbd-utils for openSUSE:Factory

2016-03-19 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2016-03-17 16:34:35

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2016-02-26 
00:29:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2016-03-17 16:47:55.0 +0100
@@ -1,0 +2,22 @@
+Mon Mar 14 08:01:22 UTC 2016 - nw...@suse.com
+
+- fate#320495. Support ha resource agent of drbd9.
+  Add patch support-drbd9-ra.patch
+
+---
+Mon Mar  7 08:18:08 UTC 2016 - nw...@suse.com
+
+- bsc#955177, fence when another node pacemaker shutdown.
+  add patch fence-after-pacemaker-down.patch 
+
+---
+Mon Mar  7 08:13:43 UTC 2016 - nw...@suse.com
+
+- Update to v8.9.6
+  * Call "drbdsetup resize" only as often as necessary on
+"drbdadm resize"
+  * Disconnect connection first on single path deletion from connection
+  * Add unfence-peer handler
+  * Fix "drbdadm adjust" for proxy configurations 
+
+---

Old:

  drbd-utils-8.9.5.tar.gz

New:

  drbd-utils-8.9.6.tar.gz
  fence-after-pacemaker-down.patch
  support-drbd9-ra.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.KTwQD7/_old  2016-03-17 16:47:56.0 +0100
+++ /var/tmp/diff_new_pack.KTwQD7/_new  2016-03-17 16:47:56.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   drbd-utils
-Version:8.9.5
+Version:8.9.6
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
@@ -30,6 +30,8 @@
 Patch2: fix-libdir-in-Makefile.patch
 Patch3: zeroout-discard-devices.patch
 Patch4: service-mod.patch
+Patch5: fence-after-pacemaker-down.patch
+Patch6: support-drbd9-ra.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -75,6 +77,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 ./autogen.sh

++ drbd-utils-8.9.5.tar.gz -> drbd-utils-8.9.6.tar.gz ++
 4153 lines of diff (skipped)

++ fence-after-pacemaker-down.patch ++
diff -Naur drbd-utils-8.9.6.orig/scripts/crm-fence-peer.sh 
drbd-utils-8.9.6/scripts/crm-fence-peer.sh
--- drbd-utils-8.9.6.orig/scripts/crm-fence-peer.sh 2016-03-14 
15:54:38.701360775 +0800
+++ drbd-utils-8.9.6/scripts/crm-fence-peer.sh  2016-03-14 16:00:06.38664 
+0800
@@ -531,6 +531,25 @@
[[ $crmd = "banned" ]] && will_fence=true
if [[ ${expected-down} = "down" && $in_ccm = "false"  && $crmd != 
"online" ]]; then
: "pacemaker considers this as clean down"
+   elif [[ $crmd/$join/$expected = "offline/down/down" ]] ; then
+   # Check if pacemaker is simply shutdown, but membership/quorum 
is
+   # possibly still established (corosync2/cman)
+   # 1.1.11 will set expected="down" on a clean shutdown too
+   # Look for "shutdown" transient node attribute
+   local node_attributes=$(set +x; echo "$cib_xml" |
+   awk "//"|
+   grep -F -e "= 0 )) || _volume=$[1 << 16]
DRBD_ROLE_LOCAL[$_volume]=${_role:-Unconfigured}
-   DRBD_ROLE_REMOTE[$_volume]=${_peer:-Unknown}
-   DRBD_CSTATE[$_volume]=$_cstate
DRBD_DSTATE_LOCAL[$_volume]=${_disk:-Unconfigured}
-   DRBD_DSTATE_REMOTE[$_volume]=${_pdsk:-DUnknown}
+
+   if $DRBD_VERSION_9 ; then
+   #Get from _peer_node_process
+   DRBD_NAME[$_volume]=${DRBD_PER_NAME[@]}
+   DRBD_ID[$_volume]=${DRBD_PER_ID[@]}
+   DRBD_VOLUME[$_volume]=${_volume}
+   DRBD_CSTATE[$_volume]=${DRBD_PER_CSTATE[@]}
+   DRBD_ROLE_REMOTE[$_volume]=${DRBD_PER_ROLE_REMOTE[@]}
+   DRBD_DSTATE_REMOTE[$_volume]=${DRBD_PER_DSTATE_REMOTE[@]}
+
+   DRBD_PER_NAME=()
+   DRBD_PER_ID=()
+   DRBD_PER_CSTATE=()
+   DRBD_PER_ROLE_REMOTE=()
+   DRBD_PER_DSTATE_REMOTE=()
+
+   : == DEBUG == _volume== ${_volume} ==
+   : == DEBUG == DRBD_ROLE_LOCAL== 
${DRBD_ROLE_LOCAL[${_volume}]} ==
+   : == DEBUG == DRBD_DSTATE_LOCAL  == 
${DRBD_DSTATE_LOCAL[${_volume}]} ==
+   : == DEBUG == DRBD_CSTATE== ${DRBD_CSTATE[${_volume}]} 
==
+   : == DEBUG == DRBD_ROLE_REMOTE   ==

commit drbd-utils for openSUSE:Factory

2016-02-25 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2016-02-25 22:07:12

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2015-12-24 
12:17:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2016-02-26 00:29:12.0 +0100
@@ -1,0 +2,5 @@
+Tue Feb 23 05:19:07 UTC 2016 - nw...@suse.com
+
+- bsc#967753. Fix different udev rules folder in Leap and openSUSE.
+
+---



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.jaxoIm/_old  2016-02-26 00:29:14.0 +0100
+++ /var/tmp/diff_new_pack.jaxoIm/_new  2016-02-26 00:29:14.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -109,7 +109,10 @@
 %endif
 
 mkdir -p %{buildroot}/usr/lib/udev/rules.d
+if [ -f "%{buildroot}/lib/udev/rules.d/65-drbd.rules" ]
+then
 mv %{buildroot}/lib/udev/rules.d/65-drbd.rules* 
%{buildroot}/usr/lib/udev/rules.d/65-drbd.rules
+fi
 
 %pre
 %service_add_pre drbd.service

commit drbd-utils for openSUSE:Factory

2015-12-24 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2015-12-24 12:17:41

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2015-11-04 
15:34:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2015-12-24 12:17:53.0 +0100
@@ -1,0 +2,39 @@
+Thu Dec 24 06:17:48 UTC 2015 - nw...@suse.com
+
+- Update to v8.9.5
+  * add support for new disk option
+'rs-discard-granularity' (module v8.4.7)
+  * add support for new disk option
+'discard-zeroes-if-aligned' (module v8.4.7)
+  * add support for v9 "path" commands
+  * doc improvements/corrections
+  * improvements to drbd ocf resource agent
+and pacemaker "constraint based fencing"
+(crm-fence-peer.sh)
+  * drbd-overview improvements
+  * Add an autoconf switch for building without man pages
+  * Fix compatibility with the musl C library
+  * Introduce the concept of paths within a connection to
+the config file; add support for paths to drbdadm adjust
+  * Allow multiple connection-mesh statements within one resource
+  * Document peer-device-options on the drbd-9.0 man pages
+  * increase the lower boundary for al-extents from 7 to 67;
+drbdadm clamps al-extents to 67 implicitly if you configures
+something lower than 67
+  * Document the events2 command on the drbd-8.4 man page
+  * Fix environment variables for handlers
+  * Rewrite the parser for configure options; Reuse the data
+structures describing drbdsetup options
+  * No longer try to set peer-device-options with the connect
+or attach commands; Only do it with the up and attach commands
+  * Fixed issues with stderr messages might go into arbitrary FDs
+  * Allow recursive includes; drbdadm includes each config
+file only once
+  * Fix parsing cut-off proxy sections
+  * When converting 8.4 to 9.0 meta-data produce meta-data the drbd9
+kernel driver will accept
+  * Obey max-peers for all volumes when creating meta-data
+  * Do not re-register at usage.drbd.org when the module is not
+loaded when drbdadm is invoked
+
+---

Old:

  drbd-utils-8.9.2.tar.gz

New:

  drbd-utils-8.9.5.tar.gz



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.v80ijx/_old  2015-12-24 12:17:54.0 +0100
+++ /var/tmp/diff_new_pack.v80ijx/_new  2015-12-24 12:17:54.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   drbd-utils
-Version:8.9.2
+Version:8.9.5
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+

++ drbd-utils-8.9.2.tar.gz -> drbd-utils-8.9.5.tar.gz ++
 11412 lines of diff (skipped)

++ zeroout-discard-devices.patch ++
--- /var/tmp/diff_new_pack.v80ijx/_old  2015-12-24 12:17:54.0 +0100
+++ /var/tmp/diff_new_pack.v80ijx/_new  2015-12-24 12:17:54.0 +0100
@@ -1,20 +1,7 @@
-From c80e2258d59d264d56bbea212ec98a114a1de32a Mon Sep 17 00:00:00 2001
-From: Nick Wang 
-Date: Tue, 21 Jul 2015 10:32:41 +0800
-Subject: [PATCH 1/1] drbdsetup: Support zeroout/discard devices instead of
- initial full sync.
-

- documentation/v84/drbdsetup.xml | 18 ++
- user/v84/config_flags.c |  2 ++
- user/v84/linux/drbd_genl.h  |  2 ++
- 3 files changed, 22 insertions(+)
-
-diff --git a/documentation/v84/drbdsetup.xml b/documentation/v84/drbdsetup.xml
-index d4c4e87..039c6d8 100644
 a/documentation/v84/drbdsetup.xml
-+++ b/documentation/v84/drbdsetup.xml
-@@ -1705,6 +1705,24 @@
+diff -Naur drbd-utils-8.9.5.orig/documentation/v84/drbdsetup.xml 
drbd-utils-8.9.5/documentation/v84/drbdsetup.xml
+--- drbd-utils-8.9.5.orig/documentation/v84/drbdsetup.xml  2015-12-24 
14:13:13.928784939 +0800
 drbd-utils-8.9.5/documentation/v84/drbdsetup.xml   2015-12-24 
14:14:51.533778352 +0800
+@@ -1889,6 +1889,24 @@
Clears the sync bitmap in addition to generating a new 
current UUID.
  

@@ -39,32 +26,27 @@
  
  
This can be used to skip the initial sync, if you want to start 
from scratch. This
-diff --git a/user/v84/config_flags.c b/user/v84/config_flags.c
-index 3b0303f..b9870fa 100644
 a/user/v84/config_flags.c
-+++ b/user/v84/config_flags.c
-@@ -1019,6 +1019,8 @@ struct context_def new_current_uuid_cmd_ctx = {
+diff -Naur drbd-utils-8.9.5.orig/user/v84/config_flags.c 
drbd-utils-8.9.5/user/v84/config_flags.c
+--- drbd-utils-8.9.5.orig/user/v84/config_flags.c  2015-12-24 
14:13:13.937784939

commit drbd-utils for openSUSE:Factory

2015-11-04 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2015-11-04 15:33:57

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is "drbd-utils"

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2015-08-21 
07:41:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2015-11-04 15:34:24.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov  3 02:14:24 UTC 2015 - nw...@suse.com
+
+- BSC#949045. Remove execute of drbd.service.
+- Add patch service-mod.patch
+
+---

New:

  service-mod.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.4wsJny/_old  2015-11-04 15:34:25.0 +0100
+++ /var/tmp/diff_new_pack.4wsJny/_new  2015-11-04 15:34:25.0 +0100
@@ -29,6 +29,7 @@
 Patch1: init-script-fixes.diff
 Patch2: fix-libdir-in-Makefile.patch
 Patch3: zeroout-discard-devices.patch
+Patch4: service-mod.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -73,6 +74,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 ./autogen.sh

++ service-mod.patch ++
Index: drbd-utils-8.9.2/scripts/Makefile.in
===
--- drbd-utils-8.9.2.orig/scripts/Makefile.in
+++ drbd-utils-8.9.2/scripts/Makefile.in
@@ -65,7 +65,7 @@ endif
 # yes, debian apparently allows installing both types from the same package
 ifneq ($(initscripttype),sysv) # "systemd" or "both"
install -d $(DESTDIR)$(systemdunitdir)
-   install -m 755 drbd.service $(DESTDIR)$(systemdunitdir)/
+   install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/
install -d $(DESTDIR)/lib/drbd/
install -m 755 drbd $(DESTDIR)/lib/drbd/
install -d $(DESTDIR)$(tmpfilesdir)/

commit drbd-utils for openSUSE:Factory

2015-08-20 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2015-08-21 07:41:20

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is drbd-utils

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2015-07-27 
09:13:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2015-08-21 07:41:54.0 +0200
@@ -1,0 +2,7 @@
+Wed Aug 19 09:00:49 UTC 2015 - nw...@suse.com
+
+- Fate#317940. Support zeroout/discard instead of zap-devices
+- Add patch zeroout-discard-devices.patch
+- Remove zap-devices-xml.patch and zap-devices.patch
+
+---

Old:

  zap-devices-xml.patch
  zap-devices.patch

New:

  zeroout-discard-devices.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.Sy1nBV/_old  2015-08-21 07:41:55.0 +0200
+++ /var/tmp/diff_new_pack.Sy1nBV/_new  2015-08-21 07:41:55.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package drbd-utils
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,8 +28,7 @@
 # PATCH-MISSING-TAG -- See 
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1: init-script-fixes.diff
 Patch2: fix-libdir-in-Makefile.patch
-Patch3: zap-devices.patch
-Patch4: zap-devices-xml.patch
+Patch3: zeroout-discard-devices.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -74,7 +73,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 ./autogen.sh

++ zeroout-discard-devices.patch ++
From c80e2258d59d264d56bbea212ec98a114a1de32a Mon Sep 17 00:00:00 2001
From: Nick Wang nw...@suse.com
Date: Tue, 21 Jul 2015 10:32:41 +0800
Subject: [PATCH 1/1] drbdsetup: Support zeroout/discard devices instead of
 initial full sync.

---
 documentation/v84/drbdsetup.xml | 18 ++
 user/v84/config_flags.c |  2 ++
 user/v84/linux/drbd_genl.h  |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/documentation/v84/drbdsetup.xml b/documentation/v84/drbdsetup.xml
index d4c4e87..039c6d8 100644
--- a/documentation/v84/drbdsetup.xml
+++ b/documentation/v84/drbdsetup.xml
@@ -1705,6 +1705,24 @@
   paraClears the sync bitmap in addition to generating a new 
current UUID./para
 /listitem
   /varlistentry
+
+  varlistentry
+termoption--zeroout-devices/option/term
+
+listitem
+  paraStart to zeroing out the device on both side in addition 
to generating
+  a new current UUID ./para
+/listitem
+  /varlistentry
+
+  varlistentry
+termoption--discard-devices/option/term
+
+listitem
+  paraStart to allocate a thinly provided backing device on both 
side in
+  addition to generating a new current UUID ./para
+/listitem
+  /varlistentry
 /variablelist/para
 
   paraThis can be used to skip the initial sync, if you want to start 
from scratch. This
diff --git a/user/v84/config_flags.c b/user/v84/config_flags.c
index 3b0303f..b9870fa 100644
--- a/user/v84/config_flags.c
+++ b/user/v84/config_flags.c
@@ -1019,6 +1019,8 @@ struct context_def new_current_uuid_cmd_ctx = {
NLA_POLICY(new_c_uuid_parms),
.fields = {
{ clear-bitmap, FLAG(clear_bm) },
+   { zeroout-devices, FLAG(zeroout_devices) },
+   { discard-devices, FLAG(discard_devices) },
{ } },
 };
 
diff --git a/user/v84/linux/drbd_genl.h b/user/v84/linux/drbd_genl.h
index 8ddedd1..2aabe4c 100644
--- a/user/v84/linux/drbd_genl.h
+++ b/user/v84/linux/drbd_genl.h
@@ -238,6 +238,8 @@ GENL_struct(DRBD_NLA_START_OV_PARMS, 9, start_ov_parms,
 
 GENL_struct(DRBD_NLA_NEW_C_UUID_PARMS, 10, new_c_uuid_parms,
__flg_field(1, DRBD_GENLA_F_MANDATORY, clear_bm)
+   __flg_field(2, 0, zeroout_devices)
+   __flg_field(3, 0, discard_devices)
 )
 
 GENL_struct(DRBD_NLA_TIMEOUT_PARMS, 11, timeout_parms,
-- 
2.1.4

commit drbd-utils for openSUSE:Factory

2015-07-27 Thread h_root

Hello community,

here is the log from the commit of package drbd-utils for openSUSE:Factory 
checked in at 2015-07-27 09:13:52

Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
 and  /work/SRC/openSUSE:Factory/.drbd-utils.new (New)


Package is drbd-utils

Changes:

--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes2015-01-09 
20:50:12.0 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new/drbd-utils.changes   
2015-07-27 09:13:54.0 +0200
@@ -1,0 +2,46 @@
+Thu Jul 23 02:28:37 UTC 2015 - nw...@suse.com
+
+- Add Patch zap-devices-xml.patch and zap-devices.patch
+  for user space entrance to zap-devices of new-current-uuid.
+- Patch fix-libdir-in-Makefile.patch
+
+---
+Fri Apr 17 06:59:04 UTC 2015 - nw...@suse.com
+
+- Upgrade to released v8.9.2 for Fate#317940
+  * change systemd unit file: basically just call the init script
+  * make some previously hardcoded timeouts configurable
+  * drbdadm: New command peer-device-options
+  * drbd 9: Move max_buffers to net_conf
+  * drbd 9: Log errors to syslog if stderr is not available
+  * init script: fixes for stacked resources
+  * fix regression corner cases in bitmap size calculation
+  * allow create-md to initialize peer-max-bio-size to 1M
+  * drbd 9: make transport selectable
+  * fix aggregating drbdsetup / drbdmeta exit statii
+  * some documentation fixes (content and build)
+  * added direct-connect command
+  * incompatible drbd-9 metadata format change. use: node_id as index for
+peer_md instead of the bitmap_index
+  * drbdadm/meta/usage_cnt: ensure output is visible
+  * drbdsetup: fix arguments for all commands expecting a peer_device
+  * exit codes: redefine E_USAGE to 1 (not 3)
+  * some build changes
+  * init script: on start, first try to load the module
+  * drbdsetup events2: Improve how timestamps are assigned
+  * udev rules (symlinks in /dev/by-res and by-disk) got fixed
+  * Fixed upper limit for drbd-8.4 activity log entries
+  * many fixes to drbdadm adjust and proxy commands for drbd-9
+  * rhcs_fence: Do not invoke fence agents in parallel, rewrite in bash
+  * drbdsetup events2 is now also available in drbd-8.4 (backported from
+drbd-9)
+  * reorganized the repository have common code for drbd-9, drbd-8.4
+and drbd-8.3 only once
+  * Fix drbd.ocf for resources without volume 0
+
+---
+Wed Feb 18 09:16:33 UTC 2015 - rgold...@suse.com
+
+- Upgrade to v8.9.2rc2 with _service file for latest git
+
+---

Old:

  drbd-utils-8.9.1.tar.bz2

New:

  drbd-utils-8.9.2.tar.gz
  fix-libdir-in-Makefile.patch
  zap-devices-xml.patch
  zap-devices.patch



Other differences:
--
++ drbd-utils.spec ++
--- /var/tmp/diff_new_pack.dnVZPI/_old  2015-07-27 09:13:54.0 +0200
+++ /var/tmp/diff_new_pack.dnVZPI/_new  2015-07-27 09:13:54.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package drbd
+# spec file for package drbd-utils
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:   drbd-utils
-Version:8.9.1
+Version:8.9.2
 Release:0
 Summary:Distributed Replicated Block Device
 License:GPL-2.0+
 Group:  Productivity/Clustering/HA
 Url:http://www.drbd.org/
-Source: %{name}-%{version}.tar.bz2
+Source: http://oss.linbit.com/drbd/%{name}-%{version}.tar.gz
 
 # PATCH-MISSING-TAG -- See 
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1: init-script-fixes.diff
+Patch2: fix-libdir-in-Makefile.patch
+Patch3: zap-devices.patch
+Patch4: zap-devices-xml.patch
 
 Provides:   drbd-bash-completion = %{version}
 Provides:   drbd-pacemaker = %{version}
@@ -35,21 +39,24 @@
 Obsoletes:  drbd-udev  %{version}
 # drbd-utils first splict from drbd-8.4.5(only driver)
 # and suse let drbd driver goes in-kernel
-Provides:   drbd = 8.4.5 
-Obsoletes:  drbd  8.4.5
+# Provides:   drbd = 8.4.5
+# Obsoletes:  drbd  8.4.5
 
 %ifarch %ix86 x86_64
 Provides:   drbd-xen = %{version}
 Obsoletes:  drbd-xen  %{version}
 %endif
-BuildRequires:  gcc 
-BuildRequires:  make
-BuildRequires:  glibc-devel 
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison

40 matches

Mail list logo