- update to 222

- link with libncurses instead of libtermcap
- spec cleanup

.cvsignore

@@ -1,15 +1,2 @@
-xterm-192.tgz
-xterm-200.tgz
-xterm-205.tgz
-xterm-205.tgz.asc
-xterm-206.tgz
-xterm-207.tgz
-ctlseqs.txt.gz
-UnicodeData-Latest.txt.gz
 16colors.txt
-xterm-208.tgz
+xterm-222.tgz
-xterm-209.tgz
-xterm-211.tgz
-xterm-212.tgz
-xterm-213.tgz
-xterm-215.tgz

sources

@@ -1,3 +1,2 @@
-92826989d4f4aa610cf6222359f3f83a  UnicodeData-Latest.txt.gz
 6093439b8d79089f4ff1cdfed358b401  16colors.txt
-8c2a45d4ca754b2cb019242e26f657eb  xterm-215.tgz
+bb77882a33083632a9c6c9de004a54fb  xterm-222.tgz

xterm-222-can-2003-0063.patch

@@ -0,0 +1,16 @@
+--- xterm-222/charproc.c.can-2003-0063	2006-09-28 02:06:28.000000000 +0200
++++ xterm-222/charproc.c	2006-11-22 18:38:28.000000000 +0100
+@@ -4587,8 +4587,13 @@
+ 	break;
+ 
+     case 21:			/* Report the window's title */
++/* This code block is disabled to fix a security issue reported
++ * in CAN-2003-0063
++ */
++#if 0
+ 	report_win_label(xw, 'l', &text,
+ 			 XGetWMName(screen->display, VShellWindow, &text));
++#endif
+ 	break;
+ 
+     default:			/* DECSLPP (24, 25, 36, 48, 72, 144) */

xterm-222-man-page_paths.patch

@@ -0,0 +1,67 @@
+--- xterm-222/xterm.man.man-page_paths	2006-08-11 03:01:11.000000000 +0200
++++ xterm-222/xterm.man	2006-11-23 10:22:28.000000000 +0100
+@@ -677,7 +677,7 @@
+ .RE
+ .IP
+ Finally, \fB-ls\fP is not completely ignored,
+-because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry
++because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry
+ (if configured to do so),
+ whereas \fIxterm\ -e\fP does not.
+ .TP 8
+@@ -1458,17 +1458,17 @@
+ The font server claims to provide the bold font that \fIxterm\fP requests,
+ but the result is not always readable.
+ XFree86 provides a feature which can be used to suppress the scaling.
+-In the X server's configuration file (e.g., "/etc/X11/XFree86"), you
++In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you
+ can add ":unscaled" to the end of the directory specification for the
+ "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP.
+ For example
+ .RS
+-	FontPath	"/usr/lib/X11/fonts/misc/"
++	FontPath	"__fontpath__"
+ .RE
+ .IP
+ would become
+ .RS
+-	FontPath	"/usr/lib/X11/fonts/misc/:unscaled"
++	FontPath	"__fontpath__/misc/:unscaled"
+ .RE
+ .IP
+ Depending on your configuration, the font server may have its own configuration
+@@ -4368,10 +4368,10 @@
+ .SH FILES
+ The actual pathnames given may differ on your system.
+ .TP 5
+-\fI/etc/utmp\fP
++\fI/var/run/utmp\fP
+ the system logfile, which records user logins.
+ .TP 5
+-\fI/etc/wtmp\fP
++\fI/var/log/wtmp\fP
+ the system logfile, which records user logins and logouts.
+ .TP 5
+ .I __apploaddir__/XTerm
+--- xterm-222/minstall.sh.man-page_paths	2006-04-10 02:34:37.000000000 +0200
++++ xterm-222/minstall.sh	2006-11-23 10:23:39.000000000 +0100
+@@ -16,6 +16,9 @@
+ END_FILE="$3"
+ APPS_DIR="$4"
+ 
++fontpath=/usr/share/X11/fonts
++xorgcfgdir=/etc/X11
++xorgcfgfil=xorg.conf
+ suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'`
+ NEW_FILE=temp$$
+ 
+@@ -23,6 +26,9 @@
+ 	-e s%__apploaddir__%$APPS_DIR% \
+ 	-e s%__mansuffix__%$suffix%g \
+ 	-e s%__miscmansuffix__%$suffix%g \
++	-e s%__fontpath__%$fontpath%g \
++	-e s%__xorgcfgdir__%$xorgcfgdir%g \
++	-e s%__xorgcfgfil__%$xorgcfgfil%g \
+ 	$OLD_FILE >$NEW_FILE
+ 
+ echo "$MINSTALL $OLD_FILE $END_FILE"

xterm.spec

@@ -1,66 +1,25 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
-Version: 215
+Version: 222
-Release: 3%{?dist}
+Release: 1%{?dist}
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: imake pkgconfig ncurses-devel libutempter-devel
+BuildRequires: libXft-devel libXaw-devel libXext-devel 
 
 Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
-#Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz
+Source1: ftp://invisible-island.net/xterm/16colors.txt
-#         ^-  now shipped in upstream source tarball
-Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz
-Source3: ftp://invisible-island.net/xterm/16colors.txt
 
