auto-import changelog data from screen-4.0.1-2.src.rpm

Mon Dec 08 2003 Lon Hohberger <lhh@redhat.com> 4.0.1-2
- Build for Fedora
Mon Dec 08 2003 Lon Hohberger <lhh@redhat.com> 4.0.1-1
- Import of 4.0.1 from upstream.
- Removed screen-homedir hack introduced in 3.9.15-8. (I was unable to
    reproduce the behavior described in #98320, and thus, the patch isn't
    necessary.)
- Fix for buffer overflow from Timo Strainen (patch 7).
- Fix for #111084 - we now require texinfo to build.
- Comment out lines in screenrc causing screen to complain at startup.

.cvsignore

@@ -1 +1 @@
-screen-3.9.15.tar.gz
+screen-4.0.1.tar.gz

screen-4.0.1-args.patch

@@ -0,0 +1,31 @@
+--- ansi.c.orig	2003-12-04 10:59:05.000000000 -0500
++++ ansi.c	2003-12-04 10:59:20.000000000 -0500
+@@ -559,7 +559,7 @@
+ 	    {
+ 	    case '0': case '1': case '2': case '3': case '4':
+ 	    case '5': case '6': case '7': case '8': case '9':
+-	      if (curr->w_NumArgs < MAXARGS)
++	      if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
+ 		{
+ 		  if (curr->w_args[curr->w_NumArgs] < 100000000)
+ 		    curr->w_args[curr->w_NumArgs] =
+--- resize.c.old        2003-11-27 02:55:07.000000000 +0200
++++ resize.c    2003-11-27 02:58:33.000000000 +0200
+@@ -682,6 +682,17 @@
+   if (wi == 0)
+     he = hi = 0;
+ 
++  if (wi > 1000)
++    {
++      Msg(0, "Window width too large, truncated");
++      wi = 1000;
++    }
++  if (he > 1000)
++    {
++      Msg(0, "Window height too large, truncated");
++      he = 1000;
++    }
++
+   if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
+     {
+       debug("ChangeWindowSize: No change.\n");

screen-4.0.1-screenrc.patch

@@ -0,0 +1,13 @@
+diff -ur screen-4.0.1/etc/screenrc screen-4.0.1-lhh/etc/screenrc
+--- screen-4.0.1/etc/screenrc	2003-09-18 12:13:03.000000000 -0400
++++ screen-4.0.1-lhh/etc/screenrc	2003-10-24 12:03:22.000000000 -0400
+@@ -143,6 +143,9 @@
+ # hardstatus alwaysignore
+ # hardstatus alwayslastline "%Lw"
+ 
++# Red Hat's normal status line
++hardstatus string "[screen %n%?: %t%?] %h"
++
+ # bind = resize =
+ # bind + resize +1
+ # bind - resize -1

screen.spec

@@ -1,13 +1,13 @@
 Summary: A screen manager that supports multiple logins on one terminal.
 Name: screen
-Version: 3.9.15
+Version: 4.0.1
-Release: 11
+Release: 2
 License: GPL2
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel texinfo
 Requires: ncurses
 
 #
@@ -26,23 +26,29 @@ Patch1: screen-3.9.13-ia64.patch
 # really end users should visit /etc/screenrc and tweak
 # it to suit their personal preferances
 #
-Patch2: screen-3.9.15-screenrc.patch
+Patch2: screen-4.0.1-screenrc.patch
+Patch3: screen-4.0.1-etcscreenrc.patch
 
 # Due to the way the build system creates rpms in a buildroot
 # we need this tweak for utf8encodings
 #
-Patch3: screen-3.9.11-utf8-install.patch
+Patch4: screen-3.9.11-utf8-install.patch
 
 # We need to allow rpm to strip the binary and we don't have a
 # libelf dependancy
-Patch4: screen-3.9.11-no-stripping-or-elf.patch
+Patch5: screen-3.9.11-no-stripping-or-elf.patch
-
-# Change sig_ign to sig_dfl in exit path
-Patch5: screen-3.9.13-child.patch
 
+# The maintainers really didn't like this patch, and I couldn't
+# reproduce the "access denied" problem on 4.0.1, so this 
+# patch is not applied for now.  We'll include it in the srpm
+# in case someone else wants it.
 #
 Patch6: screen-3.9.15-home-screendir.patch
 
+# Fixes potential buffer overflow when > 2^31 semicolons are passed.
+#
+Patch7: screen-4.0.1-args.patch
+
 %description
 The screen utility allows you to have multiple logins on just one
 terminal. Screen is useful for users who telnet into a machine or are
@@ -59,10 +65,18 @@ support multiple logins on one terminal.
 %setup -q
 %patch1 -p1 -b .ia64
 %patch2 -p1 -b .screenrc
-%patch3 -p1 -b .utf8-install
+%patch3 -p1 -b .etcscreenrc
-%patch4 -p1 -b .no-stripping-or-elf
+%patch4 -p1 -b .utf8-install
-%patch5 -p0 -b .child
+%patch5 -p1 -b .no-stripping-or-elf
-%patch6 -p1 -b .screendir
+
+# Uncomment if you want screen to first try to use $HOME/.screens
+# and subsequently try to use /tmp/S-<user>
+#
+#%patch6 -p1 -b .screendir
+
+#
+#
+%patch7 -p0 -b .args
 
 libtoolize --copy --force
 
@@ -76,8 +90,8 @@ autoconf
 	--enable-rxvt_osc \
 	--enable-locale \
 	--enable-telnet \
-	--with-sys-screenrc="/etc/screenrc" \
+	--with-sys-screenrc="/etc/screenrc" #\
-	--with-socket-dir="/tmp"
+	#--with-socket-dir="/tmp/screen"
 
 # We would like to have braille support.
 #
@@ -88,8 +102,8 @@ mv config.tmp.h config.h
 # We really don't want to be using /usr/local
 # because we wish to be FSB complient
 #
-sed -e 's/\/usr\/local\/etc/\/etc/g;' < etc/etcscreenrc > etc/etcscreenrc.tmp
+#sed -e 's/\/usr\/local\/etc/\/etc/g;' < etc/etcscreenrc > etc/etcscreenrc.tmp
-mv etc/etcscreenrc.tmp etc/etcscreenrc
+#mv etc/etcscreenrc.tmp etc/etcscreenrc
 
 find doc -type f | while read line; do
 	sed -e 's/\(\/usr\)\?\/local\/etc/\/etc/g;' < $line > $line.tmp;
@@ -150,6 +164,19 @@ fi
 %config /etc/pam.d/screen
 
 %changelog
+* Mon Dec 08 2003 Lon Hohberger <lhh@redhat.com> 4.0.1-2
+- Build for Fedora
+
+* Mon Dec 08 2003 Lon Hohberger <lhh@redhat.com> 4.0.1-1
+- Import of 4.0.1 from upstream.
+- Removed screen-homedir hack introduced in 3.9.15-8.  (I
+was unable to reproduce the behavior described in #98320,
+and thus, the patch isn't necessary.)
+- Fix for buffer overflow from Timo Strainen (patch 7).
+- Fix for #111084 - we now require texinfo to build.
+- Comment out lines in screenrc causing screen to complain
+at startup.
+
 * Tue Jul 10 2003 Lon Hohberger <lhh@redhat.com> 3.9.15-11
 - Rebuilt 
 

sources

@@ -1 +1 @@
-0dff6fdc3fbbceabf25a43710fbfe75f  screen-3.9.15.tar.gz
+2f674d5a7a299abf085d0b69c90de4f8  screen-4.0.1.tar.gz