From ab625cfcda44a1c0b828ac582f85447dc26fbd54 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 18 Feb 2009 14:47:26 +0000 Subject: [PATCH] - update to 242 - use upstream default value for modifyFunctionKeys resource - remove png suffix from icon name in desktop file --- .cvsignore | 2 +- sources | 2 +- xterm-223-resources.patch | 14 ------------- xterm-238-windowfontops.patch | 37 ----------------------------------- xterm-242-resources.patch | 16 +++++++++++++++ xterm.desktop | 2 +- xterm.spec | 13 +++++++----- 7 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 xterm-223-resources.patch delete mode 100644 xterm-238-windowfontops.patch create mode 100644 xterm-242-resources.patch diff --git a/.cvsignore b/.cvsignore index 3ea76aa..1c4c1ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ 16colors.txt -xterm-238.tgz +xterm-242.tgz diff --git a/sources b/sources index 48f2cc3..f66650d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6093439b8d79089f4ff1cdfed358b401 16colors.txt -754f670723eb9a20f9f90d7c5f4a5bad xterm-238.tgz +663fa3aac8e30e4c2d4bf07c0aee4dca xterm-242.tgz diff --git a/xterm-223-resources.patch b/xterm-223-resources.patch deleted file mode 100644 index bb639fb..0000000 --- a/xterm-223-resources.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- xterm-223/XTerm.ad.redhat-resources 2006-06-24 16:34:45.000000000 +0200 -+++ xterm-223/XTerm.ad 2007-01-08 18:13:38.000000000 +0100 -@@ -186,3 +186,11 @@ - ! - ! Alternatively, - !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ -+ -+! Red Hat Defaults: -+*VT100*eightBitInput: 0 -+*VT100*metaSendsEscape: 1 -+*VT100*backarrowKey: 0 -+*VT100*scrollBar: 1 -+*VT100*utf8Title: 1 -+*VT100*modifyFunctionKeys: 0 diff --git a/xterm-238-windowfontops.patch b/xterm-238-windowfontops.patch deleted file mode 100644 index 994cccb..0000000 --- a/xterm-238-windowfontops.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up xterm-238/charproc.c.windowfontops xterm-238/charproc.c ---- xterm-238/charproc.c.windowfontops 2009-01-06 12:10:30.000000000 +0100 -+++ xterm-238/charproc.c 2009-01-06 12:15:57.000000000 +0100 -@@ -389,10 +389,10 @@ static XtActionsRec actionsList[] = { - static XtResource resources[] = - { - Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False), -- Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, True), -+ Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, False), - Bres(XtNallowTcapOps, XtCAllowTcapOps, screen.allowTcapOp0, True), - Bres(XtNallowTitleOps, XtCAllowTitleOps, screen.allowTitleOp0, True), -- Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True), -+ Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, False), - Bres(XtNaltIsNotMeta, XtCAltIsNotMeta, screen.alt_is_not_meta, False), - Bres(XtNaltSendsEscape, XtCAltSendsEscape, screen.alt_sends_esc, False), - Bres(XtNalwaysBoldMode, XtCAlwaysBoldMode, screen.always_bold_mode, False), -diff -up xterm-238/xterm.man.windowfontops xterm-238/xterm.man ---- xterm-238/xterm.man.windowfontops 2009-01-06 12:10:30.000000000 +0100 -+++ xterm-238/xterm.man 2009-01-06 12:11:39.000000000 +0100 -@@ -1448,7 +1448,7 @@ The default is ``false.'' - .TP - .B "allowFontOps (\fPclass\fB AllowFontOps)" - Specifies whether control sequences that set/query the font should be allowed. --The default is ``true.'' -+The default is ``false.'' - .TP 8 - .B "allowSendEvents (\fPclass\fB AllowSendEvents)" - Specifies whether or not synthetic key and button events (generated using -@@ -1472,7 +1472,7 @@ The default is ``true.'' - .B "allowWindowOps (\fPclass\fB AllowWindowOps)" - Specifies whether extended window control sequences (as used in dtterm) - should be allowed. --The default is ``true.'' -+The default is ``false.'' - .TP 8 - .B "altIsNotMeta (\fPclass\fB AltIsNotMeta\fP)" - If ``true'', treat the Alt-key as if it were the Meta-key. diff --git a/xterm-242-resources.patch b/xterm-242-resources.patch new file mode 100644 index 0000000..d85eaba --- /dev/null +++ b/xterm-242-resources.patch @@ -0,0 +1,16 @@ +diff -up xterm-242/XTerm.ad.resources xterm-242/XTerm.ad +--- xterm-242/XTerm.ad.resources 2009-02-13 01:14:13.000000000 +0100 ++++ xterm-242/XTerm.ad 2009-02-18 15:00:23.000000000 +0100 +@@ -210,3 +210,12 @@ + !*allowTcapOps: false + !*allowTitleOps: false + !*allowWindowOps: false ++ ++! Red Hat Defaults: ++*allowFontOps: false ++*allowWindowOps: false ++*VT100*eightBitInput: false ++*VT100*metaSendsEscape: true ++*VT100*backarrowKey: false ++*VT100*scrollBar: true ++*VT100*utf8Title: true diff --git a/xterm.desktop b/xterm.desktop index 218abe3..dcda935 100644 --- a/xterm.desktop +++ b/xterm.desktop @@ -4,7 +4,7 @@ Name=xterm Terminal GenericName=Terminal Comment=Terminal emulator for the X Window System Exec=xterm -Icon=gnome-xterm.png +Icon=gnome-xterm Type=Application Categories=System;TerminalEmulator; NoDisplay=true diff --git a/xterm.spec b/xterm.spec index 6161a35..d9b8f98 100644 --- a/xterm.spec +++ b/xterm.spec @@ -1,6 +1,6 @@ Summary: Terminal emulator for the X Window System Name: xterm -Version: 238 +Version: 242 Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT @@ -13,10 +13,9 @@ Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz Source1: ftp://invisible-island.net/xterm/16colors.txt Source2: %{name}.desktop -Patch1: xterm-223-resources.patch +Patch1: xterm-242-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-226-man-page_paths.patch -Patch4: xterm-238-windowfontops.patch %bcond_with trace @@ -30,10 +29,9 @@ programs that can't use the window system directly. %prep %setup -q -%patch1 -p1 -b .redhat-resources +%patch1 -p1 -b .resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths -%patch4 -p1 -b .windowfontops %build %configure \ @@ -84,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT %{x11_app_defaults_dir}/XTerm-color %changelog +* Wed Feb 18 2009 Miroslav Lichvar 242-1 +- update to 242 +- use upstream default value for modifyFunctionKeys resource +- remove png suffix from icon name in desktop file + * Tue Jan 06 2009 Miroslav Lichvar 238-1 - update to 238 (#479000, CVE-2008-2383) - set default values of allowWindowOps and allowFontOps resources to false