Merge branch 'main' into 2.0

Author: jslobodzian

SPECS-EXTENDED/screen/screen-4.8.0-expand-d_xtermosc.patch

@@ -0,0 +1,37 @@
+From a96e68a70e362597c2ab49d3f9a60f4586a1ae5b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=A1clav=20Dole=C5=BEal?= <[email protected]>
+Date: Fri, 21 Feb 2020 13:49:08 +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 <[email protected]>
+---
+ display.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/display.h b/display.h
+index 459cc5d..4fc2061 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 */
+-- 
+2.20.1
+

SPECS-EXTENDED/screen/screen.signatures.json

@@ -1,6 +1,6 @@
 {
-  "Signatures": {
-    "screen.pam": "0efded3536f5803b583f9101ced3d5e9987476c0cb3596fe19d8c8084553ba3f",
-    "screen-4.9.0.tar.gz": "f9335281bb4d1538ed078df78a20c2f39d3af9a4e91c57d084271e0289c730f4"
-  }
+ "Signatures": {
+  "screen-4.8.0.tar.gz": "6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1",
+  "screen.pam": "0efded3536f5803b583f9101ced3d5e9987476c0cb3596fe19d8c8084553ba3f"
+ }
 }

SPECS-EXTENDED/screen/screen.spec

@@ -5,8 +5,8 @@ Distribution:   Mariner
 
 Summary:        A screen manager that supports multiple logins on one terminal
 Name:           screen
-Version:        4.9.0
-Release:        1%{?dist}
+Version:        4.8.0
+Release:        4%{?dist}
 License:        GPLv3+
 URL:            http://www.gnu.org/software/screen
 Requires(pre):  /usr/sbin/groupadd
@@ -23,6 +23,7 @@ Patch2:         screen-4.3.1-screenrc.patch
 Patch3:         screen-E3.patch
 Patch4:         screen-4.3.1-suppress_remap.patch
 Patch5:         screen-4.3.1-crypt.patch
+Patch6:         screen-4.8.0-expand-d_xtermosc.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -116,9 +117,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %endif
 
 %changelog
-* Wed Nov 09 2022 CBL-Mariner Servicing Account <[email protected]> - 4.9.0-1
-- Auto-upgrade to 4.9.0 - CVE-2021-26937
-
 * Tue Mar 15 2022 Pawel Winogrodzki <[email protected]> - 4.8.0-4
 - Using "autoreconf -i" to fix build issues.
 - License verified.

cgmanifest.json

@@ -25035,8 +25035,8 @@
         "type": "other",
         "other": {
           "name": "screen",
-          "version": "4.9.0",
-          "downloadUrl": "https://ftp.gnu.org/gnu/screen/screen-4.9.0.tar.gz"
+          "version": "4.8.0",
+          "downloadUrl": "https://ftp.gnu.org/gnu/screen/screen-4.8.0.tar.gz"
         }
       }
     },
@@ -28257,4 +28257,4 @@
     }
   ],
   "Version": 1
-}
+}