Imported Debian patch 4.0.3-13debian/4.0.3-13

6 files changed, 122 insertions, 30 deletions

diff --git a/debian/patches/00list b/debian/patches/00list
index de90445..2eb485f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,7 +10,7 @@
 # 10-49: "regular" code and documentation fixes
 10norootpassword
 11replace_doc_paths
-## <12 REMOVED>
+12kfreebsd_ctty
 13split_info_files
 14size_matters
 15manpage_typos
@@ -21,7 +21,7 @@
 19flowcontrol_lockup
 20defmonitor
 21manpage_nethack_activation
-22no_public_exchange
+22exchange_file_mode
 23exitcode_q_ls
 24option_parser
 25allow_symlink_sockdir
@@ -32,6 +32,8 @@
 30fix_fsf_address
 31upstream_cherries
 32misc_minor_fixes
+33increase_max_winmsg_renditions
+35screen_invoked_with_a_command
 40cjk_eastasian
 45suppress_remap
 # 50-99: experimental patches, new features etc.
diff --git a/debian/patches/12kfreebsd_ctty.dpatch b/debian/patches/12kfreebsd_ctty.dpatch
new file mode 100644
index 0000000..e2373d8
--- /dev/null
+++ b/debian/patches/12kfreebsd_ctty.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12kfreebsd_ctty.dpatch by  <hesso@pool.math.tu-berlin.de>
+##
+## DP: See inline documentation.
+
+@DPATCH@
+--- screen-4.0.3.orig/tty.sh	2009-04-10 18:15:51.923805915 +0200
++++ screen-4.0.3/tty.sh	2009-04-10 18:17:56.043804602 +0200
+@@ -801,18 +801,11 @@
+ 
+   mypid = getpid();
+ 
+-  /* The next lines should be obsolete. Can anybody check if they
+-   * are really needed on the BSD platforms?
+-   *
+-   * this is to avoid the message:
+-   *	fgtty: Not a typewriter (25)
++  /*
++   * Under BSD we have to set the controlling terminal again explicitly.
+    */
+-# if defined(__osf__) || (BSD >= 199103) || defined(ISC)
+-  if (separate_sids)
+-    setsid();	/* should be already done */
+-#  ifdef TIOCSCTTY
++# if defined(__FreeBSD_kernel__) && defined(TIOCSCTTY)
+   ioctl(fd, TIOCSCTTY, (char *)0);
+-#  endif
+ # endif
+ 
+ # ifdef POSIX
diff --git a/debian/patches/22exchange_file_mode.dpatch b/debian/patches/22exchange_file_mode.dpatch
new file mode 100644
index 0000000..730bf31
--- /dev/null
+++ b/debian/patches/22exchange_file_mode.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22exchange_file_mode.dpatch by  <hesso@pool.math.tu-berlin.de>
+##
+## DP: Make it a bit harder to shoot oneself in the foot by
+## DP: keeping the umask tight by default when creating the
+## DP: screen exchange file. Fearless users may still chmod it.
+
+@DPATCH@
+--- screen-4.0.3.orig/fileio.c	2009-04-02 02:01:23.530568088 +0200
++++ screen-4.0.3/fileio.c	2009-04-02 02:02:18.155521670 +0200
+@@ -367,11 +367,6 @@
+   char *mode = "w";
+ #ifdef COPY_PASTE
+   int public = 0;
+-# ifdef _MODE_T
+-  mode_t old_umask;
+-# else
+-  int old_umask;
+-# endif
+ # ifdef HAVE_LSTAT
+   struct stat stb, stb2;
+   int fd, exists = 0;
+@@ -434,7 +429,6 @@
+ #ifdef COPY_PASTE
+       if (dump == DUMP_EXCHANGE && public)
+ 	{
+-          old_umask = umask(0);
+ # ifdef HAVE_LSTAT
+ 	  if (exists)
+ 	    {
+@@ -455,7 +449,6 @@
+ # else
+           f = fopen(fn, mode);
+ # endif
+-          umask(old_umask);
+ 	}
+       else
+ #endif /* COPY_PASTE */
diff --git a/debian/patches/22no_public_exchange.dpatch b/debian/patches/22no_public_exchange.dpatch
deleted file mode 100644
index 2fcc489..0000000
--- a/debian/patches/22no_public_exchange.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22no_public_exchange.dpatch by  <hesso@pool.math.tu-berlin.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -Naur screen-4.0.3.orig/fileio.c screen-4.0.3/fileio.c
---- screen-4.0.3.orig/fileio.c	2008-06-01 23:39:49.000000000 +0200
-+++ screen-4.0.3/fileio.c	2008-06-01 23:44:58.000000000 +0200
-@@ -414,7 +414,17 @@
- 	  fnbuf[sizeof(fnbuf) - 1] = 0;
- 	  fn = fnbuf;
- 	}
-+/**
-+ * I consider this 'public exchange file' feature a bad idea, at least
-+ * if this is the default case. I really don't like the idea of an admin
-+ * copying configuration file snippets around that might get changed
-+ * in that buffer file.
-+ * Drop the notion of a 'public' exchange file. If someone explictly wants
-+ * to share his copy buffer contents, he is free to chmod it after its
-+ * creation.
-+ * Jan Nordholz <hesso@pool.math.tu-berlin.de>, 2007/08/07
-       public = !strcmp(fn, DEFAULT_BUFFERFILE);
-+ */
- # ifdef HAVE_LSTAT
-       exists = !lstat(fn, &stb);
-       if (public && exists && (S_ISLNK(stb.st_mode) || stb.st_nlink > 1))
diff --git a/debian/patches/33increase_max_winmsg_renditions.dpatch b/debian/patches/33increase_max_winmsg_renditions.dpatch
new file mode 100644
index 0000000..74b90f0
--- /dev/null
+++ b/debian/patches/33increase_max_winmsg_renditions.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 33increase_max_winmsg_renditions.dpatch
+## by Dustin Kirkland <kirkland@canonical.com>
+##
+## DP: Increase MAX_WINMSG_REND constant from 16 to 80
+## DP: Allows for up to 64 formatting changes on a status line
+## DP: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/315871
+
+@DPATCH@
+diff -uprN screen-4.0.3.orig/screen.c screen-4.0.3/screen.c
+--- screen-4.0.3.orig/screen.c	2003-09-08 09:26:41.000000000 -0500
++++ screen-4.0.3/screen.c	2009-01-10 12:06:34.698560196 -0600
+@@ -2026,7 +2026,7 @@ static const char months[] = "JanFebMarA
+ #endif
+ 
+ static char winmsg_buf[MAXSTR];
+-#define MAX_WINMSG_REND 16	/* rendition changes */
++#define MAX_WINMSG_REND 80	/* rendition changes */
+ static int winmsg_rend[MAX_WINMSG_REND];
+ static int winmsg_rendpos[MAX_WINMSG_REND];
+ static int winmsg_numrend;
diff --git a/debian/patches/35screen_invoked_with_a_command.dpatch b/debian/patches/35screen_invoked_with_a_command.dpatch
new file mode 100644
index 0000000..36a9474
--- /dev/null
+++ b/debian/patches/35screen_invoked_with_a_command.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35screen_invoked_with_a_command.dpatch
+##
+## DP: Cherry-picked from upstream.
+## DP: From 25c4f34d19c9f7d7262ef2a173238fdab7e283be Mon Sep 17 00:00:00 2001
+## DP: From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
+## DP: Date: Mon, 26 Jan 2009 21:19:47 +0000
+## DP: Subject: Don't forget the startup command.
+
+## DP:Fixes savannah bug #25348, launchpad bug #311443.
+## DP:---
+## DP:diff --git a/src/screen.c b/src/screen.c
+## DP:index c914c59..7239560 100644
+
+@DPATCH@
+
+--- src/screen.c
++++ src/screen.c
+@@ -1420,6 +1420,10 @@ char **av;
+ 	  /* NOTREACHED */
+ 	}
+     }
++  else if (ac) /* Screen was invoked with a command */
++    {
++      MakeWindow(&nwin);
++    }
+ 
+ #ifdef HAVE_BRAILLE
+   StartBraille();