From e1e340f25a0b0b9d83530a3984247a030b11055a Mon Sep 17 00:00:00 2001 From: guibuilder_pel7x64builder0 Date: Mon, 1 Nov 2021 23:35:24 +0100 Subject: [PATCH] mrxvt package creation Signed-off-by: guibuilder_pel7x64builder0 --- SOURCES/mrxvt-0.5.3-CVE-2021-33477.patch | 17 ++ SOURCES/mrxvt-0.5.3-gcc10-fno-common.patch | 20 ++ SOURCES/mrxvt.desktop | 9 + .../no-scroll-with-buffer-mrxvt-0.5.3.patch | 60 +++++ SPECS/mrxvt.spec | 211 ++++++++++++++++++ 5 files changed, 317 insertions(+) create mode 100644 SOURCES/mrxvt-0.5.3-CVE-2021-33477.patch create mode 100644 SOURCES/mrxvt-0.5.3-gcc10-fno-common.patch create mode 100644 SOURCES/mrxvt.desktop create mode 100644 SOURCES/no-scroll-with-buffer-mrxvt-0.5.3.patch create mode 100644 SPECS/mrxvt.spec diff --git a/SOURCES/mrxvt-0.5.3-CVE-2021-33477.patch b/SOURCES/mrxvt-0.5.3-CVE-2021-33477.patch new file mode 100644 index 0000000..fafc21a --- /dev/null +++ b/SOURCES/mrxvt-0.5.3-CVE-2021-33477.patch @@ -0,0 +1,17 @@ +--- mrxvt-0.5.3/src/command.c.CVE-2021-33477 2007-08-06 12:01:35.000000000 +0900 ++++ mrxvt-0.5.3/src/command.c 2021-07-23 22:29:59.574782349 +0900 +@@ -6518,11 +6518,14 @@ + return; + } + ++#if 0 ++ /* http://cvs.schmorp.de/rxvt-unicode/src/command.C?r1=1.584&r2=1.585 */ + if (cmd == 'Q') /* query graphics */ + { + rxvt_tt_printf(r, page, "\033G0\n"); /* no graphics */ + return; + } ++#endif + + /* swallow other graphics sequences until terminating ':' */ + do diff --git a/SOURCES/mrxvt-0.5.3-gcc10-fno-common.patch b/SOURCES/mrxvt-0.5.3-gcc10-fno-common.patch new file mode 100644 index 0000000..961a03d --- /dev/null +++ b/SOURCES/mrxvt-0.5.3-gcc10-fno-common.patch @@ -0,0 +1,20 @@ +--- mrxvt-0.5.3/src/rxvtlib.h.gcc10 2020-01-26 15:39:51.955319245 +0900 ++++ mrxvt-0.5.3/src/rxvtlib.h 2020-01-26 19:24:19.086172326 +0900 +@@ -771,7 +771,7 @@ + } action_t; + + /* Values for macro_t.type. Must sync this with macroNames from macros.c */ +-enum { ++enum macroFnNames { + MacroFnDummy=0, + MacroFnEsc, + MacroFnStr, +@@ -799,7 +799,7 @@ + MacroFnSaveConfig, + MacroFnToggleMacros, + NMACRO_FUNCS +-} macroFnNames; ++} ; + + typedef struct { + KeySym keysym; diff --git a/SOURCES/mrxvt.desktop b/SOURCES/mrxvt.desktop new file mode 100644 index 0000000..292bea0 --- /dev/null +++ b/SOURCES/mrxvt.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=mrxvt +GenericName=Terminal Emulator +Comment=MRXVT -- Multipass +Icon=mrxvt.png +Exec=/usr/bin/mrxvt +Categories=System;Emulator; diff --git a/SOURCES/no-scroll-with-buffer-mrxvt-0.5.3.patch b/SOURCES/no-scroll-with-buffer-mrxvt-0.5.3.patch new file mode 100644 index 0000000..08b926a --- /dev/null +++ b/SOURCES/no-scroll-with-buffer-mrxvt-0.5.3.patch @@ -0,0 +1,60 @@ +Index: src/rxvtlib.h +=================================================================== +--- src/rxvtlib.h (revision 244) ++++ src/rxvtlib.h (working copy) +@@ -280,7 +280,7 @@ + #define Opt_forceTransparent ((1LU<<16) | IS_OPTION1) + #define Opt_mc_hack ((1LU<<17) | IS_OPTION1) + #define Opt_tripleclickwords ((1LU<<18) | IS_OPTION1) +-#define Opt_scrollWithBuffer ((1LU<<19) | IS_OPTION1) ++/* #define Opt_scrollWithBuffer ((1LU<<19) | IS_OPTION1) */ + #define Opt_mouseWheelScrollPage ((1LU<<21) | IS_OPTION1) + #define Opt_pointerBlank ((1LU<<22) | IS_OPTION1) + #define Opt_cursorBlink ((1LU<<23) | IS_OPTION1) +Index: src/xdefaults.c +=================================================================== +--- src/xdefaults.c (revision 244) ++++ src/xdefaults.c (working copy) +@@ -203,8 +203,6 @@ + "scroll-on-tty-output inhibit" ), + BOOL( "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, + "scroll-on-keypress" ), +- BOOL( "scrollWithBuffer", "sw", Opt_scrollWithBuffer, +- "scroll-with-buffer" ), + + STRG(Rs_opacity, "opacity", "o", "%", + "transluscent window (true transparent) opaque degree", 0), +Index: src/screen.c +=================================================================== +--- src/screen.c (revision 244) ++++ src/screen.c (working copy) +@@ -938,10 +938,6 @@ + PVTS(r, page)->nscrolled = SVLINES; + else + PVTS(r, page)->nscrolled = (uint16_t)nscrolled; +- if (ISSET_OPTION(r, Opt_scrollWithBuffer) && +- VSTART != 0 && +- VSTART != SVLINES) +- rxvt_scr_page(r, page, UP, count); + } + else if (!spec) + row1 += SVLINES; +Index: doc/mrxvt.1 +=================================================================== +--- doc/mrxvt.1 (revision 244) ++++ doc/mrxvt.1 (working copy) +@@ -329,14 +329,6 @@ + Draw floating scrollbar (i.e. without a trough). + .Op Cm scrollbarFloating + . +-.BO sw +-Scroll synchronusly with buffer. Normally +-.Nm +-does not keep the screen completely up to date while scrolling. This allows +-.Nm +-to run faster when network latencies are very high and is typically useful when running across a very large internet or many gateways. +-.Op Cm scrollWithBuffer +-. + .El + .Ed + .\" {{{2 color diff --git a/SPECS/mrxvt.spec b/SPECS/mrxvt.spec new file mode 100644 index 0000000..0b6dce5 --- /dev/null +++ b/SPECS/mrxvt.spec @@ -0,0 +1,211 @@ +Summary: A lightweight multi-tabbed terminal emulator for X +Name: mrxvt +Version: 0.5.3 +Release: 31%{?dist} +URL: http://materm.sourceforge.net/wiki/Main/HomePage +License: GPLv2+ +BuildRequires: make +BuildRequires: gcc +BuildRequires: pkgconfig ncurses-devel libXft-devel libXaw-devel libXext-devel desktop-file-utils +BuildRequires: libpng-devel libjpeg-devel libutempter-devel + +Source0: http://downloads.sourceforge.net/materm/%{name}-%{version}.tar.gz +Source1: http://littlehat.homelinux.org:8000/FEDORA/mrxvt/current/0.5.3/%{name}.desktop + +Patch1: http://downloads.sourceforge.net/materm/no-scroll-with-buffer-mrxvt-0.5.3.patch +Patch2: mrxvt-0.5.3-gcc10-fno-common.patch +# http://cvs.schmorp.de/rxvt-unicode/src/command.C?r1=1.584&r2=1.585 +# https://bugzilla.redhat.com/show_bug.cgi?id=1961794 +Patch3: mrxvt-0.5.3-CVE-2021-33477.patch + +%description +Mrxvt (previously materm) is based on 2.7.11 CVS of rxvt and aterm. + +%prep +%setup -q +%patch1 -p0 -b .no-scroll-with-buffer-mrxvt-0.5.3 +%patch2 -p1 -b .gcc10 +%patch3 -p1 -b .cve-2021-33477 +sed -i 's|\r||' share/scripts/mrxvt.vbs + +%build +%configure \ + --enable-everything \ + --disable-debug + +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install + +desktop-file-install \ +%if 0%{?fedora} && 0%{?fedora} < 19 + --vendor=fedora \ +%endif + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE1} + +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc + +%files +%doc doc/README* doc/*.txt* +%doc share/scripts/ +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{_bindir}/mrxvt +%{_mandir}/man1/mrxvt.1* +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/mrxvt/default.menu +%config(noreplace) %{_sysconfdir}/mrxvt/mrxvtrc +%config(noreplace) %{_sysconfdir}/mrxvt/mrxvtrc.sample +%config(noreplace) %{_sysconfdir}/mrxvt/submenus.menu +%if 0%{?fedora} && 0%{?fedora} < 19 +%{_datadir}/applications/fedora-mrxvt.desktop +%else +%{_datadir}/applications/mrxvt.desktop +%endif +%{_datadir}/pixmaps/%{name}* + +%changelog +* Fri Jul 23 2021 Mamoru TASAKA - 0.5.3-31 +- Patch for CVE-2021-33477 (bug 1961794) + +* Thu Jul 22 2021 Fedora Release Engineering - 0.5.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.5.3-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.5.3-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.5.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Jan 26 2020 Mamoru TASAKA - 0.5.3-26 +- Fix for gcc10 -fno-common + +* Thu Nov 14 2019 Adam Jackson +- Drop unnecessary BuildRequires: imake + +* Thu Jul 25 2019 Fedora Release Engineering - 0.5.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.5.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.5.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0.5.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.5.3-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.5.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.5.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.5.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 0.5.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.5.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Toshio Kuratomi - 0.5.3- 13 +- remove --vendor from desktop-file-install on F19+ + +* Thu Feb 14 2013 Fedora Release Engineering - 0.5.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Jan 21 2013 Adam Tkac - 0.5.3-11 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Dec 21 2012 Adam Tkac - 0.5.3-10 +- rebuild against new libjpeg + +* Fri Jul 20 2012 Fedora Release Engineering - 0.5.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 0.5.3-7 +- Rebuild for new libpng + +* Tue Feb 08 2011 Fedora Release Engineering - 0.5.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 0.5.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed May 21 2008 Tom "spot" Callaway - 0.5.3-3 +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0.5.3-2 +- Autorebuild for GCC 4.3 + +* Tue Nov 27 2007 Adam M. Dutko - 0.5.3-1 +- Fixing SRPM build problem that was created by improper import. + +* Tue Nov 27 2007 Adam M. Dutko - 0.5.3-0 +- New version release for Fedora 8. +- New version of mrxvt with scroll patch. + +* Tue Aug 28 2007 Fedora Release Engineering - 0.5.2-10 +- Rebuild for selinux ppc32 issue. + +* Mon Jun 18 2007 Adam M. Dutko - 0.5.2-9 +- Removed extraneous build comments. +- Modified "end-of-line" fix to fit one line after patch1. +- Fixed comment for 0.5.2-6 + +* Mon Jun 18 2007 Mamoru Tasaka - 0.5.2-8 +- Clean up %%prep stage + +* Sat Jun 16 2007 Adam M. Dutko - 0.5.2-7 +- Removed Version entry from desktop file. + +* Sun Jun 10 2007 Adam M. Dutko - 0.5.2-6 +- Fixed "end-of-line" encoding error with sed replacement +- Fixed release tag + +* Mon Jun 4 2007 Adam M. Dutko - 0.5.2-5 +- Remove all files under datadir/doc/name +- Add proper document link +- Remove INSTALL file +- Timestamp unmodified text/images + +* Mon Jun 4 2007 Adam M. Dutko - 0.5.2-4 +- Updated spec file per suggestions in bug #: 223422 +- Fixed changelog +- Fixed sourceURL per sf.net rules +- Added parallel make +- Removed root owernship of executable +- Added directory ownership +- Removed unnecesary macros +- Added noreplace + +* Sun Jun 3 2007 Adam M. Dutko - 0.5.2-3 +- Implemented review guidelines + +* Thu May 31 2007 Adam M. Dutko - 0.5.2-2 +- Implemented naming guidelines + +* Tue Jan 16 2007 Adam M. Dutko - 0.5.2-1 +- Added X patch