Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/, sys-cluster/drbd-utils/files/
Date: Fri, 04 May 2018 18:16:52
Message-Id: 1525457799.288250f32327260ed63a4b284bbf36599ae61c6d.dilfridge@gentoo
1 commit: 288250f32327260ed63a4b284bbf36599ae61c6d
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 4 18:16:27 2018 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri May 4 18:16:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288250f3
7
8 sys-cluster/drbd-utils: Add missing sys/sysmacros.h include, bug 616758
9
10 Closes: https://bugs.gentoo.org/616758
11 Package-Manager: Portage-2.3.31, Repoman-2.3.9
12
13 sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild | 3 ++
14 .../files/drbd-utils-8.9.6-sysmacros.patch | 44 ++++++++++++++++++++++
15 2 files changed, 47 insertions(+)
16
17 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
18 index 2f4ad204b77..8295be34e7b 100644
19 --- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
20 +++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
21 @@ -46,6 +46,9 @@ src_prepare() {
22
23 epatch "${FILESDIR}"/run-lock.patch
24
25 + # bug 616758
26 + epatch "${FILESDIR}/${P}"-sysmacros.patch
27 +
28 autoreconf
29 }
30
31
32 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
33 new file mode 100644
34 index 00000000000..135f7a8b3ff
35 --- /dev/null
36 +++ b/sys-cluster/drbd-utils/files/drbd-utils-8.9.6-sysmacros.patch
37 @@ -0,0 +1,44 @@
38 +diff -ruN drbd-utils-8.9.6.orig/user/shared/shared_tool.c drbd-utils-8.9.6/user/shared/shared_tool.c
39 +--- drbd-utils-8.9.6.orig/user/shared/shared_tool.c 2018-05-04 20:13:51.959412972 +0200
40 ++++ drbd-utils-8.9.6/user/shared/shared_tool.c 2018-05-04 20:14:12.979679788 +0200
41 +@@ -8,6 +8,7 @@
42 + #define _FILE_OFFSET_BITS 64
43 +
44 + #include <sys/types.h>
45 ++#include <sys/sysmacros.h>
46 + #include <sys/stat.h>
47 + #include <sys/ioctl.h>
48 + #include <fcntl.h>
49 +diff -ruN drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c drbd-utils-8.9.6/user/v83/drbdadm_adjust.c
50 +--- drbd-utils-8.9.6.orig/user/v83/drbdadm_adjust.c 2015-02-11 17:33:00.000000000 +0100
51 ++++ drbd-utils-8.9.6/user/v83/drbdadm_adjust.c 2018-05-04 20:15:08.060378940 +0200
52 +@@ -25,6 +25,7 @@
53 + #define _GNU_SOURCE
54 +
55 + #include <sys/types.h>
56 ++#include <sys/sysmacros.h>
57 + #include <sys/stat.h>
58 + #include <sys/wait.h>
59 + #include <unistd.h>
60 +diff -ruN drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c drbd-utils-8.9.6/user/v84/drbdadm_adjust.c
61 +--- drbd-utils-8.9.6.orig/user/v84/drbdadm_adjust.c 2015-05-08 15:16:31.000000000 +0200
62 ++++ drbd-utils-8.9.6/user/v84/drbdadm_adjust.c 2018-05-04 20:14:42.192050588 +0200
63 +@@ -27,6 +27,7 @@
64 + #define _FILE_OFFSET_BITS 64
65 +
66 + #include <sys/types.h>
67 ++#include <sys/sysmacros.h>
68 + #include <sys/stat.h>
69 + #include <sys/wait.h>
70 + #include <unistd.h>
71 +diff -ruN drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c drbd-utils-8.9.6/user/v9/drbdadm_adjust.c
72 +--- drbd-utils-8.9.6.orig/user/v9/drbdadm_adjust.c 2018-05-04 20:13:51.960412985 +0200
73 ++++ drbd-utils-8.9.6/user/v9/drbdadm_adjust.c 2018-05-04 20:14:12.980679801 +0200
74 +@@ -27,6 +27,7 @@
75 + #define _FILE_OFFSET_BITS 64
76 +
77 + #include <sys/types.h>
78 ++#include <sys/sysmacros.h>
79 + #include <sys/stat.h>
80 + #include <sys/wait.h>
81 + #include <unistd.h>