gentoo resync : 03.11.2018

5 files changed, 191 insertions, 5 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 182b10d79adc..78b9126c85cc 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,11 +1,13 @@
 AUX 236-uucp-group.patch 743 BLAKE2B 6dd28f1096d25cd776f66b1e574874d840a287b645701620459d5f5a5aec40784aca3ba86018911b5274e3643d17bd4b19dbe5fcad8a1ce4477ed136eae9bbdb SHA512 481400b0fd66ccfd559353a54e6d00749a10de3e67b304eeac0e63346ca404abc9e744c0dfaadc7783a231db929dc1cd4d97bf6e5bf585d7c41e03331c4e37ba
 AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B 7e846f475ae42e3c0e461b042042adca0475dc88d49a6bacea257381235f755dbd67569b8119efd7f25e68d64dbcd2b50a922df0f91c51ec16fe52cec65f9523 SHA512 2c8064540b669aa90a26bbd1d5af0b1afff030598a1a11bfe32a9c7f7ee59860acecfcdc7a94066c8ba6b62534432c28f72739dbbe16047958e5362a46d52215
 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
+AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46
+AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
 EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93
-EBUILD udev-239.ebuild 9721 BLAKE2B cbcacc14c15f99b4e25ccab4c2f655f885280f2175cd215041186803f0e2321c97f4b71cef6371cda7b331d59c8a0d60158a173001858a8196cb815f42ef8f20 SHA512 2222606f20fc2bd3b22f4d24580ab19c3d87163837313084bdb642666163264c9e32cbc92f27751dd83959c6f186c074fd31e683bb9e19206f2ff3f971969b3b
-EBUILD udev-9999.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5
+EBUILD udev-239.ebuild 9775 BLAKE2B 8f95ea3241e3c25384c2928fed853c8faf82c69a6298e4e8fa0efc6e7f68d5c1fba6b99a84abb66eb47249c5c7f9179f30562a0a2233b0c54f64372eb899cc14 SHA512 0504977941154c9b1d5e325cc667bfedf38b110e10a999a80634b1e5143e2ba416b8b636cc629f176542a4046302bab87980a0b4e6cb1a7dae3a7180edd3bb10
+EBUILD udev-9999.ebuild 9592 BLAKE2B 71faa738512525219644d2fa238abe5630c0bfc236369d5fdd7d8a83f1a7faf01a3e26cf78b8ac30681fe9591d1545ffc7f173d43e91f9823c588d1c3300bd72 SHA512 17db537471bc3befd55f5cd6a70c7279cfe46634cf59ea3dfc4e44aac38c14465a59e1550a590959c0cabed976fc6b74aa33b2237aac9c1e753eea14884e50f0
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/files/239-stat-0.patch b/sys-fs/udev/files/239-stat-0.patch
new file mode 100644
index 000000000000..e136b703a2f5
--- /dev/null
+++ b/sys-fs/udev/files/239-stat-0.patch
@@ -0,0 +1,108 @@
+From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001
+From: Filipe Brandenburger <filbranden@google.com>
+Date: Sun, 15 Jul 2018 22:43:35 -0700
+Subject: [PATCH] build-sys: Detect whether struct statx is defined in
+ sys/stat.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
+definition for struct statx, in which case include file linux/stat.h should be
+avoided, in order to prevent a duplicate definition.
+
+    In file included from ../src/basic/missing.h:18,
+		     from ../src/basic/util.h:28,
+		     from ../src/basic/hashmap.h:10,
+		     from ../src/shared/bus-util.h:12,
+		     from ../src/libsystemd/sd-bus/bus-creds.c:11:
+    /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
+     struct statx {
+	    ^~~~~
+    In file included from /usr/include/sys/stat.h:446,
+		     from ../src/basic/util.h:19,
+		     from ../src/basic/hashmap.h:10,
+		     from ../src/shared/bus-util.h:12,
+		     from ../src/libsystemd/sd-bus/bus-creds.c:11:
+    /usr/include/bits/statx.h:36:8: note: originally defined here
+     struct statx
+	    ^~~~~
+
+Extend our meson.build to look for struct statx when only sys/stat.h is
+included and, in that case, do not include linux/stat.h anymore.
+
+Tested that systemd builds correctly when using a glibc version that includes a
+definition for struct statx.
+
+glibc Fedora RPM update:
+https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
+
+glibc upstream commit:
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
+---
+ meson.build            | 5 +++++
+ src/basic/missing.h    | 5 ++++-
+ src/basic/xattr-util.c | 1 -
+ 3 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index dd904c7148..68423bdfa5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -425,6 +425,7 @@ decl_headers = '''
+ #include <sys/stat.h>
+ '''
+ # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
++# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
+ 
+ foreach decl : ['char16_t',
+                 'char32_t',
+@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
+         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
+ endforeach
+ 
++conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
++#include <sys/stat.h>
++''', args : '-D_GNU_SOURCE') > 0)
++
+ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
+                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
+                 ['IFLA_VRF_TABLE',                   'linux/if_link.h'],
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 71a07d0574..14ad3d4914 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -15,7 +15,6 @@
+ #include <linux/neighbour.h>
+ #include <linux/oom.h>
+ #include <linux/rtnetlink.h>
+-#include <linux/stat.h>
+ #include <net/ethernet.h>
+ #include <stdlib.h>
+ #include <sys/resource.h>
+@@ -25,6 +24,10 @@
+ #include <uchar.h>
+ #include <unistd.h>
+ 
++#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
++#include <linux/stat.h>
++#endif
++
+ #if HAVE_AUDIT
+ #include <libaudit.h>
+ #endif
+diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
+index c5c55ea846..0ee0979837 100644
+--- a/src/basic/xattr-util.c
++++ b/src/basic/xattr-util.c
+@@ -2,7 +2,6 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <linux/stat.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+-- 
+2.19.1
+
diff --git a/sys-fs/udev/files/239-stat-1.patch b/sys-fs/udev/files/239-stat-1.patch
new file mode 100644
index 000000000000..1104de3c9c1a
--- /dev/null
+++ b/sys-fs/udev/files/239-stat-1.patch
@@ -0,0 +1,74 @@
+From 9c869d08d82c73f62ab3527567858ce4b0cf1257 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 18 Jul 2018 17:26:17 +0200
+Subject: [PATCH] meson: unify linux/stat.h check with other checks and use
+ _GNU_SOURCE
+
+Using _GNU_SOURCE is better because that's how we include the headers in the
+actual build, and some headers define different stuff when it is defined.
+sys/stat.h for example defines 'struct statx' conditionally.
+---
+ meson.build         | 20 ++++++++++++++------
+ src/basic/missing.h |  2 +-
+ 2 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 68423bdfa5..99035d2306 100644
+--- a/meson.build
++++ b/meson.build
+@@ -421,11 +421,9 @@ decl_headers = '''
+ #include <uchar.h>
+ #include <linux/ethtool.h>
+ #include <linux/fib_rules.h>
+-#include <linux/stat.h>
+ #include <sys/stat.h>
+ '''
+ # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
+-# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
+ 
+ foreach decl : ['char16_t',
+                 'char32_t',
+@@ -436,13 +434,23 @@ foreach decl : ['char16_t',
+                ]
+ 
+         # We get -1 if the size cannot be determined
+-        have = cc.sizeof(decl, prefix : decl_headers) > 0
++        have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
++
++        if decl == 'struct statx'
++                if have
++                        want_linux_stat_h = false
++                else
++                        have = cc.sizeof(decl,
++                                         prefix : decl_headers + '#include <linux/stat.h>',
++                                         args : '-D_GNU_SOURCE') > 0
++                        want_linux_stat_h = have
++                endif
++        endif
++
+         conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
+ endforeach
+ 
+-conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
+-#include <sys/stat.h>
+-''', args : '-D_GNU_SOURCE') > 0)
++conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
+ 
+ foreach decl : [['IFLA_INET6_ADDR_GEN_MODE',         'linux/if_link.h'],
+                 ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index 14ad3d4914..9044683b15 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -24,7 +24,7 @@
+ #include <uchar.h>
+ #include <unistd.h>
+ 
+-#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
++#if WANT_LINUX_STAT_H
+ #include <linux/stat.h>
+ #endif
+ 
+-- 
+2.19.1
+
diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild
index b6ffc09d1854..5dbe6b7d4497 100644
--- a/sys-fs/udev/udev-239.ebuild
+++ b/sys-fs/udev/udev-239.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -84,6 +84,8 @@ src_prepare() {
 		"${FILESDIR}/236-uucp-group.patch"
 		"${FILESDIR}/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch"
 		"${FILESDIR}/239-debug-extra.patch"
+		"${FILESDIR}/239-stat-0.patch"
+		"${FILESDIR}/239-stat-1.patch"
 	)
 
 	default
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 5825a197ca7d..64b447627d3c 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user versionator
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"