Skip to contentSkip to conversation

x264: upgrade to latest revision

PATCH New Anuj Mittal 1 participant 4 messages Feb 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 x264: upgrade to latest revision

---
 .../x264/x264/Fix-X32-build-by-disabling-asm.patch | 14 ++++++--------
 meta/recipes-multimedia/x264/x264_git.bb           |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)
meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch +6 -8
index 087a448eec..cb771fb0bf 100644
@@ -1,4 +1,4 @@
-From 66b120079fb21ed38cab0900c63360b0a7853eaa Mon Sep 17 00:00:00 2001
+From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001
 From: Christopher Larson <[email protected]>
 Date: Tue, 13 Dec 2016 14:22:32 -0700
 Subject: [PATCH] Fix X32 build by disabling asm
@@ -12,15 +12,16 @@ doesn't successfully build at this time, and my assembly is very rusty.
 
 Upstream-Status: Pending
 Signed-off-by: Christopher Larson <[email protected]>
+
 ---
  configure | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 3109ec4..844aeae 100755
+index 51b128d..6ea9469 100755
 --- a/configure
 +++ b/configure
-@@ -703,7 +703,13 @@ case $host_cpu in
+@@ -754,7 +754,13 @@ case $host_cpu in
          AS_EXT=".asm"
          ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
          stack_alignment=16
@@ -33,9 +34,9 @@ index 3109ec4..844aeae 100755
 +            fi
 +        fi
          if [ "$SYS" = MACOSX ]; then
-             ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
+             ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
              if cc_check '' "-arch x86_64"; then
-@@ -722,7 +728,11 @@ case $host_cpu in
+@@ -773,7 +779,11 @@ case $host_cpu in
                  RCFLAGS="--target=pe-x86-64 $RCFLAGS"
              fi
          else
@@ -48,6 +49,3 @@ index 3109ec4..844aeae 100755
          fi
          ;;
      powerpc*)
--- 
-2.8.0
-
meta/recipes-multimedia/x264/x264_git.bb +2 -2
index f22930a0ee..39429a8809 100644
@@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "72db437770fd1ce3961f624dd57a8e75ff65ae0b"
+SRCREV = "1771b556ee45207f8711744ccbd5d42a3949b14c"
 
-PV = "r2917+git${SRCPV}"
+PV = "r2991+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.24.1
#1 lore raw

PATCH 2/4 ncurses: add CVE_VERSION

Include the version number in a format that is comparable to what we get from NVD.

---
 meta/recipes-core/ncurses/ncurses_6.1+20191019.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-core/ncurses/ncurses_6.1+20191019.bb +2 -0
index ee7d4bed28..187777f6ef 100644
@@ -9,3 +9,5 @@ SRCREV = "ea70ec815b362f5bbad7a827a2edf50fd2b459cc"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5 --cache-file=${B}/config.cache"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
+
+CVE_VERSION = "6.1.${@d.getVar("PV").split('+')[1]}"
Signature · 1 line
2.24.1
#2 lore raw

PATCH 3/4 libxml2: fix CVE-2020-7595

In reply to Anuj Mittal
---
 .../libxml/libxml2/CVE-2020-7595.patch        | 36 +++++++++++++++++++
 meta/recipes-core/libxml/libxml2_2.9.10.bb    |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch
meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch new file +36 -0
new file mode 100644
index 0000000000..facfefd362
@@ -0,0 +1,36 @@
+From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
+From: Zhipeng Xie <[email protected]>
+Date: Thu, 12 Dec 2019 17:30:55 +0800
+Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
+
+When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
+return NULL which cause a infinite loop in xmlStringLenDecodeEntities
+
+Found with libFuzzer.
+
+Signed-off-by: Zhipeng Xie <[email protected]>
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c89076]
+CVE: CVE-2020-7595
+Signed-off-by: Anuj Mittal <[email protected]> 
+---
+ parser.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/parser.c b/parser.c
+index d1c31963..a34bb6cd 100644
+--- a/parser.c
++++ b/parser.c
+@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
+     else
+         c = 0;
+     while ((c != 0) && (c != end) && /* non input consuming loop */
+-	   (c != end2) && (c != end3)) {
++           (c != end2) && (c != end3) &&
++           (ctxt->instate != XML_PARSER_EOF)) {
+ 
+ 	if (c == 0) break;
+         if ((c == '&') && (str[1] == '#')) {
+-- 
+2.24.1
+
meta/recipes-core/libxml/libxml2_2.9.10.bb +1 -0
index 2c833fa7a2..6a4097c2c6 100644
@@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
            file://libxml-m4-use-pkgconfig.patch \
            file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \
            file://fix-execution-of-ptests.patch \
+           file://CVE-2020-7595.patch \
            "
 
 SRC_URI[libtar.md5sum] = "10942a1dc23137a8aa07f0639cbfece5"
Signature · 1 line
2.24.1
#3 lore raw

PATCH 4/4 sqlite3: upgrade 3.30.1 -> 3.31.1

In reply to Anuj Mittal
---
 meta/recipes-support/sqlite/sqlite3_3.30.1.bb | 20 -------------------
 meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 12 +++++++++++
 2 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.30.1.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.31.1.bb
meta/recipes-support/sqlite/sqlite3_3.30.1.bb deleted +0 -20
deleted file mode 100644
index e055aca205..0000000000
@@ -1,20 +0,0 @@
-require sqlite3.inc
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
-
-SRC_URI = "http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \
-           file://CVE-2019-19244.patch \
-           file://CVE-2019-19880.patch \
-           file://CVE-2019-19923.patch \
-           file://CVE-2019-19924.patch \
-           file://CVE-2019-19925.patch \
-           file://CVE-2019-19926.patch \
-           file://CVE-2019-19959.patch \
-           file://CVE-2019-20218.patch \
-           "
-SRC_URI[md5sum] = "51252dc6bc9094ba11ab151ba650ff3c"
-SRC_URI[sha256sum] = "8c5a50db089bd2a1b08dbc5b00d2027602ca7ff238ba7658fabca454d4298e60"
-
-# -19242 is only an issue in specific development branch commits
-CVE_CHECK_WHITELIST += "CVE-2019-19242"
meta/recipes-support/sqlite/sqlite3_3.31.1.bb new file +12 -0
new file mode 100644
index 0000000000..903d66ab29
@@ -0,0 +1,12 @@
+require sqlite3.inc
+
+LICENSE = "PD"
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
+
+SRC_URI = "http://www.sqlite.org/2020/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+           "
+SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125"
+SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae"
+
+# -19242 is only an issue in specific development branch commits
+CVE_CHECK_WHITELIST += "CVE-2019-19242"
Signature · 1 line
2.24.1