summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git')
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0001-Python3-compatibility-Convert-print-statements.patch24
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch10
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch12
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch14
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0003-Python3-compatibility-execfile-to-exec.patch10
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch16
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch10
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch10
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch10
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0008-AUTHORS-Add-Jason-Wessel.patch8
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/CVE-2017-9263.patch29
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch14
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/kernel_module.patch14
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b8dcfbebee9e7dbc74ec5eecc9b45d335d6150c1.patch8
14 files changed, 75 insertions, 114 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0001-Python3-compatibility-Convert-print-statements.patch b/recipes-networking/openvswitch/openvswitch-git/0001-Python3-compatibility-Convert-print-statements.patch
index d6197588..7bdcc003 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0001-Python3-compatibility-Convert-print-statements.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0001-Python3-compatibility-Convert-print-statements.patch
@@ -1,7 +1,7 @@
1From c5c18f9c5f1b7217d43af43be9736c1762c7ebba Mon Sep 17 00:00:00 2001 1From 3658d861c3c83caab9040bec04b195be3f86d4ce Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 1/8] Python3 compatibility: Convert print statements 4Subject: [PATCH] Python3 compatibility: Convert print statements
5 5
6Commit d34a1cc02536f9a812517a71accec3fbd3c6c98b from 6Commit d34a1cc02536f9a812517a71accec3fbd3c6c98b from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -11,6 +11,7 @@ python2.
11 11
12Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 12Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
13Signed-off-by: Ben Pfaff <blp@ovn.org> 13Signed-off-by: Ben Pfaff <blp@ovn.org>
14
14--- 15---
15 build-aux/check-structs | 4 +- 16 build-aux/check-structs | 4 +-
16 build-aux/extract-ofp-actions | 68 +++--- 17 build-aux/extract-ofp-actions | 68 +++---
@@ -22,7 +23,7 @@ Signed-off-by: Ben Pfaff <blp@ovn.org>
22 7 files changed, 306 insertions(+), 305 deletions(-) 23 7 files changed, 306 insertions(+), 305 deletions(-)
23 24
24diff --git a/build-aux/check-structs b/build-aux/check-structs 25diff --git a/build-aux/check-structs b/build-aux/check-structs
25index f79f235..bae511f 100755 26index 5129b72..cbb19b6 100755
26--- a/build-aux/check-structs 27--- a/build-aux/check-structs
27+++ b/build-aux/check-structs 28+++ b/build-aux/check-structs
28@@ -211,7 +211,7 @@ def checkStructs(): 29@@ -211,7 +211,7 @@ def checkStructs():
@@ -44,7 +45,7 @@ index f79f235..bae511f 100755
44 45
45 global fileName 46 global fileName
46diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions 47diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
47index 0062ab8..874e6b4 100755 48index ee8c4ff..67e3848 100755
48--- a/build-aux/extract-ofp-actions 49--- a/build-aux/extract-ofp-actions
49+++ b/build-aux/extract-ofp-actions 50+++ b/build-aux/extract-ofp-actions
50@@ -67,7 +67,7 @@ def fatal(msg): 51@@ -67,7 +67,7 @@ def fatal(msg):
@@ -187,7 +188,7 @@ index 0062ab8..874e6b4 100755
187 if __name__ == '__main__': 188 if __name__ == '__main__':
188 if '--help' in sys.argv: 189 if '--help' in sys.argv:
189diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors 190diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
190index 2312b76..336a240 100755 191index e36444e..97d62d2 100755
191--- a/build-aux/extract-ofp-errors 192--- a/build-aux/extract-ofp-errors
192+++ b/build-aux/extract-ofp-errors 193+++ b/build-aux/extract-ofp-errors
193@@ -426,7 +426,7 @@ static const struct ofperr_domain %s = { 194@@ -426,7 +426,7 @@ static const struct ofperr_domain %s = {
@@ -200,7 +201,7 @@ index 2312b76..336a240 100755
200 print (" { -1, -1, -1 }, /* %s */" % enum) 201 print (" { -1, -1, -1 }, /* %s */" % enum)
201 print ("""\ 202 print ("""\
202diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields 203diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
203index 498b887..425a85f 100755 204index c248e76..80c7d35 100755
204--- a/build-aux/extract-ofp-fields 205--- a/build-aux/extract-ofp-fields
205+++ b/build-aux/extract-ofp-fields 206+++ b/build-aux/extract-ofp-fields
206@@ -728,7 +728,7 @@ def make_ovs_fields(meta_flow_h, meta_flow_xml): 207@@ -728,7 +728,7 @@ def make_ovs_fields(meta_flow_h, meta_flow_xml):
@@ -213,7 +214,7 @@ index 498b887..425a85f 100755
213 recursively_replace(doc, 'oxm_classes', make_oxm_classes_xml(document)) 214 recursively_replace(doc, 'oxm_classes', make_oxm_classes_xml(document))
214 215
215diff --git a/build-aux/extract-ofp-msgs b/build-aux/extract-ofp-msgs 216diff --git a/build-aux/extract-ofp-msgs b/build-aux/extract-ofp-msgs
216index 1813638..a67e870 100755 217index c2a91f9..92c4bda 100755
217--- a/build-aux/extract-ofp-msgs 218--- a/build-aux/extract-ofp-msgs
218+++ b/build-aux/extract-ofp-msgs 219+++ b/build-aux/extract-ofp-msgs
219@@ -56,14 +56,14 @@ def fatal(msg): 220@@ -56,14 +56,14 @@ def fatal(msg):
@@ -241,7 +242,7 @@ index 1813638..a67e870 100755
241+ print(line) 242+ print(line)
242 243
243diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc 244diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc
244index 5cf26ee..b34fb11 100755 245index bdf2dcc..e82ad59 100755
245--- a/ovsdb/ovsdb-doc 246--- a/ovsdb/ovsdb-doc
246+++ b/ovsdb/ovsdb-doc 247+++ b/ovsdb/ovsdb-doc
247@@ -258,7 +258,7 @@ represent strong references; thin lines represent weak references. 248@@ -258,7 +258,7 @@ represent strong references; thin lines represent weak references.
@@ -272,11 +273,11 @@ index 5cf26ee..b34fb11 100755
272 except error.Error, e: 273 except error.Error, e:
273 sys.stderr.write("%s: %s\n" % (argv0, e.msg)) 274 sys.stderr.write("%s: %s\n" % (argv0, e.msg))
274diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in 275diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
275index 721ab50..1064448 100755 276index bfbcf23..62442ee 100755
276--- a/ovsdb/ovsdb-idlc.in 277--- a/ovsdb/ovsdb-idlc.in
277+++ b/ovsdb/ovsdb-idlc.in 278+++ b/ovsdb/ovsdb-idlc.in
278@@ -1,5 +1,6 @@ 279@@ -1,5 +1,6 @@
279 #! @PYTHON@ 280 #! /usr/bin/env @PYTHON@
280 281
281+from __future__ import print_function 282+from __future__ import print_function
282 import getopt 283 import getopt
@@ -1259,6 +1260,3 @@ index 721ab50..1064448 100755
1259 elif key in ['-C', '--directory']: 1260 elif key in ['-C', '--directory']:
1260 os.chdir(value) 1261 os.chdir(value)
1261 else: 1262 else:
1262--
12632.5.0
1264
diff --git a/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch b/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch
index 35712452..f1f9befe 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0001-use-the-linux-if_packet.h-Interface-directly.patch
@@ -1,17 +1,18 @@
1From 1cec65e45f011c3f52eed5e27d3d816502e36610 Mon Sep 17 00:00:00 2001 1From 28b2d17de9414161d5edd67766bd4b452cd809ef Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2017 12:12:51 -0700 3Date: Mon, 20 Mar 2017 12:12:51 -0700
4Subject: [PATCH 1/2] use the linux if_packet.h Interface directly 4Subject: [PATCH] use the linux if_packet.h Interface directly
5 5
6Helps compiling with musl 6Helps compiling with musl
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
9--- 10---
10 lib/netdev-linux.c | 3 +-- 11 lib/netdev-linux.c | 3 +--
11 1 file changed, 1 insertion(+), 2 deletions(-) 12 1 file changed, 1 insertion(+), 2 deletions(-)
12 13
13diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c 14diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
14index a5a9ec1ab..9dd40acdd 100644 15index fccf88f..b703156 100644
15--- a/lib/netdev-linux.c 16--- a/lib/netdev-linux.c
16+++ b/lib/netdev-linux.c 17+++ b/lib/netdev-linux.c
17@@ -33,14 +33,13 @@ 18@@ -33,14 +33,13 @@
@@ -30,6 +31,3 @@ index a5a9ec1ab..9dd40acdd 100644
30 #include <net/route.h> 31 #include <net/route.h>
31 #include <netinet/in.h> 32 #include <netinet/in.h>
32 #include <poll.h> 33 #include <poll.h>
33--
342.12.0
35
diff --git a/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch b/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch
index e44ffdaf..f997bbff 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch
@@ -1,21 +1,22 @@
1From 803bde12d32d16eefeae03422a0ac682e0601c43 Mon Sep 17 00:00:00 2001 1From 801023e72b31e7c49cbccedd76ade33a17fcbe45 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2017 12:13:30 -0700 3Date: Mon, 20 Mar 2017 12:13:30 -0700
4Subject: [PATCH 2/2] Define WAIT_ANY if not provided by system 4Subject: [PATCH] Define WAIT_ANY if not provided by system
5 5
6POSIX does not define it and uses -1 directly 6POSIX does not define it and uses -1 directly
7some libc do not have this definitions 7some libc do not have this definitions
8 8
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
10--- 11---
11 tests/test-ovn.c | 4 ++++ 12 tests/test-ovn.c | 4 ++++
12 1 file changed, 4 insertions(+) 13 1 file changed, 4 insertions(+)
13 14
14diff --git a/tests/test-ovn.c b/tests/test-ovn.c 15diff --git a/tests/test-ovn.c b/tests/test-ovn.c
15index 2e82a6f0d..76e7db9fb 100644 16index 84adf81..2bc6bdf 100644
16--- a/tests/test-ovn.c 17--- a/tests/test-ovn.c
17+++ b/tests/test-ovn.c 18+++ b/tests/test-ovn.c
18@@ -37,6 +37,10 @@ 19@@ -38,6 +38,10 @@
19 #include "simap.h" 20 #include "simap.h"
20 #include "util.h" 21 #include "util.h"
21 22
@@ -26,6 +27,3 @@ index 2e82a6f0d..76e7db9fb 100644
26 /* --relops: Bitmap of the relational operators to test, in exhaustive test. */ 27 /* --relops: Bitmap of the relational operators to test, in exhaustive test. */
27 static unsigned int test_relops; 28 static unsigned int test_relops;
28 29
29--
302.12.0
31
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 @@
1From c98fee41d130cb946aa4e60fefaa6cbf203f6790 Mon Sep 17 00:00:00 2001 1From c0ba116eab401431b4f11b66bd7d1b42741b03c3 Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 2/8] Python3 compatibility: exception cleanup 4Subject: [PATCH] Python3 compatibility: exception cleanup
5 5
6Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from 6Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -11,6 +11,7 @@ to use the "as" form for "except:".
11 11
12Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 12Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
13Signed-off-by: Ben Pfaff <blp@ovn.org> 13Signed-off-by: Ben Pfaff <blp@ovn.org>
14
14--- 15---
15 build-aux/extract-ofp-fields | 2 +- 16 build-aux/extract-ofp-fields | 2 +-
16 ovsdb/ovsdb-doc | 4 ++-- 17 ovsdb/ovsdb-doc | 4 ++--
@@ -18,7 +19,7 @@ Signed-off-by: Ben Pfaff <blp@ovn.org>
18 3 files changed, 5 insertions(+), 5 deletions(-) 19 3 files changed, 5 insertions(+), 5 deletions(-)
19 20
20diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields 21diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
21index 425a85f..61e752b 100755 22index 80c7d35..6286c9c 100755
22--- a/build-aux/extract-ofp-fields 23--- a/build-aux/extract-ofp-fields
23+++ b/build-aux/extract-ofp-fields 24+++ b/build-aux/extract-ofp-fields
24@@ -784,7 +784,7 @@ if __name__ == "__main__": 25@@ -784,7 +784,7 @@ if __name__ == "__main__":
@@ -31,7 +32,7 @@ index 425a85f..61e752b 100755
31 sys.exit(1) 32 sys.exit(1)
32 33
33diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc 34diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc
34index b34fb11..918e88a 100755 35index e82ad59..9448713 100755
35--- a/ovsdb/ovsdb-doc 36--- a/ovsdb/ovsdb-doc
36+++ b/ovsdb/ovsdb-doc 37+++ b/ovsdb/ovsdb-doc
37@@ -278,7 +278,7 @@ if __name__ == "__main__": 38@@ -278,7 +278,7 @@ if __name__ == "__main__":
@@ -53,7 +54,7 @@ index b34fb11..918e88a 100755
53 sys.exit(1) 54 sys.exit(1)
54 55
55diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in 56diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
56index 1064448..8b85f0d 100755 57index 62442ee..e7e1c6b 100755
57--- a/ovsdb/ovsdb-idlc.in 58--- a/ovsdb/ovsdb-idlc.in
58+++ b/ovsdb/ovsdb-idlc.in 59+++ b/ovsdb/ovsdb-idlc.in
59@@ -1098,7 +1098,7 @@ if __name__ == "__main__": 60@@ -1098,7 +1098,7 @@ if __name__ == "__main__":
@@ -74,6 +75,3 @@ index 1064448..8b85f0d 100755
74 sys.stderr.write("%s: %s\n" % (argv0, e)) 75 sys.stderr.write("%s: %s\n" % (argv0, e))
75 sys.exit(1) 76 sys.exit(1)
76 77
77--
782.5.0
79
diff --git a/recipes-networking/openvswitch/openvswitch-git/0003-Python3-compatibility-execfile-to-exec.patch b/recipes-networking/openvswitch/openvswitch-git/0003-Python3-compatibility-execfile-to-exec.patch
index a85980ed..98d77c8a 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0003-Python3-compatibility-execfile-to-exec.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0003-Python3-compatibility-execfile-to-exec.patch
@@ -1,7 +1,7 @@
1From 9cbae86be03756df76560c15720756f9ac088144 Mon Sep 17 00:00:00 2001 1From 8557d51e8c7325a17219911e9a65eeb3946e869f Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 3/8] Python3 compatibility: execfile to exec 4Subject: [PATCH] Python3 compatibility: execfile to exec
5 5
6Commit a4d10a7ca937d73873f6f98619d88682e69f5dbe from 6Commit a4d10a7ca937d73873f6f98619d88682e69f5dbe from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -11,12 +11,13 @@ exec().
11 11
12Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 12Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
13Signed-off-by: Ben Pfaff <blp@ovn.org> 13Signed-off-by: Ben Pfaff <blp@ovn.org>
14
14--- 15---
15 ovsdb/ovsdb-idlc.in | 2 +- 16 ovsdb/ovsdb-idlc.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
17 18
18diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in 19diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
19index 8b85f0d..3fa1a0f 100755 20index e7e1c6b..e1551f9 100755
20--- a/ovsdb/ovsdb-idlc.in 21--- a/ovsdb/ovsdb-idlc.in
21+++ b/ovsdb/ovsdb-idlc.in 22+++ b/ovsdb/ovsdb-idlc.in
22@@ -17,7 +17,7 @@ def parseSchema(filename): 23@@ -17,7 +17,7 @@ def parseSchema(filename):
@@ -28,6 +29,3 @@ index 8b85f0d..3fa1a0f 100755
28 ovs.json.to_stream(schemaJson, sys.stdout) 29 ovs.json.to_stream(schemaJson, sys.stdout)
29 sys.stdout.write('\n') 30 sys.stdout.write('\n')
30 31
31--
322.5.0
33
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 @@
1From 0f318e472d9897d99395adcfb17cbeaff05677ba Mon Sep 17 00:00:00 2001 1From 7e4bd5c2af85b1293be0a92b18f7930bda2ab41a Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 4/8] Python3 compatibility: iteritems to items 4Subject: [PATCH] Python3 compatibility: iteritems to items
5 5
6Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from 6Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -11,6 +11,7 @@ items().
11 11
12Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 12Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
13Signed-off-by: Ben Pfaff <blp@ovn.org> 13Signed-off-by: Ben Pfaff <blp@ovn.org>
14
14--- 15---
15 build-aux/extract-ofp-actions | 2 +- 16 build-aux/extract-ofp-actions | 2 +-
16 build-aux/extract-ofp-errors | 2 +- 17 build-aux/extract-ofp-errors | 2 +-
@@ -19,7 +20,7 @@ Signed-off-by: Ben Pfaff <blp@ovn.org>
19 4 files changed, 7 insertions(+), 7 deletions(-) 20 4 files changed, 7 insertions(+), 7 deletions(-)
20 21
21diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions 22diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
22index 874e6b4..c11297c 100755 23index 67e3848..c7858bd 100755
23--- a/build-aux/extract-ofp-actions 24--- a/build-aux/extract-ofp-actions
24+++ b/build-aux/extract-ofp-actions 25+++ b/build-aux/extract-ofp-actions
25@@ -13,7 +13,7 @@ version_map = {"1.0": 0x01, 26@@ -13,7 +13,7 @@ version_map = {"1.0": 0x01,
@@ -32,7 +33,7 @@ index 874e6b4..c11297c 100755
32 # Map from vendor name to the length of the action header. 33 # Map from vendor name to the length of the action header.
33 vendor_map = {"OF": (0x00000000, 4), 34 vendor_map = {"OF": (0x00000000, 4),
34diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors 35diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
35index 336a240..71ae0bd 100755 36index 97d62d2..58ba006 100755
36--- a/build-aux/extract-ofp-errors 37--- a/build-aux/extract-ofp-errors
37+++ b/build-aux/extract-ofp-errors 38+++ b/build-aux/extract-ofp-errors
38@@ -14,7 +14,7 @@ version_map = {"1.0": 0x01, 39@@ -14,7 +14,7 @@ version_map = {"1.0": 0x01,
@@ -45,7 +46,7 @@ index 336a240..71ae0bd 100755
45 token = None 46 token = None
46 line = "" 47 line = ""
47diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields 48diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
48index 61e752b..ef997dd 100755 49index 6286c9c..f624728 100755
49--- a/build-aux/extract-ofp-fields 50--- a/build-aux/extract-ofp-fields
50+++ b/build-aux/extract-ofp-fields 51+++ b/build-aux/extract-ofp-fields
51@@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01, 52@@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01,
@@ -58,7 +59,7 @@ index 61e752b..ef997dd 100755
58 TYPES = {"u8": (1, False), 59 TYPES = {"u8": (1, False),
59 "be16": (2, False), 60 "be16": (2, False),
60diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in 61diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
61index 3fa1a0f..615548f 100755 62index e1551f9..b70a599 100755
62--- a/ovsdb/ovsdb-idlc.in 63--- a/ovsdb/ovsdb-idlc.in
63+++ b/ovsdb/ovsdb-idlc.in 64+++ b/ovsdb/ovsdb-idlc.in
64@@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile): 65@@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile):
@@ -97,6 +98,3 @@ index 3fa1a0f..615548f 100755
97 structName = "%s%s" % (prefix, tableName.lower()) 98 structName = "%s%s" % (prefix, tableName.lower())
98 if table.is_root: 99 if table.is_root:
99 is_root = "true" 100 is_root = "true"
100--
1012.5.0
102
diff --git a/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch b/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch
index 717a97db..d6f93646 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch
@@ -1,7 +1,7 @@
1From bc29f98f0137fa1083a4cacf832d52f740d150a8 Mon Sep 17 00:00:00 2001 1From d22c7f1c6ade82a0cd646cfcd8df9adda6cd1ad6 Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 5/8] Python3 compatibility: fix integer problems 4Subject: [PATCH] Python3 compatibility: fix integer problems
5 5
6Commit fa145f1a53943243f94a32ce98525db8494b0052 from 6Commit fa145f1a53943243f94a32ce98525db8494b0052 from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -15,13 +15,14 @@ The simple answer is to convert it with int() and move on.
15 15
16Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 16Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
17Signed-off-by: Ben Pfaff <blp@ovn.org> 17Signed-off-by: Ben Pfaff <blp@ovn.org>
18
18--- 19---
19 ovsdb/ovsdb-idlc.in | 2 +- 20 ovsdb/ovsdb-idlc.in | 2 +-
20 python/build/nroff.py | 2 ++ 21 python/build/nroff.py | 2 ++
21 2 files changed, 3 insertions(+), 1 deletion(-) 22 2 files changed, 3 insertions(+), 1 deletion(-)
22 23
23diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in 24diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
24index 615548f..7cbcbf5 100755 25index b70a599..3645275 100755
25--- a/ovsdb/ovsdb-idlc.in 26--- a/ovsdb/ovsdb-idlc.in
26+++ b/ovsdb/ovsdb-idlc.in 27+++ b/ovsdb/ovsdb-idlc.in
27@@ -358,7 +358,7 @@ static void 28@@ -358,7 +358,7 @@ static void
@@ -46,6 +47,3 @@ index c23837f..401f699 100644
46 extend = x + len(s) - len(text[y]) 47 extend = x + len(s) - len(text[y])
47 if extend > 0: 48 if extend > 0:
48 text[y] += ' ' * extend 49 text[y] += ' ' * extend
49--
502.5.0
51
diff --git a/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch b/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch
index 54905cd0..c53502b5 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch
@@ -1,7 +1,7 @@
1From 3a9fcf1c8f60c160c282c9755ee1c7f9f7e113c3 Mon Sep 17 00:00:00 2001 1From 7f542122d62b20d11198bfdb0f2c6a460261b5e7 Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 6/8] Python3 compatibility: math error compatibility 4Subject: [PATCH] Python3 compatibility: math error compatibility
5 5
6Commit 3fa5aa4294377e0f35267936d0c5caea3e61db48 from 6Commit 3fa5aa4294377e0f35267936d0c5caea3e61db48 from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -34,12 +34,13 @@ EOF
34 34
35Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 35Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
36Signed-off-by: Ben Pfaff <blp@ovn.org> 36Signed-off-by: Ben Pfaff <blp@ovn.org>
37
37--- 38---
38 build-aux/extract-ofp-actions | 2 +- 39 build-aux/extract-ofp-actions | 2 +-
39 1 file changed, 1 insertion(+), 1 deletion(-) 40 1 file changed, 1 insertion(+), 1 deletion(-)
40 41
41diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions 42diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
42index c11297c..bd7131f 100755 43index c7858bd..4d05ef9 100755
43--- a/build-aux/extract-ofp-actions 44--- a/build-aux/extract-ofp-actions
44+++ b/build-aux/extract-ofp-actions 45+++ b/build-aux/extract-ofp-actions
45@@ -35,7 +35,7 @@ line = "" 46@@ -35,7 +35,7 @@ line = ""
@@ -51,6 +52,3 @@ index c11297c..bd7131f 100755
51 52
52 def open_file(fn): 53 def open_file(fn):
53 global file_name 54 global file_name
54--
552.5.0
56
diff --git a/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch b/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch
index faa32b73..753490f8 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch
@@ -1,7 +1,7 @@
1From 2fe58f87b00d0ec24d6997930d0bcdb130c84396 Mon Sep 17 00:00:00 2001 1From c78b39ae9ba6337210d6a9e4ccc4753cb1c3b48f Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 7/8] Python3 compatibility: unicode to str 4Subject: [PATCH] Python3 compatibility: unicode to str
5 5
6Commit 7430959d4ad17db89b8387c3aef58c8b230cad10 from 6Commit 7430959d4ad17db89b8387c3aef58c8b230cad10 from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -19,12 +19,13 @@ type because it doesn't exist.
19 19
20Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 20Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
21Signed-off-by: Ben Pfaff <blp@ovn.org> 21Signed-off-by: Ben Pfaff <blp@ovn.org>
22
22--- 23---
23 ovsdb/ovsdb-doc | 12 +++++++++--- 24 ovsdb/ovsdb-doc | 12 +++++++++---
24 1 file changed, 9 insertions(+), 3 deletions(-) 25 1 file changed, 9 insertions(+), 3 deletions(-)
25 26
26diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc 27diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc
27index 918e88a..406c293 100755 28index 9448713..d55c6e6 100755
28--- a/ovsdb/ovsdb-doc 29--- a/ovsdb/ovsdb-doc
29+++ b/ovsdb/ovsdb-doc 30+++ b/ovsdb/ovsdb-doc
30@@ -65,9 +65,15 @@ def columnGroupToNroff(table, groupXml, documented_columns): 31@@ -65,9 +65,15 @@ def columnGroupToNroff(table, groupXml, documented_columns):
@@ -46,6 +47,3 @@ index 918e88a..406c293 100755
46 type_ = ovs.db.types.BaseType.from_json(type_json) 47 type_ = ovs.db.types.BaseType.from_json(type_json)
47 else: 48 else:
48 type_ = column.type.value 49 type_ = column.type.value
49--
502.5.0
51
diff --git a/recipes-networking/openvswitch/openvswitch-git/0008-AUTHORS-Add-Jason-Wessel.patch b/recipes-networking/openvswitch/openvswitch-git/0008-AUTHORS-Add-Jason-Wessel.patch
index d2c2be7c..f55a5caf 100644
--- a/recipes-networking/openvswitch/openvswitch-git/0008-AUTHORS-Add-Jason-Wessel.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/0008-AUTHORS-Add-Jason-Wessel.patch
@@ -1,12 +1,13 @@
1From a3289add8368e0c970ae1c1c84f5df1f817ed43c Mon Sep 17 00:00:00 2001 1From f8491645416952b31000f42777ff79486a7b0511 Mon Sep 17 00:00:00 2001
2From: Ben Pfaff <blp@ovn.org> 2From: Ben Pfaff <blp@ovn.org>
3Date: Thu, 6 Jul 2017 14:01:27 -0700 3Date: Thu, 6 Jul 2017 14:01:27 -0700
4Subject: [PATCH 8/8] AUTHORS: Add Jason Wessel. 4Subject: [PATCH] AUTHORS: Add Jason Wessel.
5 5
6Commit a91c4cfaf863718bc94fb9c88939bd0b0385a6fe from 6Commit a91c4cfaf863718bc94fb9c88939bd0b0385a6fe from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
8 8
9Signed-off-by: Ben Pfaff <blp@ovn.org> 9Signed-off-by: Ben Pfaff <blp@ovn.org>
10
10--- 11---
11 AUTHORS.rst | 1 + 12 AUTHORS.rst | 1 +
12 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
@@ -23,6 +24,3 @@ index 63e6a8d..d0dc70d 100644
23 Jasper Capel jasper@capel.tv 24 Jasper Capel jasper@capel.tv
24 Jean Tourrilhes jt@hpl.hp.com 25 Jean Tourrilhes jt@hpl.hp.com
25 Jeremy Stribling strib@nicira.com 26 Jeremy Stribling strib@nicira.com
26--
272.5.0
28
diff --git a/recipes-networking/openvswitch/openvswitch-git/CVE-2017-9263.patch b/recipes-networking/openvswitch/openvswitch-git/CVE-2017-9263.patch
deleted file mode 100644
index 0fc3aa1a..00000000
--- a/recipes-networking/openvswitch/openvswitch-git/CVE-2017-9263.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1A buggy or malicious switch could send a role status message with a bad
2reason code, which if printed by OVS would cause it to abort. This fixes
3the problem.
4
5CVE: CVE-2017-9263
6Upstream-Status: Submitted
7
8Reported-by: Bhargava Shastry <bshastry at sec.t-labs.tu-berlin.de>
9Signed-off-by: Ben Pfaff <blp at ovn.org>
10---
11 lib/ofp-print.c | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14diff --git a/lib/ofp-print.c b/lib/ofp-print.c
15index 7ca953100539..1932baf4871f 100644
16--- a/lib/ofp-print.c
17+++ b/lib/ofp-print.c
18@@ -2147,7 +2147,8 @@ ofp_print_role_status_message(struct ds *string, const struct ofp_header *oh)
19 break;
20 case OFPCRR_N_REASONS:
21 default:
22- OVS_NOT_REACHED();
23+ ds_put_cstr(string, "(unknown)");
24+ break;
25 }
26 }
27
28--
292.10.2
diff --git a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
index 1ad5d6f4..5c86aacc 100644
--- a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
@@ -1,13 +1,19 @@
1Disable m4 file test where sources are built from git. 1From f675d7209f999ce80cb4249c4ebb216697387b71 Mon Sep 17 00:00:00 2001
2From: Amy Fong <amy.fong@windriver.com>
3Date: Thu, 29 Jan 2015 09:56:03 -0500
4Subject: [PATCH] Disable m4 file test where sources are built from git.
2 5
3Signed-off-by: Amy Fong <amy.fong@windriver.com> 6Signed-off-by: Amy Fong <amy.fong@windriver.com>
7
4--- 8---
5 Makefile.am | 2 +- 9 Makefile.am | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
7 11
12diff --git a/Makefile.am b/Makefile.am
13index ff7d70a..2fc1f13 100644
8--- a/Makefile.am 14--- a/Makefile.am
9+++ b/Makefile.am 15+++ b/Makefile.am
10@@ -185,7 +185,7 @@ 16@@ -189,7 +189,7 @@ CLEAN_LOCAL += clean-pycov
11 # Makefile in datapath/linux, needed to get the list of files to 17 # Makefile in datapath/linux, needed to get the list of files to
12 # distribute, requires GNU make extensions. 18 # distribute, requires GNU make extensions.
13 if GNU_MAKE 19 if GNU_MAKE
@@ -15,4 +21,4 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com>
15+# ALL_LOCAL += dist-hook-git 21+# ALL_LOCAL += dist-hook-git
16 dist-hook-git: distfiles 22 dist-hook-git: distfiles
17 @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \ 23 @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
18 (cd datapath && $(MAKE) distfiles); \ 24 (cd datapath && $(MAKE) distfiles); \
diff --git a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch b/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
index 033cfb8a..c177202f 100644
--- a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
@@ -1,13 +1,19 @@
1Specify install path for kernel module 1From adfd2380d71dff1a31efaf63cf7ac97470466ec9 Mon Sep 17 00:00:00 2001
2From: Amy Fong <amy.fong@windriver.com>
3Date: Thu, 29 Jan 2015 09:56:03 -0500
4Subject: [PATCH] Specify install path for kernel module
2 5
3Signed-off-by: Amy Fong <amy.fong@windriver.com> 6Signed-off-by: Amy Fong <amy.fong@windriver.com>
7
4--- 8---
5 datapath/linux/Makefile.main.in | 4 ++-- 9 datapath/linux/Makefile.main.in | 4 ++--
6 1 files changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
7 11
12diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in
13index 7d18253..63c520f 100644
8--- a/datapath/linux/Makefile.main.in 14--- a/datapath/linux/Makefile.main.in
9+++ b/datapath/linux/Makefile.main.in 15+++ b/datapath/linux/Makefile.main.in
10@@ -71,8 +71,8 @@ 16@@ -71,8 +71,8 @@ default:
11 $(MAKE) -C $(KSRC) M=$(builddir) modules 17 $(MAKE) -C $(KSRC) M=$(builddir) modules
12 18
13 modules_install: 19 modules_install:
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b8dcfbebee9e7dbc74ec5eecc9b45d335d6150c1.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b8dcfbebee9e7dbc74ec5eecc9b45d335d6150c1.patch
index 47c81dd9..4ae86c38 100644
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b8dcfbebee9e7dbc74ec5eecc9b45d335d6150c1.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b8dcfbebee9e7dbc74ec5eecc9b45d335d6150c1.patch
@@ -1,4 +1,4 @@
1From a2a656e6976a60e5df3ade0d17a40b4ebdc2b41a Mon Sep 17 00:00:00 2001 1From fb68120ef8aed625b04b2fbd2cb78fc59a7b7432 Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com> 2From: He Zhe <zhe.he@windriver.com>
3Date: Wed, 30 Mar 2016 06:23:45 -0400 3Date: Wed, 30 Mar 2016 06:23:45 -0400
4Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution 4Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution
@@ -12,6 +12,7 @@ Fix ptest for v2.5
12 - Modify config files for running on target. 12 - Modify config files for running on target.
13 13
14Signed-off-by: He Zhe <zhe.he@windriver.com> 14Signed-off-by: He Zhe <zhe.he@windriver.com>
15
15--- 16---
16 Makefile.am | 1 + 17 Makefile.am | 1 +
17 test.mk | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 18 test.mk | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -19,7 +20,7 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
19 create mode 100644 test.mk 20 create mode 100644 test.mk
20 21
21diff --git a/Makefile.am b/Makefile.am 22diff --git a/Makefile.am b/Makefile.am
22index a4dd7b8..0bd32c7 100644 23index ea63acb..ff7d70a 100644
23--- a/Makefile.am 24--- a/Makefile.am
24+++ b/Makefile.am 25+++ b/Makefile.am
25@@ -429,3 +429,4 @@ include windows/automake.mk 26@@ -429,3 +429,4 @@ include windows/automake.mk
@@ -105,6 +106,3 @@ index 0000000..b10a581
105+ sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite 106+ sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite
106+ sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite 107+ sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite
107+ sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite 108+ sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite
108--
1092.7.4
110