14 changed files with 125 additions and 421 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,45 +1 @@
-/xterm-346.tgz
-/xterm-348.tgz
-/xterm-349.tgz
-/xterm-350.tgz
-/xterm-351.tgz
-/xterm-353.tgz
-/xterm-354.tgz
-/xterm-356.tgz
-/xterm-357.tgz
-/xterm-358.tgz
-/xterm-359.tgz
-/xterm-360.tgz
-/xterm-361.tgz
-/xterm-362.tgz
-/xterm-363.tgz
-/xterm-364.tgz
-/xterm-366.tgz
-/xterm-367.tgz
-/xterm-368.tgz
-/xterm-369.tgz
-/xterm-370.tgz
-/xterm-371.tgz
-/xterm-372.tgz
-/xterm-373.tgz
-/xterm-374.tgz
-/xterm-375.tgz
-/xterm-377.tgz
-/xterm-378.tgz
-/xterm-379.tgz
-/xterm-380.tgz
-/xterm-381.tgz
-/dickey@invisible-island.net-rsa3072.asc
-/xterm-381.tgz.asc
-/xterm-382.tgz
-/xterm-382.tgz.asc
-/xterm-383.tgz
-/xterm-383.tgz.asc
-/xterm-384.tgz
-/xterm-384.tgz.asc
-/xterm-385.tgz
-/xterm-385.tgz.asc
-/xterm-388.tgz
-/xterm-388.tgz.asc
-/xterm-389.tgz
-/xterm-389.tgz.asc
+SOURCES/xterm-331.tgz
--- a/SOURCES/16colors.txt
+++ b/SOURCES/16colors.txt
--- a/SOURCES/xterm-CVE-2021-27135.patch
+++ b/SOURCES/xterm-CVE-2021-27135.patch
@ -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
--- a/SOURCES/xterm-desktop.patch
+++ b/SOURCES/xterm-desktop.patch
@ -1,8 +1,7 @@
-diff --git a/xterm.desktop b/xterm.desktop
-index b6b27d0..e9a2c6c 100644
--- a/xterm.desktop
-+++ b/xterm.desktop
-@@ -32,13 +32,13 @@
+diff -up xterm-323/xterm.desktop.desk xterm-323/xterm.desktop
+--- xterm-323/xterm.desktop.desk	2016-03-08 14:32:15.633422051 +0100
+++ xterm-323/xterm.desktop	2016-03-08 14:33:31.231604288 +0100
+@@ -32,12 +32,12 @@
 # -----------------------------------------------------------------------------
 [Desktop Entry]
 Name=XTerm
@ -17,4 +16,3 @@ index b6b27d0..e9a2c6c 100644
 +Icon=xterm-color
 Categories=System;TerminalEmulator;
 Keywords=shell;prompt;command;commandline;cmd;
- StartupWMClass=XTerm
--- a/SOURCES/xterm-man-paths.patch
+++ b/SOURCES/xterm-man-paths.patch
@ -1,10 +1,9 @@
-diff --git a/minstall.in b/minstall.in
-index ec3c936..e4f2911 100644
--- a/minstall.in
-+++ b/minstall.in
-@@ -109,6 +109,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
+diff -up xterm-328/minstall.in.man-paths xterm-328/minstall.in
+--- xterm-328/minstall.in.man-paths	2016-10-25 00:29:20.000000000 +0200
+++ xterm-328/minstall.in	2017-06-01 16:36:26.544065282 +0200
+@@ -138,6 +138,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^
 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
 +xorgcfgdir=/etc/X11
@ -12,23 +11,22 @@ index ec3c936..e4f2911 100644
 +X_MANSECT=7
 +
 sed	-e 's%__vendorversion__%"X Window System"%' \
- 	-e 's%__app_version__%Patch\ \#'"$PATCH_NUM"% \
- 	-e 's%__app_date__%'"$PATCH_YMD"% \
-@@ -135,6 +140,9 @@ sed	-e 's%__vendorversion__%"X Window System"%' \
- 	-e "s%__wtmp_name__%@WTMP_NAME@%g" \
- 	-e "s%__wtmp_path__%@WTMP_PATH@%g" \
+ 	-e 's%__app_version__%Patch\ \#'$PATCH_NUM% \
+ 	-e 's%__app_date__%'$PATCH_YMD% \
+@@ -163,6 +168,9 @@ sed	-e 's%__vendorversion__%"X Window Sy
+ 	-e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \
+ 	-e s%/etc/wtmp%$WTMP_PATH%g \
 	-e 's%/\\(\*\*%/*%g' \
