gentoo resync : 08.06.2019

3 files changed, 52 insertions, 2 deletions

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 86c3ae735558..479937b969cd 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,3 +1,4 @@
+AUX 0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch 3129 BLAKE2B 5beafb31039c384adaae1b8c95077bb9c1af250e78447a1cad78fbd689ee3465fe321a80ca55b91a41e3ca1ef72cda44602dd3494dd5e368e58346e02eb88ed5 SHA512 3153e2335be9dcd4f07e4b7a84d4755d15c4d7e28735016901bb5c63ccf4e4b3c66fa200907720dfd2b4e0a011ed812b5c52bfcf9b38f9aeda5781c0d71ecd9b
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
 AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
@@ -22,6 +23,6 @@ EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B c9de21a5bba881e69a2741419ea0435
 EBUILD openvswitch-2.10.1-r1.ebuild 4461 BLAKE2B 9d229b86adf3261b3761f0c92e3a41839dbaec4fdf6c35939fcb5915b0232c87dd2a25bc78b04b37729a2a9d3adfae7195a6666d5b043d77f418f31af76add62 SHA512 c660b92275b577385952c24f817fdb8dfe110158f49dd2cd62506a8252cc5181f0f43c76236287a7c8f53601e33fe5d3d5eb0e46f95fc0ee7d00f7a92d598a75
 EBUILD openvswitch-2.10.1.ebuild 4263 BLAKE2B a6e844947f481d7beaf79172d90f09f52770514d5e203b10548783efccfcc791465a75a4d4796889f8f0ba53f74a6beb21a9d8478dc7f4ec25f2ec6e8a5ae09d SHA512 3cbc185a839a30d48262552b7d2ab8604353a3c2c12fdf42b3f558c1521d58dadb2e465494a0babd03fe0a7c435215916c30df996842e5ac15e63d0188d50270
 EBUILD openvswitch-2.10.2.ebuild 4461 BLAKE2B ce73d782dcd586facd60189ec0b6c459b96fff110e56dee1f447fb608534d5410bcfae158d8c6d2f87fd7f279e586207ee594763cd462f6902253b61c7759060 SHA512 befd11f9f14266ca500ae649a61357eedbba502dec865102fccfa05be2989675345d0da771024822150d967ba0ff64ef5dd7e4b4017a4c8831b459c680336f39
-EBUILD openvswitch-2.11.1.ebuild 4461 BLAKE2B f4dfa13c33ee0a14d81fb42e7f780d6609a244fc2886b5cf5639f60694d7b96392474d603e546f1681fb04671331006669beb2a292a921cb14e0c86b8c5b4ded SHA512 bae4fec83d12bf3c6d9d04bf9e8ed0e6b06646ba068eb1f7ed6c8fa3cb6d106990de499aeb8790f282f2be775bf1fee6e832be2cea0a0c71dc3892d5b9e0d98b
+EBUILD openvswitch-2.11.1-r1.ebuild 4541 BLAKE2B 12599af7675b2f4d7bbc09875f90b752561aed6cd05093b4de43f659e2fbf86978a8ed9cefebc46bddd57e065efebc8dea3bd1a9130e012203bece86292603bb SHA512 8838b8938115a019fbcf4933bd2586fceb21494ece22ccadafaae79e21825add2e489e3e99df541f097736f1ad34facb07fcf2186f6ef9d9f195efc8b5dd98e3
 EBUILD openvswitch-2.8.1.ebuild 4446 BLAKE2B 68da5d17271fe0c59d7a6820836c56f39a35d7c151a84108f594eaaef3edf7838d80d3dd6c7d521cea09d692cfb89c00ad9eb2d58045167a21b22cacfac54724 SHA512 21edf1a60d31999eff602af6ec6fc8141a55c266d2076f8dc2a4aacb632dad0ea47375834048084642989b02a0f2f1dbce4ab4baef7e4afc37844f88528e1cd9
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
new file mode 100644
index 000000000000..1f77ab54b0ad
--- /dev/null
+++ b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
@@ -0,0 +1,46 @@
+From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <zhouyousong@yunionyun.com>
+Date: Fri, 3 May 2019 15:03:24 +0000
+Subject: [PATCH 5/5] datapath: conntrack: fix include for
+ IP6_DEFRAG_CONNTRACK_IN
+
+The enum definition is now inside include/net/ipv6_frag.h since upstream commit
+70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
+backported to stable trees (4.9, 4.14, 4.19) only these days.
+
+The error message
+
+	  CC [M]  /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments':
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type
+	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+		^~~~~~~~~~~~~~~~
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'?
+	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+					^~~~~~~~~~~~~~~~~~~~~~~
+					IP_DEFRAG_CONNTRACK_IN
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known
+	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
+				 ^~~~
+	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable]
+	scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed
+
+Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
+Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
+---
+ datapath/conntrack.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/datapath/conntrack.c b/datapath/conntrack.c
+index a7dc9e0c3..69bda5a9c 100644
+--- a/datapath/conntrack.c
++++ b/datapath/conntrack.c
+@@ -31,6 +31,7 @@
+ #include <net/netfilter/nf_conntrack_seqadj.h>
+ #include <net/netfilter/nf_conntrack_zones.h>
+ #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
++#include <net/ipv6_frag.h>
+ 
+ #ifdef CONFIG_NF_NAT_NEEDED
+ #include <linux/netfilter/nf_nat.h>
diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
index a36bb2cdaa1c..f2304f6ae354 100644
--- a/net-misc/openvswitch/openvswitch-2.11.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}
 	sys-apps/util-linux[caps]
 	virtual/pkgconfig"
 
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+PATCHES="
+	${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch
+	${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+"
 
 CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
 MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"