core-image-sato-sdk-ptest: do not pull in ptest-pkgs
PATCH 1/24 core-image-sato-sdk-ptest: do not pull in ptest-pkgs
The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW; ptests-pkgs also pulls in additional items that are specifically excluded from those due to causing issues with ptesting (particularly, bash-ptest is non-deterministic and was dropped from PTESTS_FAST/SLOW yet still gets pulled in via ptest-pkgs, and is causing failures).
--- meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +0 -2
@@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc DESCRIPTION += "Also includes ptest packages." -IMAGE_FEATURES += "ptest-pkgs" - PROVIDES += "core-image-sato-ptest" # Also include ptests which may not otherwise be included in a sato image
Signature · 1 line
2.25.0
PATCH 2/24 findutils: drop upstream-version-is-even
Upstream seems to have dropped the odd-even policy
--- meta/recipes-extended/findutils/findutils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/findutils/findutils.inc +1 -1
@@ -8,7 +8,7 @@ SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" -inherit autotools gettext texinfo update-alternatives upstream-version-is-even +inherit autotools gettext texinfo update-alternatives ALTERNATIVE_${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100"
Signature · 1 line
2.25.0
PATCH 3/24 libva-utils: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-graphics/libva/libva-utils_2.6.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/libva/libva-utils_2.6.0.bb +1 -1
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.6-branch" SRCREV = "8ea1eba433dcbceb0e5dcb54b8e3f984987f7a17" S = "${WORKDIR}/git" -UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" DEPENDS = "libva"
Signature · 1 line
2.25.0
PATCH 4/24 speexdsp: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-multimedia/speex/speexdsp_1.2.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-multimedia/speex/speexdsp_1.2.0.bb +2 -0
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8" SRC_URI = "http://downloads.xiph.org/releases/speex/speexdsp-${PV}.tar.gz" +UPSTREAM_CHECK_REGEX = "speexdsp-(?P<pver>\d+(\.\d+)+)\.tar" + SRC_URI[md5sum] = "b722df341576dc185d897131321008fc" SRC_URI[sha256sum] = "682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771"
Signature · 1 line
2.25.0
PATCH 5/24 shared-mime-info: fix (sort of) upstream version check
In reply to Alexander KanavinUpstream is using - to separate version components which version checker at the moment can't deal with (i.e 1-15-1 when 1.15.1 is meant).
--- meta/recipes-support/shared-mime-info/shared-mime-info_git.bb | 3 +++ 1 file changed, 3 insertions(+)
meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +3 -0
@@ -12,6 +12,9 @@ SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" PV = "1.15" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "Release-(?P<pver>(\d+(\-\d+)+))" +UPSTREAM_VERSION_UNKNOWN = "1" + inherit autotools pkgconfig gettext python3native mime EXTRA_OECONF = "--disable-update-mimedb"
Signature · 1 line
2.25.0
PATCH 6/24 bison: upgrade 3.4.2 -> 3.5
In reply to Alexander Kanavin---
meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} (90%)meta/recipes-devtools/bison/bison_3.5.bb renamed from meta/recipes-devtools/bison/bison_3.4.2.bb +2 -2
@@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "d1ceb9dfde2d03b24a4c1137f7f1b572" -SRC_URI[sha256sum] = "27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0" +SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" +SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" inherit autotools gettext texinfo
Signature · 1 line
2.25.0
Re: [PATCH 06/24] bison: upgrade 3.4.2 -> 3.5
http://errors.yoctoproject.org/Errors/Details/368059/
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/bison/{bison_3.4.2.bb => bison_3.5.bb} (90%)meta/recipes-devtools/bison/bison_3.5.bb renamed from meta/recipes-devtools/bison/bison_3.4.2.bb +2
-3@@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "d1ceb9dfde2d03b24a4c1137f7f1b572" -SRC_URI[sha256sum] = "27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0" +SRC_URI[md5sum] = "c0230be066069f33c8445766833f3205" +SRC_URI[sha256sum] = "55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641" inherit autotools gettext texinfo --2.25.0
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH 7/24 puzzles: upgrade to latest revision
In reply to Alexander KanavinLicense-Update: list of contributors updated.
--- meta/recipes-sato/puzzles/puzzles_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-sato/puzzles/puzzles_git.bb +2 -2
@@ -1,7 +1,7 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection" HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b" +LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a" DEPENDS = "libxt"
@@ -17,7 +17,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "1c0c49dd5cd8df6ae87f7be5371be84589fa2662" +SRCREV = "79a5378b5adc46ee33ba34d55738f916fb8adfc9" PE = "2" PV = "0.0+git${SRCPV}"
Signature · 1 line
2.25.0
PATCH 8/24 socat: upgrade 1.7.3.3 -> 1.7.3.4
In reply to Alexander Kanavin---
.../socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/socat/{socat_1.7.3.3.bb => socat_1.7.3.4.bb} (92%)meta/recipes-connectivity/socat/socat_1.7.3.4.bb renamed from meta/recipes-connectivity/socat/socat_1.7.3.3.bb +2 -2
@@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ " -SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f" -SRC_URI[sha256sum] = "0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a" +SRC_URI[md5sum] = "3cca4f8cd9d2d1caabd9cc099451bac9" +SRC_URI[sha256sum] = "972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc" inherit autotools
Signature · 1 line
2.25.0
PATCH 9/24 linux-firmware: upgrade to latest revision
In reply to Alexander KanavinLicense-Update: Copyright years, file lists
---
...ux-firmware_20190815.bb => linux-firmware_20200117.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190815.bb => linux-firmware_20200117.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +5 -3
@@ -66,7 +66,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=ab515ef6495ab5c5a3b08ab2db62df11 \ + file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \ file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
@@ -88,6 +88,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ + file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \
@@ -98,6 +99,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ + file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \
@@ -123,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ + file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -192,7 +194,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" +SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
Signature · 1 line
2.25.0
linux-firmware broken (was: Re: [PATCH 09/24] linux-firmware: upgrade to latest revision)
Quoted 2 lines · Alexander Kanavin
License-Update: Copyright years, file lists
Signed-off-by Alexander Kanavin <[email protected]>
This recipe update has broken linux-firmware for various devices I think.
It appears that since upstream's 20191022 release, linux-firmware is not meant to be installed via simple copying anymore (as this recipe still does in do_install()), but instead you're meant to use their copy-firmware.sh script.
In particular, all the symlinks that used to be part of the upstream git are missing now, because copy-firmware extracts them on the fly from the WHENCE file, they're not part of the git repository anymore. Without those various kernel drivers will fail to load their firmware...
Cheers,
Andre'
Quoted 59 lines
--- ...ux-firmware_20190815.bb => linux-firmware_20200117.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190815.bb => linux-firmware_20200117.bb} (99%)meta/recipes-kernel/linux-firmware/linux- renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +0
-0firmware_20200117.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb indexd83000b64f0..8111c410161100644meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +5
-3@@ -66,7 +66,7 @@ LICENSE = "\ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=ab515ef6495ab5c5a3b08ab2db62df11 \ + file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \ file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \@@ -88,6 +88,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ + file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \ file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \@@ -98,6 +99,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ + file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \ file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \@@ -123,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ + file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them@@ -192,7 +194,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" +SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"Signature · 1 line
2.25.0
Re: linux-firmware broken (was: Re: [PATCH 09/24] linux-firmware: upgrade to latest revision)
Patch sent :)
Alex
Quoted 115 lines · André Draszik
Quoted 2 lines · Alexander Kanavin
License-Update: Copyright years, file lists
Signed-off-by Alexander Kanavin <[email protected]>This recipe update has broken linux-firmware for various devices I think.
It appears that since upstream's 20191022 release, linux-firmware is not meant to be installed via simple copying anymore (as this recipe still does in
do_install()), but instead you're meant to use theircopy-firmware.shscript.In particular, all the symlinks that used to be part of the upstream git are missing now, because copy-firmware extracts them on the fly from the WHENCE file, they're not part of the git repository anymore. Without those various kernel drivers will fail to load their firmware...
Cheers,
Andre'Quoted 4 lines
--- ...ux-firmware_20190815.bb => linux-firmware_20200117.bb} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20190815.bb=> linux-firmware_20200117.bb} (99%)
Review
Quoted 2 lines
(quoted diff) +0
-0linux-firmware_20190815.bb b/meta/recipes-kernel/linux-firmware/linux-
Quoted 3 lines
firmware_20200117.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb LICENSE = "\ · line 66
Quoted 6 lines
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb index
d83000b64f0..8111c410161100644meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +0
-0@@ -66,7 +66,7 @@ LICENSE = "\ LIC_FILES_CHKSUM ="file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
Quoted 1 line
file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
Quoted 1 line
file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
Quoted 1 line
-
file://LICENSE.amdgpu;md5=ab515ef6495ab5c5a3b08ab2db62df11 \
Quoted 1 line
+
file://LICENSE.amdgpu;md5=d357524f5099e2a3db3c1838921c593f \
Quoted 1 line
file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \
Quoted 1 line
file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \
Quoted 1 line
file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb LIC_FILES_CHKSUM =
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +0
-0@@ -88,6 +88,7 @@ LIC_FILES_CHKSUM ="file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
Quoted 1 line
file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \
Quoted 1 line
file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \
Quoted 1 line
file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \
Quoted 1 line
+
file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \
Quoted 1 line
file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \
Quoted 1 line
file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \
Quoted 1 line
file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb LIC_FILES_CHKSUM =
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +0
-0@@ -98,6 +99,7 @@ LIC_FILES_CHKSUM ="file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
Quoted 1 line
file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \
Quoted 1 line
file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \
Quoted 1 line
file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \
Quoted 1 line
+
file://LICENCE.NXP;md5=58bb8ba632cd729b9ba6183bc6aed36f \
Quoted 1 line
file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \
Quoted 1 line
file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \
Quoted 1 line
file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb LIC_FILES_CHKSUM =
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +0
-0@@ -123,7 +125,7 @@ LIC_FILES_CHKSUM ="file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
Quoted 1 line
file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
Quoted 1 line
file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
Quoted 1 line
file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb NO_GENERIC_LICENSE[WHENCE] = "WHENCE" · line 199
Quoted 13 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +2
-2- file://WHENCE;md5=37a01e379219d1e06dbccfa90a8fc0ad \ + file://WHENCE;md5=cdcd9f664a404c681bb745bcac6253a3 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them@@ -192,7 +194,7 @@ NO_GENERIC_LICENSE[WHENCE] = "WHENCE" PE = "1" -SRCREV = "07b925b450bfb4cf3e141c612ec5b104658cd020" +SRCREV = "9c340bd1bdabf53808a9178a7be98c5f2ad599a7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
Quoted 4 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200117.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20190815.bb +0
-1--2.25.0
PATCH 10/24 libxpm: upgrade 3.5.12 -> 3.5.13
In reply to Alexander Kanavin---
.../xorg-lib/{libxpm_3.5.12.bb => libxpm_3.5.13.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libxpm_3.5.12.bb => libxpm_3.5.13.bb} (81%)meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb renamed from meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb +2 -2
@@ -21,7 +21,7 @@ PACKAGES =+ "sxpm cxpm" FILES_cxpm = "${bindir}/cxpm" FILES_sxpm = "${bindir}/sxpm" -SRC_URI[md5sum] = "20f4627672edb2bd06a749f11aa97302" -SRC_URI[sha256sum] = "fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec" +SRC_URI[md5sum] = "6f0ecf8d103d528cfc803aa475137afa" +SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" BBCLASSEXTEND = "native"
Signature · 1 line
2.25.0
PATCH 11/24 ccache: upgrade 3.7.3 -> 3.7.7
In reply to Alexander KanavinLicense-Update: copyright years
--- meta/recipes-devtools/ccache/ccache_3.7.3.bb | 7 ------- meta/recipes-devtools/ccache/ccache_3.7.7.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_3.7.3.bb create mode 100644 meta/recipes-devtools/ccache/ccache_3.7.7.bb
meta/recipes-devtools/ccache/ccache_3.7.3.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514" - -SRC_URI[md5sum] = "7be62ea6e190941a8c12a3d5394fd926" -SRC_URI[sha256sum] = "355955a61562c53c4ec4669e1c92708b0008f50d214b27f07a87cf4a1fa6b01e"
meta/recipes-devtools/ccache/ccache_3.7.7.bb new file +7 -0
@@ -0,0 +1,7 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=22d514dbc01fdf9a9784334b6b59417a" + +SRC_URI[md5sum] = "500d7bd9ebc6ee3105d7fc332c1ef395" +SRC_URI[sha256sum] = "9b61f7fab2ec15305ee8382b03365503232dfb04b57414e7b0433768d530fa8a"
Signature · 1 line
2.25.0
PATCH 12/24 piglit: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
@@ -10,7 +10,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "603cfb97542a411e8957a0d689d8b28cf8b9ef4d" +SRCREV = "6126c2d4e476c7770d216ffa1932c10e2a5a7813" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}"
Signature · 1 line
2.25.0
PATCH 13/24 kmscube: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/kmscube/kmscube_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/kmscube/kmscube_git.bb +1 -1
@@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "f632b23a528ed6b4e1fddd774db005c30ab65568" +SRCREV = "76bb57d539cb43d267e561024c34e031bf351e04" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" UPSTREAM_CHECK_COMMITS = "1"
Signature · 1 line
2.25.0
PATCH 14/24 ncurses: upgrade 6.1+20190803 -> 6.1+20191019
In reply to Alexander Kanavin---
...selective-backport-of-20191012-patch.patch | 169 ------------------
....1+20190803.bb => ncurses_6.1+20191019.bb} | 9 +-
2 files changed, 4 insertions(+), 174 deletions(-)
delete mode 100644 meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch
rename meta/recipes-core/ncurses/{ncurses_6.1+20190803.bb => ncurses_6.1+20191019.bb} (55%)meta/recipes-core/ncurses/files/0001-ncurses-selective-backport-of-20191012-patch.patch deleted +0 -169
@@ -1,169 +0,0 @@ -From 064b77f173337aa790f1cec0d741bfbc61a33d31 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <[email protected]> -Date: Fri, 18 Oct 2019 09:57:43 -0400 -Subject: [PATCH] ncurses: selective backport of 20191012 patch - -Upstream-Status: Backport [https://salsa.debian.org/debian/ncurses/commit/243908b1e3d81] - -Contents of the upstream patch that are not applied to comp_hash.c, -parse_entry.c, or dump_entry.c have been omitted. - -CVE: CVE-2019-17594 -CVE: CVE-2019-17595 - -Signed-off-by: Trevor Gamblin <[email protected]> - ---- - ncurses/tinfo/comp_hash.c | 14 ++++++++++---- - ncurses/tinfo/parse_entry.c | 32 ++++++++++++++++---------------- - progs/dump_entry.c | 7 ++++--- - 3 files changed, 30 insertions(+), 23 deletions(-) - -diff --git a/ncurses/tinfo/comp_hash.c b/ncurses/tinfo/comp_hash.c -index 21f165ca..a62d38f9 100644 ---- a/ncurses/tinfo/comp_hash.c -+++ b/ncurses/tinfo/comp_hash.c -@@ -44,7 +44,7 @@ - #include <tic.h> - #include <hashsize.h> - --MODULE_ID("$Id: comp_hash.c,v 1.49 2019/03/10 00:06:48 tom Exp $") -+MODULE_ID("$Id: comp_hash.c,v 1.51 2019/10/12 16:32:13 tom Exp $") - - /* - * Finds the entry for the given string in the hash table if present. -@@ -63,7 +63,9 @@ _nc_find_entry(const char *string, - - hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - - real_table = _nc_get_table(termcap); - ptr = real_table + data->table_data[hashvalue]; -@@ -96,7 +98,9 @@ _nc_find_type_entry(const char *string, - const HashData *data = _nc_get_hash_info(termcap); - int hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - const struct name_table_entry *const table = _nc_get_table(termcap); - - ptr = table + data->table_data[hashvalue]; -@@ -124,7 +128,9 @@ _nc_find_user_entry(const char *string) - - hashvalue = data->hash_of(string); - -- if (data->table_data[hashvalue] >= 0) { -+ if (hashvalue >= 0 -+ && (unsigned) hashvalue < data->table_size -+ && data->table_data[hashvalue] >= 0) { - - real_table = _nc_get_userdefs_table(); - ptr = real_table + data->table_data[hashvalue]; -diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c -index f8cca8b5..064376c5 100644 ---- a/ncurses/tinfo/parse_entry.c -+++ b/ncurses/tinfo/parse_entry.c -@@ -47,7 +47,7 @@ - #include <ctype.h> - #include <tic.h> - --MODULE_ID("$Id: parse_entry.c,v 1.97 2019/08/03 23:10:38 tom Exp $") -+MODULE_ID("$Id: parse_entry.c,v 1.98 2019/10/12 00:50:31 tom Exp $") - - #ifdef LINT - static short const parametrized[] = -@@ -654,12 +654,12 @@ _nc_capcmp(const char *s, const char *t) - } - - static void --append_acs0(string_desc * dst, int code, int src) -+append_acs0(string_desc * dst, int code, char *src, size_t off) - { -- if (src != 0) { -+ if (src != 0 && off < strlen(src)) { - char temp[3]; - temp[0] = (char) code; -- temp[1] = (char) src; -+ temp[1] = src[off]; - temp[2] = 0; - _nc_safe_strcat(dst, temp); - } -@@ -669,7 +669,7 @@ static void - append_acs(string_desc * dst, int code, char *src) - { - if (VALID_STRING(src) && strlen(src) == 1) { -- append_acs0(dst, code, *src); -+ append_acs0(dst, code, src, 0); - } - } - -@@ -1038,17 +1038,17 @@ postprocess_terminfo(TERMTYPE2 *tp) - _nc_str_init(&result, buf2, sizeof(buf2)); - _nc_safe_strcat(&result, acs_chars); - -- append_acs0(&result, 'l', box_chars_1[0]); /* ACS_ULCORNER */ -- append_acs0(&result, 'q', box_chars_1[1]); /* ACS_HLINE */ -- append_acs0(&result, 'k', box_chars_1[2]); /* ACS_URCORNER */ -- append_acs0(&result, 'x', box_chars_1[3]); /* ACS_VLINE */ -- append_acs0(&result, 'j', box_chars_1[4]); /* ACS_LRCORNER */ -- append_acs0(&result, 'm', box_chars_1[5]); /* ACS_LLCORNER */ -- append_acs0(&result, 'w', box_chars_1[6]); /* ACS_TTEE */ -- append_acs0(&result, 'u', box_chars_1[7]); /* ACS_RTEE */ -- append_acs0(&result, 'v', box_chars_1[8]); /* ACS_BTEE */ -- append_acs0(&result, 't', box_chars_1[9]); /* ACS_LTEE */ -- append_acs0(&result, 'n', box_chars_1[10]); /* ACS_PLUS */ -+ append_acs0(&result, 'l', box_chars_1, 0); /* ACS_ULCORNER */ -+ append_acs0(&result, 'q', box_chars_1, 1); /* ACS_HLINE */ -+ append_acs0(&result, 'k', box_chars_1, 2); /* ACS_URCORNER */ -+ append_acs0(&result, 'x', box_chars_1, 3); /* ACS_VLINE */ -+ append_acs0(&result, 'j', box_chars_1, 4); /* ACS_LRCORNER */ -+ append_acs0(&result, 'm', box_chars_1, 5); /* ACS_LLCORNER */ -+ append_acs0(&result, 'w', box_chars_1, 6); /* ACS_TTEE */ -+ append_acs0(&result, 'u', box_chars_1, 7); /* ACS_RTEE */ -+ append_acs0(&result, 'v', box_chars_1, 8); /* ACS_BTEE */ -+ append_acs0(&result, 't', box_chars_1, 9); /* ACS_LTEE */ -+ append_acs0(&result, 'n', box_chars_1, 10); /* ACS_PLUS */ - - if (buf2[0]) { - acs_chars = _nc_save_str(buf2); -diff --git a/progs/dump_entry.c b/progs/dump_entry.c -index d0e420ec..8a47084a 100644 ---- a/progs/dump_entry.c -+++ b/progs/dump_entry.c -@@ -39,7 +39,7 @@ - #include "termsort.c" /* this C file is generated */ - #include <parametrized.h> /* so is this */ - --MODULE_ID("$Id: dump_entry.c,v 1.173 2019/05/11 21:02:24 tom Exp $") -+MODULE_ID("$Id: dump_entry.c,v 1.175 2019/10/12 15:59:07 tom Exp $") - - #define DISCARD(string) string = ABSENT_STRING - #define PRINTF (void) printf -@@ -1136,7 +1136,8 @@ fmt_entry(TERMTYPE2 *tterm, - *d++ = '\\'; - *d = ':'; - } else if (*d == '\\') { -- *++d = *s++; -+ if ((*++d = *s++) == '\0') -+ break; - } - d++; - *d = '\0'; -@@ -1396,7 +1397,7 @@ one_one_mapping(const char *mapping) - - if (VALID_STRING(mapping)) { - int n = 0; -- while (mapping[n] != '\0') { -+ while (mapping[n] != '\0' && mapping[n + 1] != '\0') { - if (isLine(mapping[n]) && - mapping[n] != mapping[n + 1]) { - result = FALSE; --- -2.17.1 -
meta/recipes-core/ncurses/ncurses_6.1+20191019.bb renamed from meta/recipes-core/ncurses/ncurses_6.1+20190803.bb +4 -5
@@ -1,12 +1,11 @@ require ncurses.inc SRC_URI += "file://0001-tic-hang.patch \ - file://0002-configure-reproducible.patch \ - file://config.cache \ - file://0001-ncurses-selective-backport-of-20191012-patch.patch \ -" + file://0002-configure-reproducible.patch \ + file://config.cache \ + " # commit id corresponds to the revision in package version -SRCREV = "3c9b2677c96c645496997321bf2fe465a5e7e21f" +SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
Signature · 1 line
2.25.0
PATCH 15/24 python3-gitdb: upgrade 2.0.5 -> 2.0.6
In reply to Alexander Kanavin---
meta/recipes-devtools/python/python-gitdb.inc | 4 ++--
.../python/{python3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-gitdb_2.0.5.bb => python3-gitdb_2.0.6.bb} (97%)meta/recipes-devtools/python/python-gitdb.inc +2 -2
@@ -8,8 +8,8 @@ inherit pypi PYPI_PACKAGE = "gitdb2" -SRC_URI[md5sum] = "94e59e5fb00960541f6e137b1456ab0a" -SRC_URI[sha256sum] = "83361131a1836661a155172932a13c08bda2db3674e4caa32368aa6eb02f38c2" +SRC_URI[md5sum] = "1a7ea3362e405f8a5634f7ee53636094" +SRC_URI[sha256sum] = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350" DEPENDS = "${PYTHON_PN}-async ${PYTHON_PN}-setuptools-native ${PYTHON_PN}-smmap"
meta/recipes-devtools/python/python3-gitdb_2.0.6.bb renamed from meta/recipes-devtools/python/python3-gitdb_2.0.5.bb +1 -0
@@ -1,2 +1,3 @@ inherit setuptools3 require python-gitdb.inc +
Signature · 1 line
2.25.0
PATCH 16/24 libedit: upgrade 20191025-3.1 -> 20191231-3.1
In reply to Alexander Kanavin---
.../{libedit_20191025-3.1.bb => libedit_20191231-3.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/libedit/{libedit_20191025-3.1.bb => libedit_20191231-3.1.bb} (78%)meta/recipes-devtools/libedit/libedit_20191231-3.1.bb renamed from meta/recipes-devtools/libedit/libedit_20191025-3.1.bb +2 -2
@@ -13,7 +13,7 @@ inherit autotools SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ file://stdc-predef.patch \ " -SRC_URI[md5sum] = "2d6568467080cfd75e715d045102b544" -SRC_URI[sha256sum] = "6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39" +SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416" +SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071" BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.0
PATCH 17/24 python3-setuptools: upgrade 42.0.2 -> 45.0.0
In reply to Alexander Kanavin---
...01-conditionally-do-not-fetch-code-by-easy_install.patch | 6 +++---
meta/recipes-devtools/python/python-setuptools.inc | 4 ++--
...n3-setuptools_42.0.2.bb => python3-setuptools_45.0.0.bb} | 0
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/python/{python3-setuptools_42.0.2.bb => python3-setuptools_45.0.0.bb} (100%)meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +3 -3
@@ -1,4 +1,4 @@ -From 5bba4f57f048016aa92ce5909e9e372db619554e Mon Sep 17 00:00:00 2001 +From 50e4ebce9f711391e2fa9f43906259e19ac00e63 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 05508ce..945e118 100755 +index 09066f8..d3039a5 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -640,6 +640,11 @@ class easy_install(Command): +@@ -649,6 +649,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(rmtree_safe(tmpdir)) def easy_install(self, spec, deps=False):
meta/recipes-devtools/python/python-setuptools.inc +2 -2
@@ -10,8 +10,8 @@ inherit pypi SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI[md5sum] = "5ac69b66a6f7d4785517017f37df28e9" -SRC_URI[sha256sum] = "c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940" +SRC_URI[md5sum] = "14898abd6f436eee58a5a2ba291fcbeb" +SRC_URI[sha256sum] = "c46d9c8f2289535457d36c676b541ca78f7dcb736b97d02f50d17f7f15b583cc" DEPENDS += "${PYTHON_PN}"
meta/recipes-devtools/python/python3-setuptools_45.0.0.bb renamed from meta/recipes-devtools/python/python3-setuptools_42.0.2.bb +0 -0
Signature · 1 line
2.25.0
PATCH 18/24 python3-git: upgrade 3.0.2 -> 3.0.5
In reply to Alexander Kanavin---
.../python/{python3-git_3.0.2.bb => python3-git_3.0.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-git_3.0.2.bb => python3-git_3.0.5.bb} (88%)meta/recipes-devtools/python/python3-git_3.0.5.bb renamed from meta/recipes-devtools/python/python3-git_3.0.2.bb +2 -2
@@ -12,8 +12,8 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[md5sum] = "ccec14a5c9f18702406122983d80032c" -SRC_URI[sha256sum] = "d2f4945f8260f6981d724f5957bc076398ada55cb5d25aaee10108bcdc894100" +SRC_URI[md5sum] = "7555ad89a22f663c25cced5f623bdef0" +SRC_URI[sha256sum] = "9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42" DEPENDS += " ${PYTHON_PN}-gitdb"
Signature · 1 line
2.25.0
PATCH 19/24 gnu-config: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/gnu-config/gnu-config_git.bb +2 -2
@@ -8,8 +8,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "b98424c249119b79d3f709e26eb86f2fd4d5e5f3" -PV = "20190501+git${SRCPV}" +SRCREV = "5256817ace8493502ec88501a19e4051c2e220b0" +PV = "20200117+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in"
Signature · 1 line
2.25.0
PATCH 20/24 libarchive: upgrade 3.4.0 -> 3.4.1
In reply to Alexander Kanavin---
.../libarchive/CVE-2019-19221.patch | 101 ------------------
...ibarchive_3.4.0.bb => libarchive_3.4.1.bb} | 8 +-
2 files changed, 3 insertions(+), 106 deletions(-)
delete mode 100644 meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch
rename meta/recipes-extended/libarchive/{libarchive_3.4.0.bb => libarchive_3.4.1.bb} (91%)meta/recipes-extended/libarchive/libarchive/CVE-2019-19221.patch deleted +0 -101
@@ -1,101 +0,0 @@ -From 22b1db9d46654afc6f0c28f90af8cdc84a199f41 Mon Sep 17 00:00:00 2001 -From: Martin Matuska <[email protected]> -Date: Thu, 21 Nov 2019 03:08:40 +0100 -Subject: [PATCH] Bugfix and optimize archive_wstring_append_from_mbs() - -The cal to mbrtowc() or mbtowc() should read up to mbs_length -bytes and not wcs_length. This avoids out-of-bounds reads. - -mbrtowc() and mbtowc() return (size_t)-1 wit errno EILSEQ when -they encounter an invalid multibyte character and (size_t)-2 when -they they encounter an incomplete multibyte character. As we return -failure and all our callers error out it makes no sense to continue -parsing mbs. - -As we allocate `len` wchars at the beginning and each wchar has -at least one byte, there will never be need to grow the buffer, -so the code can be left out. On the other hand, we are always -allocatng more memory than we need. - -As long as wcs_length == mbs_length == len we can omit wcs_length. -We keep the old code commented if we decide to save memory and -use autoexpanding wcs_length in the future. - -Fixes #1276 - -Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/22b1db9d46654afc6f0c28f90af8cdc84a199f41] -CVE: CVE-2019-19221 -Signed-off-by: Anuj Mittal <[email protected]> ---- - libarchive/archive_string.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c -index 979a418b6..bd39c96f1 100644 ---- a/libarchive/archive_string.c -+++ b/libarchive/archive_string.c -@@ -591,7 +591,7 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * No single byte will be more than one wide character, - * so this length estimate will always be big enough. - */ -- size_t wcs_length = len; -+ // size_t wcs_length = len; - size_t mbs_length = len; - const char *mbs = p; - wchar_t *wcs; -@@ -600,7 +600,11 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - - memset(&shift_state, 0, sizeof(shift_state)); - #endif -- if (NULL == archive_wstring_ensure(dest, dest->length + wcs_length + 1)) -+ /* -+ * As we decided to have wcs_length == mbs_length == len -+ * we can use len here instead of wcs_length -+ */ -+ if (NULL == archive_wstring_ensure(dest, dest->length + len + 1)) - return (-1); - wcs = dest->s + dest->length; - /* -@@ -609,6 +613,12 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - * multi bytes. - */ - while (*mbs && mbs_length > 0) { -+ /* -+ * The buffer we allocated is always big enough. -+ * Keep this code path in a comment if we decide to choose -+ * smaller wcs_length in the future -+ */ -+/* - if (wcs_length == 0) { - dest->length = wcs - dest->s; - dest->s[dest->length] = L'\0'; -@@ -618,24 +628,20 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest, - return (-1); - wcs = dest->s + dest->length; - } -+*/ - #if HAVE_MBRTOWC -- r = mbrtowc(wcs, mbs, wcs_length, &shift_state); -+ r = mbrtowc(wcs, mbs, mbs_length, &shift_state); - #else -- r = mbtowc(wcs, mbs, wcs_length); -+ r = mbtowc(wcs, mbs, mbs_length); - #endif - if (r == (size_t)-1 || r == (size_t)-2) { - ret_val = -1; -- if (errno == EILSEQ) { -- ++mbs; -- --mbs_length; -- continue; -- } else -- break; -+ break; - } - if (r == 0 || r > mbs_length) - break; - wcs++; -- wcs_length--; -+ // wcs_length--; - mbs += r; - mbs_length -= r; - }
meta/recipes-extended/libarchive/libarchive_3.4.1.bb renamed from meta/recipes-extended/libarchive/libarchive_3.4.0.bb +3 -5
@@ -31,12 +31,10 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," EXTRA_OECONF += "--enable-largefile" -SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ - file://CVE-2019-19221.patch \ -" +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" -SRC_URI[md5sum] = "6046396255bd7cf6d0f6603a9bda39ac" -SRC_URI[sha256sum] = "8643d50ed40c759f5412a3af4e353cffbce4fdf3b5cf321cb72cacf06b2d825e" +SRC_URI[md5sum] = "59bff5ee6216cbb76c8354f6dd6f5a5a" +SRC_URI[sha256sum] = "fcf87f3ad8db2e4f74f32526dee62dd1fb9894782b0a503a89c9d7a70a235191" inherit autotools update-alternatives pkgconfig
Signature · 1 line
2.25.0
PATCH 21/24 python3-six: upgrade 1.13.0 -> 1.14.0
In reply to Alexander KanavinLicense-update: copyright years
---
meta/recipes-devtools/python/python-six.inc | 6 +++---
.../python/{python3-six_1.13.0.bb => python3-six_1.14.0.bb} | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-six_1.13.0.bb => python3-six_1.14.0.bb} (97%)meta/recipes-devtools/python/python-six.inc +3 -3
@@ -2,10 +2,10 @@ SUMMARY = "Python 2 and 3 compatibility library" HOMEPAGE = "https://pypi.python.org/pypi/six/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f82eb3a1a7fade60bda5980935084b62" +LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" -SRC_URI[md5sum] = "e92c23c882c7d5564ce5773fe31b2771" -SRC_URI[sha256sum] = "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66" +SRC_URI[md5sum] = "21674588a57e649d1a6d977ec3122140" +SRC_URI[sha256sum] = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a" inherit pypi
meta/recipes-devtools/python/python3-six_1.14.0.bb renamed from meta/recipes-devtools/python/python3-six_1.13.0.bb +1 -0
@@ -1,2 +1,3 @@ inherit setuptools3 require python-six.inc +
Signature · 1 line
2.25.0
PATCH 22/24 xserver-xorg: upgrade 1.20.6 -> 1.20.7
In reply to Alexander Kanavin---
.../{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (88%)meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +2 -2
@@ -5,8 +5,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-test-xtest-Initialize-array-with-braces.patch \ file://sdksyms-no-build-path.patch \ " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon"
Signature · 1 line
2.25.0
Re: [PATCH 22/24] xserver-xorg: upgrade 1.20.6 -> 1.20.7
Quoted 14 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (88%)meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +0
-0
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat · line 11
Quoted 9 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb +2
-2@@ -5,8 +5,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-test-xtest-Initialize-array-with-braces.patch \ file://sdksyms-no-build-path.patch \ " -SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" -SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" +SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9" +SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1" CFLAGS += "-fcommon"
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/1534
nodistro build so probably GL distro features related:
../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c: In function 'drmmode_crtc_set_mode':../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c:757:15: warning: unused variable 'screen' [-Wunused-variable]
757 | ScreenPtr screen = crtc->scrn->pScreen;
| ^~~~~~
../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c: In function 'drmmode_clear_pixmap':
../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c:1806:9: error: implicit declaration of function 'miClearDrawable'; did you mean 'drmCreateDrawable'? [-Werror=implicit-function-declaration]
1806 | miClearDrawable(&pixmap->drawable, gc);
| ^~~~~~~~~~~~~~~
| drmCreateDrawable../../../../../xorg-server-1.20.7/hw/xfree86/drivers/modesetting/drmmode_display.c:1806:9: warning: nested extern declaration of 'miClearDrawable' [-Wnested-externs]
cc1: some warnings being treated as errors
make[5]: *** [Makefile:789: drmmode_display.lo] Error 1
Cheers,
Richard
PATCH 23/24 sed: upgrade 4.7 -> 4.8
In reply to Alexander KanavinLicense-update: copyright years
---
meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-extended/sed/{sed_4.7.bb => sed_4.8.bb} (91%)meta/recipes-extended/sed/sed_4.8.bb renamed from meta/recipes-extended/sed/sed_4.7.bb +4 -3
@@ -2,15 +2,16 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://sed/sed.h;beginline=1;endline=15;md5=e869c874e5472ba89f63f381b0e93475" + file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ + " SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[md5sum] = "777ddfd9d71dd06711fe91f0925e1573" -SRC_URI[sha256sum] = "2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" +SRC_URI[md5sum] = "6d906edfdb3202304059233f51f9a71d" +SRC_URI[sha256sum] = "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" inherit autotools texinfo update-alternatives gettext ptest
Signature · 1 line
2.25.0
PATCH 24/24 libpcre2: upgrade 10.33 -> 10.34
In reply to Alexander Kanavin---
.../libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libpcre/{libpcre2_10.33.bb => libpcre2_10.34.bb} (93%)meta/recipes-support/libpcre/libpcre2_10.34.bb renamed from meta/recipes-support/libpcre/libpcre2_10.33.bb +2 -2
@@ -14,8 +14,8 @@ SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ " -SRC_URI[md5sum] = "80b355f2dce909a2e2424f5c79eddb44" -SRC_URI[sha256sum] = "35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa" +SRC_URI[md5sum] = "d280b62ded13f9ccf2fac16ee5286366" +SRC_URI[sha256sum] = "74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca" CVE_PRODUCT = "pcre2"
Signature · 1 line
2.25.0