gentoo resync : 28.04.2018

3 files changed, 15 insertions, 1 deletions

diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 8591eaae97c6..fceaf76e112f 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -2,6 +2,7 @@ AUX connman-1.16-execinfo-assumptions.patch 1391 BLAKE2B 18685f63a346339fbdb1813
 AUX connman-1.31-xtables.patch 1367 BLAKE2B 26dd03af8e4a2389b4151cae0b5f4a87c128487cbbf428676216ffbfb28c0e0abab17d07d4378c021465f2e64a4d42660a60e7b589d63d094167d7db5dd37154 SHA512 681615666a535fe0a60f1472768f63ecfadd974e2a39d38b1e229be00449d0acd24902fb674f6b6567bb0915c5b59adc0d76d5b886d50d59c776b239ecbb7c4d
 AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad84391f1d974df976fae943f73863200eb3acdde630c68db2979be03cc072c663a1e8198e7eb598ccfbe6ee5f20b8cadac4a6df6ff77194f SHA512 630ac9d147046f084a960795de87183c5c446006df7a6a74c02416e972a3bd55390e1ab9c3f0ea4449324d0fb7c271ebd6b64727ede834128ca8515853a9e905
 AUX connman-1.33-resolv-conf-overwrite.patch 354 BLAKE2B e72099b97477c3549d3a9082c06419f736ebb79bc12d37d3dd0acdd39a0454d62a9d5053b9fa349534be5171426a8fbca6aeed30e017404baf21f32d77a04948 SHA512 1998d0d2923f8dca3706c7c75ad87ffa2570a785ed3e5ec1c85cc539bbfb7ea9173dae5320c3f95fbeee9c9c72870607b8eb4b3fd2c36a1962ad8925d72e24e2
+AUX connman-1.35-include-ifbridge-before-netinet.patch 259 BLAKE2B a6c5ae9bfb61e2c4180d88229b809eb11081bd7e74425d9c1b565ba20b140d15eb810898abe34e2429e87ca3b7ab9f2062d092f1018595f3e57e0b8f82e194fd SHA512 6398c7e4b7d47eb27c8d962bf2c8e9d5bd9bfc1b0a8182a13d05bed3931bfd9750bdae8bcc47ba3e1f93e2391b65b16ddcf2a0c005a08d4626f2c0d2cb855180
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 483 BLAKE2B 946dcb53fbadba4b2ddea95450f779680a8a00356489480f6ade122b8b2450fae90db0be76320d3666b991d09c766fba9a7037fb16b7b18db07bcbe4cfe83080 SHA512 a9999849f1e9b7c8c44db5aebbc5d2e615ff191da582333c3a575f594b99a6324469525a2937a98ccc444fcb42cf0131b2067263451273c6e093b22cb746306b
 AUX connman.service 198 BLAKE2B 8b943dc995fed630b15bcfe1040598e13a5b2118967f9fb681e36beaec4e1bf2f9c25e10f9c2d19bc7cd56c10e811b3722d12048b5180bae57bd8af074697ad4 SHA512 a769961922c40b5ed3e5a09d08262b20b84aa27fc278678063b348431ba2976de9f2ebcd9f9b0afa6241540d255ba4cdf7120b75184510d41444b7dd3209b825
@@ -12,5 +13,5 @@ DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a
 EBUILD connman-1.29.ebuild 2013 BLAKE2B 8b80a54f1e7db67aaf16b7ba31d27aa4e9533260944944d6e3877d3794f67963b420a074bafdc5b5ec1f26fe29f6a24e29bd618a9eec52b3c3c2d690db21975e SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b
 EBUILD connman-1.33-r1.ebuild 2280 BLAKE2B ac059303eeae7e2eefa254a874ff80c254c8dda3b80bbbf27ea62f6a9a59c5033bb0b244d30c68dc2dd3cb8117af6c0204b766911804cae6323a8056f7b1852e SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0
 EBUILD connman-1.34.ebuild 2490 BLAKE2B bd804da85d0d880e69cf9fd6ea2b8fe813c508ffc3196cb82774d59966b9a4468f271e7e9472e74814c8c6a3df22c934ca2fcac5c792e64bb72226f0172d4b4a SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302
-EBUILD connman-1.35-r1.ebuild 2493 BLAKE2B 676f3b96731dbe0b2cee3831967e879464d1ee0b418094e3ce16fe971fad817d46fd06e7d7b7ebcbca0d030eed1e8f805f4e4697044e03d9472b702b6b6c5961 SHA512 025041636b7cbf7d571a290f428d4cd4234d306279a08250660d01d1bd6e652537f2fa78656b55cbdc13531e8468b918a7005ee53a0aaf88994f35fee67235ff
+EBUILD connman-1.35-r1.ebuild 2557 BLAKE2B 4a24da33f7d40a1b0ae339e7031e83b01fbce6da1da149b7ea8de388b859a48f24c50acf85a0d432e516c2da0de74ec0480304d0fcf0e40f5ad2a461ffa5dbe3 SHA512 bd20274ae49359ce891711a0e8e56320b9e63fca510403171f40a4f71d996b5d88d71972076eb4cb62d8dc7c6ed21b0fb7431598fcf1424049f4699ea2b22d95
 MISC metadata.xml 1087 BLAKE2B a6c16a8e9ce0a5154d6b6081f1527316dd2bf9aec3d45c1f64c224ab25479e041b4848f08fef072ef5d026517bfc49c04756f062524aa6ad60c80945c7c182b1 SHA512 8f02d9cf4194c9e24edaa9a0427d63db483bbf559ea119a043a70a759f583aec42203bedd12c91364e1c24850e9cb6b1831054294c3837a0c3a50cb75dc1de42
diff --git a/net-misc/connman/connman-1.35-r1.ebuild b/net-misc/connman/connman-1.35-r1.ebuild
index 6805bf58a4d0..67a8c779709e 100644
--- a/net-misc/connman/connman-1.35-r1.ebuild
+++ b/net-misc/connman/connman-1.35-r1.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
 	"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
+	"${FILESDIR}/${PN}-1.35-include-ifbridge-before-netinet.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch b/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch
new file mode 100644
index 000000000000..53f3c194db67
--- /dev/null
+++ b/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch
@@ -0,0 +1,12 @@
+--- connman-1.35/src/tethering.c
++++ connman-1.35/src/tethering.c
+@@ -35,8 +35,8 @@ 
+ #include <string.h>
+ #include <fcntl.h>
+ #include <linux/if_tun.h>
+-#include <netinet/in.h>
+ #include <linux/if_bridge.h>
++#include <netinet/in.h>
+ 
+ #include "connman.h"
+