Upgrade xterm 372 -> 380 to address CVE-2022-45063 & CVE-2023-40359 (#6146)
- xterm: refresh patches - xterm: lint spec - xterm: prefer https instead of http - xterm: switch to %make_build Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
This commit is contained in:
Muhammad Falak R Wani
GitHub
Родитель
6d9a611aed
Коммит
2c710a1ee9
|
|
@ -1,4 +1,4 @@
|
|||
From dcfa97b04779f5680e7ad17dbe75020bb36de04f Mon Sep 17 00:00:00 2001
|
||||
From 6696712fa7336550c8740be3d8947c993cea16e0 Mon Sep 17 00:00:00 2001
|
||||
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
||||
Date: Fri, 12 Aug 2022 07:27:06 +0530
|
||||
Subject: [PATCH 1/3] xterm defaults
|
||||
|
|
@ -25,5 +25,5 @@ index 6d347a1..e4b1828 100644
|
|||
+*VT100*utf8Title: true
|
||||
+*termName: xterm-256color
|
||||
--
|
||||
2.37.1
|
||||
2.40.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 67509cf49144a602430d0ee0918770919616f461 Mon Sep 17 00:00:00 2001
|
||||
From bcec1be9a45ae1c319c2bca9d5093c05db6be717 Mon Sep 17 00:00:00 2001
|
||||
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
||||
Date: Fri, 12 Aug 2022 07:29:12 +0530
|
||||
Subject: [PATCH 2/3] xterm desktop
|
||||
|
|
@ -9,10 +9,10 @@ Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xterm.desktop b/xterm.desktop
|
||||
index 61dcd2c..401b03a 100644
|
||||
index b6b27d0..e9a2c6c 100644
|
||||
--- a/xterm.desktop
|
||||
+++ b/xterm.desktop
|
||||
@@ -32,12 +32,12 @@
|
||||
@@ -32,13 +32,13 @@
|
||||
# -----------------------------------------------------------------------------
|
||||
[Desktop Entry]
|
||||
Name=XTerm
|
||||
|
|
@ -27,6 +27,7 @@ index 61dcd2c..401b03a 100644
|
|||
+Icon=xterm-color
|
||||
Categories=System;TerminalEmulator;
|
||||
Keywords=shell;prompt;command;commandline;cmd;
|
||||
StartupWMClass=XTerm
|
||||
--
|
||||
2.37.1
|
||||
2.40.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From bd87b44049dd383d6139b2b756dbfc3167ad4937 Mon Sep 17 00:00:00 2001
|
||||
From 43040291be2f48d6b2aae015592266c0b1dbd59e Mon Sep 17 00:00:00 2001
|
||||
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
||||
Date: Fri, 12 Aug 2022 07:34:42 +0530
|
||||
Subject: [PATCH 3/3] xterm man paths
|
||||
|
|
@ -10,7 +10,7 @@ Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
|
|||
2 files changed, 11 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/minstall.in b/minstall.in
|
||||
index cd15775..0228db7 100644
|
||||
index fe2c610..03b00b3 100644
|
||||
--- a/minstall.in
|
||||
+++ b/minstall.in
|
||||
@@ -141,6 +141,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
|
||||
|
|
@ -36,10 +36,10 @@ index cd15775..0228db7 100644
|
|||
"$OLD_FILE" >$NEW_FILE
|
||||
# diff -u $OLD_FILE $NEW_FILE
|
||||
diff --git a/xterm.man b/xterm.man
|
||||
index f5f510f..fdc4990 100644
|
||||
index f8270fd..51867fa 100644
|
||||
--- a/xterm.man
|
||||
+++ b/xterm.man
|
||||
@@ -2551,19 +2551,18 @@ Since X11R6, bitmap fonts have been scaled.
|
||||
@@ -2572,19 +2572,18 @@ Since X11R6, bitmap fonts have been scaled.
|
||||
The font server claims to provide the bold font that \fI\*n\fP requests,
|
||||
but the result is not always readable.
|
||||
XFree86 introduced a feature which can be used to suppress the scaling.
|
||||
|
|
@ -63,5 +63,5 @@ index f5f510f..fdc4990 100644
|
|||
.IP
|
||||
Depending on your configuration, the font server may have its own configuration
|
||||
--
|
||||
2.37.1
|
||||
2.40.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"16colors.txt": "a2342029672532256110ef28a0ea1addb7f6fd1f08aacc382d0fbe2308f178c2",
|
||||
"xterm-372.tgz": "c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1"
|
||||
"xterm-380.tar.gz": "a46c2799ee2897006f3a01cd80416cca7a3942503a8975f51a281a9f5627da21"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +1,30 @@
|
|||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
%bcond_with trace
|
||||
%global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
|
||||
|
||||
Summary: Terminal emulator for the X Window System
|
||||
Name: xterm
|
||||
Version: 372
|
||||
Version: 380
|
||||
Release: 1%{?dist}
|
||||
URL: https://invisible-island.net/xterm
|
||||
License: MIT
|
||||
BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel
|
||||
BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils
|
||||
BuildRequires: libxkbfile-devel xorg-x11-apps
|
||||
Requires: xterm-resize = %{version}-%{release}
|
||||
Recommends: xorg-x11-fonts-misc
|
||||
|
||||
Source0: http://ftp.invisible-island.net/archives/xterm/%{name}-%{version}.tgz
|
||||
Source1: http://ftp.invisible-island.net/archives/xterm/16colors.txt
|
||||
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
URL: https://invisible-island.net/xterm
|
||||
Source0: https://github.com/ThomasDickey/xterm-snapshots/archive/refs/tags/%{name}-%{version}.tar.gz
|
||||
Source1: https://ftp.invisible-island.net/archives/xterm/16colors.txt
|
||||
Patch1: xterm-defaults.patch
|
||||
Patch2: xterm-desktop.patch
|
||||
Patch3: xterm-man-paths.patch
|
||||
|
||||
%bcond_with trace
|
||||
|
||||
%global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libXaw-devel
|
||||
BuildRequires: libXext-devel
|
||||
BuildRequires: libXft-devel
|
||||
BuildRequires: libutempter-devel
|
||||
BuildRequires: libxkbfile-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-apps
|
||||
Requires: xterm-resize = %{version}-%{release}
|
||||
|
||||
%description
|
||||
The xterm program is a terminal emulator for the X Window System. It
|
||||
|
|
@ -29,18 +32,14 @@ provides DEC VT102 and Tektronix 4014 compatible terminals for
|
|||
programs that can't use the window system directly.
|
||||
|
||||
%package resize
|
||||
Summary: Set environment and terminal settings to current window size
|
||||
Summary: Set environment and terminal settings to current window size
|
||||
|
||||
%description resize
|
||||
Prints a shell command for setting the appropriate environment variables to
|
||||
indicate the current size of the window from which the command is run.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1 -b .defaults
|
||||
%patch2 -p1 -b .desk
|
||||
%patch3 -p1 -b .man-paths
|
||||
%autosetup -n %{name}-snapshots-%{name}-%{version} -p1
|
||||
|
||||
for f in THANKS; do
|
||||
iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
|
||||
|
|
@ -65,10 +64,10 @@ done
|
|||
--disable-full-tgetent \
|
||||
--enable-sixel-graphics
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
make DESTDIR=%{buildroot} install
|
||||
|
||||
cp -fp %{SOURCE1} 16colors.txt
|
||||
|
||||
|
|
@ -76,11 +75,11 @@ desktop-file-install \
|
|||
%if 0%{?fedora} && 0%{?fedora} < 19
|
||||
--vendor=fedora \
|
||||
%endif
|
||||
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
|
||||
--dir=%{buildroot}%{_datadir}/applications \
|
||||
xterm.desktop
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
|
||||
install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
|
||||
mkdir -p %{buildroot}%{_datadir}/appdata
|
||||
install -m644 -p xterm.appdata.xml %{buildroot}%{_datadir}/appdata
|
||||
|
||||
%files
|
||||
%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n THANKS
|
||||
|
|
@ -103,6 +102,13 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
|
|||
%{_mandir}/man1/resize.1*
|
||||
|
||||
%changelog
|
||||
* Fri Aug 12 2022 Muhammad Falak <mwani@microsoft.com> - 380-1
|
||||
- Bump version to address CVE-2022-45063 & CVE-2023-40359
|
||||
- Refresh all patches to apply cleanly
|
||||
- Use https instead of http for urls
|
||||
- Switch to autosetup
|
||||
- Switch to %make_build
|
||||
|
||||
* Fri Aug 12 2022 Muhammad Falak <mwani@microsoft.com> - 372-1
|
||||
- Bump version to address CVE-2021-27135
|
||||
- Refresh all patches to apply cleanly
|
||||
|
|
@ -548,18 +554,18 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
|
|||
- Upgrade to upstream version 213 (fixes bug 192627)
|
||||
- fix bug 189161 : make -r/-rv do reverseVideo with or without
|
||||
xterm*{fore,back}ground set
|
||||
|
||||
|
||||
* Thu Apr 13 2006 Jason Vas Dias <jvdias@redhat.com> - 212-1
|
||||
- Upgrade to upstream version 212
|
||||
- fix bug 188031 : paths in man-page
|
||||
|
||||
|
||||
* Wed Mar 29 2006 Jason Vas Dias <jvdias@redhat.com> - 211-4
|
||||
- fix bug 186935: cursor GCs must be freed with XtReleaseGC
|
||||
|
||||
* Tue Mar 21 2006 Jason Vas Dias <jvdias@redhat.com> - 211-1
|
||||
- Upgrade to upstream version 211 (fixes bug 186094).
|
||||
- Enable new 'utf8Title' resource by default
|
||||
|
||||
|
||||
* Tue Mar 07 2006 Jason Vas Dias <jvdias@redhat.com> - 209-4
|
||||
- fix bug 183993: call set_cursor_gcs in ReverseVideo
|
||||
|
||||
|
|
@ -612,17 +618,17 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
|
|||
* Wed Oct 12 2005 Jason Vas Dias <jvdias@redhat.com> 205-1
|
||||
- Upgrade to upstream version 205
|
||||
fixes bugs: 124421, 129146, 159562, 161894, 169347
|
||||
|
||||
|
||||
* Sat Sep 24 2005 Mike A. Harris <mharris@redhat.com> 200-10
|
||||
- Updated xterm-resources-redhat.patch to add "xterm*ttyModes: erase ^?"
|
||||
resource to fix bug (#155538,160354,163812,162549)
|
||||
|
||||
|
||||
* Wed Sep 14 2005 Mike A. Harris <mharris@redhat.com> 200-9
|
||||
- Updated xterm-resources-redhat.patch to remove utf8 resource which was
|
||||
added in the 200-7 build, as it was incorrectly set to 'true' instead
|
||||
of '1', and bug #138681 turned out to be a gdm bug instead of an xterm
|
||||
bug. This fixes bug (#163568).
|
||||
|
||||
|
||||
* Mon Aug 29 2005 Mike A. Harris <mharris@redhat.com> 200-8
|
||||
- Added --disable-tek4014 to ./configure flags, to disable tek support
|
||||
for bug (#164210)
|
||||
|
|
@ -663,7 +669,7 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
|
|||
it no longer applies cleanly. Hopefully we can just ship stock xterm
|
||||
resources now, although I realize that is more likely to be a pie in the
|
||||
sky fantasy once the bug reports trickle in from this change. ;o)
|
||||
|
||||
|
||||
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 179-8
|
||||
- rebuilt
|
||||
|
||||
|
|
|
|||
|
|
@ -30507,8 +30507,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "xterm",
|
||||
"version": "372",
|
||||
"downloadUrl": "http://ftp.invisible-island.net/archives/xterm/xterm-372.tgz"
|
||||
"version": "380",
|
||||
"downloadUrl": "https://github.com/ThomasDickey/xterm-snapshots/archive/refs/tags/xterm-380.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче