[OE-core] [thud][PATCH 3/3] Curl: Securiyt fix CVE-2019-5435 CVE-2019-5436
From: Armin Kuster
Source: CUrl.org
MR: 98455
Type: Security Fix
Disposition: Backport from https://curl.haxx.se/
ChangeID: 86b094a440ea473b114764e8d64df8142d561609
Description:
Fixes CVE-2019-5435 CVE-2019-5436
Signed-off-by: Armin Kuster
---
meta/recipes-support/curl/curl/CVE-2019-5435.patch | 200 +
meta/recipes-support/curl/curl/CVE-2019-5436.patch | 32
meta/recipes-support/curl/curl_7.61.0.bb | 2 +
3 files changed, 234 insertions(+)
create mode 100644 meta/recipes-support/curl/curl/CVE-2019-5435.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2019-5436.patch
diff --git a/meta/recipes-support/curl/curl/CVE-2019-5435.patch
b/meta/recipes-support/curl/curl/CVE-2019-5435.patch
new file mode 100644
index 000..8ac5554
--- /dev/null
+++ b/meta/recipes-support/curl/curl/CVE-2019-5435.patch
@@ -0,0 +1,200 @@
+From 5fc28510a4664f46459d9a40187d81cc08571e60 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Mon, 29 Apr 2019 08:00:49 +0200
+Subject: [PATCH] CURL_MAX_INPUT_LENGTH: largest acceptable string input size
+
+This limits all accepted input strings passed to libcurl to be less than
+CURL_MAX_INPUT_LENGTH (800) bytes, for these API calls:
+curl_easy_setopt() and curl_url_set().
+
+The 800 number is arbitrary picked and is meant to detect mistakes
+or abuse, not to limit actual practical use cases. By limiting the
+acceptable string lengths we also reduce the risk of integer overflows
+all over.
+
+NOTE: This does not apply to `CURLOPT_POSTFIELDS`.
+
+Test 1559 verifies.
+
+Closes #3805
+
+Upstream-Status: Backport
+Dropped a few changes to apply against this version
+https://github.com/curl/curl/commit/5fc28510a4664f4
+
+CVE: CVE-2019-5435
+affects: libcurl 7.19.4 to and including 7.64.1
+Signed-off-by: Armin Kuster
+
+---
+ lib/setopt.c | 7 +
+ lib/urldata.h | 4 +++
+ 7 files changed, 146 insertions(+), 3 deletions(-)
+ create mode 100644 tests/data/test1559
+ create mode 100644 tests/libtest/lib1559.c
+
+Index: curl-7.61.0/lib/setopt.c
+===
+--- curl-7.61.0.orig/lib/setopt.c
curl-7.61.0/lib/setopt.c
+@@ -60,6 +60,13 @@ CURLcode Curl_setstropt(char **charp, co
+ if(s) {
+ char *str = strdup(s);
+
++if(str) {
++ size_t len = strlen(str);
++ if(len > CURL_MAX_INPUT_LENGTH) {
++free(str);
++return CURLE_BAD_FUNCTION_ARGUMENT;
++ }
++}
+ if(!str)
+ return CURLE_OUT_OF_MEMORY;
+
+Index: curl-7.61.0/lib/urldata.h
+===
+--- curl-7.61.0.orig/lib/urldata.h
curl-7.61.0/lib/urldata.h
+@@ -79,6 +79,10 @@
+ */
+ #define RESP_TIMEOUT (1800*1000)
+
++/* Max string intput length is a precaution against abuse and to detect junk
++ input easier and better. */
++#define CURL_MAX_INPUT_LENGTH 800
++
+ #include "cookie.h"
+ #include "psl.h"
+ #include "formdata.h"
+Index: curl-7.61.0/tests/data/test1559
+===
+--- /dev/null
curl-7.61.0/tests/data/test1559
+@@ -0,0 +1,44 @@
++
++
++
++CURLOPT_URL
++
++
++
++
++
++
++
++
++none
++
++
++# require HTTP so that CURLOPT_POSTFIELDS works as assumed
++
++http
++
++
++lib1559
++
++
++
++Set excessive URL lengths
++
++
++
++#
++# Verify that the test runs to completion without crashing
++
++
++0
++
++
++CURLOPT_URL 1000 bytes URL == 43
++CURLOPT_POSTFIELDS 1000 bytes data == 0
++CURLUPART_URL 1000 bytes URL == 3
++CURLUPART_SCHEME 1000 bytes scheme == 3
++CURLUPART_USER 1000 bytes user == 3
++
++
++
++
+Index: curl-7.61.0/tests/libtest/lib1559.c
+===
+--- /dev/null
curl-7.61.0/tests/libtest/lib1559.c
+@@ -0,0 +1,78 @@
++/***
++ * _ _ _
++ * Project ___| | | | _ \| |
++ * / __| | | | |_) | |
++ *| (__| |_| | _ <| |___
++ * \___|\___/|_| \_\_|
++ *
++ * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al.
++ *
++ * This software is licensed as described in the file COPYING, which
++ * you should have received as part of this distribution. The terms
++ * are also available at https://curl.haxx.se/docs/copyright.html.
++ *
++ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
++ * copies of the Software, and permit persons to whom the Software is
++ * furnished to do so, under the terms of the COPYING file.
++ *
++ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
++ * KIND, either express or implied.
++ *
++ ***/
++#include "test.h"
++
++#include "testutil.h"
++#include "warnless.h"
++#
[OE-core] [thud][PATCH 2/3] wget: Security fix for CVE-2019-5953
From: Armin Kuster
Source: http://git.savannah.gnu.org/cgit/wget.git
MR: 89341
Type: Security Fix
Disposition: Backport from
http://git.savannah.gnu.org/cgit/wget.git/commit/?id=692d5c5215de0db482c252492a92fc424cc6a97c
ChangeID: 1c19a2fd7ead88cc4ee92d425179d60d4635864b
Description:
Fixes CVE-2019-5953
Affects: < 1.20.1
Signed-off-by: Armin Kuster
---
.../recipes-extended/wget/wget/CVE-2019-5953.patch | 51 ++
meta/recipes-extended/wget/wget_1.19.5.bb | 1 +
2 files changed, 52 insertions(+)
create mode 100644 meta/recipes-extended/wget/wget/CVE-2019-5953.patch
diff --git a/meta/recipes-extended/wget/wget/CVE-2019-5953.patch
b/meta/recipes-extended/wget/wget/CVE-2019-5953.patch
new file mode 100644
index 000..e43e8e5
--- /dev/null
+++ b/meta/recipes-extended/wget/wget/CVE-2019-5953.patch
@@ -0,0 +1,51 @@
+From 692d5c5215de0db482c252492a92fc424cc6a97c Mon Sep 17 00:00:00 2001
+From: Tim Ruehsen
+Date: Fri, 5 Apr 2019 11:50:44 +0200
+Subject: [PATCH] Fix a buffer overflow vulnerability
+
+* src/iri.c(do_conversion): Reallocate the output buffer to a larger
+ size if it is already full
+
+Upstream-Status: Backport
+http://git.savannah.gnu.org/cgit/wget.git/commit/?id=692d5c5215de0db482c252492a92fc424cc6a97c
+CVE: CVE-2019-5953
+Signed-off-by: Armin Kuster
+
+---
+ src/iri.c | 12 +---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+Index: wget-1.19.5/src/iri.c
+===
+--- wget-1.19.5.orig/src/iri.c
wget-1.19.5/src/iri.c
+@@ -151,8 +151,11 @@ do_conversion (const char *tocode, const
+ *out = s = xmalloc (outlen + 1);
+ done = 0;
+
++ DEBUGP (("iconv %s -> %s\n", tocode, fromcode));
++
+ for (;;)
+ {
++ DEBUGP (("iconv outlen=%d inlen=%d\n", outlen, inlen));
+ if (iconv (cd, (ICONV_CONST char **) &in, &inlen, out, &outlen) !=
(size_t)(-1) &&
+ iconv (cd, NULL, NULL, out, &outlen) != (size_t)(-1))
+ {
+@@ -187,11 +190,14 @@ do_conversion (const char *tocode, const
+ }
+ else if (errno == E2BIG) /* Output buffer full */
+ {
++ logprintf (LOG_VERBOSE,
++_("Reallocate output buffer len=%d outlen=%d
inlen=%d\n"), len, outlen, inlen);
+ tooshort++;
+ done = len;
+- len = outlen = done + inlen * 2;
+- s = xrealloc (s, outlen + 1);
+- *out = s + done;
++ len = done + inlen * 2;
++ s = xrealloc (s, len + 1);
++ *out = s + done - outlen;
++ outlen += inlen * 2;
+ }
+ else /* Weird, we got an unspecified error */
+ {
diff --git a/meta/recipes-extended/wget/wget_1.19.5.bb
b/meta/recipes-extended/wget/wget_1.19.5.bb
index e37d8c7..920b74d 100644
--- a/meta/recipes-extended/wget/wget_1.19.5.bb
+++ b/meta/recipes-extended/wget/wget_1.19.5.bb
@@ -1,6 +1,7 @@
SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://0002-improve-reproducibility.patch \
+ file://CVE-2019-5953.patch \
"
SRC_URI[md5sum] = "2db6f03d655041f82eb64b8c8a1fa7da"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [thud][PATCH 1/3] glib-2.0: Security fix for CVE-2019-12450
From: Armin Kuster
Source: glib-2.0
MR: 98443
Type: Security Fix
Disposition: Backport from
https://gitlab.gnome.org/GNOME/glib/commit/d8f8f4d637ce43f8699ba94c9b7648beda0ca174
ChangeID: 880b9b349cb8d82c7c1314a3657ec9094baba741
Description:
Signed-off-by: Armin Kuster
---
.../glib-2.0/glib-2.0/CVE-2019-12450.patch | 59 ++
meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb | 1 +
2 files changed, 60 insertions(+)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/CVE-2019-12450.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/CVE-2019-12450.patch
b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2019-12450.patch
new file mode 100644
index 000..37ad580
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2019-12450.patch
@@ -0,0 +1,59 @@
+From d8f8f4d637ce43f8699ba94c9b7648beda0ca174 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy
+Date: Thu, 23 May 2019 10:41:53 +0200
+Subject: [PATCH] gfile: Limit access to files when copying
+
+file_copy_fallback creates new files with default permissions and
+set the correct permissions after the operation is finished. This
+might cause that the files can be accessible by more users during
+the operation than expected. Use G_FILE_CREATE_PRIVATE for the new
+files to limit access to those files.
+
+Upstream-Status: Backport
+https://gitlab.gnome.org/GNOME/glib/commit/d8f8f4d637ce43f8699ba94c9b7648beda0ca174
+CVE: CVE-2019-12450
+Signed-off-by: Armin kuster
+
+---
+ gio/gfile.c | 11 ++-
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gio/gfile.c b/gio/gfile.c
+index 24b136d..74b5804 100644
+--- a/gio/gfile.c
b/gio/gfile.c
+@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile *source,
+ out = (GOutputStream*)_g_local_file_output_stream_replace
(_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+FALSE,
NULL,
+flags &
G_FILE_COPY_BACKUP,
+-
G_FILE_CREATE_REPLACE_DESTINATION,
+- info,
++
G_FILE_CREATE_REPLACE_DESTINATION |
++
G_FILE_CREATE_PRIVATE, info,
+
cancellable, error);
+ else
+ out = (GOutputStream*)_g_local_file_output_stream_create
(_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+- FALSE, 0,
info,
++ FALSE,
G_FILE_CREATE_PRIVATE, info,
+
cancellable, error);
+ }
+ else if (flags & G_FILE_COPY_OVERWRITE)
+@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile *source,
+ out = (GOutputStream *)g_file_replace (destination,
+ NULL,
+ flags & G_FILE_COPY_BACKUP,
+-
G_FILE_CREATE_REPLACE_DESTINATION,
++
G_FILE_CREATE_REPLACE_DESTINATION |
++ G_FILE_CREATE_PRIVATE,
+ cancellable, error);
+ }
+ else
+ {
+- out = (GOutputStream *)g_file_create (destination, 0, cancellable,
error);
++ out = (GOutputStream *)g_file_create (destination,
G_FILE_CREATE_PRIVATE, cancellable, error);
+ }
+
+ if (!out)
+--
+2.7.4
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
index 1271a7c..879bc48 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz
\
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
file://date-lt.patch \
+ file://CVE-2019-12450.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain
Hi, Richard > Whilst I can guess why, its not obvious at all the dnf needs > MACHINE_ARCH. I'd probably be happier with a better variable name. > Which code exactly is using it? Arch information is necessary for rpm. As what do for dnf-native in _configure_rpm function, nativesdk-dnf has to do the same work. But the environment for nativesdk doesn't supply arch information. I think MACHINE_ARCH is suitable to supply arch information for nativesdk. How about your Opinion? Best regards Lei > -Original Message- > From: richard.pur...@linuxfoundation.org > [mailto:richard.pur...@linuxfoundation.org] > Sent: Tuesday, June 04, 2019 6:26 PM > To: Lei, Maohui > Cc: openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] toolchain-scripts: make rpm work in toolchain > > On Tue, 2019-06-04 at 08:29 +, Lei, Maohui wrote: > > Hi Richard > > > > This patch is necessary for dnf-nativesdk which has been merged. But > > this patch is still ignored. > > Do you have any comment about this patch? > > Basically I really don't like exporting "random" variables in the SDK, > particularly when the meaning/use of them isn't clear. > > Whilst I can guess why, its not obvious at all the dnf needs > MACHINE_ARCH. I'd probably be happier with a better variable name. > Which code exactly is using it? > > Cheers, > > Richard > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] json-c: Make implicit-fallthrough only a warning for compilation under icecc
Please disregard this one, I have submitted a newer patch under a new
subject-line:
json-c: Disable icecc to avoid implicit-fallthrough warning as error
On 6/06/19 1:13 PM, Douglas Royds wrote:
icecc preprocesses source files locally before shipping them off to be compiled
on remote hosts. This preprocessing removes comments, including /* fallthrough
*/
comments in switch statements that normally prevent the implicit-fallthrough
warning. Rather than turning off -Werror completely, just reduce
implicit-fallthrough to a warning only.
In the -native case, we might be building on an earlier gcc, eg. gcc 5.4
under Ubuntu 16.04, so we do disable -Werror completely.
See https://github.com/icecc/icecream/issues/419
Signed-off-by: Douglas Royds
---
meta/recipes-devtools/json-c/json-c_0.13.1.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
index 5b10e68297..87a87aec44 100644
--- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
@@ -22,6 +22,9 @@ inherit autotools
EXTRA_OECONF = "--enable-rdrand"
+TARGET_CPPFLAGS =+ "-Wno-error=implicit-fallthrough"
+BUILD_CPPFLAGS =+ "-Wno-error"
+
do_configure_prepend() {
# Clean up autoconf cruft that should not be in the tarball
rm -f ${S}/config.status
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] json-c: Disable icecc to avoid implicit-fallthrough warning as error
icecc preprocesses source files locally before shipping them off to be compiled
on remote hosts. This preprocessing removes comments, including /* fallthrough
*/
comments in switch statements that normally prevent the implicit-fallthrough
warning.
Rather than turning off -Werror by patching configure.ac, it is simpler to
disable icecc completely for json-c. There are very few source files to compile,
so the compilation is quick even without icecc.
See https://github.com/icecc/icecream/issues/419
Signed-off-by: Douglas Royds
---
meta/recipes-devtools/json-c/json-c_0.13.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
index 5b10e68297..8d2a20352d 100644
--- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
@@ -21,6 +21,7 @@ RPROVIDES_${PN} = "libjson"
inherit autotools
EXTRA_OECONF = "--enable-rdrand"
+ICECC_DISABLED = "1"
do_configure_prepend() {
# Clean up autoconf cruft that should not be in the tarball
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] json-c: Make implicit-fallthrough only a warning for compilation under icecc
icecc preprocesses source files locally before shipping them off to be compiled
on remote hosts. This preprocessing removes comments, including /* fallthrough
*/
comments in switch statements that normally prevent the implicit-fallthrough
warning. Rather than turning off -Werror completely, just reduce
implicit-fallthrough to a warning only.
In the -native case, we might be building on an earlier gcc, eg. gcc 5.4
under Ubuntu 16.04, so we do disable -Werror completely.
See https://github.com/icecc/icecream/issues/419
Signed-off-by: Douglas Royds
---
meta/recipes-devtools/json-c/json-c_0.13.1.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
index 5b10e68297..87a87aec44 100644
--- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
@@ -22,6 +22,9 @@ inherit autotools
EXTRA_OECONF = "--enable-rdrand"
+TARGET_CPPFLAGS =+ "-Wno-error=implicit-fallthrough"
+BUILD_CPPFLAGS =+ "-Wno-error"
+
do_configure_prepend() {
# Clean up autoconf cruft that should not be in the tarball
rm -f ${S}/config.status
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] json-c: Make implicit-fallthrough only a warning for compilation under icecc
icecc preprocesses source files locally before shipping them off to be compiled
on remote hosts. This preprocessing removes comments, including /* fallthough */
comments in switch statements that normally prevent the implicit-fallthrough
warning. Rather than turning off -Werror completely, just reduce
implicit-fallthrough to a warning only.
See https://github.com/icecc/icecream/issues/419
Signed-off-by: Douglas Royds
---
meta/recipes-devtools/json-c/json-c_0.13.1.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
index 5b10e68297..ddda7375d3 100644
--- a/meta/recipes-devtools/json-c/json-c_0.13.1.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.13.1.bb
@@ -22,6 +22,9 @@ inherit autotools
EXTRA_OECONF = "--enable-rdrand"
+TARGET_CPPFLAGS =+ "-Wno-error=implicit-fallthrough"
+BUILD_CPPFLAGS =+ "-Wno-error=implicit-fallthrough"
+
do_configure_prepend() {
# Clean up autoconf cruft that should not be in the tarball
rm -f ${S}/config.status
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/1] slang: modify an array test
One array test attempts to create an array that is far too
large to exist. Different exceptions are thrown for 32 and 64
bit machines, so we account for that when catching them.
Signed-off-by: Joe Slater
---
meta/recipes-extended/slang/slang/array_test.patch | 20
1 file changed, 20 insertions(+)
create mode 100644 meta/recipes-extended/slang/slang/array_test.patch
diff --git a/meta/recipes-extended/slang/slang/array_test.patch
b/meta/recipes-extended/slang/slang/array_test.patch
new file mode 100644
index 000..ccd416f
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/array_test.patch
@@ -0,0 +1,20 @@
+slang: modify array test
+
+One array test tries to create an array that is far too large and anticipates
an exception.
+IndexError will only be thrown for 64 bit machines, so we add InvalidParmError
for 32 bit ones.
+
+Upstream-Status: Submitted [jedsoft.org]
+
+Signed-off-by: Joe Slater
+
+--- a/src/test/array.sl
b/src/test/array.sl
+@@ -165,7 +165,7 @@ try
+ {
+SS = Long_Type[1,1,1,1,1,1];
+ }
+-catch IndexError;
++catch IndexError,InvalidParmError;
+
+ private define array_map2_func ()
+ {
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH 2/2] bash: inherit useradd and remove redundant patch
On Tue, 2019-06-04 at 15:29 -0400, Sakib Sajal wrote: > 1) inherit useradd to allow new users to be created. > > Ensure that useradd/del are available when running > bash ptests. > > 2) run ptest as non-root. > > Removed patch: >fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch > > which enabled the two tests: >execscript, test, > to be run by root but under 'su' as a user. These two tests > now fail since all bash ptest are now run as non-root and there > is no need to 'su'. There are remaining problems with the test > that will be resolved in future commits. > > Bash ptest statistics with said changes: >PASS: 77 >SKIP: 0 >FAIL: 4 > > Failed tests: execscript > test > read > trap > > Signed-off-by: Sakib Sajal > Signed-off-by: Randy Macleod Nearly but this breaks one of the selftests which will need fixing: https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/500 oe-selftest -r imagefeatures.ImageFeatures.test_useradd_static should reproduce. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Remove manual RDEPENDS from PN-ptest to PN package
On Wed, 2019-06-05 at 21:41 +0300, Adrian Bunk wrote:
> They are now added automatically by the ptest class.
>
> Signed-off-by: Adrian Bunk
> ---
> meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb | 2 +-
> meta/recipes-devtools/elfutils/elfutils_0.176.bb| 2 +-
> meta/recipes-extended/sed/sed_4.2.2.bb | 2 +-
> meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> index 54b135eaef..ed946159bd 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
> @@ -113,7 +113,7 @@ ALTERNATIVE_LINK_NAME[mkfs.ext2] =
> "${base_sbindir}/mkfs.ext2"
> ALTERNATIVE_${PN}-tune2fs = "tune2fs"
> ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
>
> -RDEPENDS_${PN}-ptest += "${PN} coreutils procps bash bzip2 diffutils perl
> sed"
> +RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
> RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs
> e2fsprogs-badblocks e2fsprogs-resize2fs"
>
> do_compile_ptest() {
> diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> index 1a5c70b088..6ed329fd55 100644
> --- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> +++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
> @@ -44,7 +44,7 @@ inherit autotools gettext ptest
>
> EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
> EXTRA_OECONF_append_class-native = " --without-bzlib"
> -RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils
> ${PN}"
> +RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils"
Won't that need a += there to preserve the class definition? How was
this tested?
Cheers,
Richard
> EXTRA_OECONF_append_class-target += "--disable-tests-rpath"
>
> diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb
> b/meta/recipes-extended/sed/sed_4.2.2.bb
> index f10e365ea4..8e436bad80 100644
> --- a/meta/recipes-extended/sed/sed_4.2.2.bb
> +++ b/meta/recipes-extended/sed/sed_4.2.2.bb
> @@ -15,7 +15,7 @@ SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056"
> SRC_URI[sha256sum] =
> "fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
>
> inherit autotools texinfo update-alternatives gettext ptest
> -RDEPENDS_${PN}-ptest += "make ${PN}"
> +RDEPENDS_${PN}-ptest += "make"
> RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru"
>
> EXTRA_OECONF = "--disable-acl \
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> index 7e80bb45d1..9583ee3abb 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
>
> DEPENDS = "liburcu popt libxml2 util-linux"
> RDEPENDS_${PN} = "libgcc"
> -RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps
> perl-module-overloading coreutils util-linux kmod lttng-modules"
> +RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps
> perl-module-overloading coreutils util-linux kmod lttng-modules"
> RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
> RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
> # babelstats.pl wants getopt-long
> --
> 2.17.1
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wic/engine: include .wks.in in wic search and list
On Wed, Jun 05, 2019 at 11:38:22PM +0800, chee.yang@intel.com wrote: > From: Chee Yang Lee > > allow wic to list and search for kickstart file in .wks.in extension. > basename show by wic list images to fully exclude extension. > > Signed-off-by: Chee Yang Lee Reviewed-by: Tom Rini -- Tom signature.asc Description: PGP signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Remove manual RDEPENDS from PN-ptest to PN package
They are now added automatically by the ptest class.
Signed-off-by: Adrian Bunk
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb | 2 +-
meta/recipes-devtools/elfutils/elfutils_0.176.bb| 2 +-
meta/recipes-extended/sed/sed_4.2.2.bb | 2 +-
meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
index 54b135eaef..ed946159bd 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
@@ -113,7 +113,7 @@ ALTERNATIVE_LINK_NAME[mkfs.ext2] =
"${base_sbindir}/mkfs.ext2"
ALTERNATIVE_${PN}-tune2fs = "tune2fs"
ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
-RDEPENDS_${PN}-ptest += "${PN} coreutils procps bash bzip2 diffutils perl sed"
+RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs
e2fsprogs-badblocks e2fsprogs-resize2fs"
do_compile_ptest() {
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
index 1a5c70b088..6ed329fd55 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
@@ -44,7 +44,7 @@ inherit autotools gettext ptest
EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
EXTRA_OECONF_append_class-native = " --without-bzlib"
-RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils ${PN}"
+RDEPENDS_${PN}-ptest = "libasm libelf bash make coreutils ${PN}-binutils"
EXTRA_OECONF_append_class-target += "--disable-tests-rpath"
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb
b/meta/recipes-extended/sed/sed_4.2.2.bb
index f10e365ea4..8e436bad80 100644
--- a/meta/recipes-extended/sed/sed_4.2.2.bb
+++ b/meta/recipes-extended/sed/sed_4.2.2.bb
@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056"
SRC_URI[sha256sum] =
"fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
inherit autotools texinfo update-alternatives gettext ptest
-RDEPENDS_${PN}-ptest += "make ${PN}"
+RDEPENDS_${PN}-ptest += "make"
RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru"
EXTRA_OECONF = "--disable-acl \
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
index 7e80bb45d1..9583ee3abb 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.6.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
DEPENDS = "liburcu popt libxml2 util-linux"
RDEPENDS_${PN} = "libgcc"
-RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps
perl-module-overloading coreutils util-linux kmod lttng-modules"
+RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps
perl-module-overloading coreutils util-linux kmod lttng-modules"
RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
# babelstats.pl wants getopt-long
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: Upgrade 1.1.1b -> 1.1.1c
Backported patch removed.
Signed-off-by: Adrian Bunk
---
.../openssl/openssl/CVE-2019-1543.patch | 69 ---
.../openssl/openssl/afalg.patch | 6 +-
.../{openssl_1.1.1b.bb => openssl_1.1.1c.bb} | 5 +-
3 files changed, 5 insertions(+), 75 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch
rename meta/recipes-connectivity/openssl/{openssl_1.1.1b.bb =>
openssl_1.1.1c.bb} (97%)
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch
b/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch
deleted file mode 100644
index 900ef97fce..00
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1543.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Backport
[https://github.com/openssl/openssl/commit/f426625b6ae9a7831010750490a5f0ad689c5ba3]
-Signed-off-by: Ross Burton
-
-From f426625b6ae9a7831010750490a5f0ad689c5ba3 Mon Sep 17 00:00:00 2001
-From: Matt Caswell
-Date: Tue, 5 Mar 2019 14:39:15 +
-Subject: [PATCH] Prevent over long nonces in ChaCha20-Poly1305
-
-ChaCha20-Poly1305 is an AEAD cipher, and requires a unique nonce input for
-every encryption operation. RFC 7539 specifies that the nonce value (IV)
-should be 96 bits (12 bytes). OpenSSL allows a variable nonce length and
-front pads the nonce with 0 bytes if it is less than 12 bytes. However it
-also incorrectly allows a nonce to be set of up to 16 bytes. In this case
-only the last 12 bytes are significant and any additional leading bytes are
-ignored.
-
-It is a requirement of using this cipher that nonce values are unique.
-Messages encrypted using a reused nonce value are susceptible to serious
-confidentiality and integrity attacks. If an application changes the
-default nonce length to be longer than 12 bytes and then makes a change to
-the leading bytes of the nonce expecting the new value to be a new unique
-nonce then such an application could inadvertently encrypt messages with a
-reused nonce.
-
-Additionally the ignored bytes in a long nonce are not covered by the
-integrity guarantee of this cipher. Any application that relies on the
-integrity of these ignored leading bytes of a long nonce may be further
-affected.
-
-Any OpenSSL internal use of this cipher, including in SSL/TLS, is safe
-because no such use sets such a long nonce value. However user
-applications that use this cipher directly and set a non-default nonce
-length to be longer than 12 bytes may be vulnerable.
-
-CVE: CVE-2019-1543
-
-Fixes #8345
-
-Reviewed-by: Paul Dale
-Reviewed-by: Richard Levitte
-(Merged from https://github.com/openssl/openssl/pull/8406)
-
-(cherry picked from commit 2a3d0ee9d59156c48973592331404471aca886d6)
- crypto/evp/e_chacha20_poly1305.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/evp/e_chacha20_poly1305.c
b/crypto/evp/e_chacha20_poly1305.c
-index c1917bb86a6..d3e2c622a1b 100644
a/crypto/evp/e_chacha20_poly1305.c
-+++ b/crypto/evp/e_chacha20_poly1305.c
-@@ -30,6 +30,8 @@ typedef struct {
-
- #define data(ctx) ((EVP_CHACHA_KEY *)(ctx)->cipher_data)
-
-+#define CHACHA20_POLY1305_MAX_IVLEN 12
-+
- static int chacha_init_key(EVP_CIPHER_CTX *ctx,
-const unsigned char user_key[CHACHA_KEY_SIZE],
-const unsigned char iv[CHACHA_CTR_SIZE], int enc)
-@@ -533,7 +535,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int
type, int arg,
- return 1;
-
- case EVP_CTRL_AEAD_SET_IVLEN:
--if (arg <= 0 || arg > CHACHA_CTR_SIZE)
-+if (arg <= 0 || arg > CHACHA20_POLY1305_MAX_IVLEN)
- return 0;
- actx->nonce_len = arg;
- return 1;
diff --git a/meta/recipes-connectivity/openssl/openssl/afalg.patch
b/meta/recipes-connectivity/openssl/openssl/afalg.patch
index 7c4b084f3d..b7c0e9697f 100644
--- a/meta/recipes-connectivity/openssl/openssl/afalg.patch
+++ b/meta/recipes-connectivity/openssl/openssl/afalg.patch
@@ -18,14 +18,14 @@ index 3baa8ce..9ef52ed 100755
-($mi2) = $mi2 =~ /(\d+)/;
-my $ver = $ma*1 + $mi1*100 + $mi2;
-if ($ver < $minver) {
--$disabled{afalgeng} = "too-old-kernel";
+-disable('too-old-kernel', 'afalgeng');
-} else {
-push @{$config{engdirs}}, "afalg";
-}
-} else {
--$disabled{afalgeng} = "cross-compiling";
+-disable('cross-compiling', 'afalgeng');
-}
+push @{$config{engdirs}}, "afalg";
} else {
- $disabled{afalgeng} = "not-linux";
+ disable('not-linux', 'afalgeng');
}
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1b.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
similarity index 97%
rename from meta/recipes-connectivity/openssl/openssl_1.1.1b.bb
rename to meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
index 8bb3a309a2..669b1a103
[OE-core] [PATCH] gcc: Remove 0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
This was added 9 years ago as a workaround for a problem with
gcc 4.5 on mips.
Building webkitgtk works for me without it for qemumips.
Debian also builds webkitgtk for 32/64 bit big/little endian mips
without using this workaround.
Signed-off-by: Adrian Bunk
---
meta/recipes-devtools/gcc/gcc-8.3.inc | 1 -
...gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 59 ---
meta/recipes-devtools/gcc/gcc-9.1.inc | 1 -
...gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 59 ---
4 files changed, 120 deletions(-)
delete mode 100644
meta/recipes-devtools/gcc/gcc-8.3/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
delete mode 100644
meta/recipes-devtools/gcc/gcc-9.1/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
diff --git a/meta/recipes-devtools/gcc/gcc-8.3.inc
b/meta/recipes-devtools/gcc/gcc-8.3.inc
index 996f7fcdb0..1781ff5b5d 100644
--- a/meta/recipes-devtools/gcc/gcc-8.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-8.3.inc
@@ -36,7 +36,6 @@ SRC_URI = "\
file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
file://0004-64-bit-multilib-hack.patch \
file://0005-optional-libstdc.patch \
- file://0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch \
file://0007-COLLECT_GCC_OPTIONS.patch \
file://0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
file://0009-fortran-cross-compile-hack.patch \
diff --git
a/meta/recipes-devtools/gcc/gcc-8.3/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
b/meta/recipes-devtools/gcc/gcc-8.3/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
deleted file mode 100644
index 0cea228c87..00
---
a/meta/recipes-devtools/gcc/gcc-8.3/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1dba090a11c40b0926f9707a543d658c95e1f156 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 29 Mar 2013 09:14:20 +0400
-Subject: [PATCH 06/40] gcc: disable MASK_RELAX_PIC_CALLS bit
-
-The new feature added after 4.3.3
-"http://www.pubbs.net/200909/gcc/94048-patch-add-support-for-rmipsjalr.html";
-will cause cc1plus eat up all the system memory when build webkit-gtk.
-The function mips_get_pic_call_symbol keeps on recursively calling itself.
-Disable this feature to walk aside the bug.
-
-Signed-off-by: Dongxiao Xu
-Signed-off-by: Khem Raj
-
-Upstream-Status: Inappropriate [configuration]
- gcc/configure| 7 ---
- gcc/configure.ac | 7 ---
- 2 files changed, 14 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index 3901722400c..0c9b8ac5f55 100755
a/gcc/configure
-+++ b/gcc/configure
-@@ -27553,13 +27553,6 @@ $as_echo_n "checking assembler and linker for
explicit JALR relocation... " >&6;
- rm -f conftest.*
- fi
- fi
--if test $gcc_cv_as_ld_jalr_reloc = yes; then
-- if test x$target_cpu_default = x; then
--target_cpu_default=MASK_RELAX_PIC_CALLS
-- else
--target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS"
-- fi
--fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$gcc_cv_as_ld_jalr_reloc" >&5
- $as_echo "$gcc_cv_as_ld_jalr_reloc" >&6; }
-
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 1b1362f70fe..53840363115 100644
a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4798,13 +4798,6 @@ x:
- rm -f conftest.*
- fi
- fi
--if test $gcc_cv_as_ld_jalr_reloc = yes; then
-- if test x$target_cpu_default = x; then
--target_cpu_default=MASK_RELAX_PIC_CALLS
-- else
--target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS"
-- fi
--fi
- AC_MSG_RESULT($gcc_cv_as_ld_jalr_reloc)
-
- AC_CACHE_CHECK([linker for .eh_frame personality relaxation],
---
-2.21.0
-
diff --git a/meta/recipes-devtools/gcc/gcc-9.1.inc
b/meta/recipes-devtools/gcc/gcc-9.1.inc
index eb2538020c..4c648a1694 100644
--- a/meta/recipes-devtools/gcc/gcc-9.1.inc
+++ b/meta/recipes-devtools/gcc/gcc-9.1.inc
@@ -33,7 +33,6 @@ SRC_URI = "\
file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
file://0004-64-bit-multilib-hack.patch \
file://0005-optional-libstdc.patch \
- file://0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch \
file://0007-COLLECT_GCC_OPTIONS.patch \
file://0008-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
file://0009-fortran-cross-compile-hack.patch \
diff --git
a/meta/recipes-devtools/gcc/gcc-9.1/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
b/meta/recipes-devtools/gcc/gcc-9.1/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
deleted file mode 100644
index 4a552d5169..00
---
a/meta/recipes-devtools/gcc/gcc-9.1/0006-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ca3b3ac12d9b6e1065333dec89e7be2c733509d9 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 29 Mar 2013 09:14:20 +0400
-Subject: [PATCH 06/37] gcc: disable MASK_RELAX_PIC_CALLS
Re: [OE-core] [PATCH 2/3] p11-kit: Enable nativesdk and trust-paths option
Hi Ross, Thanks for the review! On Wed, 2019-06-05 at 17:09 +0100, Burton, Ross wrote: > On Thu, 30 May 2019 at 14:48, Philippe Normand > wrote: > > +PACKAGECONFIG ??= "trust-paths" > > PACKAGECONFIG[trust-paths] = "--with-trust- > > paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca- > > certificates" > > Should that be /etc? Or $(sysconfdir)? Especially in native and > nativesdk builds. > Yeah you're right, hardcoding /etc might not be a good idea. I kind of abandoned this patch series though, since it was decided to not make gnutls depend on p11-kit for the time being. This patch was merged instead: https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=4babb468b856f495ef828ee21cefb266ed58bd28 Do you think a follow-up is needed? I'm sorry I didn't know about $(sysconfdir) before. Philippe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] p11-kit: Enable nativesdk and trust-paths option
On Thu, 30 May 2019 at 14:48, Philippe Normand wrote: > +PACKAGECONFIG ??= "trust-paths" > PACKAGECONFIG[trust-paths] = > "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" Should that be /etc? Or $(sysconfdir)? Especially in native and nativesdk builds. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wic/engine: include .wks.in in wic search and list
From: Chee Yang Lee
allow wic to list and search for kickstart file in .wks.in extension.
basename show by wic list images to fully exclude extension.
Signed-off-by: Chee Yang Lee
---
scripts/lib/wic/engine.py | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 42e93c3..61939ad1 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -75,7 +75,8 @@ def find_canned_image(scripts_path, wks_file):
for fname in files:
if fname.endswith("~") or fname.endswith("#"):
continue
-if fname.endswith(".wks") and wks_file + ".wks" == fname:
+if ((fname.endswith(".wks") and wks_file + ".wks" == fname) or
\
+ (fname.endswith(".wks.in") and wks_file + ".wks.in" ==
fname)):
fullpath = os.path.join(canned_wks_dir, fname)
return fullpath
return None
@@ -92,7 +93,7 @@ def list_canned_images(scripts_path):
for fname in files:
if fname.endswith("~") or fname.endswith("#"):
continue
-if fname.endswith(".wks"):
+if fname.endswith(".wks") or fname.endswith(".wks.in"):
fullpath = os.path.join(canned_wks_dir, fname)
with open(fullpath) as wks:
for line in wks:
@@ -101,7 +102,7 @@ def list_canned_images(scripts_path):
if idx != -1:
desc = line[idx +
len("short-description:"):].strip()
break
-basename = os.path.splitext(fname)[0]
+basename = fname.split('.')[0]
print(" %s\t\t%s" % (basename.ljust(30), desc))
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meta: license: fix non-SPDX license being removed from INCOMPATIBLE_LICENSE
A non-SPDX license (which is not an alias to an SPDX license) cannot
currently be marked as incompatible in INCOMPATIBLE_LICENSE.
In the current state, we take all INCOMPATIBLE_LICENSE and pass them
through expand_wildcard_licenses which is only adding SPDX licenses that
match the glob regexp of what is in INCOMPATIBLE_LICENSE (be it a direct
match to an SPDX license or via an alias).
This does not work well with custom licenses.
E.g.:
foo.bb:
LICENSE = "FooLicense"
conf/local.conf:
INCOMPATIBLE_LICENSE = "FooLicense"
`bitbake foo`
Gives no warning, no error, builds and packages successfully, because
INCOMPATIBLE_LICENSE is basically empty since FooLicense is neither in
SPDXLICENSEMAP nor in SRC_DISTRIBUTE_LICENSES.
Let's add the original licenses to the list returned by
expand_wildcard_licenses to be able to handle the aforementioned case.
INCOMPATIBLE_LICENSE = "FooLicense GPLv2 GPLv3+" used to "resolve" to
"GPLv2 GPLv3". It now resolves to "FooLicense GPLv2 GPLv3 GPLv3+" which
fixes the issue with custom licenses not being in SPDXLICENSEMAP or
SRC_DISTRIBUTE_LICENSES and thus being left out of the blacklisted
licenses.
Signed-off-by: Quentin Schulz
---
meta/classes/license.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ed91a4b4db..adca881c85 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -268,7 +268,7 @@ def expand_wildcard_licenses(d, wildcard_licenses):
wildcards from SPDXLICENSEMAP flags and SRC_DISTRIBUTE_LICENSES values.
"""
import fnmatch
-licenses = []
+licenses = wildcard_licenses[:]
spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys()
for wld_lic in wildcard_licenses:
spdxflags = fnmatch.filter(spdxmapkeys, wld_lic)
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] package.bbclass: Clean up writing of runtime pkgdata files
> -Original Message- > From: Richard Purdie > Sent: den 5 juni 2019 16:07 > To: Peter Kjellerstedt ; openembedded- > c...@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] package.bbclass: Clean up writing of > runtime pkgdata files > > On Wed, 2019-06-05 at 16:01 +0200, Peter Kjellerstedt wrote: > > This introduces a variable, PKGDATA_VARS, that contains the names of > > the variables that are to be output in the runtime pkgdata files. > > Its a good cleanup, I just know how people are going to use this > variable to write out all kind of other data into pkgdata :( This was of course triggered by Rob Walton's recent attempt at adding HOMEPAGE and my own earlier attempt at adding SRC_URI. But is it a problem (for OE-Core) that this possibility exists? As long as you do not accept the addition of those variables into OE-Core, then nothing has changed for you (except that the code is now a bit more tidy). However, for us it means I can get rid of the horrible hack we have that adds SRC_URI to the pkgdata files, and instead replace it with a simple variable addition in our distro configuration. > Cheers, > > Richard //Peter -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] package.bbclass: Clean up writing of runtime pkgdata files
On Wed, 2019-06-05 at 16:01 +0200, Peter Kjellerstedt wrote: > This introduces a variable, PKGDATA_VARS, that contains the names of > the variables that are to be output in the runtime pkgdata files. Its a good cleanup, I just know how people are going to use this variable to write out all kind of other data into pkgdata :( Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] package.bbclass: Clean up writing of runtime pkgdata files
This introduces a variable, PKGDATA_VARS, that contains the names of
the variables that are to be output in the runtime pkgdata files.
Signed-off-by: Peter Kjellerstedt
---
meta/classes/package.bbclass | 56
1 file changed, 18 insertions(+), 38 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0694855504..20d72bba79 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1349,6 +1349,8 @@ EXPORT_FUNCTIONS package_name_hook
PKGDESTWORK = "${WORKDIR}/pkgdata"
+PKGDATA_VARS = "PN PE PV PR PKGE PKGV PKGR LICENSE DESCRIPTION SUMMARY
RDEPENDS RPROVIDES RRECOMMENDS RSUGGESTS RREPLACES RCONFLICTS SECTION PKG
ALLOW_EMPTY FILES CONFFILES FILES_INFO pkg_postinst pkg_postrm pkg_preinst
pkg_prerm"
+
python emit_pkgdata() {
from glob import glob
import json
@@ -1453,48 +1455,26 @@ fi
total_size += fstat.st_size
d.setVar('FILES_INFO', json.dumps(files, sort_keys=True))
-subdata_file = pkgdatadir + "/runtime/%s" % pkg
-sf = open(subdata_file, 'w')
-write_if_exists(sf, pkg, 'PN')
-write_if_exists(sf, pkg, 'PE')
-write_if_exists(sf, pkg, 'PV')
-write_if_exists(sf, pkg, 'PR')
-write_if_exists(sf, pkg, 'PKGE')
-write_if_exists(sf, pkg, 'PKGV')
-write_if_exists(sf, pkg, 'PKGR')
-write_if_exists(sf, pkg, 'LICENSE')
-write_if_exists(sf, pkg, 'DESCRIPTION')
-write_if_exists(sf, pkg, 'SUMMARY')
-write_if_exists(sf, pkg, 'RDEPENDS')
-rprov = write_if_exists(sf, pkg, 'RPROVIDES')
-write_if_exists(sf, pkg, 'RRECOMMENDS')
-write_if_exists(sf, pkg, 'RSUGGESTS')
-write_if_exists(sf, pkg, 'RREPLACES')
-write_if_exists(sf, pkg, 'RCONFLICTS')
-write_if_exists(sf, pkg, 'SECTION')
-write_if_exists(sf, pkg, 'PKG')
-write_if_exists(sf, pkg, 'ALLOW_EMPTY')
-write_if_exists(sf, pkg, 'FILES')
-write_if_exists(sf, pkg, 'CONFFILES')
process_postinst_on_target(pkg, d.getVar("MLPREFIX"))
add_set_e_to_scriptlets(pkg)
-write_if_exists(sf, pkg, 'pkg_postinst')
-write_if_exists(sf, pkg, 'pkg_postrm')
-write_if_exists(sf, pkg, 'pkg_preinst')
-write_if_exists(sf, pkg, 'pkg_prerm')
-write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
-write_if_exists(sf, pkg, 'FILES_INFO')
-for dfile in (d.getVar('FILERPROVIDESFLIST_' + pkg) or "").split():
-write_if_exists(sf, pkg, 'FILERPROVIDES_' + dfile)
-
-write_if_exists(sf, pkg, 'FILERDEPENDSFLIST')
-for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg) or "").split():
-write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile)
-
-sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
-sf.close()
+
+subdata_file = pkgdatadir + "/runtime/%s" % pkg
+with open(subdata_file, 'w') as sf:
+for var in (d.getVar('PKGDATA_VARS') or "").split():
+val = write_if_exists(sf, pkg, var)
+
+write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
+for dfile in (d.getVar('FILERPROVIDESFLIST_' + pkg) or "").split():
+write_if_exists(sf, pkg, 'FILERPROVIDES_' + dfile)
+
+write_if_exists(sf, pkg, 'FILERDEPENDSFLIST')
+for dfile in (d.getVar('FILERDEPENDSFLIST_' + pkg) or "").split():
+write_if_exists(sf, pkg, 'FILERDEPENDS_' + dfile)
+
+sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
# Symlinks needed for rprovides lookup
+rprov = d.getVar('RPROVIDES_%s' % pkg) or d.getVar('RPROVIDES')
if rprov:
for p in rprov.strip().split():
subdata_sym = pkgdatadir + "/runtime-rprovides/%s/%s" % (p,
pkg)
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bluez5: fix obex packaging
Ship some obex files in the appropriate obex package. This fixes boot
error:
[FAILED] Failed to start Bluetooth OBEX service.
that was caused by the obex.service being shipped in the main package,
rather than the -obex (that includes obexd).
Signed-off-by: Diego Rondini
---
meta/recipes-connectivity/bluez5/bluez5.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc
b/meta/recipes-connectivity/bluez5/bluez5.inc
index 93d1b4d8b0..a4c2f3a816 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -119,7 +119,10 @@ FILES_${PN}-dev += " \
FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
${exec_prefix}/lib/systemd/user/obex.service \
+${systemd_system_unitdir}/obex.service \
+
${sysconfdir}/systemd/system/multi-user.target.wants/obex.service \
${datadir}/dbus-1/services/org.bluez.obex.service \
+${sysconfdir}/dbus-1/system.d/obexd.conf \
"
SYSTEMD_SERVICE_${PN}-obex = "obex.service"
--
2.17.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [warrior][PATCH] createrepo-c: Fix build QA error for nativesdk-createrepo-c.
On Wed, 5 Jun 2019 at 10:21, Lei Maohui wrote:
> "QA Issue: nativesdk-createrepo-c rdepends on nativesdk-python3-dev
> [dev-deps]"
>
> +INSANE_SKIP_${PN} += "dev-deps"
> BBCLASSEXTEND = "native nativesdk"
>
This does not fix the issue, but merely silences it.You need to look into
the actual problem.
Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] make-mod-scripts: Add nostamp flag on configure task
On Wed, 2019-06-05 at 16:56 +0800, Jun Nie wrote: > Sorry for start a new mail for I just register to mail list and > cannot > reply original mail. > > Maybe below change to meta/classes/kernel.bbclass is acceptable > because rebuild of make-mod-scripts is triggered only when kernel is > already cleaned for this case. > > do_clean[depends] += "make-mod-scripts:do_clean" Yes, this could be a solution... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lrzsz: Add implicit declaration fixes from Debian
On Wed, Jun 05, 2019 at 10:18:31AM +0200, Martin Jansa wrote: > On Mon, Jun 03, 2019 at 09:47:02AM +0300, Adrian Bunk wrote: > > Signed-off-by: Adrian Bunk > > -- > > You need one more dash here, now this v2 comment ended in final commit message > which I believe wasn't the intention. > > http://git.openembedded.org/openembedded-core/commit/?id=6fa60ac102f6d3977df4236bd5a22680298bdac2 > > the same with tcp-wrappers change: > http://git.openembedded.org/openembedded-core/commit/?id=cd1dc2334fd3e3d1db9be1d26e888051e3f59c5a >... Yes thanks, I already noticed my mistake. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] make-mod-scripts: Add nostamp flag on configure task
Sorry for start a new mail for I just register to mail list and cannot reply original mail. Maybe below change to meta/classes/kernel.bbclass is acceptable because rebuild of make-mod-scripts is triggered only when kernel is already cleaned for this case. do_clean[depends] += "make-mod-scripts:do_clean" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][master][PATCH] nativesdk-qemu:Make it support aarch64_be.
Otherwise, there will be "no aarch64_be-softmmu" error. Signed-off-by: Lei Maohui --- meta/recipes-devtools/qemu/qemu-targets.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu-targets.inc b/meta/recipes-devtools/qemu/qemu-targets.inc index 550d6f0..8184ef5 100644 --- a/meta/recipes-devtools/qemu/qemu-targets.inc +++ b/meta/recipes-devtools/qemu/qemu-targets.inc @@ -13,7 +13,7 @@ def get_qemu_target_list(d): softmmuonly += arch + "-softmmu," archs.remove(arch) linuxuseronly = "" -for arch in ['armeb', 'alpha', 'ppc64abi32', 'sparc32plus']: +for arch in ['armeb', 'alpha', 'ppc64abi32', 'sparc32plus', 'aarch64_be']: if arch in archs: linuxuseronly += arch + "-linux-user," archs.remove(arch) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH] createrepo-c: Fix build QA error for nativesdk-createrepo-c.
"QA Issue: nativesdk-createrepo-c rdepends on nativesdk-python3-dev [dev-deps]"
Signed-off-by: Lei Maohui
---
meta/recipes-devtools/createrepo-c/createrepo-c_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
index 9aa8d2a..4f290ae 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
@@ -20,6 +20,7 @@ inherit cmake pkgconfig bash-completion distutils3-base
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}
-DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF"
+INSANE_SKIP_${PN} += "dev-deps"
BBCLASSEXTEND = "native nativesdk"
# Direct createrepo to read rpm configuration from our sysroot, not the one it
was compiled in
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lrzsz: Add implicit declaration fixes from Debian
On Mon, Jun 03, 2019 at 09:47:02AM +0300, Adrian Bunk wrote:
> Signed-off-by: Adrian Bunk
> --
You need one more dash here, now this v2 comment ended in final commit message
which I believe wasn't the intention.
http://git.openembedded.org/openembedded-core/commit/?id=6fa60ac102f6d3977df4236bd5a22680298bdac2
the same with tcp-wrappers change:
http://git.openembedded.org/openembedded-core/commit/?id=cd1dc2334fd3e3d1db9be1d26e888051e3f59c5a
> v2: Add comment in the patch header.
> ---
> .../lrzsz/lrzsz-0.12.20/include.patch | 25 +++
> meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 1 +
> 2 files changed, 26 insertions(+)
> create mode 100644 meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch
>
> diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch
> b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch
> new file mode 100644
> index 00..5fcb3aa92b
> --- /dev/null
> +++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/include.patch
> @@ -0,0 +1,25 @@
> +Implicit declaration compile warning fixes from Debian
> +
> +Signed-off-by: Adrian Bunk
> +Upstream-Status: Inappropriate [upstream is dead]
> +
> +--- lrzsz-0.12.21.orig/lib/long-options.c
> lrzsz-0.12.21/lib/long-options.c
> +@@ -22,6 +22,7 @@
> + #endif
> +
> + #include
> ++#include
> + #include
> + #include "long-options.h"
> +
> +--- lrzsz-0.12.21.orig/src/lsyslog.c
> lrzsz-0.12.21/src/lsyslog.c
> +@@ -22,6 +22,7 @@
> + #ifdef ENABLE_SYSLOG
> + #include "zglobal.h"
> + #include
> ++#include
> + #include
> + #include
> + #endif
> diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
> b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
> index 002c774c6d..34556b2c29 100644
> --- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
> +++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
> @@ -20,6 +20,7 @@ SRC_URI =
> "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
> file://lrzsz_fix_for_automake-1.12.patch \
> file://lrzsz-check-locale.h.patch \
> file://cve-2018-10195.patch \
> + file://include.patch \
> "
>
> SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
> --
> 2.17.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Fix license "names"/versions.
These were broken in commit 4786ecdf7cd427089464dcb62579110d494e7cd7
which performed a cleanup to avoid non-standard field names.
There is an SPDX License list at https://spdx.org/licenses/ which
aims to be a standard. Yocto also uses a substitution map SPDXLICENSEMAP,
default one stored at meta/conf/licenses.conf.
According to meta/conf/licenses.conf, "AFL-2" corresponds to "AFL-2.0"
which is not correct for dbus.
According to the same licenses.conf file "MPL-1" corresponds to "MPL-1.0",
which is correct for libical but since SPDX aims to be a standard
I am updating the identifier in libical's .bb file as well.
To verify the actual license used you can use:
dbus:
cd /tmp/
wget http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
tar -xaf dbus-glib-0.110.tar.gz
cd dbus-glib-0.110
grep -A1 "^The Academic Free License$" COPYING
cd /tmp/
wget http://dbus.freedesktop.org/releases/dbus/dbus-1.12.14.tar.gz
tar -xaf dbus-1.12.14.tar.gz
cd dbus-1.12.14
grep -A1 "^The Academic Free License$" COPYING
cairo:
wget --quiet -O -
https://cgit.freedesktop.org/cairo/plain/COPYING-MPL-1.1?h=1.16.0 | grep -A1
"MOZILLA PUBLIC LICENSE"
libical:
wget --quiet -O -
https://raw.githubusercontent.com/libical/libical/v2.0.0/COPYING | grep
"Mozilla Public License"
taglib:
wget --quiet -O -
https://raw.githubusercontent.com/taglib/taglib/v1.11.1/COPYING.MPL | grep -A1
"MOZILLA PUBLIC LICENSE"
---
meta/recipes-core/dbus/dbus-glib_0.110.bb | 2 +-
meta/recipes-core/dbus/dbus-test_1.12.14.bb | 2 +-
meta/recipes-core/dbus/dbus_1.12.14.bb| 2 +-
meta/recipes-graphics/cairo/cairo_1.16.0.bb | 12 ++--
meta/recipes-support/libical/libical_2.0.0.bb | 2 +-
meta/recipes-support/taglib/taglib_1.11.1.bb | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus-glib_0.110.bb
b/meta/recipes-core/dbus/dbus-glib_0.110.bb
index b7383bd..9afbc2b 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.110.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.110.bb
@@ -2,7 +2,7 @@ SUMMARY = "High level language (GLib) binding for D-Bus"
DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \
the D-Bus library with the GLib thread abstraction and main loop."
HOMEPAGE = "http://www.freedesktop.org/Software/dbus";
-LICENSE = "AFL-2 | GPLv2+"
+LICENSE = "AFL-2.1 | GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c"
SECTION = "base"
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.14.bb
b/meta/recipes-core/dbus/dbus-test_1.12.14.bb
index d7eb628..10447c6 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.14.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.14.bb
@@ -1,7 +1,7 @@
SUMMARY = "D-Bus test package (for D-bus functionality testing only)"
HOMEPAGE = "http://dbus.freedesktop.org";
SECTION = "base"
-LICENSE = "AFL-2 | GPLv2+"
+LICENSE = "AFL-2.1 | GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
diff --git a/meta/recipes-core/dbus/dbus_1.12.14.bb
b/meta/recipes-core/dbus/dbus_1.12.14.bb
index 60d589d..4e7f614 100644
--- a/meta/recipes-core/dbus/dbus_1.12.14.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.14.bb
@@ -2,7 +2,7 @@ SUMMARY = "D-Bus message bus"
DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to
talk to one another. In addition to interprocess communication, D-Bus helps
coordinate process lifecycle; it makes it simple and reliable to code a
\"single instance\" application or daemon, and to launch applications and
daemons on demand when their services are needed."
HOMEPAGE = "http://dbus.freedesktop.org";
SECTION = "base"
-LICENSE = "AFL-2 | GPLv2+"
+LICENSE = "AFL-2.1 | GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
DEPENDS = "expat virtual/libintl autoconf-archive"
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index c2628ae..f32e9ba 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -10,12 +10,12 @@ HOMEPAGE = "http://cairographics.org";
BUGTRACKER = "http://bugs.freedesktop.org";
SECTION = "libs"
-LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+"
-LICENSE_${PN} = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-doc = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1"
-LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1"
+LICENSE = "MPL-1.1 & LGPLv2.1 & GPLv3+"
+LICENSE_${PN} = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}-dev = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}-doc = "MPL-1.1 & LGPLv2.1"
+LICENSE_${PN}