-+	-e s%__fontpath__%$fontpath%g \
-+	-e s%__xorgcfgdir__%$xorgcfgdir%g \
-+	-e s%__xorgcfgfil__%$xorgcfgfil%g \
- 	"$OLD_FILE" >$NEW_FILE
+ 	-e s%__fontpath__%$fontpath%g \
+ 	-e s%__xorgcfgdir__%$xorgcfgdir%g \
+ 	-e s%__xorgcfgfil__%$xorgcfgfil%g \
+ 	$OLD_FILE >$NEW_FILE
 # diff -u $OLD_FILE $NEW_FILE
 
-diff --git a/xterm.man b/xterm.man
-index 1792099..9b63f79 100644
--- a/xterm.man
-+++ b/xterm.man
-@@ -2580,19 +2580,18 @@ Since X11R6, bitmap fonts have been scaled.
+diff -up xterm-328/xterm.man.man-paths xterm-328/xterm.man
+--- xterm-328/xterm.man.man-paths	2017-05-31 00:57:12.000000000 +0200
+++ xterm-328/xterm.man	2017-06-01 16:33:16.493512367 +0200
+@@ -2328,19 +2328,18 @@ Since X11R6, bitmap fonts have been scal
 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.
--- a/SOURCES/xterm-resources.patch
+++ b/SOURCES/xterm-resources.patch
@ -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
--- a/SPECS/xterm.spec
+++ b/SPECS/xterm.spec
@ -1,27 +1,25 @@
-
-%bcond_with trace
-
 Summary: Terminal emulator for the X Window System
 Name: xterm
-Version: 389
-Release: 4%{?dist}
+Version: 331
+Release: 2%{?dist}
 URL: https://invisible-island.net/xterm
-License: MIT AND X11 AND HPND AND CC-BY-4.0
-BuildRequires: make
+License: MIT
+Group: User Interface/X
 BuildRequires: gcc pkgconfig ncurses-devel libutempter-devel
 BuildRequires: libXft-devel libXaw-devel libXext-devel desktop-file-utils
-BuildRequires: libxkbfile-devel pcre2-devel pkgconfig(libpcre2-posix)
-BuildRequires: gnupg2
+BuildRequires: libxkbfile-devel xorg-x11-apps
+Requires: xterm-resize = %{version}-%{release}
 Recommends: xorg-x11-fonts-misc

-Source0: https://invisible-island.net/archives/xterm/%{name}-%{version}.tgz
-Source1: https://invisible-island.net/archives/xterm/%{name}-%{version}.tgz.asc
-Source2: https://invisible-island.net/public/dickey@invisible-island.net-rsa3072.asc
-Source3: https://invisible-island.net/archives/xterm/16colors.txt
+Source0: ftp://ftp.invisible-island.net/xterm/%{name}-%{version}.tgz
+Source1: ftp://ftp.invisible-island.net/xterm/16colors.txt

-Patch1: xterm-defaults.patch
+Patch1: xterm-resources.patch
 Patch2: xterm-desktop.patch
 Patch3: xterm-man-paths.patch
+Patch4: xterm-CVE-2021-27135.patch
+
+%bcond_with trace

 %global x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)

@ -38,12 +36,12 @@ 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
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %setup -q

-%patch 1 -p1 -b .defaults
-%patch 2 -p1 -b .desk
-%patch 3 -p1 -b .man-paths
+%patch1 -p1 -b .resources
+%patch2 -p1 -b .desk
+%patch3 -p1 -b .man-paths
+%patch4 -p1 -b .CVE-2021-27135

 for f in THANKS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@ -54,25 +52,26 @@ done
 %configure \
 	--enable-meta-sends-esc \
 	--disable-backarrow-key \
+	--enable-256-color \
 	--enable-exec-xterm \
+	--enable-luit \
 %{?with_trace: --enable-trace} \
 	--enable-warnings \
+	--enable-wide-chars \
 	--with-app-defaults=%{x11_app_defaults_dir} \
 	--with-icon-theme=hicolor \
 	--with-icondir=%{_datadir}/icons \
 	--with-utempter \
 	--with-tty-group=tty \
 	--disable-full-tgetent \
-	--with-pcre2 \
-	--enable-readline-mouse \
 	--enable-logging

-%make_build
+make %{?_smp_mflags}

 %install
-%make_install
+make DESTDIR=$RPM_BUILD_ROOT install

-cp -fp %{SOURCE3} 16colors.txt
+cp -fp %{SOURCE1} 16colors.txt

 desktop-file-install \
 %if 0%{?fedora} && 0%{?fedora} < 19
