Skip to contentSkip to conversation

ctags: upgrade 5.9.20220501.0 -> 5.9.20220508.0

PATCH New Wang Mingyu 1 participant 4 messages May 16, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ctags: upgrade 5.9.20220501.0 -> 5.9.20220508.0

---
 .../ctags/{ctags_5.9.20220501.0.bb => ctags_5.9.20220508.0.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-devtools/ctags/{ctags_5.9.20220501.0.bb => ctags_5.9.20220508.0.bb} (95%)
meta-oe/recipes-devtools/ctags/ctags_5.9.20220508.0.bb renamed from meta-oe/recipes-devtools/ctags/ctags_5.9.20220501.0.bb +1 -1
similarity index 95%
rename from meta-oe/recipes-devtools/ctags/ctags_5.9.20220501.0.bb
rename to meta-oe/recipes-devtools/ctags/ctags_5.9.20220508.0.bb
index dd8a163b0..02f01cc60 100644
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 inherit autotools-brokensep pkgconfig manpages
 
-SRCREV = "364032bec335e92ccb25b8b2bfee25012609688f"
+SRCREV = "3f9e162a2a2d49920550bddb6de9da46a8340a41"
 SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 nbdkit: upgrade 1.31.2 -> 1.31.5

---
 .../nbdkit/{nbdkit_1.31.2.bb => nbdkit_1.31.5.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-networking/recipes-support/nbdkit/{nbdkit_1.31.2.bb => nbdkit_1.31.5.bb} (95%)
meta-networking/recipes-support/nbdkit/nbdkit_1.31.5.bb renamed from meta-networking/recipes-support/nbdkit/nbdkit_1.31.2.bb +1 -1
similarity index 95%
rename from meta-networking/recipes-support/nbdkit/nbdkit_1.31.2.bb
rename to meta-networking/recipes-support/nbdkit/nbdkit_1.31.5.bb
index 16e29a2fd..79b0001b5 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0"
 SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \
 "
 
-SRCREV = "4a5e55f798beb922dd4bbfd7c40837e35a9754b6"
+SRCREV = "a671de5017546149ef38bfdbdae95c675538b93b"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 openjpeg: upgrade 2.4.0 -> 2.5.0

In reply to Wang Mingyu

file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch file://CVE-2021-29338.patch
file://CVE-2022-1122.patch
removed since they're included in 2.5.0

Changelog:
==========
No API/ABI break compared to v2.4.0, but additional symbols for subset of components decoding (hence the MINOR version bump).

Encoder: add support for generation of TLM markers
Decoder: add support for high throughput (HTJ2K) decoding.
Decoder: add support for partial bitstream decoding

---
 ...-include-dir-to-usr-include-.-Obviou.patch | 36 ---------
 .../openjpeg/openjpeg/CVE-2021-29338.patch    | 78 -------------------
 .../openjpeg/openjpeg/CVE-2022-1122.patch     | 31 --------
 .../{openjpeg_2.4.0.bb => openjpeg_2.5.0.bb}  | 12 +--
 4 files changed, 4 insertions(+), 153 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch
 delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2021-29338.patch
 delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2022-1122.patch
 rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.4.0.bb => openjpeg_2.5.0.bb} (55%)
meta-oe/recipes-graphics/openjpeg/openjpeg/0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch deleted +0 -36
deleted file mode 100644
index 663f499df..000000000
@@ -1,36 +0,0 @@
-From 3e4fe4c42d4d63c36df966baea87da6fbc032553 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <[email protected]>
-Date: Thu, 7 Jan 2021 16:05:28 +0900
-Subject: [PATCH] This patch fixed include dir to /usr/include/. Obviously, it
- is not suitble for cross-compile. So, removed this patch temporarily.
-https://github.com/uclouvain/openjpeg/issues/1174
-
-Upsteam-Status: Pending
-https://github.com/uclouvain/openjpeg/issues/1320
-
-Signed-off-by: Lei Maohui <[email protected]>
----
- cmake/OpenJPEGConfig.cmake.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index 8a726697..2925108a 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-   # This is an install tree
-   include(${SELF_DIR}/OpenJPEGTargets.cmake)
- 
-+  # We find a relative path from the PKG directory to header files.
-+  set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
-   set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
--  get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
-+  file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-+
-+  get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
- 
- else()
-   if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
--- 
-2.25.1
-
meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2021-29338.patch deleted +0 -78

78 lines not on this page · raw message

meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2022-1122.patch deleted +0 -31
deleted file mode 100644
index 8aa9c15e3..000000000
@@ -1,31 +0,0 @@
-Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d]
-CVE: CVE-2022-1122
-
-While this patch improves things re-CVE-2022-1122, the defect is undergoing re-analysis and there may be follow-up commits.
-
-From 0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d Mon Sep 17 00:00:00 2001
-From: xiaoxiaoafeifei <[email protected]>
-Date: Wed, 14 Jul 2021 09:35:13 +0800
-Subject: [PATCH] Fix segfault in src/bin/jp2/opj_decompress.c due to
- uninitialized pointer (fixes #1368) (#1369)
-
----
- src/bin/jp2/opj_decompress.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
-index 0e028735..18ead672 100644
---- a/src/bin/jp2/opj_decompress.c
-+++ b/src/bin/jp2/opj_decompress.c
-@@ -1356,7 +1356,7 @@ int main(int argc, char **argv)
-         int it_image;
-         num_images = get_num_images(img_fol.imgdirpath);
- 
--        dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
-+        dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t));
-         if (!dirptr) {
-             destroy_parameters(&parameters);
-             return EXIT_FAILURE;
--- 
-2.25.1
-
meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb renamed from meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb +4 -8
similarity index 55%
rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.4.0.bb
rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb
index f248619ec..c71e53564 100644
@@ -5,14 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c"
 
 DEPENDS = "libpng tiff lcms zlib"
 
-SRC_URI = " \
-    git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \
-    file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
-    file://0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch \
-    file://CVE-2021-29338.patch \
-    file://CVE-2022-1122.patch \
-"
-SRCREV = "37ac30ceff6640bbab502388c5e0fa0bff23f505"
+SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \
+           file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
+           "
+SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811"
 S = "${WORKDIR}/git"
 
 inherit cmake
Signature · 1 line
2.25.1
#3 lore raw

PATCH 1/1 phpmyadmin: upgrade 5.1.3 -> 5.2.0

In reply to Wang Mingyu

Changelog:
=========
* Removed support for Microsoft Internet Explorer
* Requires PHP 7.2 or newer
* Requires the openssl PHP extension
* Improved handling of system CA bundle and cacert.pem, falling back to Mozilla CA if needed
* Replace "master/slave" terms with "primary/replica"
* Add "NOT LIKE %...%" operator to Table search
* Add support for the Mroonga engine
* Add support for account locking
* Several fixes and improvements to the SQL parser library

---
 .../phpmyadmin/{phpmyadmin_5.1.3.bb => phpmyadmin_5.2.0.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-webserver/recipes-php/phpmyadmin/{phpmyadmin_5.1.3.bb => phpmyadmin_5.2.0.bb} (94%)
meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.0.bb renamed from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb +1 -1
similarity index 94%
rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb
rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.0.bb
index 7ccc05ec3..45de45564 100644
@@ -11,7 +11,7 @@ SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-la
            file://apache.conf \
 "
 
-SRC_URI[sha256sum] = "c562feddc0f8ff5e69629113f273a0d024a65fb928c48e89ce614744d478296f"
+SRC_URI[sha256sum] = "66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230"
 
 UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/"
 UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P<pver>\d+(\.\d+)+)-all-languages.tar.xz"
Signature · 1 line
2.25.1