diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-12-02 21:05:15 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-12-02 21:05:20 +0300 |
commit | 996bc45c6b2ab1ef612fa4710088373f1f627ea9 (patch) | |
tree | 5a16fa220483d7427ab4cec7612852a3149439dc /meta-openembedded/meta-oe/recipes-support | |
parent | 2eda1a371b06865fd2d4d84af3de14440e3bafa3 (diff) | |
download | openbmc-996bc45c6b2ab1ef612fa4710088373f1f627ea9.tar.xz |
meta-openembedded: subtree update:e4ac09169d..459dbf1078
Alex Kiernan (1):
leveldb: Upgrade 1.20 -> 1.22
Cengiz Can (1):
recipes-support: gperftools: RDEPENDS for pprof
Changqing Li (2):
python3-django: upgrade 1.11.14 -> 2.2.7
python-sqlparse/python3-sqlparse: move from meta-cloud-services
Christopher Larson (1):
kconfig-frontends: drop unneeded target flex/bison deps
Daniels Umanovskis (1):
gattlib: add recipe
Fabio Berton (3):
mdbus2: Add recipe
jpnevulator: Add recipe
emlog: Add recipe
Jacopo Dall'Aglio (1):
python-netifaces: add recipes
Khem Raj (8):
packagegroup-meta-oe: Drop gperftools for mips/musl as well
python-slip-dbus: Add missing rdep on six module
htop: Use python3
pidgin: Use python3
mercurial: Upgrade to 5.2 and switch to py3
a2jmidid: Upgrade to release 9
pidgin: Use python3 during build
tvheadend: Demand use of py3 during build
Lei YU (1):
googletest: Add PV and set to 1.10.0
Leon Anavi (1):
stalonetray: Add a simple stand-alone system tray
Li Zhou (1):
libssh2: Security Advisory - libssh2 - CVE-2019-17498
Michael Haener (1):
libmbim: upgrade 1.20.0 -> 1.20.2
Nicola Lunghi (2):
python-configargparse: add package (version 0.15.1)
python3-dbussy: add recipe (v1.2.1)
Qi.Chen@windriver.com (1):
python3-pid: upgrade to 2.2.5
Ross Burton (3):
glmark2: upgrade to latest HEAD
glmark2: use Python 3 to build
jack: upgrade to 1.19.14
Ulrich Ölmann (1):
python3-yarl: add missing dependencies
Zang Ruochen (6):
p910nd: upgrade 0.95 -> 0.97
links: upgrade 2.16 -> 2.20.2
links-x11: upgrade 2.16 -> 2.20.2
libmicrohttpd: upgrade 0.9.67 -> 0.9.68
gsoap: upgrade 2.8.51 -> 2.8.95
mksh: upgrade 56 -> 57
Zheng Ruoqin (1):
libsdl: Refresh patch
zhangxiao (1):
syslog-ng: Fix multilib header conflict - syslog-ng-config.h
Change-Id: I8557e00b893b61c10ee305fb3229db773b4b894f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
15 files changed, 204 insertions, 259 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb index 731c83516..ee34acec2 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.7.bb @@ -35,5 +35,10 @@ PACKAGECONFIG[static] = "--enable-static,--disable-static," PACKAGE_BEFORE_PN += "libtcmalloc-minimal" FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS_${PN} += "binutils perl-module-getopt-long perl-module-posix" + RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch deleted file mode 100644 index 5ceb4bf02..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 8a10b6bd556426616e93f15639f369defbeca33f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 14 Aug 2017 11:58:58 -0700 -Subject: [PATCH] Fix out of tree builds - -When build dir is not same as sourcedir then the build failed due -to use of $(srcdir) variable which assumes source = build therefore -replace that with top_srcdir - -Additionally move the conditional addition of sources to Makefile.am -instead of adding it in configure.ac, since then we can use top_srcdir -variable to access those sources too otherwise its not possible to -specify the right dir for these sources - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted[https://sourceforge.net/p/gsoap2/patches/171/] - - configure.ac | 5 +++-- - gsoap/Makefile.am | 14 +++++++------- - gsoap/samples/autotest/Makefile.am | 8 ++++---- - gsoap/samples/databinding/Makefile.am | 8 ++++---- - gsoap/wsdl/Makefile.am | 15 +++++++++------ - 5 files changed, 27 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0631c18..c36e696 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -265,7 +265,7 @@ if test "x$with_openssl" = "xyes"; then - WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" - # an ugly hack to get httpda and smdevp plugins to conditionally - # compile with wsdl2h when OPENSSL is available -- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz" -+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" - SAMPLE_INCLUDES= - SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" - WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" -@@ -289,12 +289,13 @@ else - SAMPLE_INCLUDES= - WSDL2H_SOAP_CPP_LIB="libgsoap++.a" - fi -+AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") -+AC_SUBST(WITH_OPENSSL) - AC_SUBST(WSDL2H_EXTRA_FLAGS) - AC_SUBST(WSDL2H_EXTRA_LIBS) - AC_SUBST(SAMPLE_INCLUDES) - AC_SUBST(SAMPLE_SSL_LIBS) - AC_SUBST(WSDL2H_SOAP_CPP_LIB) -- - # enable the compile of the samples - AC_ARG_ENABLE(samples, - [ --enable-samples enable compile for the gsoap samples], -diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am -index 7273b82..9c0c89f 100644 ---- a/gsoap/Makefile.am -+++ b/gsoap/Makefile.am -@@ -13,26 +13,26 @@ AM_CXXFLAGS = $(SOAPCPP2_DEBUG) -D$(platform) - AM_CFLAGS = $(SOAPCPP2_DEBUG) -D$(platform) - - # Install all soapcpp2 and wsdl2h files into ${prefix}/share/gsoap --nobase_pkgdata_DATA = $(srcdir)/import/* $(srcdir)/plugin/* $(srcdir)/WS/* $(srcdir)/custom/* $(srcdir)/extras/* -+nobase_pkgdata_DATA = $(top_srcdir)/gsoap/import/* $(top_srcdir)/gsoap/plugin/* $(top_srcdir)/gsoap/WS/* $(top_srcdir)/gsoap/custom/* $(top_srcdir)/gsoap/extras/* - - ## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target: - stdsoap2_ck.c: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ck.c -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ck.c - - stdsoap2_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_cpp.cpp - - stdsoap2_ck_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ck_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ck_cpp.cpp - - stdsoap2_ssl.c: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl.c -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ssl.c - - stdsoap2_ssl_cpp.cpp: stdsoap2.cpp -- $(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/stdsoap2.cpp stdsoap2_ssl_cpp.cpp - ## do the same fo dom.cpp since we want to link it into the cpp libs and dom.c into the c libs - dom_cpp.cpp: dom.cpp -- $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp -+ $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp - - lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a - -diff --git a/gsoap/samples/autotest/Makefile.am b/gsoap/samples/autotest/Makefile.am -index 36adf51..61e514c 100644 ---- a/gsoap/samples/autotest/Makefile.am -+++ b/gsoap/samples/autotest/Makefile.am -@@ -6,13 +6,13 @@ - AUTOMAKE_OPTIONS = subdir-objects foreign 1.4 - - CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin --AM_LDFLAGS=$(CPPFLAGS) -I$(srcdir) -L$(srcdir) -+AM_LDFLAGS=$(CPPFLAGS) -I$(top_srcdir)/gsoap/samples/autotest -L$(top_srcdir)/gsoap/samples/autotest - SOAP=$(top_srcdir)/gsoap/src/soapcpp2$(EXEEXT) - WSDL=$(top_srcdir)/gsoap/wsdl/wsdl2h$(EXEEXT) --WSDL_FLAGS=-d -P -t $(srcdir)/typemap.dat -+WSDL_FLAGS=-d -P -t $(top_srcdir)/gsoap/samples/autotest/typemap.dat - SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/import -I$(top_srcdir)/gsoap/custom --WSDLINPUT=$(srcdir)/examples.wsdl --SOAPHEADER=$(srcdir)/examples.h -+WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl -+SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h - SOAP_CPP_SRC=soapC.cpp soapServer.cpp - SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a - -diff --git a/gsoap/samples/databinding/Makefile.am b/gsoap/samples/databinding/Makefile.am -index 892d4fd..86ad482 100644 ---- a/gsoap/samples/databinding/Makefile.am -+++ b/gsoap/samples/databinding/Makefile.am -@@ -6,13 +6,13 @@ - AUTOMAKE_OPTIONS = subdir-objects foreign 1.4 - - CPPFLAGS=$(SAMPLE_INCLUDES) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin --AM_LDFLAGS=$(AM_CPPFLAGS) -I$(srcdir) -L$(srcdir) -+AM_LDFLAGS=$(AM_CPPFLAGS) -I$(top_srcdir)/gsoap/samples/databinding -L$(top_srcdir)/gsoap/samples/databinding - SOAP=$(top_srcdir)/gsoap/src/soapcpp2$(EXEEXT) - WSDL=$(top_srcdir)/gsoap/wsdl/wsdl2h$(EXEEXT) --WSDL_FLAGS=-g -t $(srcdir)/addresstypemap.dat -+WSDL_FLAGS=-g -t $(top_srcdir)/gsoap/samples/databinding/addresstypemap.dat - SOAP_FLAGS=-0 -CS -p address -I$(top_srcdir)/gsoap/import --WSDLINPUT=$(srcdir)/address.xsd --SOAPHEADER=$(srcdir)/address.h -+WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd -+SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h - SOAP_CPP_SRC=addressC.cpp - SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a - -diff --git a/gsoap/wsdl/Makefile.am b/gsoap/wsdl/Makefile.am -index b8da5db..9f2aefa 100644 ---- a/gsoap/wsdl/Makefile.am -+++ b/gsoap/wsdl/Makefile.am -@@ -6,14 +6,14 @@ - AUTOMAKE_OPTIONS = foreign 1.4 - - # INCLUDES=-I$(top_srcdir)/gsoap --# AM_LDFLAGS=$(INCLUDES) -I$(srcdir) -L$(srcdir) --AM_LDFLAGS=-L$(srcdir) -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin -+# AM_LDFLAGS=$(INCLUDES) -I$(top_srcdir)/gsoap/wsdl -L$(top_srcdir)/gsoap/wsdl -+AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin - AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin - SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) - SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) - SOAP_CPP_SRC=wsdlC.cpp --SOAPHEADER=$(srcdir)/wsdl.h --SOAP_FLAGS=-SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gsoap/import -+SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h -+SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import - BUILT_SOURCES=$(SOAP_CPP_SRC) - # WSDL2H_EXTRA_FLAGS=-DWITH_OPENSSL -DWITH_GZIP # defined in configure.in - # WSDL2H_EXTRA_LIBS=-lssl -lcrypto -lz # defined in configure.in -@@ -24,11 +24,14 @@ $(SOAP_CPP_SRC) : $(SOAPHEADER) - #LIBS= - - bin_PROGRAMS=wsdl2h -- -+if WITH_OPENSSL -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c $(WSDL2H_EXTRA_LIBS) -+else -+wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) -+endif - wsdl2h_CFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) - wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) - wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) - wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) --wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) - - CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch deleted file mode 100644 index 571cbe540..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From db260fbc7af4c73c997c485a0c69c61594a0e59c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Aug 2017 19:48:50 -0700 -Subject: [PATCH] stdgsoap2: Fix build with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gsoap/stdsoap2.c | 2 +- - gsoap/stdsoap2.cpp | 4 ++-- - gsoap/stdsoap2.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c -index 58e9df4..62389e1 100644 ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) - return soap->error = SOAP_EOM; - return SOAP_OK; - } --#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) -+#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) - if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) - host = NULL; - #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) -diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp -index 58e9df4..b637161 100644 ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -4462,7 +4462,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr) - return soap->error = SOAP_EOM; - return SOAP_OK; - } --#if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) -+#if defined(LINUX) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) || defined(__ANDROID__) - if (gethostbyname_r(addr, &hostent, soap->buf, sizeof(soap->buf), &host, &soap->errnum) < 0) - host = NULL; - #elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) -@@ -19658,7 +19658,7 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if defined(_GNU_SOURCE) && !defined(__ANDROID__) -+# if defined(_GNU_SOURCE) && !defined(__ANDROID__) && defined(__GLIBC__) - return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ - # else - strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ -diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h -index 07a3952..c6ace4c 100644 ---- a/gsoap/stdsoap2.h -+++ b/gsoap/stdsoap2.h -@@ -947,7 +947,7 @@ extern "C" { - # endif - #elif defined(SOCKLEN_T) - # define SOAP_SOCKLEN_T SOCKLEN_T --#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) -+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(OPENBSD) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__ANDROID__) || defined(_XOPEN_SOURCE) || defined (LINUX) - # define SOAP_SOCKLEN_T socklen_t - #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS) - # define SOAP_SOCKLEN_T int --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb index 36530d2df..22a049892 100644 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - file://0001-Fix-out-of-tree-builds.patch \ - file://0001-stdgsoap2-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "212951d6e1435bb51fa4320f458809ea" -SRC_URI[sha256sum] = "3e7bb24a9e492f5cb86daca34054c9787152f1d7b70add36b789d03816d5ffa1" +SRC_URI[md5sum] = "88031646018d60857f21246962d10011" +SRC_URI[sha256sum] = "fe07aa152cd946ef8ebd3f87653f14c1d38efe7c6e6fce8c6f773c4814f79baf" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch new file mode 100644 index 000000000..6153bdedb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch @@ -0,0 +1,26 @@ +From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Nov 2019 10:43:49 -0800 +Subject: [PATCH] Ask for python3 specifically + +python2 is on its way out + +Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + scripts/MakeHeader.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py +index 7c48fdd..7a7586d 100755 +--- a/scripts/MakeHeader.py ++++ b/scripts/MakeHeader.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import os, sys, string, io + try: + from StringIO import StringIO +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb index 01c856d12..64eb0c571 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3" DEPENDS = "ncurses" SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ - file://0001-Use-pkg-config.patch" + file://0001-Use-pkg-config.patch \ + file://0001-Ask-for-python3-specifically.patch \ + " SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb index c400462e0..f5569de9f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.68.bb @@ -8,8 +8,8 @@ DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "e28e04e3d3eca62f5754efb844d17812" -SRC_URI[sha256sum] = "7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495" +SRC_URI[md5sum] = "1c3ca3bf92dfc680538b4186c58a9bd0" +SRC_URI[sha256sum] = "c5716e2a2899abc9e16c8fa7a1a58da88f81aca96a0b7e68a5d4d89e21610b61" inherit autotools lib_package pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch b/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch new file mode 100644 index 000000000..001080072 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch @@ -0,0 +1,131 @@ +From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 +From: Will Cosgrove <will@panic.com> +Date: Fri, 30 Aug 2019 09:57:38 -0700 +Subject: [PATCH] packet.c: improve message parsing (#402) + +* packet.c: improve parsing of packets + +file: packet.c + +notes: +Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. + +Upstream-Status: Backport +CVE: CVE-2019-17498 +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/packet.c | 68 ++++++++++++++++++++++------------------------------ + 1 file changed, 29 insertions(+), 39 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 38ab629..2e01bfc 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + size_t datalen, int macstate) + { + int rc = 0; +- char *message = NULL; +- char *language = NULL; ++ unsigned char *message = NULL; ++ unsigned char *language = NULL; + size_t message_len = 0; + size_t language_len = 0; + LIBSSH2_CHANNEL *channelp = NULL; +@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + + case SSH_MSG_DISCONNECT: + if(datalen >= 5) { +- size_t reason = _libssh2_ntohu32(data + 1); ++ uint32_t reason = 0; ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr++; /* advance past type */ + +- if(datalen >= 9) { +- message_len = _libssh2_ntohu32(data + 5); ++ _libssh2_get_u32(&buf, &reason); ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + +- if(message_len < datalen-13) { +- /* 9 = packet_type(1) + reason(4) + message_len(4) */ +- message = (char *) data + 9; +- +- language_len = +- _libssh2_ntohu32(data + 9 + message_len); +- language = (char *) data + 9 + message_len + 4; +- +- if(language_len > (datalen-13-message_len)) { +- /* bad input, clear info */ +- language = message = NULL; +- language_len = message_len = 0; +- } +- } +- else +- /* bad size, clear it */ +- message_len = 0; +- } + if(session->ssh_msg_disconnect) { +- LIBSSH2_DISCONNECT(session, reason, message, +- message_len, language, language_len); ++ LIBSSH2_DISCONNECT(session, reason, (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } ++ + _libssh2_debug(session, LIBSSH2_TRACE_TRANS, + "Disconnect(%d): %s(%s)", reason, + message, language); +@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + int always_display = data[1]; + + if(datalen >= 6) { +- message_len = _libssh2_ntohu32(data + 2); +- +- if(message_len <= (datalen - 10)) { +- /* 6 = packet_type(1) + display(1) + message_len(4) */ +- message = (char *) data + 6; +- language_len = _libssh2_ntohu32(data + 6 + +- message_len); +- +- if(language_len <= (datalen - 10 - message_len)) +- language = (char *) data + 10 + message_len; +- } ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 2; /* advance past type & always display */ ++ ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + } + + if(session->ssh_msg_debug) { +- LIBSSH2_DEBUG(session, always_display, message, +- message_len, language, language_len); ++ LIBSSH2_DEBUG(session, always_display, ++ (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } + } ++ + /* + * _libssh2_debug will actually truncate this for us so + * that it's not an inordinate about of data +@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 25e0af3ff..185ea11b0 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -7,8 +7,9 @@ DEPENDS = "zlib" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz" - +SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ + file://CVE-2019-17498.patch \ +" SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.20.2.bb index 90fa20084..645fe3b26 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.20.2.bb @@ -47,7 +47,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps } -SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" -SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" +SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.20.2.bb index 19ea7a67b..1a36291e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.20.2.bb @@ -9,7 +9,7 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --without-x" -SRC_URI[md5sum] = "645fb0c0294e4c3268f94d307d394ffb" -SRC_URI[sha256sum] = "82f03038d5e050a65681b9888762af41c40fd42dec7e59a8d630bfb0ee134a3f" +SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" +SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.97.bb index 5ebbb29e1..45aa0d4ac 100644 --- a/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb +++ b/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.97.bb @@ -9,8 +9,8 @@ PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \ file://fix-var-lock.patch" -SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491" -SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029" +SRC_URI[md5sum] = "69461a6c54dca0b13ecad5b83864b43e" +SRC_URI[sha256sum] = "4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f" do_compile () { ${CC} ${LDFLAGS} -o p910nd p910nd.c diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch new file mode 100644 index 000000000..c7b4163cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], + + if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then + if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then +- AC_PATH_PROG([PYTHON], [python], [no]) ++ AC_PATH_PROG([PYTHON], [python3], [no]) + fi + + if test x"$PYTHON" = x"no" ; then +@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently + dnl (Thanks to XChat) + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then + AC_MSG_CHECKING(for Python compile flags) +- PKG_CHECK_MODULES(PY, python, [ ++ PKG_CHECK_MODULES(PY, python3, [ + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + ], [ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb index b094ba25e..fdc79e81b 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb @@ -2,15 +2,16 @@ SUMMARY = "multi-protocol instant messaging client" SECTION = "x11/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "python virtual/libintl intltool-native libxml2 gconf glib-2.0-native" +DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native" -inherit autotools gettext pkgconfig gconf perlnative +inherit autotools gettext pkgconfig gconf perlnative python3native SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ file://pidgin-cross-python-265.patch \ + file://use_py3.patch \ " SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 3aba4473d..8e5368953 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -27,7 +27,7 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" -inherit autotools gettext systemd pkgconfig update-rc.d +inherit autotools gettext systemd pkgconfig update-rc.d multilib_header EXTRA_OECONF = " \ --enable-dynamic-linking \ @@ -103,6 +103,8 @@ do_install_append() { else install ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf fi + + oe_multilib_header syslog-ng/syslog-ng-config.h } FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" |