-Patch0: xterm-can-2003-0063.patch
+Patch1: xterm-212-redhat-resources.patch
-Patch1: xterm-resources-redhat.patch
+Patch2: xterm-222-can-2003-0063.patch
-Patch2: xterm-179-ppc-fix-bug-101472.patch
+Patch3: xterm-222-man-page_paths.patch
-Patch3: xterm-tty-group-name.patch
-Patch4: xterm-206-appsdir.patch
-Patch5: xterm-207-freetype.patch
-Patch6: xterm-207-eightBitInput_false.patch
-Patch7: xterm-209-redhat-resources.patch
-Patch8: xterm-208-root-grab-console.patch
-Patch9: xterm-209-bz182382.patch
-Patch10: xterm-209-bz183993.patch
-Patch11: xterm-211-bz186094.patch
-Patch12: xterm-212-bz186935.patch
-Patch13: xterm-212-redhat-resources.patch
-Patch14: xterm-212-man-page_paths.patch
-Patch15: xterm-213-bz189161.patch
-Patch16: xterm-215-tcsegfault.patch
 
-BuildRequires: pkgconfig
-BuildRequires: libXft-devel
-BuildRequires: freetype-devel
-BuildRequires: libXrender-devel
-BuildRequires: libXaw-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXext-devel
-BuildRequires: libXt-devel
-BuildRequires: libSM-devel
-BuildRequires: libICE-devel
-BuildRequires: libX11-devel
-BuildRequires: libXpm-devel
-BuildRequires: libtermcap-devel
-BuildRequires: fontconfig-devel
-BuildRequires: expat-devel
-BuildRequires: zlib-devel
-BuildRequires: libtermcap-devel
-BuildRequires: libutempter-devel
-
-%{?!DEBUGINFO:     %define DEBUGINFO    1}
 %{?!enable_trace:  %define enable_trace 0}
-%if !%{DEBUGINFO}
-%define debug_package %{nil}
-%endif
 
 %define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
 
-%{?!_with_256_color: %define _with_256_color 1}
-%{?!_with_tek4014: %define _with_tek4014 1}
-
 %description
 The xterm program is a terminal emulator for the X Window System. It
 provides DEC VT102 and Tektronix 4014 compatible terminals for
@@ -68,78 +27,39 @@ programs that can't use the window system directly.
 
 %prep
 %setup -q
-# The xterm source code used to decompress with all of the files read-only,
+
-# but appears to be fixed now
+%patch1 -p1 -b .redhat-resources
-#chmod -R u+w .
+%patch2 -p1 -b .can-2003-0063
-%patch0 -p0 -b .can-2003-0063
+%patch3 -p1 -b .man-page_paths
-#%patch1 -p1 -b .resources-redhat
-%patch3 -p1 -b .tty-group-name
-%patch4 -p1 -b .appsdir
-#%patch5 -p1 -b .freetype
-#^- now fixed upstream in 208
-#%patch6 -p1 -b .eightBitInput_false
-#%patch7 -p1 -b .redhat-resources
-#      ^- patch now in patch13
-%patch8 -p1 -b .root-grab-console
-#%patch9 -p1 -b .bz182382
-#      ^- patch now upstream
-#%patch10 -p1 -b .bz183993
-#      ^- patch now upstream
-#%patch11 -p1 -b .bz186094
-#      ^- patch now in redhat-resources
-#%patch12 -p1 -b .bz186935
-#      ^- patch now upstream
-%patch13 -p1 -b .redhat-resources
-%patch14 -p1 -b .man-page_paths
-%patch15 -p1 -b .bz189161
-%patch16 -p1 -b .tcsegfault
 
 %build
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
+%configure \
-%if %{DEBUGINFO}
-export CFLAGS="$RPM_OPT_FLAGS"
-%else
-export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
-%endif
-%configure --enable-luit \
-           --enable-warnings \
-           --enable-wide-chars \
-           --with-utempter \
-	   --enable-narrowproto \
-	   --with-app-defaults=%{x11_app_defaults_dir} \
-%if !%{_with_tek4014}
-           --disable-tek4014 \
-%endif
-%if %{_with_256_color}
 	--enable-256-color \
-%endif
+	--enable-luit \
 %if %{enable_trace}
 	--enable-trace \
 %endif
-;
+	--enable-warnings \
-export XTERM_TTY_GROUP_NAME=tty;
+	--enable-wide-chars \
-make
+	--with-app-defaults=%{x11_app_defaults_dir} \
+	--with-utempter \
+	--with-tty-group=tty \
+	--disable-full-tgetent
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir}
+make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
+
-mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
+cp -fp %{SOURCE1} 16colors.txt
-#gunzip < %SOURCE1 > ctlseqs.txt
-#   ^- now shipped in upstream tarball
-gunzip < %SOURCE2 > UnicodeData.txt
-cp -fp %SOURCE3 16colors.txt
-%if !%{DEBUGINFO}
-/usr/lib/rpm/brp-compress
-exit 0
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
+%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
 %{_bindir}/resize
 %{_bindir}/uxterm
 %{_bindir}/xterm
@@ -150,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm-color
 
 %changelog
+* Thu Nov 23 2006 Miroslav Lichvar <mlichvar@redhat.com> 222-1
+- update to 222
+- link with libncurses instead of libtermcap
+- spec cleanup
+
 * Mon Sep 04 2006 Miroslav Lichvar <mlichvar@redhat.com> 215-3.fc6
 - fix segfault when /etc/termcap is missing (#201246)