From 165ffabe8933d2e44074d67921ea465eab4d90cb Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 12 Jul 2017 17:02:41 -0400 Subject: openvswitch: uprev to v2.7.1 Released at the end of June 2017 this is a bugfix release with no major functional changes. Surprisingly the patch for CVE-2017-9263 is still not applied upstream so we continue to carry this change. The remaining patches were audited and cleaned up as needed. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- ...gure-Only-link-against-libpcap-on-FreeBSD.patch | 70 ------------- ...-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch | 110 +++++++++++++++++++++ ...-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch | 110 --------------------- recipes-networking/openvswitch/openvswitch_git.bb | 4 +- 4 files changed, 112 insertions(+), 182 deletions(-) delete mode 100644 recipes-networking/openvswitch/files/configure-Only-link-against-libpcap-on-FreeBSD.patch create mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch delete mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch (limited to 'recipes-networking/openvswitch') diff --git a/recipes-networking/openvswitch/files/configure-Only-link-against-libpcap-on-FreeBSD.patch b/recipes-networking/openvswitch/files/configure-Only-link-against-libpcap-on-FreeBSD.patch deleted file mode 100644 index 0a44b85e..00000000 --- a/recipes-networking/openvswitch/files/configure-Only-link-against-libpcap-on-FreeBSD.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d30e714ccb9d13caf39d14d5b2fc9523b678ed51 Mon Sep 17 00:00:00 2001 -From: Ben Pfaff -Date: Thu, 14 Mar 2013 15:20:55 -0700 -Subject: [PATCH] configure: Only link against libpcap on FreeBSD. - -commit d30e714ccb9d13caf39d14d5b2fc9523b678ed51 upstream -http://git.openvswitch.org/git/openvswitch - -On other platforms there is no benefit to linking against libpcap, because -it is not used. - -Signed-off-by: Ben Pfaff -CC: Ed Maste ---- - acinclude.m4 | 7 ++++++- - configure.ac | 3 +-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index f0610c9..19a47dd 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1,6 +1,6 @@ - # -*- autoconf -*- - --# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. -+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. -@@ -295,6 +295,8 @@ AC_DEFUN([OVS_CHECK_IF_PACKET], - fi]) - - dnl Checks for net/if_dl.h. -+dnl -+dnl (We use this as a proxy for checking whether we're building on FreeBSD.) - AC_DEFUN([OVS_CHECK_IF_DL], - [AC_CHECK_HEADER([net/if_dl.h], - [HAVE_IF_DL=yes], -@@ -303,6 +305,9 @@ AC_DEFUN([OVS_CHECK_IF_DL], - if test "$HAVE_IF_DL" = yes; then - AC_DEFINE([HAVE_IF_DL], [1], - [Define to 1 if net/if_dl.h is available.]) -+ -+ # On FreeBSD we use libpcap to access network devices. -+ AC_SEARCH_LIBS([pcap_open_live], [pcap]) - fi]) - - dnl Checks for buggy strtok_r. -diff --git a/configure.ac b/configure.ac -index 1cacd29..bd49179 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,4 +1,4 @@ --# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. -+# Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. -@@ -44,7 +44,6 @@ AC_SYS_LARGEFILE - AC_SEARCH_LIBS([pow], [m]) - AC_SEARCH_LIBS([clock_gettime], [rt]) - AC_SEARCH_LIBS([timer_create], [rt]) --AC_SEARCH_LIBS([pcap_open_live], [pcap]) - - OVS_CHECK_ESX - OVS_CHECK_COVERAGE --- -1.8.3.2 - diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch new file mode 100644 index 00000000..47c81dd9 --- /dev/null +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch @@ -0,0 +1,110 @@ +From a2a656e6976a60e5df3ade0d17a40b4ebdc2b41a Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Wed, 30 Mar 2016 06:23:45 -0400 +Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution + +Signed-off-by: Radu Patriu + +Fix ptest for v2.5 + - Copy certain files from srcdir since it has been different from + build directory. + - Copy more necessary files for new added test cases. + - Modify config files for running on target. + +Signed-off-by: He Zhe +--- + Makefile.am | 1 + + test.mk | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 73 insertions(+) + create mode 100644 test.mk + +diff --git a/Makefile.am b/Makefile.am +index a4dd7b8..0bd32c7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -429,3 +429,4 @@ include windows/automake.mk + include ovn/automake.mk + include selinux/automake.mk + include build-aux/automake.mk ++include test.mk +diff --git a/test.mk b/test.mk +new file mode 100644 +index 0000000..b10a581 +--- /dev/null ++++ b/test.mk +@@ -0,0 +1,72 @@ ++TEST_DEST ?= ${prefix}/lib/openvswitch ++TEST_ROOT ?= ${prefix}/lib/openvswitch ++TEST_DEPEND = ++ ++if HAVE_OPENSSL ++TEST_DEPEND += $(TESTPKI_FILES) ++endif ++ ++test-install: $(TEST_DEPEND) ++ @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\ ++ install -d $(TEST_DEST)/tests ;\ ++ install $(srcdir)/vtep/ovs-vtep $(TEST_DEST)/tests ;\ ++ install -d $(TEST_DEST)/python ;\ ++ install -d $(TEST_DEST)/python/ovs ;\ ++ install -d $(TEST_DEST)/python/ovs/db ;\ ++ install -d $(TEST_DEST)/python/ovs/unixctl ;\ ++ install -d $(TEST_DEST)/vswitchd ;\ ++ install $(srcdir)/vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\ ++ install vswitchd/ovs-vswitchd $(TEST_DEST)/vswitchd ;\ ++ install -d $(TEST_DEST)/debian ;\ ++ install $(srcdir)/debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\ ++ install -d $(TEST_DEST)/build-aux ;\ ++ install $(srcdir)/build-aux/check-structs $(TEST_DEST)/build-aux ;\ ++ install -d $(TEST_DEST)/xenserver ;\ ++ install $(srcdir)/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\ ++ install $(srcdir)/xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\ ++ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\ ++ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\ ++ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\ ++ install -d $(TEST_DEST)/vtep ;\ ++ install $(srcdir)/vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\ ++ install -d $(TEST_DEST)/ovn ;\ ++ install $(srcdir)/ovn/ovn-nb.ovsschema $(TEST_DEST)/ovn ;\ ++ install $(srcdir)/ovn/ovn-sb.ovsschema $(TEST_DEST)/ovn ;\ ++ install -d $(TEST_DEST)/utilities ;\ ++ install $(srcdir)/utilities/ovs-pcap.in $(TEST_DEST)/utilities ;\ ++ install $(srcdir)/utilities/ovs-pki.in $(TEST_DEST)/utilities ;\ ++ for p in $$list ; do \ ++ echo $$p ;\ ++ p=$${p#../git/} ;\ ++ pre=$${p#tests\/} ;\ ++ if test $$pre != $$p ; then \ ++ echo installing $$p to $(TEST_DEST)/tests/$$pre ;\ ++ if test -f $$p ; then \ ++ install $$p $(TEST_DEST)/tests/$$pre ;\ ++ else \ ++ install $(srcdir)/$$p $(TEST_DEST)/tests/$$pre ;\ ++ fi ;\ ++ continue ;\ ++ fi ;\ ++ pre=$${p#python\/ovs\/} ;\ ++ if test $$pre != $$p ; then \ ++ echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\ ++ if test -f $$p ; then \ ++ install $$p $(TEST_DEST)/python/ovs/$$pre ;\ ++ else \ ++ install $(srcdir)/$$p $(TEST_DEST)/python/ovs/$$pre ;\ ++ fi ;\ ++ continue ;\ ++ fi; \ ++ done ;\ ++ sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|at_srcdir=.*|at_srcdir='"'"'.'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|at_top_srcdir=.*|at_top_srcdir='"'"'..'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|at_top_build_prefix=.*|at_top_build_prefix='"'"'../'"'"'|g' $(TEST_DEST)/tests/atconfig ++ sed -i 's|^\(.*config\.log.*\)|#\1|g' $(TEST_DEST)/tests/testsuite ++ sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite ++ sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite ++ sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite +-- +2.7.4 + diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch deleted file mode 100644 index 47c81dd9..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch +++ /dev/null @@ -1,110 +0,0 @@ -From a2a656e6976a60e5df3ade0d17a40b4ebdc2b41a Mon Sep 17 00:00:00 2001 -From: He Zhe -Date: Wed, 30 Mar 2016 06:23:45 -0400 -Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution - -Signed-off-by: Radu Patriu - -Fix ptest for v2.5 - - Copy certain files from srcdir since it has been different from - build directory. - - Copy more necessary files for new added test cases. - - Modify config files for running on target. - -Signed-off-by: He Zhe ---- - Makefile.am | 1 + - test.mk | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 73 insertions(+) - create mode 100644 test.mk - -diff --git a/Makefile.am b/Makefile.am -index a4dd7b8..0bd32c7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -429,3 +429,4 @@ include windows/automake.mk - include ovn/automake.mk - include selinux/automake.mk - include build-aux/automake.mk -+include test.mk -diff --git a/test.mk b/test.mk -new file mode 100644 -index 0000000..b10a581 ---- /dev/null -+++ b/test.mk -@@ -0,0 +1,72 @@ -+TEST_DEST ?= ${prefix}/lib/openvswitch -+TEST_ROOT ?= ${prefix}/lib/openvswitch -+TEST_DEPEND = -+ -+if HAVE_OPENSSL -+TEST_DEPEND += $(TESTPKI_FILES) -+endif -+ -+test-install: $(TEST_DEPEND) -+ @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\ -+ install -d $(TEST_DEST)/tests ;\ -+ install $(srcdir)/vtep/ovs-vtep $(TEST_DEST)/tests ;\ -+ install -d $(TEST_DEST)/python ;\ -+ install -d $(TEST_DEST)/python/ovs ;\ -+ install -d $(TEST_DEST)/python/ovs/db ;\ -+ install -d $(TEST_DEST)/python/ovs/unixctl ;\ -+ install -d $(TEST_DEST)/vswitchd ;\ -+ install $(srcdir)/vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\ -+ install vswitchd/ovs-vswitchd $(TEST_DEST)/vswitchd ;\ -+ install -d $(TEST_DEST)/debian ;\ -+ install $(srcdir)/debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\ -+ install -d $(TEST_DEST)/build-aux ;\ -+ install $(srcdir)/build-aux/check-structs $(TEST_DEST)/build-aux ;\ -+ install -d $(TEST_DEST)/xenserver ;\ -+ install $(srcdir)/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\ -+ install $(srcdir)/xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\ -+ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\ -+ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\ -+ install $(srcdir)/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\ -+ install -d $(TEST_DEST)/vtep ;\ -+ install $(srcdir)/vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\ -+ install -d $(TEST_DEST)/ovn ;\ -+ install $(srcdir)/ovn/ovn-nb.ovsschema $(TEST_DEST)/ovn ;\ -+ install $(srcdir)/ovn/ovn-sb.ovsschema $(TEST_DEST)/ovn ;\ -+ install -d $(TEST_DEST)/utilities ;\ -+ install $(srcdir)/utilities/ovs-pcap.in $(TEST_DEST)/utilities ;\ -+ install $(srcdir)/utilities/ovs-pki.in $(TEST_DEST)/utilities ;\ -+ for p in $$list ; do \ -+ echo $$p ;\ -+ p=$${p#../git/} ;\ -+ pre=$${p#tests\/} ;\ -+ if test $$pre != $$p ; then \ -+ echo installing $$p to $(TEST_DEST)/tests/$$pre ;\ -+ if test -f $$p ; then \ -+ install $$p $(TEST_DEST)/tests/$$pre ;\ -+ else \ -+ install $(srcdir)/$$p $(TEST_DEST)/tests/$$pre ;\ -+ fi ;\ -+ continue ;\ -+ fi ;\ -+ pre=$${p#python\/ovs\/} ;\ -+ if test $$pre != $$p ; then \ -+ echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\ -+ if test -f $$p ; then \ -+ install $$p $(TEST_DEST)/python/ovs/$$pre ;\ -+ else \ -+ install $(srcdir)/$$p $(TEST_DEST)/python/ovs/$$pre ;\ -+ fi ;\ -+ continue ;\ -+ fi; \ -+ done ;\ -+ sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|at_srcdir=.*|at_srcdir='"'"'.'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|at_top_srcdir=.*|at_top_srcdir='"'"'..'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|at_top_build_prefix=.*|at_top_build_prefix='"'"'../'"'"'|g' $(TEST_DEST)/tests/atconfig -+ sed -i 's|^\(.*config\.log.*\)|#\1|g' $(TEST_DEST)/tests/testsuite -+ sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite -+ sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite -+ sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite --- -2.7.4 - diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index a2893e9d..39726075 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb @@ -12,11 +12,11 @@ RDEPENDS_${PN}-ptest += "\ " S = "${WORKDIR}/git" -PV = "2.7.0+${SRCREV}" +PV = "2.7.1+${SRCREV}" FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:" -SRCREV = "c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1" +SRCREV = "b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc" SRC_URI = "file://openvswitch-switch \ file://openvswitch-switch-setup \ file://openvswitch-testcontroller \ -- cgit v1.2.3-54-g00ecf