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 --- .../0002-Python3-compatibility-exception-cleanup.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch') diff --git a/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch index 59c0f3e4..70abd263 100644 --- a/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch +++ b/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch @@ -1,7 +1,7 @@ -From c98fee41d130cb946aa4e60fefaa6cbf203f6790 Mon Sep 17 00:00:00 2001 +From c0ba116eab401431b4f11b66bd7d1b42741b03c3 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Thu, 29 Jun 2017 20:33:23 -0700 -Subject: [PATCH 2/8] Python3 compatibility: exception cleanup +Subject: [PATCH] Python3 compatibility: exception cleanup Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from https://github.com/openvswitch/ovs.git @@ -11,6 +11,7 @@ to use the "as" form for "except:". Signed-off-by: Jason Wessel Signed-off-by: Ben Pfaff + --- build-aux/extract-ofp-fields | 2 +- ovsdb/ovsdb-doc | 4 ++-- @@ -18,7 +19,7 @@ Signed-off-by: Ben Pfaff 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields -index 425a85f..61e752b 100755 +index 80c7d35..6286c9c 100755 --- a/build-aux/extract-ofp-fields +++ b/build-aux/extract-ofp-fields @@ -784,7 +784,7 @@ if __name__ == "__main__": @@ -31,7 +32,7 @@ index 425a85f..61e752b 100755 sys.exit(1) diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc -index b34fb11..918e88a 100755 +index e82ad59..9448713 100755 --- a/ovsdb/ovsdb-doc +++ b/ovsdb/ovsdb-doc @@ -278,7 +278,7 @@ if __name__ == "__main__": @@ -53,7 +54,7 @@ index b34fb11..918e88a 100755 sys.exit(1) diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in -index 1064448..8b85f0d 100755 +index 62442ee..e7e1c6b 100755 --- a/ovsdb/ovsdb-idlc.in +++ b/ovsdb/ovsdb-idlc.in @@ -1098,7 +1098,7 @@ if __name__ == "__main__": @@ -74,6 +75,3 @@ index 1064448..8b85f0d 100755 sys.stderr.write("%s: %s\n" % (argv0, e)) sys.exit(1) --- -2.5.0 - -- cgit v1.2.3-54-g00ecf