From 711b5e29b9a1e65610a6ac243c55e058e27a03e5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 07:09:20 +0200 Subject: Merging debian version 2:8.1.0875-5+deb10u5. Signed-off-by: Daniel Baumann --- debian/patches/CVE-2022-0696.patch | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'debian/patches/CVE-2022-0696.patch') diff --git a/debian/patches/CVE-2022-0696.patch b/debian/patches/CVE-2022-0696.patch index 0e1491e..95ee4cd 100644 --- a/debian/patches/CVE-2022-0696.patch +++ b/debian/patches/CVE-2022-0696.patch @@ -18,21 +18,17 @@ Backport: Since the old version dosn't do command line completion correctly, those parts are dropped and we only forbid switching the tab page. -diff --git a/src/version.c b/src/version.c -index c5f5c22f90ac..777476d80dce 100644 --- a/src/version.c +++ b/src/version.c -@@ -795,6 +795,8 @@ static char *(features[]) = - 805, +@@ -796,6 +796,8 @@ static int included_patches[] = /**/ 5024, -+/**/ -+ 4428, /**/ ++ 4428, ++/**/ 4397, /**/ -diff --git a/src/window.c b/src/window.c -index 1f5e7096047c..b00ed977fc04 100644 + 4218, --- a/src/window.c +++ b/src/window.c @@ -3656,6 +3656,14 @@ win_new_tabpage(int after) -- cgit v1.2.3