From 4fe7a1353f8f7f96c7407caa3352fa50fcce5aa3 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Mon, 7 Oct 2019 09:34:48 -0400
Subject: meta-openembedded: subtree update:e6d76b05a7..01d539b324

Adrian Ratiu (1):
      renderdoc: add x11 to REQUIRED_DISTRO_FEATURES

Callaghan, Dan (2):
      firewalld: update to 0.7.1
      strongswan: install dev headers

George McCollister (1):
      wireshark: fix qt5 build

Jean-Marie LEMETAYER (1):
      python-toml: add recipes for python2 and python3

Khem Raj (1):
      xscreensaver: Remove xserver-nodm-init rdep

Maciej Pijanowski (1):
      smem: package smemcap separately

Ovidiu Panait (1):
      kea: Disable parallel install

Peiran Hong (1):
      zabbix: upgrade 3.0.9 -> 4.2.6

Randy MacLeod (1):
      libteam: update from 1.28 to 1.29

Trevor Gamblin (2):
      php: fix CVE-2019-6978
      gd: fix CVE-2019-6978

Change-Id: I2c308ff46213876c1d74f42b5d9f9e52946bbf02
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-support/libteam/libteam_1.28.bb        | 39 ----------------------
 .../recipes-support/libteam/libteam_1.29.bb        | 39 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.28.bb
 create mode 100644 meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.29.bb

(limited to 'meta-openembedded/meta-oe/recipes-support/libteam')

diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.28.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.28.bb
deleted file mode 100644
index b80bb4efa..000000000
--- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.28.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Library for controlling team network device"
-HOMEPAGE = "http://www.libteam.org/"
-SECTION = "libs/network"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "libnl libdaemon jansson"
-
-SRC_URI = "git://github.com/jpirko/libteam \
-           file://0001-include-sys-select.h-for-fd_set-definition.patch \
-           file://0002-teamd-Re-adjust-include-header-order.patch \
-           file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \
-           file://run-ptest \
-           "
-SRCREV = "903950c7fcf28c32f4b62d9d1c07c0234e8378a2"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig ptest
-
-FILES_${PN} = "${libdir}/libteam${SOLIBS} \
-"
-
-PACKAGES += "${PN}-dctl ${PN}-utils"
-FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \
-"
-FILES_${PN}-utils = "${bindir}/bond2team \
-                     ${bindir}/teamd \
-                     ${bindir}/teamdctl \
-                     ${bindir}/teamnl \
-"
-
-RDEPENDS_${PN}-utils = "bash"
-RDEPENDS_${PN}-ptest = "python"
-
-do_install_ptest() {
-	install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/
-}
diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.29.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.29.bb
new file mode 100644
index 000000000..821ca1938
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.29.bb
@@ -0,0 +1,39 @@
+SUMMARY = "Library for controlling team network device"
+HOMEPAGE = "http://www.libteam.org/"
+SECTION = "libs/network"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "libnl libdaemon jansson"
+
+SRC_URI = "git://github.com/jpirko/libteam \
+           file://0001-include-sys-select.h-for-fd_set-definition.patch \
+           file://0002-teamd-Re-adjust-include-header-order.patch \
+           file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \
+           file://run-ptest \
+           "
+SRCREV = "e897f02bf2403d4859a99e090e34ea768b4c0540"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig ptest
+
+FILES_${PN} = "${libdir}/libteam${SOLIBS} \
+"
+
+PACKAGES += "${PN}-dctl ${PN}-utils"
+FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \
+"
+FILES_${PN}-utils = "${bindir}/bond2team \
+                     ${bindir}/teamd \
+                     ${bindir}/teamdctl \
+                     ${bindir}/teamnl \
+"
+
+RDEPENDS_${PN}-utils = "bash"
+RDEPENDS_${PN}-ptest = "python"
+
+do_install_ptest() {
+	install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/
+}
-- 
cgit v1.2.3