From 500e5d2ad58f78d3aa5132081123955b6681bb8c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Mon, 16 Apr 2018 15:40:12 +0800 Subject: openvswitch: refresh patches to fix QA warning Refresh patches with devtool command to fix do_patch warning. Drop CVE-2017-9263.patch since it had been fixed upstream. Signed-off-by: Yi Zhao Signed-off-by: Bruce Ashfield --- .../0004-Python3-compatibility-iteritems-to-items.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch') diff --git a/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch b/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch index ddc86db2..092c42d6 100644 --- a/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch +++ b/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch @@ -1,7 +1,7 @@ -From 0f318e472d9897d99395adcfb17cbeaff05677ba Mon Sep 17 00:00:00 2001 +From 7e4bd5c2af85b1293be0a92b18f7930bda2ab41a Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 29 Jun 2017 20:33:23 -0700 -Subject: [PATCH 4/8] Python3 compatibility: iteritems to items +Subject: [PATCH] Python3 compatibility: iteritems to items Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from https://github.com/openvswitch/ovs.git @@ -11,6 +11,7 @@ items(). Signed-off-by: Jason Wessel Signed-off-by: Ben Pfaff + --- build-aux/extract-ofp-actions | 2 +- build-aux/extract-ofp-errors | 2 +- @@ -19,7 +20,7 @@ Signed-off-by: Ben Pfaff 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions -index 874e6b4..c11297c 100755 +index 67e3848..c7858bd 100755 --- a/build-aux/extract-ofp-actions +++ b/build-aux/extract-ofp-actions @@ -13,7 +13,7 @@ version_map = {"1.0": 0x01, @@ -32,7 +33,7 @@ index 874e6b4..c11297c 100755 # Map from vendor name to the length of the action header. vendor_map = {"OF": (0x00000000, 4), diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors -index 336a240..71ae0bd 100755 +index 97d62d2..58ba006 100755 --- a/build-aux/extract-ofp-errors +++ b/build-aux/extract-ofp-errors @@ -14,7 +14,7 @@ version_map = {"1.0": 0x01, @@ -45,7 +46,7 @@ index 336a240..71ae0bd 100755 token = None line = "" diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields -index 61e752b..ef997dd 100755 +index 6286c9c..f624728 100755 --- a/build-aux/extract-ofp-fields +++ b/build-aux/extract-ofp-fields @@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01, @@ -58,7 +59,7 @@ index 61e752b..ef997dd 100755 TYPES = {"u8": (1, False), "be16": (2, False), diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in -index 3fa1a0f..615548f 100755 +index e1551f9..b70a599 100755 --- a/ovsdb/ovsdb-idlc.in +++ b/ovsdb/ovsdb-idlc.in @@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile): @@ -97,6 +98,3 @@ index 3fa1a0f..615548f 100755 structName = "%s%s" % (prefix, tableName.lower()) if table.is_root: is_root = "true" --- -2.5.0 - -- cgit v1.2.3-54-g00ecf