From ffc866b26b7bed6c8ff8bcbdcbcbc2123d9907cd Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 17 Feb 2021 16:08:58 +0000 Subject: Update drbd-utils patches for v9.x --- .../drbd-utils/drbd-utils-64bit-lib-service.patch | 4 ++-- sys-cluster/drbd-utils/drbd-utils-kernel-5.3.patch | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 sys-cluster/drbd-utils/drbd-utils-kernel-5.3.patch diff --git a/sys-cluster/drbd-utils/drbd-utils-64bit-lib-service.patch b/sys-cluster/drbd-utils/drbd-utils-64bit-lib-service.patch index e51633f..bdb8775 100644 --- a/sys-cluster/drbd-utils/drbd-utils-64bit-lib-service.patch +++ b/sys-cluster/drbd-utils/drbd-utils-64bit-lib-service.patch @@ -1,5 +1,5 @@ ---- scripts/drbd.service 2015-03-09 11:58:51.000000000 +0000 -+++ scripts/drbd.service 2020-03-30 19:16:48.887076583 +0100 +--- a/scripts/drbd.service 2015-03-09 11:58:51.000000000 +0000 ++++ b/scripts/drbd.service 2020-03-30 19:16:48.887076583 +0100 @@ -7,11 +7,11 @@ Type=oneshot RemainAfterExit=yes diff --git a/sys-cluster/drbd-utils/drbd-utils-kernel-5.3.patch b/sys-cluster/drbd-utils/drbd-utils-kernel-5.3.patch deleted file mode 100644 index 5ba1764..0000000 --- a/sys-cluster/drbd-utils/drbd-utils-kernel-5.3.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: He Zhe -Origin: upstream, https://github.com/LINBIT/drbd-utils/commit/859151b228 -Bug: https://github.com/LINBIT/drbd-utils/pull/4 -Bug-Ubuntu: https://launchpad.net/bugs/1866458 -Reviewed-By: Rafael David Tinoco -Last-Update: 2020-03-09 - ---- drbd-utils-8.9.10.orig/user/shared/libgenl.h -+++ drbd-utils-8.9.10/user/shared/libgenl.h -@@ -851,7 +851,7 @@ static inline struct nlattr *nla_nest_st - { - 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; -- cgit v1.2.3