From 288250f32327260ed63a4b284bbf36599ae61c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
Date: Fri, 4 May 2018 20:16:27 +0200
Subject: [PATCH] sys-cluster/drbd-utils: Add missing sys/sysmacros.h include,
 bug 616758

Closes: https://bugs.gentoo.org/616758
Package-Manager: Portage-2.3.31, Repoman-2.3.9
---
 .../drbd-utils/drbd-utils-8.9.6-r1.ebuild     |  3 ++
 .../files/drbd-utils-8.9.6-sysmacros.patch    | 44 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch

diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
index 2f4ad204b7764..8295be34e7bca 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/run-lock.patch
 
+	# bug 616758
+	epatch "${FILESDIR}/${P}"-sysmacros.patch
+
 	autoreconf
 }
 
diff --git a/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
new file mode 100644
index 0000000000000..135f7a8b3ff42
--- /dev/null
+++ b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
@@ -0,0 +1,44 @@
+diff -ruN drbd-utils-8.9.6.orig/user/shared/shared_tool.c drbd-utils-8.9.6/user/shared/shared_tool.c
+--- drbd-utils-8.9.6.orig/user/shared/shared_tool.c	2018-05-04 20:13:51.959412972 +0200
++++ drbd-utils-8.9.6/user/shared/shared_tool.c	2018-05-04 20:14:12.979679788 +0200
+@@ -8,6 +8,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+diff -ruN drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c drbd-utils-8.9.6/user/v83/drbdadm_adjust.c
+--- drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c	2015-02-11 17:33:00.000000000 +0100
++++ drbd-utils-8.9.6/user/v83/drbdadm_adjust.c	2018-05-04 20:15:08.060378940 +0200
+@@ -25,6 +25,7 @@
+ #define _GNU_SOURCE
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+diff -ruN drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c drbd-utils-8.9.6/user/v84/drbdadm_adjust.c
+--- drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c	2015-05-08 15:16:31.000000000 +0200
++++ drbd-utils-8.9.6/user/v84/drbdadm_adjust.c	2018-05-04 20:14:42.192050588 +0200
+@@ -27,6 +27,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+diff -ruN drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c drbd-utils-8.9.6/user/v9/drbdadm_adjust.c
+--- drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c	2018-05-04 20:13:51.960412985 +0200
++++ drbd-utils-8.9.6/user/v9/drbdadm_adjust.c	2018-05-04 20:14:12.980679801 +0200
+@@ -27,6 +27,7 @@
+ #define _FILE_OFFSET_BITS 64
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <unistd.h>