From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] screen: Version bump. 4.8.0 -> 4.9.0
Date: Sun, 6 Feb 2022 00:07:16 +0100 [thread overview]
Message-ID: <20220205230718.2518022-3-christian.melki@t2data.com> (raw)
In-Reply-To: <20220205230718.2518022-1-christian.melki@t2data.com>
New screen version just released after the last bump.
Mostly bugfixes over 1,5 year. Nothing exceptional.
https://lists.gnu.org/archive/html/info-gnu/2022-02/msg00000.html
* CVE-2021-26937 fixed.
* Drop other patches that looks incorporated.
* Drop unused patches.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0101-fix_screen_utf8_nfd.patch | 37 ----------
...d-d_xtermosc-array-in-struct-display.patch | 37 ----------
...-is-used-in-place-of-TERMCAP_BUFSIZE.patch | 24 -------
.../screen-4.8.0/0104-CVE-2021-26937.patch | 69 -------------------
patches/screen-4.8.0/autogen.sh | 9 ---
patches/screen-4.8.0/series | 12 ----
.../0001-comm.h-now-depends-on-term.h.patch | 0
...-needed-for-list_-display-generic-.o.patch | 0
.../0003-suppress_remap.patch} | 2 +-
patches/screen-4.9.0/autogen.sh | 1 +
patches/screen-4.9.0/series | 6 ++
rules/screen.make | 4 +-
12 files changed, 10 insertions(+), 191 deletions(-)
delete mode 100644 patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
delete mode 100644 patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
delete mode 100644 patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
delete mode 100644 patches/screen-4.8.0/0104-CVE-2021-26937.patch
delete mode 100755 patches/screen-4.8.0/autogen.sh
delete mode 100644 patches/screen-4.8.0/series
rename patches/{screen-4.8.0 => screen-4.9.0}/0001-comm.h-now-depends-on-term.h.patch (100%)
rename patches/{screen-4.8.0 => screen-4.9.0}/0002-comm.h-needed-for-list_-display-generic-.o.patch (100%)
rename patches/{screen-4.8.0/0100-suppress_remap.patch => screen-4.9.0/0003-suppress_remap.patch} (92%)
create mode 120000 patches/screen-4.9.0/autogen.sh
create mode 100644 patches/screen-4.9.0/series
diff --git a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch b/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
deleted file mode 100644
index 54cc81f0d..000000000
--- a/patches/screen-4.8.0/0101-fix_screen_utf8_nfd.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Jan 2022 12:53:57 +0100
-Subject: [PATCH] fix_screen_utf8_nfd
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- ansi.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ansi.c b/ansi.c
-index 2a52eddd32d4..83b266d6f777 100644
---- a/ansi.c
-+++ b/ansi.c
-@@ -692,10 +692,6 @@ register int len;
- }
- curr->w_rend.font = 0;
- }
--# ifdef DW_CHARS
-- if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-- curr->w_mbcs = 0xff;
--# endif
- if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
- {
- int ox, oy;
-@@ -730,6 +726,10 @@ register int len;
- }
- break;
- }
-+# ifdef DW_CHARS
-+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-+ curr->w_mbcs = 0xff;
-+# endif
- font = curr->w_rend.font;
- # endif
- # ifdef DW_CHARS
diff --git a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch b/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
deleted file mode 100644
index 8cbfc6d2f..000000000
--- a/patches/screen-4.8.0/0102-Expand-d_xtermosc-array-in-struct-display.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <vdolezal@redhat.com>
-Date: Fri, 21 Feb 2020 14:02:51 +0100
-Subject: [PATCH] Expand-d_xtermosc-array-in-struct-display
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit c5db181 expands index range of "typ2" by one without expanding
-affected arrays. d_xtermosc in struct display is one of these.
-
-Related: c5db181b6e017cfccb8d7842ce140e59294d9f62
- (ansi: add support for xterm OSC 11)
-Related: 68386dfb1fa33471372a8cd2e74686758a2f527b
- (Fix out of bounds access when setting w_xtermosc after OSC 49)
-
-Signed-off-by: Václav Doležal <vdolezal@redhat.com>
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- display.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/display.h b/display.h
-index 459cc5dc1543..4fc206189b4b 100644
---- a/display.h
-+++ b/display.h
-@@ -112,7 +112,7 @@ struct display
- int d_mousetrack; /* set when user wants to use mouse even when the window
- does not */
- #ifdef RXVT_OSC
-- int d_xtermosc[4]; /* osc used */
-+ int d_xtermosc[5]; /* osc used */
- #endif
- struct mchar d_lpchar; /* missing char */
- struct timeval d_status_time; /* time of status display */
diff --git a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch b/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
deleted file mode 100644
index 1152cb522..000000000
--- a/patches/screen-4.8.0/0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 27 Apr 2020 18:12:56 +0200
-Subject: [PATCH] TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- termcap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/termcap.c b/termcap.c
-index ed9e838c4c9d..29684cf974f7 100644
---- a/termcap.c
-+++ b/termcap.c
-@@ -1066,7 +1066,7 @@ int aflag;
- {
- if (i >= T_KEYPAD) /* don't put keypad codes in TERMCAP */
- continue; /* - makes it too big */
--#if (TERMCAP_BUF < 1024)
-+#if (TERMCAP_BUFSIZE < 1024)
- if (i >= T_FEXTRA && i < T_BACKTAB) /* also skip extra vt220 keys */
- continue;
- if (i > T_BACKTAB && i < T_NAVIGATE) /* more vt220 keys */
diff --git a/patches/screen-4.8.0/0104-CVE-2021-26937.patch b/patches/screen-4.8.0/0104-CVE-2021-26937.patch
deleted file mode 100644
index 9f4e879af..000000000
--- a/patches/screen-4.8.0/0104-CVE-2021-26937.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Jan 2022 12:53:57 +0100
-Subject: [PATCH] CVE-2021-26937
-
-Imported from screen_4.8.0-7.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- encoding.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/encoding.c b/encoding.c
-index e5db3e708126..79f5d14024c4 100644
---- a/encoding.c
-+++ b/encoding.c
-@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *));
- # 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 @@ int c;
- {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 @@ int c;
- }
-
- 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 @@ struct mchar *mc;
- {
- /* 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 @@ struct mchar *mc;
- 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 */
diff --git a/patches/screen-4.8.0/autogen.sh b/patches/screen-4.8.0/autogen.sh
deleted file mode 100755
index 9e73c8d20..000000000
--- a/patches/screen-4.8.0/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-autoconf \
- --force \
- --warnings=cross \
- --warnings=syntax \
- --warnings=obsolete \
- --warnings=unsupported
-
diff --git a/patches/screen-4.8.0/series b/patches/screen-4.8.0/series
deleted file mode 100644
index c9b8d7197..000000000
--- a/patches/screen-4.8.0/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:buildroot --start-number 1
-0001-comm.h-now-depends-on-term.h.patch
-0002-comm.h-needed-for-list_-display-generic-.o.patch
-#tag:debian --start-number 100
-0100-suppress_remap.patch
-0101-fix_screen_utf8_nfd.patch
-0102-Expand-d_xtermosc-array-in-struct-display.patch
-0103-TERMCAP_BUF-is-used-in-place-of-TERMCAP_BUFSIZE.patch
-0104-CVE-2021-26937.patch
-# d92ac31ab347a013a74ca7f4001696ec - git-ptx-patches magic
diff --git a/patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch b/patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
similarity index 100%
rename from patches/screen-4.8.0/0001-comm.h-now-depends-on-term.h.patch
rename to patches/screen-4.9.0/0001-comm.h-now-depends-on-term.h.patch
diff --git a/patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch b/patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
similarity index 100%
rename from patches/screen-4.8.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
rename to patches/screen-4.9.0/0002-comm.h-needed-for-list_-display-generic-.o.patch
diff --git a/patches/screen-4.8.0/0100-suppress_remap.patch b/patches/screen-4.9.0/0003-suppress_remap.patch
similarity index 92%
rename from patches/screen-4.8.0/0100-suppress_remap.patch
rename to patches/screen-4.9.0/0003-suppress_remap.patch
index 7da242564..fda63e90c 100644
--- a/patches/screen-4.8.0/0100-suppress_remap.patch
+++ b/patches/screen-4.9.0/0003-suppress_remap.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
1 file changed, 2 deletions(-)
diff --git a/termcap.c b/termcap.c
-index 26cba62fd7c1..ed9e838c4c9d 100644
+index 26c8f5a96589..29684cf974f7 100644
--- a/termcap.c
+++ b/termcap.c
@@ -553,8 +553,6 @@ int map;
diff --git a/patches/screen-4.9.0/autogen.sh b/patches/screen-4.9.0/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/screen-4.9.0/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/screen-4.9.0/series b/patches/screen-4.9.0/series
new file mode 100644
index 000000000..bf7060df3
--- /dev/null
+++ b/patches/screen-4.9.0/series
@@ -0,0 +1,6 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-comm.h-now-depends-on-term.h.patch
+0002-comm.h-needed-for-list_-display-generic-.o.patch
+0003-suppress_remap.patch
+# 086ac9b43abed5bb61eef564f1ac00d9 - git-ptx-patches magic
diff --git a/rules/screen.make b/rules/screen.make
index 1087dfc9d..4f1994660 100644
--- a/rules/screen.make
+++ b/rules/screen.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SCREEN) += screen
#
# Paths and names
#
-SCREEN_VERSION := 4.8.0
-SCREEN_MD5 := d276213d3acd10339cd37848b8c4ab1e
+SCREEN_VERSION := 4.9.0
+SCREEN_MD5 := b1ef8ed89134d335e614016634982b6d
SCREEN := screen-$(SCREEN_VERSION)
SCREEN_SUFFIX := tar.gz
SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX))
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2022-02-05 23:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-05 23:07 [ptxdist] [PATCH] zstd: Version bump. 1.5.1 -> 1.5.2 Christian Melki
2022-02-05 23:07 ` [ptxdist] [PATCH] util-linux-ng: Version bump 2.37.2 -> 2.37.3 Christian Melki
2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-05 23:07 ` Christian Melki [this message]
2022-02-14 12:43 ` [ptxdist] [APPLIED] screen: Version bump. 4.8.0 -> 4.9.0 Michael Olbrich
2022-02-05 23:07 ` [ptxdist] [PATCH] qemu: Version bump. 6.1.0 -> 6.2.0 Christian Melki
2022-02-05 23:07 ` [ptxdist] [PATCH] pulseaudio: Version bump. 13.0 -> 1.5.0 Christian Melki
2022-02-07 5:56 ` Bruno Thomsen
2022-02-07 7:54 ` Michael Olbrich
2022-02-07 8:05 ` Christian Melki
2022-02-07 10:30 ` Christian Melki
2022-02-07 12:02 ` Michael Olbrich
2022-02-14 12:43 ` [ptxdist] [APPLIED] zstd: Version bump. 1.5.1 -> 1.5.2 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220205230718.2518022-3-christian.melki@t2data.com \
--to=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox