gentoo resync : 06.05.2018

3 files changed, 49 insertions, 1 deletions

diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index 6bd8cb99661a..24cebb05b4cd 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -1,8 +1,9 @@
 AUX drbd-utils-8.0.rc 3073 BLAKE2B 982d8e20bba38259cc9cb37c922a2653e65471cd7fc9a66ace58cfaaee7989b035076dac523484e0b9ba74a89e1a90f06844234aeb703556beaff66fc6564680 SHA512 9cd9de6d41552f080f3d590630ecd1686ea32b9e9db3b78a132e7fb55318a338331c09af5d80ba885d48a001ee3f7a6f791ddd806e834d2a7c72f01a00ec2f6c
+AUX drbd-utils-8.9.6-sysmacros.patch 1749 BLAKE2B 8d086d294c99f21c369821750b5772319f6cfe687251843cf741ac8c87f958986b2d464558b0dbe275e7a280eec9bc5ab6ce72a781d5c6b9f8d5dc25fac36855 SHA512 574c759a2125f2dbf240ab310cc57425773d75ec5e508693d09f506df704329c8a6e367f5621df5bb43fc1af22e65da1bd7631cb26715147b70c8704ab797d24
 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab
 DIST drbd-utils-8.9.3.tar.gz 768700 BLAKE2B 4d6989e69ecb68b3f4d68b0e807aa911e60511fc91c0ea4e7500d044262348ad00a5517505c9bb912ba392677cb4b6a64405a9821cf59f1200f8eb7b662d89ec SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
 EBUILD drbd-utils-8.9.3.ebuild 2410 BLAKE2B 562b48faffe5e6c4e4e9984a3aea88dbf2d125c3822c361637588b40a01b0917e0a3fb67a4c25dd07001ed5263fde53c51210adf86b62ff63a5a8f5f6cc3818f SHA512 91530010427a1cbc5cc5ae8d6026954b626b21495dfc90c34ae92acead467813f7c7d929d32a3401b01b26cba31199c9ef78ad69d74484d59f924b51faf43928
-EBUILD drbd-utils-8.9.6-r1.ebuild 2420 BLAKE2B 0208a74c642a1b903d95c49915afd5df25da1393a34bfb9ec5c47ee46b564277019eb7e322f424efc40db4543257e2eb6e554bd4145d147247a7dfc639b8cedd SHA512 b859f336b2ce76028b4c46a6d783089f122e2ddae6fe4b29f728c61f870f605f08f56df5e2ad53de5ed357ecdc641a3eebfef6d6d58acc495c2385b97df1c6c4
+EBUILD drbd-utils-8.9.6-r1.ebuild 2478 BLAKE2B 5155f241126f545397c0ee4aead4dbfb2d291615f1d3e73ae81feacb9c806e25e02a8afbbf93b892c0488ed17801f43d548d671d2d66bbc69c04e758c2752fd3 SHA512 f4dbeeff4969083a531ccc164b14daa682b2f5cf5e375153c29ae1e5e698f15bcf70bf3b8584d5517820fc632bc984324ef74180e1cbb3aae5f67643bb29acef
 EBUILD drbd-utils-8.9.6.ebuild 2422 BLAKE2B d26972f0f86e93b7038a963921c888aa797898f67fbe2f59aead44b3c4e6452b608dc8bb43346de0fa2b25569c5980ec41c44ea2c016c1613ae99658e00a3bfd SHA512 d2c4b3ccc0ebefc7212a9575a4042770764ad922b6fa99bf25b85df3ccd55e477101b0ea2c9a885aa61800b42041aa0c29460223329f88934aecea5debba53b8
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
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 2f4ad204b776..8295be34e7bc 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 000000000000..135f7a8b3ff4
--- /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>