Skip to contentSkip to conversation

man-db: upgrade 2.9.4 -> 2.10.0

PATCH In review Wang Mingyu 2 participants 3 messages Feb 8, 2022 – Feb 9, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 man-db: upgrade 2.9.4 -> 2.10.0

License-Update:
==============
COPYING : "GNU Library" changed to "GNU Lesser"
format changed
COPYING.LIB : "51 Franklin St" changed to "51 Franklin Street"
format changed

---
 .../man-db/{man-db_2.9.4.bb => man-db_2.10.0.bb}            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/man-db/{man-db_2.9.4.bb => man-db_2.10.0.bb} (90%)
meta/recipes-extended/man-db/man-db_2.10.0.bb renamed from meta/recipes-extended/man-db/man-db_2.9.4.bb +3 -3
similarity index 90%
rename from meta/recipes-extended/man-db/man-db_2.9.4.bb
rename to meta/recipes-extended/man-db/man-db_2.10.0.bb
index f97974abb8..6a8ac2e3e3 100644
@@ -2,13 +2,13 @@ SUMMARY = "An implementation of the standard Unix documentation system accessed
 HOMEPAGE = "http://man-db.nongnu.org/"
 DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases."
 LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+                    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
            file://99_mandb \
            file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[sha256sum] = "b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756"
+SRC_URI[sha256sum] = "0a8629022f7117dc7fc6473c6fdb14913b24b106059bb056abee87dbd6070c79"
 
 # remove at next version upgrade or when output changes
 PR = "r1"
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 screen: upgrade 4.8.0 -> 4.9.0

CVE-2021-26937.patch
removed since it is included in 4.9.0

Changelog:
=========
* Hardstatus option for used encoding (escape string '%e')
* OpenBSD uses native openpty() from its utils.h
* Fixes:
- fix combining char handling that could lead to a segfault
- CVE-2021-26937: possible denial of service via a crafted UTF-8 character sequence (bug #60030)
- make screen exit code be 0 when checking --help
- session names limit is 80 symbols (bug #61534)
- option -X ignores specified user in multiuser env (bug #37437)
- a lot of reformations/fixes/cleanups (man page and source code)

---
 .../screen/screen/CVE-2021-26937.patch        | 68 -------------------
 .../{screen_4.8.0.bb => screen_4.9.0.bb}      |  4 +-
 2 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 meta/recipes-extended/screen/screen/CVE-2021-26937.patch
 rename meta/recipes-extended/screen/{screen_4.8.0.bb => screen_4.9.0.bb} (91%)
meta/recipes-extended/screen/screen/CVE-2021-26937.patch deleted +0 -68
deleted file mode 100644
index 983b35c1b0..0000000000
@@ -1,68 +0,0 @@
-Description: [CVE-2021-26937] Fix out of bounds array access
-Author: Michael Schröder <[email protected]>
-Bug-Debian: https://bugs.debian.org/982435
-Bug: https://savannah.gnu.org/bugs/?60030
-Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
-Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3
-Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html
-
-CVE: CVE-2021-26937
-Upstream-Status: Pending
-Signed-off-by: Scott Murray <[email protected]>
-
---- a/encoding.c
-+++ b/encoding.c
-@@ -43,7 +43,7 @@
- # ifdef UTF8
- static int   recode_char __P((int, int, int));
- static int   recode_char_to_encoding __P((int, int));
--static void  comb_tofront __P((int, int));
-+static void  comb_tofront __P((int));
- #  ifdef DW_CHARS
- static int   recode_char_dw __P((int, int *, int, int));
- static int   recode_char_dw_to_encoding __P((int, int *, int));
-@@ -1263,6 +1263,8 @@
-     {0x30000, 0x3FFFD},
-   };
-
-+  if (c >= 0xdf00 && c <= 0xdfff)
-+    return 1;          /* dw combining sequence */
-   return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
-           (cjkwidth &&
-            bisearch(c, ambiguous,
-@@ -1330,11 +1332,12 @@
- }
-
- static void
--comb_tofront(root, i)
--int root, i;
-+comb_tofront(i)
-+int i;
- {
-   for (;;)
-     {
-+      int root = i >= 0x700 ? 0x801 : 0x800;
-       debug1("bring to front: %x\n", i);
-       combchars[combchars[i]->prev]->next = combchars[i]->next;
-       combchars[combchars[i]->next]->prev = combchars[i]->prev;
-@@ -1396,9 +1399,9 @@
-     {
-       /* full, recycle old entry */
-       if (c1 >= 0xd800 && c1 < 0xe000)
--        comb_tofront(root, c1 - 0xd800);
-+        comb_tofront(c1 - 0xd800);
-       i = combchars[root]->prev;
--      if (c1 == i + 0xd800)
-+      if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
- 	{
- 	  /* completely full, can't recycle */
- 	  debug("utf8_handle_comp: completely full!\n");
-@@ -1422,7 +1425,7 @@
-   mc->font  = (i >> 8) + 0xd8;
-   mc->fontx = 0;
-   debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
--  comb_tofront(root, i);
-+  comb_tofront(i);
- }
-
- #else /* !UTF8 */
meta/recipes-extended/screen/screen_4.9.0.bb renamed from meta/recipes-extended/screen/screen_4.8.0.bb +1 -3
similarity index 91%
rename from meta/recipes-extended/screen/screen_4.8.0.bb
rename to meta/recipes-extended/screen/screen_4.9.0.bb
index 6d307d5abc..1ed0961630 100644
@@ -21,11 +21,9 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            file://0002-comm.h-now-depends-on-term.h.patch \
            file://0001-fix-for-multijob-build.patch \
            file://0001-Remove-more-compatibility-stuff.patch \
-           file://CVE-2021-26937.patch \
           "
 
-SRC_URI[md5sum] = "d276213d3acd10339cd37848b8c4ab1e"
-SRC_URI[sha256sum] = "6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1"
+SRC_URI[sha256sum] = "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4"
 
 inherit autotools texinfo
 

--
2.25.1

#2 lore raw
In reply to Wang Mingyu

This is failing on musl see
https://errors.yoctoproject.org/Errors/Details/624476/

Quoted 50 lines · wangmy

License-Update:
==============
COPYING : "GNU Library" changed to "GNU Lesser"
format changed
COPYING.LIB : "51 Franklin St" changed to "51 Franklin Street"
format changed

---
 .../man-db/{man-db_2.9.4.bb => man-db_2.10.0.bb}            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/man-db/{man-db_2.9.4.bb => man-db_2.10.0.bb} (90%)
meta/recipes-extended/man-db/man-db_2.10.0.bb renamed from meta/recipes-extended/man-db/man-db_2.9.4.bb +3 -4
similarity index 90%
rename from meta/recipes-extended/man-db/man-db_2.9.4.bb
rename to meta/recipes-extended/man-db/man-db_2.10.0.bb
index f97974abb8..6a8ac2e3e3 100644
@@ -2,13 +2,13 @@ SUMMARY = "An implementation of the standard Unix documentation system accessed
 HOMEPAGE = "http://man-db.nongnu.org/"
 DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases."
 LICENSE = "LGPLv2.1 & GPLv2"
-LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
+                    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
            file://99_mandb \
            file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[sha256sum] = "b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756"
+SRC_URI[sha256sum] = "0a8629022f7117dc7fc6473c6fdb14913b24b106059bb056abee87dbd6070c79"
 
 # remove at next version upgrade or when output changes
 PR = "r1"
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161485): https://lists.openembedded.org/g/openembedded-core/message/161485
Mute This Topic: https://lists.openembedded.org/mt/88992456/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-