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.changes 2017-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 f4a2325172bb011db033ee1d8d1fc747c22f254f Mon Sep 17 00:00:00 2001 -From: Kristoffer Gronlund <kgronl...@suse.com> -Date: Tue, 4 Apr 2017 11:22:23 +0200 -Subject: [PATCH] Disable quorum in default configuration (bsc#1032142) - ---- - scripts/global_common.conf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scripts/global_common.conf b/scripts/global_common.conf -index dd36e92..545b600 100644 ---- a/scripts/global_common.conf -+++ b/scripts/global_common.conf -@@ -32,7 +32,8 @@ common { +diff -Naur drbd-utils-9.0.0+git.98b6340c.orig/scripts/global_common.conf drbd-utils-9.0.0+git.98b6340c/scripts/global_common.conf +--- drbd-utils-9.0.0+git.98b6340c.orig/scripts/global_common.conf 2017-06-07 16:04:14.063680274 +0800 ++++ drbd-utils-9.0.0+git.98b6340c/scripts/global_common.conf 2017-06-07 16:04:45.519644428 +0800 +@@ -42,6 +42,7 @@ - options { - # cpu-mask on-no-data-accessible -- quorum majority; -+ # quorum majority; + # RECOMMENDED for three or more storage nodes with DRBD 9: + # quorum majority; + quorum off; + # on-no-quorum suspend-io | io-error; } - disk { --- -2.12.0 - ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">git://git.linbit.com/drbd-utils.git</param> <param name="scm">git</param> <param name="filename">drbd-utils</param> <!-- build service using release drbd-utils atm. <param name="version">9.0.0</param> --> <param name="versionformat">9.0.0+git.%h</param> <param name="revision">master</param> </service> <service name="recompress" mode="disabled"> <param name="file">*drbd-utils*.tar</param> <param name="compression">gz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">drbd-utils</param> </service> </services> ++++++ drbd-utils-8.9.11.tar.gz -> drbd-utils-9.0.0.tar.gz ++++++ ++++ 2285 lines of diff (skipped)
