rpms
/
xterm
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rpms:c9
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
rpms:i9c-beta
rpms:c9-beta
..
compare: rpms:i8c
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
rpms:i9c-beta
rpms:c9-beta

No commits in common. 'c9' and 'i8c' have entirely different histories.
c9 ... i8c

7 changed files with 113 additions and 162 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/xterm-366.tgz SOURCES/xterm-331.tgz

2
.xterm.metadata
Unescape View File

@ -1 +1 @@
1ec2fc8b5ee63d5a0d1c69cf7898624f280f6342 SOURCES/xterm-366.tgz ad8325e4a23cc32be0933b2f38ae11f96797b12a SOURCES/xterm-331.tgz

56
SOURCES/xterm-CVE-2021-27135.patch
Unescape View File

@ -0,0 +1,56 @@
diff --git a/button.c b/button.c
index ac1f742..4e8554d 100644
--- a/button.c
+++ b/button.c
@@ -3802,6 +3802,7 @@ SaltTextAway(XtermWidget xw,
TScreen *screen = TScreenOf(xw);
int i, j = 0;
int eol;
+ size_t have = 0;
Char *line;
Char *lp;
CELL first = *cellc;
@@ -3827,7 +3828,11 @@ SaltTextAway(XtermWidget xw,
/* UTF-8 may require more space */
if_OPT_WIDE_CHARS(screen, {
- j *= 4;
+ if (j > 0) {
+ if (screen->max_combining > 0)
+ j += screen->max_combining;
+ j *= 6;
+ }
});
/* now get some memory to save it in */
@@ -3864,10 +3869,27 @@ SaltTextAway(XtermWidget xw,
}
*lp = '\0'; /* make sure we have end marked */
- TRACE(("Salted TEXT:%d:%s\n", (int) (lp - line),
- visibleChars(line, (unsigned) (lp - line))));
+ have = (size_t) (lp - line);
+ /*
+ * Scanning the buffer twice is unnecessary. Discard unwanted memory if
+ * the estimate is too-far off.
+ */
+ if ((have * 2) < (size_t) j) {
+ Char *next;
+ screen->selection_size = have + 1;
+ next = realloc(line, screen->selection_size);
+ if (next == NULL) {
+ free(line);
+ screen->selection_length = 0;
+ screen->selection_size = 0;
+ }
+ screen->selection_data = next;
+ }
+
+ screen->selection_length = have;
- screen->selection_length = (unsigned long) (lp - line);
+ TRACE(("Salted TEXT:%u:%s\n", (unsigned) have,
+ visibleChars(screen->selection_data, (unsigned) have)));
}
#if OPT_PASTE64

15
SOURCES/xterm-defaults.patch
Unescape View File

@ -1,15 +0,0 @@
diff -up xterm-333/XTerm.ad.defaults xterm-333/XTerm.ad
--- xterm-333/XTerm.ad.defaults 2016-12-22 03:07:39.000000000 +0100
+++ xterm-333/XTerm.ad 2018-05-30 15:44:53.325426803 +0200
@@ -259,3 +259,11 @@
!*allowTcapOps: false
!*allowTitleOps: false
!*allowWindowOps: false
+
+! Red Hat Defaults:
+*allowFontOps: false
+*allowTcapOps: false
+*VT100*eightBitInput: false
+*VT100*scrollBar: true
+*VT100*utf8Title: true
+*termName: xterm-256color

32
SOURCES/xterm-man-paths.patch
Unescape View File

@ -1,10 +1,9 @@
diff --git a/minstall.in b/minstall.in diff -up xterm-328/minstall.in.man-paths xterm-328/minstall.in
index cd15775..a4b39a9 100644 --- xterm-328/minstall.in.man-paths 2016-10-25 00:29:20.000000000 +0200
--- a/minstall.in +++ xterm-328/minstall.in 2017-06-01 16:36:26.544065282 +0200
+++ b/minstall.in @@ -138,6 +138,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^
@@ -141,6 +141,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
USE_Name=${USE_chr0}${USE_chr1} USE_Name=${USE_chr0}${USE_chr1}
USE_NAME=`echo "$USE_name" | tr "$lower" "$upper"` USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'`
+fontpath=/usr/share/X11/fonts +fontpath=/usr/share/X11/fonts
+xorgcfgdir=/etc/X11 +xorgcfgdir=/etc/X11
@ -12,23 +11,22 @@ index cd15775..a4b39a9 100644
+X_MANSECT=7 +X_MANSECT=7
+ +
sed -e 's%__vendorversion__%"X Window System"%' \ sed -e 's%__vendorversion__%"X Window System"%' \
-e 's%__app_version__%Patch\ \#'"$PATCH_NUM"% \ -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \
-e 's%__app_date__%'"$PATCH_YMD"% \ -e 's%__app_date__%'$PATCH_YMD% \
@@ -167,6 +172,9 @@ sed -e 's%__vendorversion__%"X Window System"%' \ @@ -163,6 +168,9 @@ sed -e 's%__vendorversion__%"X Window Sy
-e 's%fIwtmp\\%fI'$WTMP_NAME'\\%g' \ -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
-e "s%/etc/wtmp%$WTMP_PATH%g" \ -e s%/etc/wtmp%$WTMP_PATH%g \
-e 's%/\\(\*\*%/*%g' \ -e 's%/\\(\*\*%/*%g' \
+ -e s%__fontpath__%$fontpath%g \ + -e s%__fontpath__%$fontpath%g \
+ -e s%__xorgcfgdir__%$xorgcfgdir%g \ + -e s%__xorgcfgdir__%$xorgcfgdir%g \
+ -e s%__xorgcfgfil__%$xorgcfgfil%g \ + -e s%__xorgcfgfil__%$xorgcfgfil%g \
"$OLD_FILE" >$NEW_FILE $OLD_FILE >$NEW_FILE
# diff -u $OLD_FILE $NEW_FILE # diff -u $OLD_FILE $NEW_FILE
diff --git a/xterm.man b/xterm.man diff -up xterm-328/xterm.man.man-paths xterm-328/xterm.man
index 14d97b8..bc76923 100644 --- xterm-328/xterm.man.man-paths 2017-05-31 00:57:12.000000000 +0200
--- a/xterm.man +++ xterm-328/xterm.man 2017-06-01 16:33:16.493512367 +0200
+++ b/xterm.man @@ -2328,19 +2328,18 @@ Since X11R6, bitmap fonts have been scal
@@ -2512,19 +2512,18 @@ Since X11R6, bitmap fonts have been scaled.
The font server claims to provide the bold font that \fI\*n\fP requests, The font server claims to provide the bold font that \fI\*n\fP requests,
but the result is not always readable. but the result is not always readable.
XFree86 introduced a feature which can be used to suppress the scaling. XFree86 introduced a feature which can be used to suppress the scaling.

14
SOURCES/xterm-resources.patch
Unescape View File

@ -0,0 +1,14 @@
diff -up xterm-284/XTerm.ad.resources xterm-284/XTerm.ad
--- xterm-284/XTerm.ad.resources 2011-07-11 12:52:16.000000000 +0200
+++ xterm-284/XTerm.ad 2012-10-15 12:25:24.390541803 +0200
@@ -254,3 +254,10 @@
!*allowTcapOps: false
!*allowTitleOps: false
!*allowWindowOps: false
+
+! Red Hat Defaults:
+*allowFontOps: false
+*allowTcapOps: false
+*VT100*eightBitInput: false
+*VT100*scrollBar: true
+*VT100*utf8Title: true

148
SPECS/xterm.spec
Unescape View File

@ -1,22 +1,23 @@
Summary: Terminal emulator for the X Window System Summary: Terminal emulator for the X Window System
Name: xterm Name: xterm
Version: 366 Version: 331
Release: 9%{?dist} Release: 2%{?dist}
URL: https://invisible-island.net/xterm URL: https://invisible-island.net/xterm
License: MIT License: MIT
BuildRequires: make Group: User Interface/X
BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel
BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils
BuildRequires: libxkbfile-devel pcre2-devel pkgconfig(libpcre2-posix) BuildRequires: libxkbfile-devel xorg-x11-apps
Requires: xterm-resize = %{version}-%{release} Requires: xterm-resize = %{version}-%{release}
Recommends: xorg-x11-fonts-misc Recommends: xorg-x11-fonts-misc
Source0: ftp://ftp.invisible-island.net/xterm/%{name}-%{version}.tgz Source0: ftp://ftp.invisible-island.net/xterm/%{name}-%{version}.tgz
Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt
Patch1: xterm-defaults.patch Patch1: xterm-resources.patch
Patch2: xterm-desktop.patch Patch2: xterm-desktop.patch
Patch3: xterm-man-paths.patch Patch3: xterm-man-paths.patch
Patch4: xterm-CVE-2021-27135.patch
%bcond_with trace %bcond_with trace
@ -37,9 +38,10 @@ indicate the current size of the window from which the command is run.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .defaults %patch1 -p1 -b .resources
%patch2 -p1 -b .desk %patch2 -p1 -b .desk
%patch3 -p1 -b .man-paths %patch3 -p1 -b .man-paths
%patch4 -p1 -b .CVE-2021-27135
for f in THANKS; do for f in THANKS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} && iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@ -52,6 +54,7 @@ done
--disable-backarrow-key \ --disable-backarrow-key \
--enable-256-color \ --enable-256-color \
--enable-exec-xterm \ --enable-exec-xterm \
--enable-luit \
%{?with_trace: --enable-trace} \ %{?with_trace: --enable-trace} \
--enable-warnings \ --enable-warnings \
--enable-wide-chars \ --enable-wide-chars \
@ -61,13 +64,12 @@ done
--with-utempter \ --with-utempter \
--with-tty-group=tty \ --with-tty-group=tty \
--disable-full-tgetent \ --disable-full-tgetent \
--with-pcre2 \
--enable-logging --enable-logging
%make_build make %{?_smp_mflags}
%install %install
%make_install make DESTDIR=$RPM_BUILD_ROOT install
cp -fp %{SOURCE1} 16colors.txt cp -fp %{SOURCE1} 16colors.txt
@ -91,7 +93,7 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
%{_mandir}/man1/xterm.1* %{_mandir}/man1/xterm.1*
%{_datadir}/appdata/xterm.appdata.xml %{_datadir}/appdata/xterm.appdata.xml
%{_datadir}/applications/*xterm.desktop %{_datadir}/applications/*xterm.desktop
%{_datadir}/icons/hicolor/*/apps/*xterm* %{_datadir}/icons/hicolor/*/apps/xterm*
%{_datadir}/pixmaps/*xterm*.xpm %{_datadir}/pixmaps/*xterm*.xpm
%{x11_app_defaults_dir}/KOI8RXTerm* %{x11_app_defaults_dir}/KOI8RXTerm*
%{x11_app_defaults_dir}/UXTerm* %{x11_app_defaults_dir}/UXTerm*
@ -102,124 +104,20 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
%{_mandir}/man1/resize.1* %{_mandir}/man1/resize.1*
%changelog %changelog
* Fri Mar 17 2023 Tomas Korbar <tkorbar@redhat.com> - 366-9 * Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 331-2
- Enable logging support - Rebuilt for MSVSphere 8.8
- Resolves: rhbz#2179054
* Tue Feb 08 2022 Tomas Korbar <tkorbar@redhat.com> - 366-8
- disable sixel support
- Resolves: CVE-2022-24130
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu 05 Aug 2021 Lukas Javorsky <ljavorsk@redhat.com> - 366-6
- Second rebuild against pcre2-10.37 (bug #1970765)
* Thu Aug 05 2021 Tomas Korbar <tkorbar@redhat.com> - 366-5
- Rebuild because of missing gating configuration
- Related: rhbz#1970765
* Wed Jul 28 2021 Lukas Javorsky <ljavorsk@redhat.com> - 366-4
- Rebuild against pcre2-10.37 (bug #1970765)
* Tue Jun 01 2021 Tomas Korbar <tkorbar@redhat.com> - 366-3
- Drop luit support
- Resolves: rhbz#1959213
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 366-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Feb 11 2021 Tomas Korbar <tkorbar@redhat.com> - 366-1
- Rebase to version 366
- Resolves: rhbz#1927543
* Wed Feb 03 2021 Tomas Korbar <tkorbar@redhat.com> - 364-1
- Rebase to version 364 (#1924362)
- Build with pcre2 support (#1909609)
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 363-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 19 2021 Tomas Korbar <tkorbar@redhat.com> - 363-1
- Rebase to version 363 (#1910995)
- Build with pcre2 support (#1909609)
* Fri Nov 13 2020 Tomas Korbar <tkorbar@redhat.com> - 362-1
- Rebase to version 362 (#1896986)
* Thu Oct 22 2020 Tomas Korbar <tkorbar@redhat.com> - 361-1
- Rebase to version 361 (#1888488)
* Mon Sep 21 2020 Tomas Korbar <tkorbar@redhat.com> - 360-1
- Rebase to version 360 (#1880883)
* Tue Aug 18 2020 Tomas Korbar <tkorbar@redhat.com> - 359-1
- Rebase to version 359 (#1869418)
* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 358-2
- BuildRequires luit, not xorg-x11-apps
* Mon Jul 13 2020 Tomas Korbar <tkorbar@redhat.com> - 358-1
- Rebase to version 358 (#1856126)
* Mon Jul 06 2020 Tomas Korbar <tkorbar@redhat.com> - 357-1 * Fri Mar 17 2023 Tomas Korbar <tkorbar@redhat.com> - 331-2
- Rebase to version 357 (#1853951) - Enable logging support
- Resolves: rhbz#2178912
* Sun May 03 2020 Tomas Korbar <tkorbar@redhat.com> - 356-1
- Rebase to version 356 (#1830237)
* Wed Apr 29 2020 Tomas Korbar <tkorbar@redhat.com> - 354-1
- Rebase to version 354 (#1828107)
* Mon Feb 24 2020 Tomas Korbar <tkorbar@redhat.com> - 353-1
- Rebase to version 353 (#1792091)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 351-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Nov 25 2019 Tomas Korbar <tkorbar@redhat.com> - 351-1
- update to 351
* Tue Nov 12 2019 Tomas Korbar <tkorbar@redhat.com> - 350-1
- update to 350
* Tue Oct 29 2019 Tomas Korbar <tkorbar@redhat.com> - 349-2
- enable sixel graphics (#1763712)
* Tue Sep 24 2019 Tomas Korbar <tkorbar@redhat.com> - 349-1
- update to 349
* Mon Aug 26 2019 Tomas Korbar <tkorbar@redhat.com> - 348-1
- update to 348
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 346-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue May 28 2019 Miroslav Lichvar <mlichvar@redhat.com> 346-1
- update to 346
* Tue May 14 2019 Miroslav Lichvar <mlichvar@redhat.com> 345-1
- update to 345
* Tue Feb 26 2019 Miroslav Lichvar <mlichvar@redhat.com> 344-1
- update to 344
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 334-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Aug 13 2018 Miroslav Lichvar <mlichvar@redhat.com> 334-1
- update to 334
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 333-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed May 30 2018 Miroslav Lichvar <mlichvar@redhat.com> 333-2 * Fri Feb 12 2021 Tomas Korbar <tkorbar@redhat.com> - 331-1.2
- change default termName to xterm-256color (#1577159) - Fix issue found by covcan
- Related: rhbz#1927567
* Mon Apr 16 2018 Miroslav Lichvar <mlichvar@redhat.com> 332-1 * Thu Feb 11 2021 Tomas Korbar <tkorbar@redhat.com> - 331-1.1
- update to 332 - Backport security fix for CVE-2021-27135
- Resolves: rhbz#1927567
* Thu Mar 29 2018 Miroslav Lichvar <mlichvar@redhat.com> 331-1 * Thu Mar 29 2018 Miroslav Lichvar <mlichvar@redhat.com> 331-1
- update to 331 - update to 331

Write Preview
Loading…
Cancel
Save