@ -94,7 +93,7 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 %{_mandir}/man1/xterm.1*
 %{_datadir}/appdata/xterm.appdata.xml
 %{_datadir}/applications/*xterm.desktop
-%{_datadir}/icons/hicolor/*/apps/*xterm*
+%{_datadir}/icons/hicolor/*/apps/xterm*
 %{_datadir}/pixmaps/*xterm*.xpm
 %{x11_app_defaults_dir}/KOI8RXTerm*
 %{x11_app_defaults_dir}/UXTerm*
@ -105,229 +104,17 @@ install -m644 -p xterm.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 %{_mandir}/man1/resize.1*

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 389-4
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Fri Mar 17 2023 Tomas Korbar <tkorbar@redhat.com> - 331-2
+- Enable logging support
+- Resolves: rhbz#2178912

-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 389-3
- Bump release for June 2024 mass rebuild
+* Fri Feb 12 2021 Tomas Korbar <tkorbar@redhat.com> - 331-1.2
+- Fix issue found by covcan
+- Related: rhbz#1927567

-* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 389-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 03 2024 Tomas Korbar <tkorbar@redhat.com> - 389-1
- Rebase to version 389
- Resolves: rhbz#2256390
-
-* Tue Nov 28 2023 Florian Weimer <fweimer@redhat.com> - 388-3
- Fix C compatibility issue in the configure script (#2251945)
-
-* Wed Nov 01 2023 Tomas Korbar <tkorbar@redhat.com> - 388-2
- Add licenses to fully conform to SPDX
-
-* Wed Oct 25 2023 Tomas Korbar <tkorbar@redhat.com> - 388-1
- Rebase to version 388
- Resolves: rhbz#2242865
-
-* Tue Oct 03 2023 Tomas Korbar <tkorbar@redhat.com> - 385-1
- Rebase to version 385
- Resolves: rhbz#2241681
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 384-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Tomas Korbar <tkorbar@redhat.com> - 384-1
- Rebase to version 384
- Resolves: rhbz#2221827
-
-* Fri Jul 07 2023 Tomas Korbar <tkorbar@redhat.com> - 383-1
- Rebase to version 383
- Resolves: rhbz#2218033
-
-* Wed May 31 2023 Tomas Korbar <tkorbar@redhat.com> - 382-1
- Rebase to version 382
- Resolves: rhbz#2211276
-
-* Mon May 29 2023 Tomas Korbar <tkorbar@redhat.com> - 381-1
- Rebase to version 381
- Resolves:rhbz#2210609
-
-* Tue May 16 2023 Tomas Korbar <tkorbar@redhat.com> - 380-1
- Rebase to version 380
- Resolves: rhbz#2204459
-
-* Thu Mar 16 2023 Tomas Korbar <tkorbar@redhat.com> - 379-2
- Enable logging feature
-
-* Sun Feb 19 2023 Tomas Korbar <tkorbar@redhat.com> - 379-1
- Rebase to version 379
- Resolves: rhbz#2170296
-
-* Wed Feb 08 2023 Tomas Korbar <tkorbar@redhat.com> - 378-3
- Enable readline-mouse configuration option
- Resolves: rhbz#2166860
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 378-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 12 2023 Tomas Korbar <tkorbar@redhat.com> - 378-1
- Rebase to version 378
- Resolves: rhbz#2159449
-
-* Thu Dec 08 2022 Tomas Korbar <tkorbar@redhat.com> - 377-1
- Rebase to version 377
- Remove unnecessary dependency on xterm-resize
- Resolves: rhbz#2143618
- Resolves: rhbz#2142751
-
-* Mon Oct 31 2022 Tomas Korbar <tkorbar@redhat.com> - 375-1
- Rebase to version 375
- Resolves: rhbz#2137784
-
-* Tue Oct 11 2022 Tomas Korbar <tkorbar@redhat.com> - 374-1
- Rebase to version 374
- Resolves: rhbz#2133585
-
-* Wed Oct 05 2022 Tomas Korbar <tkorbar@redhat.com> - 373-1
- Rebase to version 373
- Resolves: rhbz#2129661
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 372-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Apr 25 2022 Tomas Korbar <tkorbar@redhat.com> - 372-1
- Rebase to version 372
- Resolves: rhbz#2062511
-
-* Mon Feb 28 2022 Tomas Korbar <tkorbar@redhat.com> - 371-1
- Rebase to version 371
- Resolves: rhbz#2058442
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 370-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 07 2022 Thomas E. Dickey <dickey@invisible-island.net> - 370-2
- Trim configure options which are no longer necessary.
- Resolves: rhbz#2038247
-
-* Tue Nov 30 2021 Tomas Korbar <tkorbar@redhat.com> - 370-1
- Rebase to version 370
- Resolves: rhbz#2023017
-
-* Wed Sep 22 2021 Tomas Korbar <tkorbar@redhat.com> - 369-1
- Rebase to version 369
- Resolves: rhbz#2006589
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 368-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 14 2021 Petr Pisar <ppisar@redhat.com> - 368-2
- Rebuild against pcre2-10.37 (bug #1965025)
-
-* Tue Jun 08 2021 Tomas Korbar <tkorbar@redhat.com> - 368-1
- Rebase to version 368
- Resolves: rhbz#1969214
-
-* Fri May 21 2021 Joe Orton <jorton@redhat.com> - 367-3
- drop luit support
-
-* Mon May 17 2021 Peter Hutterer <peter.hutterer@redhat.com> 367-2
- Add luit to Requires
- Resolves: rhbz#1959210
-
-* Mon Apr 12 2021 Tomas Korbar <tkorbar@redhat.com> - 367-1
- Rebase to version 367
- Resolves: rhbz#1943741
-
-* 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
- Rebase to version 357 (#1853951)
-
-* 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
- change default termName to xterm-256color (#1577159)
-
-* Mon Apr 16 2018 Miroslav Lichvar <mlichvar@redhat.com> 332-1
- update to 332
+* 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
 - update to 331
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -1,25 +0,0 @@
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#Rawhide
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#gating rhel
--- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
--- a/plans.fmf
+++ b/plans.fmf
@ -1,36 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/xterm.git
-      name: /plans/tier1/internal
-
-/tier1-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/xterm.git
-      name: /plans/tier1/public
-
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/xterm.git
-      name: /plans/tier2-tier3/internal
-
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/xterm.git
-      name: /plans/tier2-tier3/public
-
-/others-internal:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/xterm.git
-      name: /plans/others/internal
-
-/others-public:
-  plan:
-    import:
-      url: https://src.fedoraproject.org/tests/xterm.git
-      name: /plans/others/public
-
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-SHA512 (xterm-389.tgz) = a87703692d621f38670c85be3495aa3840de5e53136dc7be01b3b7003add6109310cc583ac5f0ac1f67e588628336a4b48e947f8d1a326d33a804e2c164890fc
-SHA512 (xterm-389.tgz.asc) = a793f911ed2aea78cd7ab289af7f031054ea86a6d726f4cd4775c44b30e9cc6217adbcda49bd195aa04a5c22ccf9d1cdefd99fe3d0785c5e126a901b0399195e
-SHA512 (dickey@invisible-island.net-rsa3072.asc) = 19e19d3844b82d956ed01fc553bfbfcbd80f41a0ed2d51a2d0a6b9d2d5eede9482c9dba792f540c5cc386b8bf5d4a4a8da831edc42a2e50465fa42a3224b55af
--- a/xterm-configure-c99.patch
+++ b/xterm-configure-c99.patch
@ -1,24 +0,0 @@
-diff -ur xterm-388.orig/aclocal.m4 xterm-388/aclocal.m4
--- xterm-388.orig/aclocal.m4	2023-10-02 23:23:32.000000000 +0200
-+++ xterm-388/aclocal.m4	2023-11-28 15:32:31.790171161 +0100
-@@ -4759,7 +4759,7 @@
- 	int x = (XkbBI_Info |XkbBI_MinorError |XkbBI_MajorError |XkbBI_TerminalBell |XkbBI_MarginBell);
- 	Atom y = 0;
- 	(void)x;
-	XkbBell((Display *)0, (Widget)0, 0, y);
-+	XkbBell((Display *)0, (Window)0, 0, y);
- ],[cf_cv_xkb_bell_ext=yes],[cf_cv_xkb_bell_ext=no])
- ])
- test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT,1,[Define 1 if we have XKB Bell extension])
-diff -ur xterm-388.orig/configure xterm-388/configure
--- xterm-388.orig/configure	2023-10-08 23:26:36.000000000 +0200
-+++ xterm-388/configure	2023-11-28 15:32:53.598984387 +0100
-@@ -17023,7 +17023,7 @@
- 	int x = (XkbBI_Info |XkbBI_MinorError |XkbBI_MajorError |XkbBI_TerminalBell |XkbBI_MarginBell);
- 	Atom y = 0;
- 	(void)x;
-	XkbBell((Display *)0, (Widget)0, 0, y);
-+	XkbBell((Display *)0, (Window)0, 0, y);
- 
-   ;
-   return 0;
--- a/xterm-defaults.patch
+++ b/xterm-defaults.patch
@ -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