diff --git a/_service b/_service index 503dc1a..a408ab7 100644 --- a/_service +++ b/_service @@ -5,10 +5,10 @@ drbd-utils - 9.9.0+git.%h + 9.12.0+git.%h master diff --git a/cibadmin-return-code-convert.patch b/cibadmin-return-code-convert.patch deleted file mode 100644 index 1a9b15d..0000000 --- a/cibadmin-return-code-convert.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.sh 2019-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 diff --git a/drbd-utils-9.10.0.tar.gz b/drbd-utils-9.10.0.tar.gz deleted file mode 100644 index ef974b0..0000000 --- a/drbd-utils-9.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d576ff180d6cd5d94319c616bbaee578e477607b67c8162b6363ca717668f0a6 -size 1190905 diff --git a/drbd-utils-9.12.0.tar.gz b/drbd-utils-9.12.0.tar.gz new file mode 100644 index 0000000..540eff8 --- /dev/null +++ b/drbd-utils-9.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a6d000aac7f746419839a2c2afcb71fa8779fe0b5898e967767791cb8f4bc7 +size 1206497 diff --git a/drbd-utils.changes b/drbd-utils.changes index ad77e01..369e5a5 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Mon Feb 3 12:26:16 UTC 2020 - Dominique Leuenberger @@ -199,23 +220,23 @@ Fri Sep 1 08:13:38 UTC 2017 - nwang@suse.com * 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 +- Remove Update-block-drbd-script-to-support-xen.patch ------------------------------------------------------------------- Fri Aug 25 06:45:36 UTC 2017 - nwang@suse.com -- fate#323392, enable drbdmon which imported in 8.9.10 +- fate#323392, enable drbdmon which imported in 8.9.10 ------------------------------------------------------------------- Fri Aug 11 06:09:20 UTC 2017 - nwang@suse.com - bsc#1052352, support block drbd for legacy format. -- Add Update-block-drbd-script-to-support-xen.patch +- Add Update-block-drbd-script-to-support-xen.patch ------------------------------------------------------------------- Tue Jul 25 08:35:18 UTC 2017 - nwang@suse.com -- bsc#1048671, Fix handler called from kernel always invalid +- bsc#1048671, Fix handler called from kernel always invalid for stacking resource - Add fix_call_khelper_with_stack.patch diff --git a/drbd-utils.spec b/drbd-utils.spec index 2e0be3e..74c7102 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -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 @@ 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: 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 @@ raid 1. It is a building block for setting up clusters. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build export WANT_DRBD_REPRODUCIBLE_BUILD=1 @@ -175,6 +168,7 @@ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz %{_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 diff --git a/netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch b/netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch deleted file mode 100644 index b8415b3..0000000 --- a/netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 - diff --git a/netlink-prepare-for-kernel-v5.2.patch b/netlink-prepare-for-kernel-v5.2.patch deleted file mode 100644 index 7e23a68..0000000 --- a/netlink-prepare-for-kernel-v5.2.patch +++ /dev/null @@ -1,27 +0,0 @@ -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...) \ --- -2.16.4 -