Compare commits
No commits in common. "c8" and "c8s" have entirely different histories.
|
@ -0,0 +1 @@
|
||||||
|
ad8325e4a23cc32be0933b2f38ae11f96797b12a SOURCES/xterm-331.tgz
|
|
@ -1,56 +0,0 @@
|
||||||
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
|
|
|
@ -1,7 +1,7 @@
|
||||||
Summary: Terminal emulator for the X Window System
|
Summary: Terminal emulator for the X Window System
|
||||||
Name: xterm
|
Name: xterm
|
||||||
Version: 331
|
Version: 331
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
URL: https://invisible-island.net/xterm
|
URL: https://invisible-island.net/xterm
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
|
@ -17,7 +17,6 @@ Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt
|
||||||
Patch1: xterm-resources.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
|
||||||
|
|
||||||
|
@ -41,7 +40,6 @@ indicate the current size of the window from which the command is run.
|
||||||
%patch1 -p1 -b .resources
|
%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}{_,} &&
|
||||||
|
@ -63,8 +61,7 @@ done
|
||||||
--with-icondir=%{_datadir}/icons \
|
--with-icondir=%{_datadir}/icons \
|
||||||
--with-utempter \
|
--with-utempter \
|
||||||
--with-tty-group=tty \
|
--with-tty-group=tty \
|
||||||
--disable-full-tgetent \
|
--disable-full-tgetent
|
||||||
--enable-logging
|
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
@ -104,18 +101,6 @@ 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> - 331-2
|
|
||||||
- Enable logging support
|
|
||||||
- Resolves: rhbz#2178912
|
|
||||||
|
|
||||||
* Fri Feb 12 2021 Tomas Korbar <tkorbar@redhat.com> - 331-1.2
|
|
||||||
- Fix issue found by covcan
|
|
||||||
- Related: rhbz#1927567
|
|
||||||
|
|
||||||
* Thu Feb 11 2021 Tomas Korbar <tkorbar@redhat.com> - 331-1.1
|
|
||||||
- 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
|
||||||
- add gcc to build requirements
|
- add gcc to build requirements
|
||||||
|
|
Loading…
Reference in New Issue