rpms/xterm/devel xterm-208-redhat-resources.patch, NONE, 1.1 xterm-208-root-grab-console.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xterm.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3893

Modified Files:
	.cvsignore sources xterm.spec 
Added Files:
	xterm-208-redhat-resources.patch 
	xterm-208-root-grab-console.patch 
Log Message:
Upgrade to upstream version 208

xterm-208-redhat-resources.patch:
 XTerm.ad |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE xterm-208-redhat-resources.patch ---
--- xterm-208/XTerm.ad.redhat-resources	2006-01-03 21:10:17.000000000 -0500
+++ xterm-208/XTerm.ad	2006-01-17 15:05:24.000000000 -0500
@@ -186,3 +186,8 @@
 
 ! Here is a pattern that is useful for double-clicking on a URL:
 *charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,126:48
+
+! Red Hat Defaults:
+*VT100*eightBitInput: 0
+*VT100*backarrowKey:  0
+*VT100*scrollBar:     1

xterm-208-root-grab-console.patch:
 main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xterm-208-root-grab-console.patch ---
--- xterm-208/main.c.root-grab-console	2006-01-03 21:10:25.000000000 -0500
+++ xterm-208/main.c	2006-01-17 15:09:42.000000000 -0500
@@ -2055,11 +2055,12 @@
 #ifndef __sgi
 	    {
 		struct stat sbuf;
+		uid_t my_uid = getuid();
 
 		/* Must be owner and have read/write permission.
 		   xdm cooperates to give the console the right user. */
 		if (!stat("/dev/console", &sbuf) &&
-		    (sbuf.st_uid == getuid()) &&
+		    ((my_uid==0) || (sbuf.st_uid == my_uid)) &&
 		    !access("/dev/console", R_OK | W_OK)) {
 		    Console = True;
 		} else


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	15 Dec 2005 00:47:38 -0000	1.9
+++ .cvsignore	17 Jan 2006 20:41:21 -0000	1.10
@@ -7,3 +7,4 @@
 ctlseqs.txt.gz
 UnicodeData-Latest.txt.gz
 16colors.txt
+xterm-208.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	15 Dec 2005 00:47:38 -0000	1.9
+++ sources	17 Jan 2006 20:41:21 -0000	1.10
@@ -1,4 +1,4 @@
-3de8a3756c284a46a08c6d0308909486  xterm-207.tgz
+a062d0b398918015d07c31ecdcc5111a  xterm-208.tgz
 0048925cb45d60429bc2f7665d563680  ctlseqs.txt.gz
 92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
 6093439b8d79089f4ff1cdfed358b401  16colors.txt


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xterm.spec	21 Dec 2005 22:23:11 -0000	1.33
+++ xterm.spec	17 Jan 2006 20:41:21 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 207
-Release: 10
+Version: 208
+Release: 1
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -17,6 +17,8 @@
 Patch4: xterm-206-appsdir.patch
 Patch5: xterm-207-freetype.patch
 Patch6: xterm-207-eightBitInput_false.patch
+Patch7: xterm-208-redhat-resources.patch
+Patch8: xterm-208-root-grab-console.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -53,8 +55,11 @@
 #%patch1 -p1 -b .resources-redhat
 %patch3 -p1 -b .tty-group-name
 %patch4 -p1 -b .appsdir
-%patch5 -p1 -b .freetype
-%patch6 -p1 -b .eightBitInput_false
+#%patch5 -p1 -b .freetype
+#^- now fixed upstream in 208
+#%patch6 -p1 -b .eightBitInput_false
+%patch7 -p1 -b .redhat-resources
+%patch8 -p1 -b .root-grab-console
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
@@ -100,6 +105,12 @@
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Tue Jan 17 2006 Jason Vas Dias<jvdias at redhat.com> - 208-1
+- Upgrade to upstream version 208
+- Allow root user to grab the console, even if /dev/console 
+  not owned by root
+- restore Red Hat '*VT100*scrollBar:1' default Xresource
+
 * Wed Dec 21 2005 Jason Vas Dias<jvdias at redhat.com> - 207-10
 - Fix bug 164210: tek4014 support should be enabled by default