These two patches are now staged.
I'll be sending a consolidated list of patches once I do the push of this +
some other uprevs.
Bruce
On Wed, Jul 12, 2017 at 5:02 PM, Mark Asselstine <
mark.asselst...@windriver.com> wrote:
> 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 <mark.asselst...@windriver.com>
> ---
> ...gure-Only-link-against-libpcap-on-FreeBSD.patch | 70
> ----------------------
> ...b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch} | 0
> recipes-networking/openvswitch/openvswitch_git.bb | 4 +-
> 3 files changed, 2 insertions(+), 72 deletions(-)
> delete mode 100644 recipes-networking/openvswitch/files/configure-
> Only-link-against-libpcap-on-FreeBSD.patch
> rename recipes-networking/openvswitch/openvswitch-git/{
> openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch =>
> openvswitch-add-ptest-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch}
> (100%)
>
> 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 0a44b85..0000000
> --- 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 <b...@nicira.com>
> -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 <b...@nicira.com>
> -CC: Ed Maste <ema...@freebsd.org>
> ----
> - 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-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch
> b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-
> b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch
> similarity index 100%
> rename from recipes-networking/openvswitch/openvswitch-git/
> openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch
> rename to recipes-networking/openvswitch/openvswitch-git/
> openvswitch-add-ptest-b29cb89e9e9fe3119b2e5dd5d4fb79141635b7cc.patch
> diff --git a/recipes-networking/openvswitch/openvswitch_git.bb
> b/recipes-networking/openvswitch/openvswitch_git.bb
> index a2893e9..3972607 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 \
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
--
_______________________________________________
meta-virtualization mailing list
meta-virtualization@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-virtualization
