gentoo resync : 11.01.2018

3 files changed, 43 insertions, 3 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 0d35fa6ee746..5993cf89fdd9 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,4 @@
+AUX 233-fix-includes.patch 1053 BLAKE2B 77e46c52bfed92e86e784dba346198413672de31c33f7fdfc4dc63786b1dd47a6c3f80d4bf0873a57fc676f3b72a4a27e7dd2e94ef2bd2ac0b4d7fcc1f8dc7bc SHA512 a4df18879862a17c6135a51591677c7e1ab8a98e5f2ba4eaec8e9275e4345c85a84ccd5bf2f8d8c6da51fd9152711681fd71eec86aab311e24bfe5469940f5ab
 AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc
 AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX 236-uucp-group.patch 743 BLAKE2B 6dd28f1096d25cd776f66b1e574874d840a287b645701620459d5f5a5aec40784aca3ba86018911b5274e3643d17bd4b19dbe5fcad8a1ce4477ed136eae9bbdb SHA512 481400b0fd66ccfd559353a54e6d00749a10de3e67b304eeac0e63346ca404abc9e744c0dfaadc7783a231db929dc1cd4d97bf6e5bf585d7c41e03331c4e37ba
@@ -10,7 +11,7 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
 EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68
 EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d
-EBUILD udev-233.ebuild 12992 BLAKE2B 782d651360a8ea3e694f6dddecaf9faf7890bad6c19b10072356372f6e03094bbc741382268ad7472b6a5178b12dbfbb4aa2564e89946b9adf1373d1d4fd531d SHA512 43a241d81d922547ae4477c57aaf4f9007fb1d47dbe542185673f14d6cc4e5efec467b7f4e2d79ed4bcde498bb8fef57d0fa43e8be9791aebb0bae321b18495d
+EBUILD udev-233.ebuild 13038 BLAKE2B 1361e9be77672f5865f56cfe2a04a4611bb8878f65cc3a0af79ac24d80cda1eb770a9cf5fe7817d5ca6a24b86e3490f3038cfeca69966ceba15b9b8f6ad75124 SHA512 8c032562738205f6676dda630b6908c3c684c6a73b0c5edc7a9060986f750a3b4e8df32ffee33c65d648e5a59df7ab9b62b4bea64ee269209a7f5e228b493bad
 EBUILD udev-234-r1.ebuild 9974 BLAKE2B caaf6515a522c42a8daea3d39f197004338a7edff22a17b0027affd53f672dc7773800a1534a4b8c6d793804b29cf958b60ad400e68c734b831f6d44f9f05f04 SHA512 9ef6102a04e87774bb8f22618f9a4bca062c215cfa6adc3a23033f72c7d3720315717d301ff6cdac99dfccfd25cb7285408a54c0bf6578e0b9c5a28c2ddc762a
 EBUILD udev-235.ebuild 9972 BLAKE2B 1de48390b65a4f968757d7fe7d91be88937d052b0cd2f0d63bdf2e87886eebeda169bd7f2435eaaa34d45663b1d09670c4c6c30ba2b187052f940013331021f9 SHA512 2facc8ddb8c4286201efd1b06c842babd249b9a42f8e00c056aa3f795780a0ea6146dea61360964571b6e683e50993ad01fa0923479f7f23f8a636dc5e3aed0e
 EBUILD udev-236.ebuild 9972 BLAKE2B 6537664039b6cbe972ba16e8413f87a57e0837002d423ed1ea904cb86f099ed6111083e9a8d638312fdbfa793039fefa80bf6b20ff0a41f23bd5fcd08037baaf SHA512 980f1fdd1fb802d87aeba23ce1d66d13c39bc87f3a0648e2e433c76d8853af2e9e20d2fe7d931d80dbb286594e5545aa24bfa94db1782fb8f5ec8e52a650d280
diff --git a/sys-fs/udev/files/233-fix-includes.patch b/sys-fs/udev/files/233-fix-includes.patch
new file mode 100644
index 000000000000..44b06214f89d
--- /dev/null
+++ b/sys-fs/udev/files/233-fix-includes.patch
@@ -0,0 +1,38 @@
+From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001
+From: Matija Skala <mskala@gmx.com>
+Date: Wed, 15 Mar 2017 13:21:10 +0100
+Subject: [PATCH] fix includes
+
+linux/sockios.h is needed for the SIOCGSTAMPNS macro
+
+xlocale.h is included indirectly in glibc and doesn't even exist in
+other libcs
+---
+ src/basic/parse-util.c           | 1 -
+ src/libsystemd-network/sd-lldp.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
+index 6e58ced6f5..d86700736d 100644
+--- a/src/basic/parse-util.c
++++ b/src/basic/parse-util.c
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <xlocale.h>
+ 
+ #include "alloc-util.h"
+ #include "extract-word.h"
+diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c
+index 0702241506..39ddb2461a 100644
+--- a/src/libsystemd-network/sd-lldp.c
++++ b/src/libsystemd-network/sd-lldp.c
+@@ -19,6 +19,7 @@
+ ***/
+ 
+ #include <arpa/inet.h>
++#include <linux/sockios.h>
+ 
+ #include "sd-lldp.h"
+ 
diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index c42ecc2c0be4..e999f9e4e9c7 100644
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools bash-completion-r1 linux-info multilib-minimal toolchain-funcs udev user versionator
+inherit autotools bash-completion-r1 linux-info ltprune multilib-minimal toolchain-funcs udev user versionator
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
@@ -57,6 +57,7 @@ S=${WORKDIR}/systemd-${PV}
 
 PATCHES=(
 	"${FILESDIR}"/233-format-warnings.patch
+	"${FILESDIR}"/233-fix-includes.patch
 )
 
 check_default_rules() {