* [OE-core][dunfell 01/12] initscripts: Fix various shellcheck warnings in populate-volatile.sh
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 02/12] initscripts: Fix populate-volatile.sh bug when file/dir exists Steve Sakoman
` (10 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0a128a238f63d52aa82f8c63ee2f84ab528b3346)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../initscripts-1.0/populate-volatile.sh | 58 +++++++++----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 1c525b71bd..3a265329f0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -9,10 +9,10 @@
### END INIT INFO
# Get ROOT_DIR
-DIRNAME=`dirname $0`
-ROOT_DIR=`echo $DIRNAME | sed -ne 's:/etc/.*::p'`
+DIRNAME="$(dirname "$0")"
+ROOT_DIR="$(echo "$DIRNAME" | sed -ne 's:/etc/.*::p')"
-[ -e ${ROOT_DIR}/etc/default/rcS ] && . ${ROOT_DIR}/etc/default/rcS
+[ -e "${ROOT_DIR}/etc/default/rcS" ] && . "${ROOT_DIR}/etc/default/rcS"
# When running populate-volatile.sh at rootfs time, disable cache.
[ -n "$ROOT_DIR" ] && VOLATILE_ENABLE_CACHE=no
# If rootfs is read-only, disable cache.
@@ -46,13 +46,13 @@ create_file() {
[ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
} || {
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC
+ eval "$EXEC"
else
# Creating some files at rootfs time may fail and should fail,
# but these failures should not be logged to make sure the do_rootfs
# process doesn't fail. This does no harm, as this script will
# run on target to set up the correct files and directories.
- eval $EXEC > /dev/null 2>&1
+ eval "$EXEC" > /dev/null 2>&1
fi
}
}
@@ -68,11 +68,11 @@ mk_dir() {
[ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
} || {
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC
+ eval "$EXEC"
else
# For the same reason with create_file(), failures should
# not be logged.
- eval $EXEC > /dev/null 2>&1
+ eval "$EXEC" > /dev/null 2>&1
fi
}
}
@@ -96,11 +96,11 @@ link_file() {
test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache.build
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC
+ eval "$EXEC"
else
# For the same reason with create_file(), failures should
# not be logged.
- eval $EXEC > /dev/null 2>&1
+ eval "$EXEC" > /dev/null 2>&1
fi
}
@@ -117,11 +117,11 @@ check_requirements() {
TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
- sed 's@\(^:\)*:.*@\1@' ${ROOT_DIR}/etc/passwd | sort | uniq > "${TMP_DEFINED}"
- cat ${CFGFILE} | grep -v "^#" | cut -s -d " " -f 2 > "${TMP_INTERMED}"
+ sed 's@\(^:\)*:.*@\1@' "${ROOT_DIR}/etc/passwd" | sort | uniq > "${TMP_DEFINED}"
+ grep -v "^#" "${CFGFILE}" | cut -s -d " " -f 2 > "${TMP_INTERMED}"
cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
- NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
- NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
+ NR_DEFINED_USERS="$(wc -l < "${TMP_DEFINED}")"
+ NR_COMBINED_USERS="$(wc -l < "${TMP_COMBINED}")"
[ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && {
echo "Undefined users:"
@@ -131,12 +131,12 @@ check_requirements() {
}
- sed 's@\(^:\)*:.*@\1@' ${ROOT_DIR}/etc/group | sort | uniq > "${TMP_DEFINED}"
- cat ${CFGFILE} | grep -v "^#" | cut -s -d " " -f 3 > "${TMP_INTERMED}"
+ sed 's@\(^:\)*:.*@\1@' "${ROOT_DIR}/etc/group" | sort | uniq > "${TMP_DEFINED}"
+ grep -v "^#" "${CFGFILE}" | cut -s -d " " -f 3 > "${TMP_INTERMED}"
cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
- NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"
- NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`"
+ NR_DEFINED_GROUPS="$(wc -l < "${TMP_DEFINED}")"
+ NR_COMBINED_GROUPS="$(wc -l < "${TMP_COMBINED}")"
[ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && {
echo "Undefined groups:"
@@ -157,13 +157,13 @@ apply_cfgfile() {
[ "${VERBOSE}" != "no" ] && echo "Applying ${CFGFILE}"
- [ "${SKIP_REQUIREMENTS}" == "yes" ] || check_requirements "${CFGFILE}" || {
+ [ "${SKIP_REQUIREMENTS}" = "yes" ] || check_requirements "${CFGFILE}" || {
echo "Skipping ${CFGFILE}"
return 1
}
- cat ${CFGFILE} | sed 's/#.*//' | \
- while read TTYPE TUSER TGROUP TMODE TNAME TLTARGET; do
+ sed 's/#.*//' "${CFGFILE}" | \
+ while read -r TTYPE TUSER TGROUP TMODE TNAME TLTARGET; do
test -z "${TLTARGET}" && continue
TNAME=${ROOT_DIR}${TNAME}
[ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
@@ -187,9 +187,9 @@ apply_cfgfile() {
[ -L "${TNAME}" ] && {
[ "${VERBOSE}" != "no" ] && echo "Found link."
- NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
- echo ${NEWNAME} | grep -v "^/" >/dev/null && {
- TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
+ NEWNAME=$(ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/')
+ echo "${NEWNAME}" | grep -v "^/" >/dev/null && {
+ TNAME="$(echo "${TNAME}" | sed -e 's@\(.*\)/.*@\1@')/${NEWNAME}"
[ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
} || {
TNAME="${NEWNAME}"
@@ -217,7 +217,7 @@ apply_cfgfile() {
clearcache=0
exec 9</proc/cmdline
-while read line <&9
+while read -r line <&9
do
case "$line" in
*clearcache*) clearcache=1
@@ -228,11 +228,11 @@ do
done
exec 9>&-
-if test -e ${ROOT_DIR}/etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate" -a "x$clearcache" = "x0"
+if test -e "${ROOT_DIR}/etc/volatile.cache" -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate" -a "x$clearcache" = "x0"
then
- sh ${ROOT_DIR}/etc/volatile.cache
+ sh "${ROOT_DIR}/etc/volatile.cache"
else
- rm -f ${ROOT_DIR}/etc/volatile.cache ${ROOT_DIR}/etc/volatile.cache.build
+ rm -f "${ROOT_DIR}/etc/volatile.cache" "${ROOT_DIR}/etc/volatile.cache.build"
# Apply the core file with out checking requirements. ${TMPROOT} is
# needed by check_requirements but is setup by this file, so it must be
@@ -246,7 +246,7 @@ else
TMP_FILE="${TMPROOT}/tmp_volatile.$$"
rm -f "$TMP_FILE"
- CFGFILES="`ls -1 "${CFGDIR}" | grep -v "^${COREDEF}\$" | sort`"
+ CFGFILES="$(ls -1 "${CFGDIR}" | grep -v "^${COREDEF}\$" | sort)"
for file in ${CFGFILES}; do
cat "${CFGDIR}/${file}" >> "$TMP_FILE"
done
@@ -264,7 +264,7 @@ else
fi
rm "$TMP_FILE"
- [ -e ${ROOT_DIR}/etc/volatile.cache.build ] && sync && mv ${ROOT_DIR}/etc/volatile.cache.build ${ROOT_DIR}/etc/volatile.cache
+ [ -e "${ROOT_DIR}/etc/volatile.cache.build" ] && sync && mv "${ROOT_DIR}/etc/volatile.cache.build" "${ROOT_DIR}/etc/volatile.cache"
fi
if [ -z "${ROOT_DIR}" ] && [ -f /etc/ld.so.cache ] && [ ! -f /var/run/ld.so.cache ]
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 02/12] initscripts: Fix populate-volatile.sh bug when file/dir exists
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 01/12] initscripts: Fix various shellcheck warnings in populate-volatile.sh Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 03/12] checklayer: check layer in BBLAYERS before test Steve Sakoman
` (9 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
The blocks which test for entry exitence (file or directory) use a
`A && B || C` syntax. This form is not behaving as a if-then-else block
even the code logic assumes that. C may run when A is true which breaks
the case where VERBOSE is 'no' but the file/directory exists.
Along with fixing these specific issues, this patch fixes the other
instances where blocks of form `A && B || C` are used as if-then-else.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1b9ea22acb66554925720e04cf24100664234574)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../initscripts-1.0/populate-volatile.sh | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 3a265329f0..f21f48dd30 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -26,15 +26,15 @@ COREDEF="00_core"
create_file() {
EXEC=""
- [ -z "$2" ] && {
+ if [ -z "$2" ]; then
EXEC="
touch \"$1\";
"
- } || {
+ else
EXEC="
cp \"$2\" \"$1\";
"
- }
+ fi
EXEC="
${EXEC}
chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1;
@@ -42,9 +42,9 @@ create_file() {
test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
- [ -e "$1" ] && {
+ if [ -e "$1" ]; then
[ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
- } || {
+ else
if [ -z "$ROOT_DIR" ]; then
eval "$EXEC"
else
@@ -54,7 +54,7 @@ create_file() {
# run on target to set up the correct files and directories.
eval "$EXEC" > /dev/null 2>&1
fi
- }
+ fi
}
mk_dir() {
@@ -64,9 +64,9 @@ mk_dir() {
chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
- [ -e "$1" ] && {
+ if [ -e "$1" ]; then
[ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
- } || {
+ else
if [ -z "$ROOT_DIR" ]; then
eval "$EXEC"
else
@@ -74,7 +74,7 @@ mk_dir() {
# not be logged.
eval "$EXEC" > /dev/null 2>&1
fi
- }
+ fi
}
link_file() {
@@ -188,13 +188,13 @@ apply_cfgfile() {
[ -L "${TNAME}" ] && {
[ "${VERBOSE}" != "no" ] && echo "Found link."
NEWNAME=$(ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/')
- echo "${NEWNAME}" | grep -v "^/" >/dev/null && {
+ if echo "${NEWNAME}" | grep -v "^/" >/dev/null; then
TNAME="$(echo "${TNAME}" | sed -e 's@\(.*\)/.*@\1@')/${NEWNAME}"
[ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
- } || {
+ else
TNAME="${NEWNAME}"
[ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
- }
+ fi
}
case "${TTYPE}" in
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 03/12] checklayer: check layer in BBLAYERS before test
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 01/12] initscripts: Fix various shellcheck warnings in populate-volatile.sh Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 02/12] initscripts: Fix populate-volatile.sh bug when file/dir exists Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 04/12] cve-update: handle baseMetricV2 as optional Steve Sakoman
` (8 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Lee Chee Yang <chee.yang.lee@intel.com>
layer under test should absent from BBLAYERS when running
yocto-check-layer. This allow to get signatures before layer
under test. There are existing steps to add the layer under
test to BBLAYERS after getting initial signatures.
add steps to check for layer under test in BBLAYERS before
running any test, skip test for the layer if the layer under
test exist in BBLAYERS.
[YOCTO #13176]
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit be02e8dbfb0d1decce125322f9f1e11a649756c0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
scripts/lib/checklayer/__init__.py | 14 ++++++++++++++
scripts/yocto-check-layer | 9 ++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py
index f625d59896..fe545607bb 100644
--- a/scripts/lib/checklayer/__init__.py
+++ b/scripts/lib/checklayer/__init__.py
@@ -229,6 +229,20 @@ def add_layers(bblayersconf, layers, logger):
f.write("\nBBLAYERS += \"%s\"\n" % path)
return True
+def check_bblayers(bblayersconf, layer_path, logger):
+ '''
+ If layer_path found in BBLAYERS return True
+ '''
+ import bb.parse
+ import bb.data
+
+ ldata = bb.parse.handle(bblayersconf, bb.data.init(), include=True)
+ for bblayer in (ldata.getVar('BBLAYERS') or '').split():
+ if os.path.normpath(bblayer) == os.path.normpath(layer_path):
+ return True
+
+ return False
+
def check_command(error_msg, cmd, cwd=None):
'''
Run a command under a shell, capture stdout and stderr in a single stream,
diff --git a/scripts/yocto-check-layer b/scripts/yocto-check-layer
index ca6c79bc8d..b7c83c8b54 100755
--- a/scripts/yocto-check-layer
+++ b/scripts/yocto-check-layer
@@ -24,7 +24,7 @@ import scriptpath
scriptpath.add_oe_lib_path()
scriptpath.add_bitbake_lib_path()
-from checklayer import LayerType, detect_layers, add_layers, add_layer_dependencies, get_signatures
+from checklayer import LayerType, detect_layers, add_layers, add_layer_dependencies, get_signatures, check_bblayers
from oeqa.utils.commands import get_bb_vars
PROGNAME = 'yocto-check-layer'
@@ -138,6 +138,13 @@ def main():
layer['type'] == LayerType.ERROR_BSP_DISTRO:
continue
+ if check_bblayers(bblayersconf, layer['path'], logger):
+ logger.info("%s already in %s. To capture initial signatures, layer under test should not present "
+ "in BBLAYERS. Please remove %s from BBLAYERS." % (layer['name'], bblayersconf, layer['name']))
+ results[layer['name']] = None
+ results_status[layer['name']] = 'SKIPPED (Layer under test should not present in BBLAYERS)'
+ continue
+
logger.info('')
logger.info("Setting up for %s(%s), %s" % (layer['name'], layer['type'],
layer['path']))
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 04/12] cve-update: handle baseMetricV2 as optional
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (2 preceding siblings ...)
2020-08-03 14:26 ` [OE-core][dunfell 03/12] checklayer: check layer in BBLAYERS before test Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-03 14:26 ` [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem Steve Sakoman
` (7 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Konrad Weihmann <kweihmann@outlook.com>
Currently in NVD DB an item popped up, which hasn't set baseMetricV2.
Let the parser handle it as an optional item.
In case use baseMetricV2 before baseMetricV3
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fdcbf3f28289188c5a97664d1421d4a5c4991eda)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/meta/cve-update-db-native.bb | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb
index f27ade40db..32d6dbdffc 100644
--- a/meta/recipes-core/meta/cve-update-db-native.bb
+++ b/meta/recipes-core/meta/cve-update-db-native.bb
@@ -176,15 +176,20 @@ def update_db(c, jsondata):
if not elt['impact']:
continue
+ accessVector = None
cveId = elt['cve']['CVE_data_meta']['ID']
cveDesc = elt['cve']['description']['description_data'][0]['value']
date = elt['lastModifiedDate']
- accessVector = elt['impact']['baseMetricV2']['cvssV2']['accessVector']
- cvssv2 = elt['impact']['baseMetricV2']['cvssV2']['baseScore']
-
try:
+ accessVector = elt['impact']['baseMetricV2']['cvssV2']['accessVector']
+ cvssv2 = elt['impact']['baseMetricV2']['cvssV2']['baseScore']
+ except KeyError:
+ cvssv2 = 0.0
+ try:
+ accessVector = accessVector or elt['impact']['baseMetricV3']['cvssV3']['attackVector']
cvssv3 = elt['impact']['baseMetricV3']['cvssV3']['baseScore']
- except:
+ except KeyError:
+ accessVector = accessVector or "UNKNOWN"
cvssv3 = 0.0
c.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?)",
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (3 preceding siblings ...)
2020-08-03 14:26 ` [OE-core][dunfell 04/12] cve-update: handle baseMetricV2 as optional Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-04 21:46 ` Richard Purdie
2020-08-03 14:26 ` [OE-core][dunfell 06/12] gtk-icon-cache.bbclass: add features_check Steve Sakoman
` (6 subsequent siblings)
11 siblings, 1 reply; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
allarch package adwaita-icon-theme inherit both allarch and
gtk-icon-cache, since commit 31e3d34c8a9c3e8481aa837aa0bf52adf095fe62
[gtk-icon-cache.bbclass: add runtime dependency], it start depend on
non-allarch packages gdk-pixbuf and gtk+3, which make it's signature
changes when machine changed.
like for task do_prepare_recipe_sysroot:
"Hash for dependent task
gdk-pixbuf/gdk-pixbuf_2.40.0.bb:do_populate_sysroot changed from
a72aba8432699c8ce4ca1f71833ef14a89ffde0ea4063e37b9d819fdb1e407f4 to
1ad4e1bd76921b71482657f3b017184e9ade8e2a0b9f43ad64ed2dda83b1520f"
the only way to fix this is remove the task dependency.
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS not work in class, so add it in
layer.conf.
Maybe we have other recipes under other layers have similar problem, we
can only add one by one to its layer.conf, seems not a good idea. but
add *->pixbuf will influence other packages
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ec0888d73d7e7f811961f50f334c72fbc6b1d401)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/conf/layer.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 43917d4c3c..70a8d0ee3c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -80,6 +80,8 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
weston-init->kbd \
connman->xl2tpd \
lttng-tools->lttng-modules \
+ adwaita-icon-theme->gdk-pixbuf \
+ adwaita-icon-theme->gtk+3 \
"
# Avoid adding bison-native to the sysroot without a specific
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem
2020-08-03 14:26 ` [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem Steve Sakoman
@ 2020-08-04 21:46 ` Richard Purdie
2020-08-05 5:59 ` Martin Jansa
0 siblings, 1 reply; 19+ messages in thread
From: Richard Purdie @ 2020-08-04 21:46 UTC (permalink / raw)
To: Steve Sakoman, openembedded-core
On Mon, 2020-08-03 at 04:26 -1000, Steve Sakoman wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> allarch package adwaita-icon-theme inherit both allarch and
> gtk-icon-cache, since commit 31e3d34c8a9c3e8481aa837aa0bf52adf095fe62
> [gtk-icon-cache.bbclass: add runtime dependency]
Did we add that to dunfell? If not we don't need this fix?
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem
2020-08-04 21:46 ` Richard Purdie
@ 2020-08-05 5:59 ` Martin Jansa
2020-08-05 6:18 ` Khem Raj
0 siblings, 1 reply; 19+ messages in thread
From: Martin Jansa @ 2020-08-05 5:59 UTC (permalink / raw)
To: Richard Purdie
Cc: Steve Sakoman, Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
We did the gtk-icon-cache.bbclass backport in:
https://git.openembedded.org/openembedded-core/commit/meta/classes/gtk-icon-cache.bbclass?h=dunfell&id=e921edd27e71af00f07e3f1e973d2b0c6c777bf4
but this fix, is only for adwaita-icon-them and other recipes using
gtk-icon-cache might need identical fix as mentioned by Khem in review of
this work around in master:
https://lists.openembedded.org/g/openembedded-core/message/140910
I guess it would be better to just
revert e921edd27e71af00f07e3f1e973d2b0c6c777bf4 in dunfell and find better
solution for master first.
Cheers,
On Tue, Aug 4, 2020 at 11:46 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2020-08-03 at 04:26 -1000, Steve Sakoman wrote:
> > From: Changqing Li <changqing.li@windriver.com>
> >
> > allarch package adwaita-icon-theme inherit both allarch and
> > gtk-icon-cache, since commit 31e3d34c8a9c3e8481aa837aa0bf52adf095fe62
> > [gtk-icon-cache.bbclass: add runtime dependency]
>
> Did we add that to dunfell? If not we don't need this fix?
>
> Cheers,
>
> Richard
>
>
>
[-- Attachment #2: Type: text/html, Size: 1827 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem
2020-08-05 5:59 ` Martin Jansa
@ 2020-08-05 6:18 ` Khem Raj
2020-08-05 14:13 ` Steve Sakoman
0 siblings, 1 reply; 19+ messages in thread
From: Khem Raj @ 2020-08-05 6:18 UTC (permalink / raw)
To: Martin Jansa
Cc: Richard Purdie, Steve Sakoman,
Patches and discussions about the oe-core layer
On Tue, Aug 4, 2020 at 10:59 PM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> We did the gtk-icon-cache.bbclass backport in:
> https://git.openembedded.org/openembedded-core/commit/meta/classes/gtk-icon-cache.bbclass?h=dunfell&id=e921edd27e71af00f07e3f1e973d2b0c6c777bf4
> but this fix, is only for adwaita-icon-them and other recipes using gtk-icon-cache might need identical fix as mentioned by Khem in review of this work around in master:
> https://lists.openembedded.org/g/openembedded-core/message/140910
>
> I guess it would be better to just revert e921edd27e71af00f07e3f1e973d2b0c6c777bf4 in dunfell and find better solution for master first.
>
+1
> Cheers,
>
> On Tue, Aug 4, 2020 at 11:46 PM Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
>>
>> On Mon, 2020-08-03 at 04:26 -1000, Steve Sakoman wrote:
>> > From: Changqing Li <changqing.li@windriver.com>
>> >
>> > allarch package adwaita-icon-theme inherit both allarch and
>> > gtk-icon-cache, since commit 31e3d34c8a9c3e8481aa837aa0bf52adf095fe62
>> > [gtk-icon-cache.bbclass: add runtime dependency]
>>
>> Did we add that to dunfell? If not we don't need this fix?
>>
>> Cheers,
>>
>> Richard
>>
>>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [OE-core][dunfell 06/12] gtk-icon-cache.bbclass: add features_check
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (4 preceding siblings ...)
2020-08-03 14:26 ` [OE-core][dunfell 05/12] layer.conf: fix adwaita-icon-theme signature change problem Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-04 21:47 ` Richard Purdie
2020-08-03 14:26 ` [OE-core][dunfell 07/12] cogl-1.0: correct X11 dependencies Steve Sakoman
` (5 subsequent siblings)
11 siblings, 1 reply; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Changqing Li <changqing.li@windriver.com>
'bitbake world -k' when DISTRO_FEATURES don't have x11 and wayland,
report errors:
Nothing PROVIDES 'gtk+3'
Nothing RPROVIDES 'blueman'
gtk+3 set ANY_OF_DISTRO_FEATURES, so add it here too
since we DEPENDS on it
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ab9ff563c77cd5105f4ef9426f076b10ea8e2ee8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/gtk-icon-cache.bbclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index dd394af27c..340a283851 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -1,5 +1,10 @@
FILES_${PN} += "${datadir}/icons/hicolor"
+#gtk+3 reqiure GTK3DISTROFEATURES, DEPENDS on it make all the
+#recipes inherit this class require GTK3DISTROFEATURES
+inherit features_check
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
DEPENDS +=" ${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} \
${@['gdk-pixbuf', '']['${BPN}' == 'gdk-pixbuf']} \
${@['gtk+3', '']['${BPN}' == 'gtk+3']} \
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [OE-core][dunfell 06/12] gtk-icon-cache.bbclass: add features_check
2020-08-03 14:26 ` [OE-core][dunfell 06/12] gtk-icon-cache.bbclass: add features_check Steve Sakoman
@ 2020-08-04 21:47 ` Richard Purdie
2020-08-05 1:59 ` Steve Sakoman
0 siblings, 1 reply; 19+ messages in thread
From: Richard Purdie @ 2020-08-04 21:47 UTC (permalink / raw)
To: Steve Sakoman, openembedded-core
On Mon, 2020-08-03 at 04:26 -1000, Steve Sakoman wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> 'bitbake world -k' when DISTRO_FEATURES don't have x11 and wayland,
> report errors:
> Nothing PROVIDES 'gtk+3'
> Nothing RPROVIDES 'blueman'
>
> gtk+3 set ANY_OF_DISTRO_FEATURES, so add it here too
> since we DEPENDS on it
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit ab9ff563c77cd5105f4ef9426f076b10ea8e2ee8)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> meta/classes/gtk-icon-cache.bbclass | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-
> icon-cache.bbclass
> index dd394af27c..340a283851 100644
> --- a/meta/classes/gtk-icon-cache.bbclass
> +++ b/meta/classes/gtk-icon-cache.bbclass
> @@ -1,5 +1,10 @@
> FILES_${PN} += "${datadir}/icons/hicolor"
>
> +#gtk+3 reqiure GTK3DISTROFEATURES, DEPENDS on it make all the
> +#recipes inherit this class require GTK3DISTROFEATURES
> +inherit features_check
> +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> +
Sorry, I understand now. I'd suggest we don't backport this as it
causes problems in other layers and is probably too invasive for the
LTS.
Cheers,
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OE-core][dunfell 06/12] gtk-icon-cache.bbclass: add features_check
2020-08-04 21:47 ` Richard Purdie
@ 2020-08-05 1:59 ` Steve Sakoman
0 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-05 1:59 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Tue, Aug 4, 2020 at 11:47 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Mon, 2020-08-03 at 04:26 -1000, Steve Sakoman wrote:
> > From: Changqing Li <changqing.li@windriver.com>
> >
> > 'bitbake world -k' when DISTRO_FEATURES don't have x11 and wayland,
> > report errors:
> > Nothing PROVIDES 'gtk+3'
> > Nothing RPROVIDES 'blueman'
> >
> > gtk+3 set ANY_OF_DISTRO_FEATURES, so add it here too
> > since we DEPENDS on it
> >
> > Signed-off-by: Changqing Li <changqing.li@windriver.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit ab9ff563c77cd5105f4ef9426f076b10ea8e2ee8)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> > meta/classes/gtk-icon-cache.bbclass | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-
> > icon-cache.bbclass
> > index dd394af27c..340a283851 100644
> > --- a/meta/classes/gtk-icon-cache.bbclass
> > +++ b/meta/classes/gtk-icon-cache.bbclass
> > @@ -1,5 +1,10 @@
> > FILES_${PN} += "${datadir}/icons/hicolor"
> >
> > +#gtk+3 reqiure GTK3DISTROFEATURES, DEPENDS on it make all the
> > +#recipes inherit this class require GTK3DISTROFEATURES
> > +inherit features_check
> > +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> > +
>
> Sorry, I understand now. I'd suggest we don't backport this as it
> causes problems in other layers and is probably too invasive for the
> LTS.
OK, makes sense. I'll drop this patch from the pull request.
Steve
^ permalink raw reply [flat|nested] 19+ messages in thread
* [OE-core][dunfell 07/12] cogl-1.0: correct X11 dependencies
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (5 preceding siblings ...)
2020-08-03 14:26 ` [OE-core][dunfell 06/12] gtk-icon-cache.bbclass: add features_check Steve Sakoman
@ 2020-08-03 14:26 ` Steve Sakoman
2020-08-03 14:27 ` [OE-core][dunfell 08/12] boost: backport fix to make async_pipes work with asio Steve Sakoman
` (4 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:26 UTC (permalink / raw)
To: openembedded-core
From: Matt Madison <matt@madison.systems>
cogl depends on libxdamage when configured for X11 support.
A dependency was added for this in 2012 with
959a2f6d88d8fa6874fff83b7a1f0e7d4e36b887, but that addition
was lost when the recipe was reworked in 2013 with
b508fdd2b19ca30da8d09caf646897dc4cf195c8. That commit also
added a dependency on libxi, which is not actually needed.
The missing dependency doesn't cause problems in most cases,
since mesa also depends on libxdamage, but when an alternative
opengl implementation such as libglvnd is used, cogl fails
to configure.
Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7651a63c508562caf1a3732cb49af50bccc98e8b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 1c5d0b79cb..d581ad1c04 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -21,7 +21,7 @@ EDEPENDS_GL = "virtual/libgl libdrm"
EDEPENDS_GLES2 = "virtual/libgles2"
EDEPENDS_KMS = "libdrm virtual/egl"
EDEPENDS_EGL = "virtual/egl"
-EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi libxrandr"
+EDEPENDS_X11 = "virtual/libx11 libxcomposite libxdamage libxfixes libxrandr"
EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland"
# Extra RDEPENDS for PACKAGECONFIG
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 08/12] boost: backport fix to make async_pipes work with asio
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (6 preceding siblings ...)
2020-08-03 14:26 ` [OE-core][dunfell 07/12] cogl-1.0: correct X11 dependencies Steve Sakoman
@ 2020-08-03 14:27 ` Steve Sakoman
2020-08-03 14:27 ` [OE-core][dunfell 09/12] bind: upgrade 9.11.19 -> 9.11.21 Steve Sakoman
` (3 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:27 UTC (permalink / raw)
To: openembedded-core
From: Viktor Rosendahl <Viktor.Rosendahl@bmw.de>
async_pipe is missing the executor_type type, which is expected by
asio in /usr/include/boost/asio/impl/read.hpp. Without this, it's
not possible to even compile code that uses constructs such as:
boost::asio::io_service foo;
boost::process::async_pipe foopipe{ boost::process::async_pipe(foo) };
This is only relevant for Dunfell because master has already moved to
boost-1.73.0 in which this bug has been fixed. The bug is also not
present in Zeus, which uses boost-1.71.0.
Signed-off-by: Viktor Rosendahl <Viktor.Rosendahl@bmw.de>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../0001-added-typedef-executor_type.patch | 54 +++++++++++++++++++
meta/recipes-support/boost/boost_1.72.0.bb | 1 +
2 files changed, 55 insertions(+)
create mode 100644 meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch
diff --git a/meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch b/meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch
new file mode 100644
index 0000000000..7b8178fd76
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-added-typedef-executor_type.patch
@@ -0,0 +1,54 @@
+From 6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0 Mon Sep 17 00:00:00 2001
+From: Klemens David Morgenstern <klemens.morgenstern@gmx.net>
+Date: Fri, 22 Nov 2019 14:03:22 +0800
+Subject: [PATCH] added typedef executor_type;
+
+Upstream-Status: Backport [https://github.com/boostorg/process/commit/6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0]
+
+Signed-off-by: Viktor Rosendahl <Viktor.Rosendahl@bmw.de>
+---
+ include/boost/process/async_pipe.hpp | 2 ++
+ include/boost/process/detail/posix/async_pipe.hpp | 1 +
+ include/boost/process/detail/windows/async_pipe.hpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/include/boost/process/async_pipe.hpp b/include/boost/process/async_pipe.hpp
+index 101fe1d..a562432 100644
+--- a/boost/process/async_pipe.hpp
++++ b/boost/process/async_pipe.hpp
+@@ -47,6 +47,8 @@ public:
+ */
+ typedef platform_specific handle_type;
+
++ typedef typename handle_type::executor_type executor_type;
++
+ /** Construct a new async_pipe, does automatically open the pipe.
+ * Initializes source and sink with the same io_context.
+ * @note Windows creates a named pipe here, where the name is automatically generated.
+diff --git a/include/boost/process/detail/posix/async_pipe.hpp b/include/boost/process/detail/posix/async_pipe.hpp
+index 725a078..a82c057 100644
+--- a/boost/process/detail/posix/async_pipe.hpp
++++ b/boost/process/detail/posix/async_pipe.hpp
+@@ -23,6 +23,7 @@ class async_pipe
+ public:
+ typedef int native_handle_type;
+ typedef ::boost::asio::posix::stream_descriptor handle_type;
++ typedef typename handle_type::executor_type executor_type;
+
+ inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {}
+
+diff --git a/include/boost/process/detail/windows/async_pipe.hpp b/include/boost/process/detail/windows/async_pipe.hpp
+index 06d5f2d..0b447f9 100644
+--- a/boost/process/detail/windows/async_pipe.hpp
++++ b/boost/process/detail/windows/async_pipe.hpp
+@@ -48,6 +48,7 @@ class async_pipe
+ public:
+ typedef ::boost::winapi::HANDLE_ native_handle_type;
+ typedef ::boost::asio::windows::stream_handle handle_type;
++ typedef typename handle_type::executor_type executor_type;
+
+ async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {}
+ async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink)
+--
+2.17.1
+
diff --git a/meta/recipes-support/boost/boost_1.72.0.bb b/meta/recipes-support/boost/boost_1.72.0.bb
index 0b7badbc76..51c84bc935 100644
--- a/meta/recipes-support/boost/boost_1.72.0.bb
+++ b/meta/recipes-support/boost/boost_1.72.0.bb
@@ -8,4 +8,5 @@ SRC_URI += "file://arm-intrinsics.patch \
file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
file://0001-dont-setup-compiler-flags-m32-m64.patch \
file://0001-revert-cease-dependence-on-range.patch \
+ file://0001-added-typedef-executor_type.patch \
"
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 09/12] bind: upgrade 9.11.19 -> 9.11.21
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (7 preceding siblings ...)
2020-08-03 14:27 ` [OE-core][dunfell 08/12] boost: backport fix to make async_pipes work with asio Steve Sakoman
@ 2020-08-03 14:27 ` Steve Sakoman
2020-08-03 14:27 ` [OE-core][dunfell 10/12] gnutls: upgrade 3.6.13 -> 3.6.14 Steve Sakoman
` (2 subsequent siblings)
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:27 UTC (permalink / raw)
To: openembedded-core
From: Yi Zhao <yi.zhao@windriver.com>
Bug and CVE fixes only
Detailed list of changes at:
https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_11_21/CHANGES
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c6749532f94f435e6771d66d3fa225e676753478)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../bind/{bind_9.11.19.bb => bind_9.11.21.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/bind/{bind_9.11.19.bb => bind_9.11.21.bb} (98%)
diff --git a/meta/recipes-connectivity/bind/bind_9.11.19.bb b/meta/recipes-connectivity/bind/bind_9.11.21.bb
similarity index 98%
rename from meta/recipes-connectivity/bind/bind_9.11.19.bb
rename to meta/recipes-connectivity/bind/bind_9.11.21.bb
index 276173e09f..ee546a0a2c 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.19.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.21.bb
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://0001-avoid-start-failure-with-bind-user.patch \
"
-SRC_URI[sha256sum] = "0dee554a4caa368948b32da9a0c97b516c19103bc13ff5b3762c5d8552f52329"
+SRC_URI[sha256sum] = "668158b005b3de4328fa0dbbbb3f524b66f28f024c67538aa9412a9e69c9dfbc"
UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
# stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 10/12] gnutls: upgrade 3.6.13 -> 3.6.14
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (8 preceding siblings ...)
2020-08-03 14:27 ` [OE-core][dunfell 09/12] bind: upgrade 9.11.19 -> 9.11.21 Steve Sakoman
@ 2020-08-03 14:27 ` Steve Sakoman
2020-08-03 14:27 ` [OE-core][dunfell 11/12] gnutls: Fix krb5 code license to GPLv2.1+ to match the LICENSE file Steve Sakoman
2020-08-03 14:27 ` [OE-core][dunfell 12/12] glib-networking: upgrade 2.62.3 to 2.62.4 Steve Sakoman
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:27 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
Security and bug fix release on the stable 3.6.x branch
Fixes CVE-2020-13777
Detailed list of changes at:
https://lists.gnupg.org/pipermail/gnutls-help/2020-June/004648.html
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cd88c81804a4a52b9875f2244c9f35911539be96)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../gnutls/{gnutls_3.6.13.bb => gnutls_3.6.14.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-support/gnutls/{gnutls_3.6.13.bb => gnutls_3.6.14.bb} (93%)
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.13.bb b/meta/recipes-support/gnutls/gnutls_3.6.14.bb
similarity index 93%
rename from meta/recipes-support/gnutls/gnutls_3.6.13.bb
rename to meta/recipes-support/gnutls/gnutls_3.6.14.bb
index f56d42a613..a285e5a1f1 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.13.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.14.bb
@@ -21,8 +21,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
file://arm_eabi.patch \
"
-SRC_URI[md5sum] = "bb1fe696a11543433785b4fc70ca225f"
-SRC_URI[sha256sum] = "32041df447d9f4644570cf573c9f60358e865637d69b7e59d1159b7240b52f38"
+SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 11/12] gnutls: Fix krb5 code license to GPLv2.1+ to match the LICENSE file.
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (9 preceding siblings ...)
2020-08-03 14:27 ` [OE-core][dunfell 10/12] gnutls: upgrade 3.6.13 -> 3.6.14 Steve Sakoman
@ 2020-08-03 14:27 ` Steve Sakoman
2020-08-03 14:27 ` [OE-core][dunfell 12/12] glib-networking: upgrade 2.62.3 to 2.62.4 Steve Sakoman
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:27 UTC (permalink / raw)
To: openembedded-core
From: zhengruoqin <zhengrq.fnst@cn.fujitsu.com>
This was discussed and accepted upstream by the project so their license is consistent.
Please reference to https://gitlab.com/gnutls/gnutls/-/issues/1018
and https://gitlab.com/gnutls/gnutls/-/merge_requests/1285.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 267d07301c79c24969c169add05284f612c41d77)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...se-to-GPLv2.1-to-keep-with-LICENSE-f.patch | 90 +++++++++++++++++++
meta/recipes-support/gnutls/gnutls_3.6.14.bb | 1 +
2 files changed, 91 insertions(+)
create mode 100644 meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch b/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch
new file mode 100644
index 0000000000..a610abf9b5
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch
@@ -0,0 +1,90 @@
+From c0ae3f659c6c130d151378ba4d7d861e3b7b970f Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Wed, 8 Jul 2020 14:50:27 +0900
+Subject: [PATCH] Modied the license to GPLv2.1+ to keep with LICENSE file.
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+Please reference to https://gitlab.com/gnutls/gnutls/-/issues/1018.
+Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/merge_requests/1285].
+---
+ lib/x509/krb5.c | 20 +++++++++++---------
+ lib/x509/krb5.h | 20 +++++++++++---------
+ 2 files changed, 22 insertions(+), 18 deletions(-)
+
+diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c
+index 7fe84e6..d68c737 100644
+--- a/lib/x509/krb5.c
++++ b/lib/x509/krb5.c
+@@ -1,21 +1,23 @@
+ /*
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
++ * Author: Nikos Mavrogiannopoulos
++ *
+ * This file is part of GnuTLS.
+ *
+- * GnuTLS is free software: you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
++ * The GnuTLS is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public License
++ * as published by the Free Software Foundation; either version 2.1 of
++ * the License, or (at your option) any later version.
+ *
+- * GnuTLS is distributed in the hope that it will be useful, but
++ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program. If not, see <https://www.gnu.org/licenses/>
+ *
+- * You should have received a copy of the GNU General Public License
+- * along with this program. If not, see
+- * <https://www.gnu.org/licenses/>.
+ */
+
+ #include <config.h>
+diff --git a/lib/x509/krb5.h b/lib/x509/krb5.h
+index d8926af..815bb28 100644
+--- a/lib/x509/krb5.h
++++ b/lib/x509/krb5.h
+@@ -1,21 +1,23 @@
+ /*
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
++ * Author: Nikos Mavrogiannopoulos
++ *
+ * This file is part of GnuTLS.
+ *
+- * GnuTLS is free software: you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
++ * The GnuTLS is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public License
++ * as published by the Free Software Foundation; either version 2.1 of
++ * the License, or (at your option) any later version.
+ *
+- * GnuTLS is distributed in the hope that it will be useful, but
++ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program. If not, see <https://www.gnu.org/licenses/>
+ *
+- * You should have received a copy of the GNU General Public License
+- * along with this program. If not, see
+- * <https://www.gnu.org/licenses/>.
+ */
+
+ #ifndef GNUTLS_LIB_X509_KRB5_H
+--
+2.17.1
+
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.14.bb b/meta/recipes-support/gnutls/gnutls_3.6.14.bb
index a285e5a1f1..cc0454a561 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.14.bb
@@ -19,6 +19,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \
file://arm_eabi.patch \
+ file://0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch \
"
SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread* [OE-core][dunfell 12/12] glib-networking: upgrade 2.62.3 to 2.62.4
2020-08-03 14:26 [OE-core][dunfell 00/12] Patch review Steve Sakoman
` (10 preceding siblings ...)
2020-08-03 14:27 ` [OE-core][dunfell 11/12] gnutls: Fix krb5 code license to GPLv2.1+ to match the LICENSE file Steve Sakoman
@ 2020-08-03 14:27 ` Steve Sakoman
11 siblings, 0 replies; 19+ messages in thread
From: Steve Sakoman @ 2020-08-03 14:27 UTC (permalink / raw)
To: openembedded-core
Bug and CVE fix release
Fixes CVE-2020-13645
Details of changes at:
https://gitlab.gnome.org/GNOME/glib-networking/-/commits/glib-2-62
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../{glib-networking_2.62.3.bb => glib-networking_2.62.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.62.3.bb => glib-networking_2.62.4.bb} (88%)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb b/meta/recipes-core/glib-networking/glib-networking_2.62.4.bb
similarity index 88%
rename from meta/recipes-core/glib-networking/glib-networking_2.62.3.bb
rename to meta/recipes-core/glib-networking/glib-networking_2.62.4.bb
index e9596ce1a4..b74532087c 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.62.3.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.62.4.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "a758ca62bd54982a798b39c744cbf783"
-SRC_URI[archive.sha256sum] = "8ca1f86f23a76b5c7640624f7d5490705c78e81375e1741c9a1c41ce7f8f7ff7"
+SRC_URI[archive.md5sum] = "fad14a4a2cac73f0c2f9d426f1a9e5af"
+SRC_URI[archive.sha256sum] = "c18f289eec480fdce12044c0a06f77521edf9f460d16ad4213de61f2a3b294cf"
PACKAGECONFIG ??= "gnutls"
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread