Merge branch 'master' of git://anonscm.debian.org/collab-maint/screen

Conflicts:
	debian/changelog
	debian/control
	debian/rules

15 files changed, 293 insertions, 193 deletions

diff --git a/debian/patches/10norootpassword.patch b/debian/patches/10norootpassword.patch
index fa24c8f..33acad4 100644
--- a/debian/patches/10norootpassword.patch
+++ b/debian/patches/10norootpassword.patch
@@ -4,8 +4,8 @@ password set. If not, ask for an unlocking key.
 See https://bugs.launchpad.net/bugs/6760
 Index: screen/attacher.c
 ===================================================================
---- screen.orig/attacher.c	2011-10-08 19:54:22.000000000 +0200
-+++ screen/attacher.c	2011-10-08 19:58:12.000000000 +0200
+--- screen.orig/attacher.c	2014-04-17 14:18:51.212368190 +0200
++++ screen/attacher.c	2014-04-17 14:18:51.204368735 +0200
 @@ -847,11 +847,15 @@
  #ifdef USE_PAM
    pam_handle_t *pamh = 0;
@@ -25,8 +25,8 @@ Index: screen/attacher.c
    pass = ppp->pw_passwd;
    if (pass == 0 || *pass == 0)
      {
-@@ -884,6 +888,8 @@
-       pass = crypt(mypass, salt);
+@@ -890,6 +894,8 @@
+ 	}
        pass = ppp->pw_passwd = SaveStr(pass);
      }
 +#ifdef USE_PAM
@@ -34,7 +34,7 @@ Index: screen/attacher.c
  #endif
  
    debug("screen_builtin_lck looking in gcos field\n");
-@@ -913,6 +919,8 @@
+@@ -919,6 +925,8 @@
            AttacherFinit(SIGARG);
            /* NOTREACHED */
          }
@@ -43,18 +43,20 @@ Index: screen/attacher.c
  #ifdef USE_PAM
        PAM_conversation.appdata_ptr = cp1;
        pam_error = pam_start("screen", ppp->pw_name, &PAM_conversation, &pamh);
-@@ -923,10 +931,13 @@
+@@ -929,11 +937,14 @@
        PAM_conversation.appdata_ptr = 0;
        if (pam_error == PAM_SUCCESS)
  	break;
 -#else
--      if (!strncmp(crypt(cp1, pass), pass, strlen(pass)))
+-      char *buf = crypt(cp1, pass);
+-      if (buf && !strncmp(buf, pass, strlen(pass)))
 -	break;
  #endif
 +        }
 +      else
 +	{
-+          if (!strncmp(crypt(cp1, pass), pass, strlen(pass)))
++          char *buf = crypt(cp1, pass);
++          if (buf && !strncmp(buf, pass, strlen(pass)))
 +	    break;
 +	}
        debug("screen_builtin_lck: NO!!!!!\n");
diff --git a/debian/patches/11replace_doc_paths.patch b/debian/patches/11replace_doc_paths.patch
index eee2d47..b3e2ad0 100644
--- a/debian/patches/11replace_doc_paths.patch
+++ b/debian/patches/11replace_doc_paths.patch
@@ -3,8 +3,8 @@ Description: Fix the references to configuration and pipe paths to match the
 locations Debian uses.
 Index: screen/doc/screen.1
 ===================================================================
---- screen.orig/doc/screen.1	2012-03-20 22:34:27.000000000 +0100
-+++ screen/doc/screen.1	2012-03-20 22:35:03.000000000 +0100
+--- screen.orig/doc/screen.1	2014-04-17 14:19:01.303692035 +0200
++++ screen/doc/screen.1	2014-04-17 14:19:01.287693091 +0200
 @@ -101,7 +101,7 @@
  the invoking shell to the application (emacs in this case), because it is
  forked from the parent screen process, not from the invoking shell.
@@ -23,7 +23,7 @@ Index: screen/doc/screen.1
  This can also be defined through the \*Qdeflogin\*U .screenrc command.
  .TP 5
  .BR \-ls " [" \fImatch ]
-@@ -620,7 +620,7 @@
+@@ -622,7 +622,7 @@
  
  .SH CUSTOMIZATION
  The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
@@ -32,7 +32,7 @@ Index: screen/doc/screen.1
  .I screen
  is installed setuid-root, then the administrator
  should compile
-@@ -633,7 +633,7 @@
+@@ -635,7 +635,7 @@
  When
  .I screen
  is invoked, it executes initialization commands from the files
@@ -41,7 +41,7 @@ Index: screen/doc/screen.1
  \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
  defaults\*U that can be overridden in the following ways: for the
  global screenrc file 
-@@ -1835,7 +1835,7 @@
+@@ -1837,7 +1837,7 @@
  The echo command may be used to annoy 
  .I screen
  users with a 'message of the
@@ -50,7 +50,7 @@ Index: screen/doc/screen.1
  The option \*Q-n\*U may be used to suppress the line feed.
  See also \*Qsleep\*U.
  Echo is also useful for online checking of environment variables.
-@@ -4844,14 +4844,14 @@
+@@ -4846,14 +4846,14 @@
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC 
@@ -68,7 +68,7 @@ Index: screen/doc/screen.1
  Socket directories (default)
  .IP /usr/tmp/screens/S-<login>
  Alternate socket directories.
-@@ -4870,7 +4870,7 @@
+@@ -4872,7 +4872,7 @@
  or
  .IP /etc/termcap
  Terminal capability databases
@@ -77,7 +77,7 @@ Index: screen/doc/screen.1
  Login records
  .IP $LOCKPRG
  Program that locks a terminal.
-@@ -4992,9 +4992,9 @@
+@@ -4994,9 +4994,9 @@
  must be installed as set-uid with owner root on most systems in order
  to be able to correctly change the owner of the tty device file for
  each window.
@@ -91,8 +91,8 @@ Index: screen/doc/screen.1
  This will cause some programs (like "w" or "rwho")
 Index: screen/doc/screen.texinfo
 ===================================================================
---- screen.orig/doc/screen.texinfo	2012-03-20 22:34:27.000000000 +0100
-+++ screen/doc/screen.texinfo	2012-03-20 22:35:03.000000000 +0100
+--- screen.orig/doc/screen.texinfo	2014-04-17 14:19:01.303692035 +0200
++++ screen/doc/screen.texinfo	2014-04-17 14:19:01.295692566 +0200
 @@ -182,7 +182,7 @@
  the invoking shell to the application (emacs in this case), because it is
  forked from the parent screen process, not from the invoking shell.
@@ -111,7 +111,7 @@ Index: screen/doc/screen.texinfo
  is equivalent to the @code{deflogin} command (@pxref{Login}).
  
  @item -ls [@var{match}]
-@@ -485,7 +485,7 @@
+@@ -486,7 +486,7 @@
  @cindex screenrc
  When @code{screen} is invoked, it executes initialization commands from
  the files @file{.screenrc} in the user's home directory and
@@ -120,7 +120,7 @@ Index: screen/doc/screen.texinfo
  following ways:
  For the global screenrc file @code{screen} searches for the environment
  variable @code{$SYSSCREENRC} (this override feature may be disabled at
-@@ -1069,7 +1069,7 @@
+@@ -1070,7 +1070,7 @@
  @item logfile @var{filename}
  Place where to collect logfiles.  @xref{Log}.
  @item login [@var{state}]
@@ -129,7 +129,7 @@ Index: screen/doc/screen.texinfo
  @item logtstamp [@var{state}]
  Configure logfile time-stamps.  @xref{Log}.
  @item mapdefault
-@@ -2318,7 +2318,7 @@
+@@ -2319,7 +2319,7 @@
  * Naming Windows::		Control the name of the window
  * Console::			See the host's console messages
  * Kill::                        Destroy an unwanted window
@@ -138,7 +138,7 @@ Index: screen/doc/screen.texinfo
  * Mode::                        Control the file mode of the pty
  * Monitor::                     Watch for activity or inactivity in a window
  * Windows::			List the active windows
-@@ -2527,7 +2527,7 @@
+@@ -2528,7 +2528,7 @@
  @kindex L
  @deffn Command login [state]
  (@kbd{C-a L})@*
@@ -147,7 +147,7 @@ Index: screen/doc/screen.texinfo
  This controls whether or not the window is @dfn{logged in}.  In addition
  to this toggle, it is convenient to have ``log in'' and ``log out''
  keys.  For instance, @code{bind I login on} and @code{bind O 
-@@ -5670,17 +5670,17 @@
+@@ -5671,17 +5671,17 @@
  global initialization files.
  
  @item @code{$SYSSCREENRC}
@@ -168,7 +168,7 @@ Index: screen/doc/screen.texinfo
  Socket directories (default)
  
  @item /usr/tmp/screens/S-@var{login}
-@@ -5703,7 +5703,7 @@
+@@ -5704,7 +5704,7 @@
  @itemx /etc/termcap
  Terminal capability databases
  
@@ -177,7 +177,7 @@ Index: screen/doc/screen.texinfo
  Login records
  
  @item @code{$LOCKPRG}
-@@ -5809,10 +5809,10 @@
+@@ -5810,10 +5810,10 @@
  in order to be able to
  correctly change the owner of the tty device file for each window.
  Special permission may also be required to write the file
@@ -190,7 +190,7 @@ Index: screen/doc/screen.texinfo
  with SIGKILL.  This will cause some programs (like "w" or "rwho") to
  advertise that a user is logged on who really isn't.
  
-@@ -5893,7 +5893,7 @@
+@@ -5894,7 +5894,7 @@
  @cindex socket directory
  
  The socket directory defaults either to @file{$HOME/.screen} or simply to 
diff --git a/debian/patches/13split_info_files.patch b/debian/patches/13split_info_files.patch
index 9944796..55bab19 100644
--- a/debian/patches/13split_info_files.patch
+++ b/debian/patches/13split_info_files.patch
@@ -1,6 +1,8 @@
 Author: <hesso@pool.math.tu-berlin.de>
-Description: Split the info files at 50k to match the distribution style
-of the orig tarball.
+Description: Split the info files at 50k
+ This matches the distribution style of the orig tarball.
+Last-Revised: 2013-05-16 by Axel Beckert <abe@debian.org>
+
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
 @@ -28,7 +28,7 @@
@@ -8,7 +10,7 @@ of the orig tarball.
  info screen.info: screen.texinfo
  	@rm -f screen.info*
 -	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-+	$(MAKEINFO) --split 50000 $(srcdir)/screen.texinfo -o screen.info
++	$(MAKEINFO) --split-size=50000 $(srcdir)/screen.texinfo -o screen.info
  
  install: installdirs
  	$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
diff --git a/debian/patches/14size_matters.patch b/debian/patches/14size_matters.patch
index 0642291..b3a3d7d 100644
--- a/debian/patches/14size_matters.patch
+++ b/debian/patches/14size_matters.patch
@@ -3,8 +3,8 @@ Description: * Increase the MAXSTR macro to suit present-day needs.
 * Increase the maximum length of the input line buffer likewise.
 Index: screen/input.c
 ===================================================================
---- screen.orig/input.c	2012-03-20 22:34:27.000000000 +0100
-+++ screen/input.c	2012-03-20 22:35:13.000000000 +0100
+--- screen.orig/input.c	2014-04-17 14:19:10.747075706 +0200
++++ screen/input.c	2014-04-17 14:19:10.731076736 +0200
 @@ -43,7 +43,7 @@
  
  struct inpline
@@ -36,8 +36,8 @@ Index: screen/input.c
        maxlen = flayer->l_width - 1 - strlen(istr);
 Index: screen/process.c
 ===================================================================
---- screen.orig/process.c	2012-03-20 22:34:27.000000000 +0100
-+++ screen/process.c	2012-03-20 22:35:13.000000000 +0100
+--- screen.orig/process.c	2014-04-17 14:19:10.747075706 +0200
++++ screen/process.c	2014-04-17 14:19:10.735076470 +0200
 @@ -2097,7 +2097,7 @@
  	ChangeAKA(fore, *args, strlen(*args));
        break;
@@ -49,8 +49,8 @@ Index: screen/process.c
  	  s = *args;
 Index: screen/screen.h
 ===================================================================
---- screen.orig/screen.h	2012-03-20 22:34:27.000000000 +0100
-+++ screen/screen.h	2012-03-20 22:35:13.000000000 +0100
+--- screen.orig/screen.h	2014-04-17 14:19:10.747075706 +0200
++++ screen/screen.h	2014-04-17 14:19:10.739076209 +0200
 @@ -91,7 +91,7 @@
  
  #define Ctrl(c) ((c)&037)
@@ -62,9 +62,9 @@ Index: screen/screen.h
  #define MSGMINWAIT 	1
 Index: screen/window.c
 ===================================================================
---- screen.orig/window.c	2012-03-20 22:34:27.000000000 +0100
-+++ screen/window.c	2012-03-20 22:35:13.000000000 +0100
-@@ -2233,7 +2233,7 @@
+--- screen.orig/window.c	2014-04-17 14:19:10.747075706 +0200
++++ screen/window.c	2014-04-17 14:19:10.739076209 +0200
+@@ -2237,7 +2237,7 @@
        return;
      }
    flayer = &p->w_layer;
diff --git a/debian/patches/16fix_gcc_warnings.patch b/debian/patches/16fix_gcc_warnings.patch
index 0ef8b31..06fd700 100644
--- a/debian/patches/16fix_gcc_warnings.patch
+++ b/debian/patches/16fix_gcc_warnings.patch
@@ -2,8 +2,8 @@ Author: <hesso@pool.math.tu-berlin.de>
 Description: Get rid of several minor gcc warnings.
 Index: screen/attacher.c
 ===================================================================
---- screen.orig/attacher.c	2011-10-08 19:58:12.000000000 +0200
-+++ screen/attacher.c	2011-10-08 19:58:41.000000000 +0200
+--- screen.orig/attacher.c	2014-04-17 14:19:15.702758400 +0200
++++ screen/attacher.c	2014-04-17 14:19:15.638762477 +0200
 @@ -848,7 +848,7 @@
    pam_handle_t *pamh = 0;
    int pam_error;
@@ -15,9 +15,9 @@ Index: screen/attacher.c
  #ifdef USE_PAM
 Index: screen/layer.c
 ===================================================================
---- screen.orig/layer.c	2011-10-08 19:54:20.000000000 +0200
-+++ screen/layer.c	2011-10-08 19:58:41.000000000 +0200
-@@ -492,7 +492,7 @@
+--- screen.orig/layer.c	2014-04-17 14:19:15.702758400 +0200
++++ screen/layer.c	2014-04-17 14:19:15.642762218 +0200
+@@ -493,7 +493,7 @@
  void
  LClearLine(l, y, xs, xe, bce, ol)
  struct layer *l;
diff --git a/debian/patches/46fix-keybinding-typo-in-manpage.patch b/debian/patches/46fix-keybinding-typo-in-manpage.patch
index 3513776..34bc54a 100644
--- a/debian/patches/46fix-keybinding-typo-in-manpage.patch
+++ b/debian/patches/46fix-keybinding-typo-in-manpage.patch
@@ -6,18 +6,9 @@ backspace) (Closes: #541793)
 
 Index: screen/doc/screen.1
 ===================================================================
---- screen.orig/doc/screen.1	2011-10-08 19:58:19.000000000 +0200
-+++ screen/doc/screen.1	2011-10-08 19:59:19.000000000 +0200
-@@ -512,7 +512,7 @@
- Show the number (and title) of the current window.
- .IP "\fBC-a backspace\fP"
- .PD 0
--.IP "\fBC-a h\fP"
-+.IP "\fBC-a C-h\fP"
- .IP "\fBC-a p\fP"
- .IP "\fBC-a C-p\fP	(prev)"
- .PD
-@@ -578,7 +578,7 @@
+--- screen.orig/doc/screen.1	2014-04-17 14:21:30.439417247 +0200
++++ screen/doc/screen.1	2014-04-17 14:21:30.427417253 +0200
+@@ -580,7 +580,7 @@
  Write out a \*Q.termcap\*U file.
  .IP "\fBC-a ?\fP	(help)"
  Show key bindings.
@@ -28,9 +19,9 @@ Index: screen/doc/screen.1
  .IP "\fBC-a :\fP	(colon)"
 Index: screen/doc/screen.texinfo
 ===================================================================
---- screen.orig/doc/screen.texinfo	2011-10-08 19:58:19.000000000 +0200
-+++ screen/doc/screen.texinfo	2011-10-08 19:59:19.000000000 +0200
-@@ -791,7 +791,7 @@
+--- screen.orig/doc/screen.texinfo	2014-04-17 14:21:30.439417247 +0200
++++ screen/doc/screen.texinfo	2014-04-17 14:21:30.431417261 +0200
+@@ -792,7 +792,7 @@
  (help)@*
  Show key bindings.  @xref{Help}.
  
@@ -39,7 +30,7 @@ Index: screen/doc/screen.texinfo
  (quit)@*
  Kill all windows and terminate @code{screen}.  @xref{Quit}.
  
-@@ -2031,13 +2031,10 @@
+@@ -2032,13 +2032,10 @@
  
  @node Quit,  , Suspend, Session Management
  @section Quit
diff --git a/debian/patches/47screen-cc.patch b/debian/patches/47screen-cc.patch
index a8f58e6..a8f8d3c 100644
--- a/debian/patches/47screen-cc.patch
+++ b/debian/patches/47screen-cc.patch
@@ -2,8 +2,8 @@ Author: <bpkroth@gmail.com>
 Description: Some patches stolen from the fedora package for better error checking and tty security.
 Index: screen/utmp.c
 ===================================================================
---- screen.orig/utmp.c	2011-10-08 19:54:17.000000000 +0200
-+++ screen/utmp.c	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/utmp.c	2014-04-17 14:21:36.843412125 +0200
++++ screen/utmp.c	2014-04-17 14:21:36.815412195 +0200
 @@ -361,7 +361,7 @@
        char *tty;
        debug("couln't zap slot -> do mesg n\n");
@@ -42,8 +42,8 @@ Index: screen/utmp.c
    retbuf[0] = '\0';
 Index: screen/extern.h
 ===================================================================
---- screen.orig/extern.h	2011-10-08 19:54:16.000000000 +0200
-+++ screen/extern.h	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/extern.h	2014-04-17 14:21:36.843412125 +0200
++++ screen/extern.h	2014-04-17 14:21:36.819412181 +0200
 @@ -110,6 +110,7 @@
  extern struct baud_values *lookup_baud __P((int bps));
  extern int   SetBaud __P((struct mode *, int, int));
@@ -54,8 +54,8 @@ Index: screen/extern.h
  /* mark.c */
 Index: screen/screen.c
 ===================================================================
---- screen.orig/screen.c	2011-10-08 19:58:56.000000000 +0200
-+++ screen/screen.c	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/screen.c	2014-04-17 14:21:36.843412125 +0200
++++ screen/screen.c	2014-04-17 14:21:36.823412180 +0200
 @@ -972,8 +972,13 @@
  	else \
  	  attach_tty = ""; \
@@ -74,8 +74,8 @@ Index: screen/screen.c
    } while (0)
 Index: screen/tty.sh
 ===================================================================
---- screen.orig/tty.sh	2011-10-08 19:58:28.000000000 +0200
-+++ screen/tty.sh	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/tty.sh	2014-04-17 14:21:36.843412125 +0200
++++ screen/tty.sh	2014-04-17 14:21:36.827412192 +0200
 @@ -60,6 +60,7 @@
  #include <sys/types.h>
  #include <signal.h>
@@ -106,8 +106,8 @@ Index: screen/tty.sh
   */
 Index: screen/socket.c
 ===================================================================
---- screen.orig/socket.c	2011-10-08 19:54:17.000000000 +0200
-+++ screen/socket.c	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/socket.c	2014-04-17 14:21:36.843412125 +0200
++++ screen/socket.c	2014-04-17 14:21:36.827412192 +0200
 @@ -722,6 +722,7 @@
    char *args[MAXARGS];
    register int n;
@@ -126,8 +126,8 @@ Index: screen/socket.c
        if (IsNumColon(p, 10, buf, sizeof(buf)))
 Index: screen/braille_tsi.c
 ===================================================================
---- screen.orig/braille_tsi.c	2011-10-08 19:54:17.000000000 +0200
-+++ screen/braille_tsi.c	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/braille_tsi.c	2014-04-17 14:21:36.843412125 +0200
++++ screen/braille_tsi.c	2014-04-17 14:21:36.831412183 +0200
 @@ -127,7 +127,6 @@
    r = read(bd.bd_fd,ibuf,1);
    if (r != 1)
@@ -138,8 +138,8 @@ Index: screen/braille_tsi.c
    else
 Index: screen/fileio.c
 ===================================================================
---- screen.orig/fileio.c	2011-10-08 19:58:46.000000000 +0200
-+++ screen/fileio.c	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/fileio.c	2014-04-17 14:21:36.843412125 +0200
++++ screen/fileio.c	2014-04-17 14:21:36.831412183 +0200
 @@ -80,8 +80,6 @@
      }
    else
@@ -151,8 +151,8 @@ Index: screen/fileio.c
        cp[len1 + add_colon] = '\0';
 Index: screen/attacher.c
 ===================================================================
---- screen.orig/attacher.c	2011-10-08 19:59:12.000000000 +0200
-+++ screen/attacher.c	2011-10-08 19:59:23.000000000 +0200
+--- screen.orig/attacher.c	2014-04-17 14:21:36.843412125 +0200
++++ screen/attacher.c	2014-04-17 14:21:36.831412183 +0200
 @@ -185,8 +185,8 @@
  	  if (ret == SIG_POWER_BYE)
  	    {
@@ -258,7 +258,7 @@ Index: screen/attacher.c
  #endif
    char *pass = 0, mypass[16 + 1], salt[3];
    int using_pam = 1;
-@@ -926,6 +941,15 @@
+@@ -932,6 +947,15 @@
        pam_error = pam_start("screen", ppp->pw_name, &PAM_conversation, &pamh);
        if (pam_error != PAM_SUCCESS)
  	AttacherFinit(SIGARG);		/* goodbye */
diff --git a/debian/patches/48screen-ipv6.patch b/debian/patches/48screen-ipv6.patch
index 36526cc..f632d93 100644
--- a/debian/patches/48screen-ipv6.patch
+++ b/debian/patches/48screen-ipv6.patch
@@ -2,12 +2,12 @@ Author: <bpkroth@gmail.com>
 Description: Some patches stolen from the fedora package for better error checking and tty security.
 Index: screen/doc/screen.1
 ===================================================================
---- screen.orig/doc/screen.1	2012-03-20 22:41:10.000000000 +0100
-+++ screen/doc/screen.1	2012-03-20 22:41:13.000000000 +0100
-@@ -398,6 +398,12 @@
- the \fB-d\fP or \fB-r\fP option to tell screen to look only for
- attached or detached screen sessions. Note that this command doesn't
- work if the session is password protected.
+--- screen.orig/doc/screen.1	2014-04-17 14:23:06.359089910 +0200
++++ screen/doc/screen.1	2014-04-17 14:23:06.343089985 +0200
+@@ -400,6 +400,12 @@
+ \fB-r\fP option to tell screen to look only for attached or
+ detached screen sessions. Note that this command doesn't work if
+ the session is password protected.
 +.TP 5
 +.B \-4
 +Resolve hostnames only to IPv4 addresses.
@@ -19,8 +19,8 @@ Index: screen/doc/screen.1
  .ta 12n 26n
 Index: screen/extern.h
 ===================================================================
---- screen.orig/extern.h	2012-03-20 22:41:12.000000000 +0100
-+++ screen/extern.h	2012-03-20 22:41:13.000000000 +0100
+--- screen.orig/extern.h	2014-04-17 14:23:06.359089910 +0200
++++ screen/extern.h	2014-04-17 14:23:06.343089985 +0200
 @@ -459,8 +459,7 @@
  
  /* teln.c */
@@ -33,8 +33,8 @@ Index: screen/extern.h
  extern int   DoTelnet __P((char *, int *, int));
 Index: screen/help.c
 ===================================================================
---- screen.orig/help.c	2012-03-20 22:14:48.000000000 +0100
-+++ screen/help.c	2012-03-20 22:41:13.000000000 +0100
+--- screen.orig/help.c	2014-04-17 14:23:06.359089910 +0200
++++ screen/help.c	2014-04-17 14:23:06.347089970 +0200
 @@ -66,6 +66,10 @@
  {
    printf("Use: %s [-opts] [cmd [args]]\n", myname);
@@ -48,8 +48,8 @@ Index: screen/help.c
    printf("-c file       Read configuration file instead of '.screenrc'.\n");
 Index: screen/screen.c
 ===================================================================
---- screen.orig/screen.c	2012-03-20 22:41:12.000000000 +0100
-+++ screen/screen.c	2012-03-20 22:41:13.000000000 +0100
+--- screen.orig/screen.c	2014-04-17 14:23:06.359089910 +0200
++++ screen/screen.c	2014-04-17 14:23:06.347089970 +0200
 @@ -248,8 +248,9 @@
  struct win *fore;
  struct win *windows;
@@ -89,8 +89,8 @@ Index: screen/screen.c
  		  break;
 Index: screen/teln.c
 ===================================================================
---- screen.orig/teln.c	2012-03-20 22:14:48.000000000 +0100
-+++ screen/teln.c	2012-03-20 22:41:13.000000000 +0100
+--- screen.orig/teln.c	2014-04-17 14:23:06.359089910 +0200
++++ screen/teln.c	2014-04-17 14:23:06.347089970 +0200
 @@ -30,6 +30,7 @@
  #include <sys/socket.h>
  #include <fcntl.h>
@@ -271,9 +271,9 @@ Index: screen/teln.c
  int
 Index: screen/window.c
 ===================================================================
---- screen.orig/window.c	2012-03-20 22:35:13.000000000 +0100
-+++ screen/window.c	2012-03-20 22:41:13.000000000 +0100
-@@ -607,6 +607,13 @@
+--- screen.orig/window.c	2014-04-17 14:23:06.359089910 +0200
++++ screen/window.c	2014-04-17 14:23:06.351089971 +0200
+@@ -611,6 +611,13 @@
    n = pp - wtab;
    debug1("Makewin creating %d\n", n);
  
@@ -287,7 +287,7 @@ Index: screen/window.c
    if ((f = OpenDevice(nwin.args, nwin.lflag, &type, &TtyName)) < 0)
      return -1;
    if (type == W_TYPE_GROUP)
-@@ -768,7 +775,7 @@
+@@ -772,7 +779,7 @@
  #ifdef BUILTIN_TELNET
    if (type == W_TYPE_TELNET)
      {
@@ -296,7 +296,7 @@ Index: screen/window.c
  	{
  	  FreeWindow(p);
  	  return -1;
-@@ -880,6 +887,13 @@
+@@ -884,6 +891,13 @@
    int lflag, f;
  
    lflag = nwin_default.lflag;
@@ -310,7 +310,7 @@ Index: screen/window.c
    if ((f = OpenDevice(p->w_cmdargs, lflag, &p->w_type, &TtyName)) < 0)
      return -1;
  
-@@ -913,7 +927,7 @@
+@@ -917,7 +931,7 @@
  #ifdef BUILTIN_TELNET
    if (p->w_type == W_TYPE_TELNET)
      {
@@ -319,7 +319,7 @@ Index: screen/window.c
          return -1;
      }
    else
-@@ -1072,16 +1086,6 @@
+@@ -1076,16 +1090,6 @@
        *namep = "telnet";
        return 0;
      }
@@ -338,8 +338,8 @@ Index: screen/window.c
        Msg(0, "Invalid argument '%s'", arg);
 Index: screen/window.h
 ===================================================================
---- screen.orig/window.h	2012-03-20 22:14:48.000000000 +0100
-+++ screen/window.h	2012-03-20 22:41:13.000000000 +0100
+--- screen.orig/window.h	2014-04-17 14:23:06.359089910 +0200
++++ screen/window.h	2014-04-17 14:23:06.351089971 +0200
 @@ -268,7 +268,7 @@
    struct display *w_zdisplay;
  #endif
diff --git a/debian/patches/49long-usernames.patch b/debian/patches/49long-usernames.patch
index 58ce4f6..02a3a49 100644
--- a/debian/patches/49long-usernames.patch
+++ b/debian/patches/49long-usernames.patch
@@ -1,8 +1,10 @@
 Description: Patch to allow usernames longer than 20 characters.
 Source: http://www.mail-archive.com/screen-devel@gnu.org/msg00186.html
 Author: Steve Kemp
+Author: Martin von Wittich <martin.von.wittich@iserv.eu>
 Upstream-Bug: http://savannah.gnu.org/bugs/?21653
 Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560231
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735554
 Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/582153
 
 Index: screen/acconfig.h
@@ -62,9 +64,9 @@ Index: screen/acls.h
    int  u_detachwin;		/* the window where he last detached */
 Index: screen/screen.c
 ===================================================================
---- screen.orig/screen.c	2011-10-08 21:20:56.000000000 +0200
-+++ screen/screen.c	2011-10-08 21:20:57.000000000 +0200
-@@ -997,7 +997,7 @@
+--- screen.orig/screen.c	2014-01-16 22:13:09.000000000 +0100
++++ screen/screen.c	2014-01-16 22:15:00.000000000 +0100
+@@ -997,10 +997,10 @@
  
    if (home == 0 || *home == '\0')
      home = ppp->pw_dir;
@@ -72,7 +74,11 @@ Index: screen/screen.c
 +  if (strlen(LoginName) > MAX_USERNAME_LEN)
      Panic(0, "LoginName too long - sorry.");
  #ifdef MULTIUSER
-   if (multi && strlen(multi) > 20)
+-  if (multi && strlen(multi) > 20)
++  if (multi && strlen(multi) > MAX_USERNAME_LEN)
+     Panic(0, "Screen owner name too long - sorry.");
+ #endif
+   if (strlen(home) > MAXPATHLEN - 25)
 Index: screen/screen.h
 ===================================================================
 --- screen.orig/screen.h	2011-10-08 21:20:48.000000000 +0200
diff --git a/debian/patches/50increase-max-TERM-length.patch b/debian/patches/50increase-max-TERM-length.patch
index 5a138b7..fb32064 100644
--- a/debian/patches/50increase-max-TERM-length.patch
+++ b/debian/patches/50increase-max-TERM-length.patch
@@ -2,6 +2,7 @@ From: Andy Spencer
 Subject: [screen-devel] [PATCH 1/1] Increase max TERM length to 40 characters
 Date: Tue, 5 Apr 2011 03:26:58 +0000
 Source: https://lists.gnu.org/archive/html/screen-devel/2011-04/msg00002.html
+Debian-Bugs: 630976 621804
 
 Some terms contain rather long TERM names these days, for example,
 `rxvt-unicode-256color'. Increasing the max size for the TERM variables
@@ -38,3 +39,19 @@ Index: screen/screen.h
  	  int encoding;		/* encoding of display */
  	  int detachfirst;      /* whether to detach remote sessions first */
  	}
+Index: screen/process.c
+===================================================================
+--- screen.orig/process.c	2013-07-22 16:56:05.000000000 +0200
++++ screen/process.c	2013-07-22 17:02:15.000000000 +0200
+@@ -2664,9 +2664,9 @@
+       s = NULL;
+       if (ParseSaveStr(act, &s))
+ 	break;
+-      if (strlen(s) >= 20)
++      if (strlen(s) >= 40)
+ 	{
+-	  OutputMsg(0, "%s: term: argument too long ( < 20)", rc_name);
++	  OutputMsg(0, "%s: term: argument too long ( < 40)", rc_name);
+ 	  free(s);
+ 	  break;
+ 	}
diff --git a/debian/patches/51fix-utf8-status-padding-bug.patch b/debian/patches/51fix-utf8-status-padding-bug.patch
index 0254492..a5c3da7 100644
--- a/debian/patches/51fix-utf8-status-padding-bug.patch
+++ b/debian/patches/51fix-utf8-status-padding-bug.patch
@@ -10,9 +10,9 @@ Signed-off-by: Dustin Kirkland <address@hidden>
 === modified file 'src/display.c'
 Index: screen/display.c
 ===================================================================
---- screen.orig/display.c	2012-03-20 22:15:02.000000000 +0100
-+++ screen/display.c	2012-03-20 22:41:28.000000000 +0100
-@@ -2155,7 +2155,7 @@
+--- screen.orig/display.c	2014-04-17 14:23:17.247036061 +0200
++++ screen/display.c	2014-04-17 14:23:17.235036151 +0200
+@@ -2163,7 +2163,7 @@
      {
        int chars = strlen_onscreen((unsigned char *)(s + start), (unsigned char *)(s + max));
        D_encoding = 0;
@@ -21,7 +21,7 @@ Index: screen/display.c
        D_encoding = UTF8;
        D_x -= (max - chars);	/* Yak! But this is necessary to count for
  				   the fact that not every byte represents a
-@@ -2249,11 +2249,15 @@
+@@ -2257,11 +2257,15 @@
  RefreshHStatus()
  {
    char *buf;
@@ -39,7 +39,7 @@ Index: screen/display.c
    if (buf && *buf)
      {
        ShowHStatus(buf);
-@@ -2348,8 +2352,13 @@
+@@ -2356,8 +2360,13 @@
  	{
  	  if (y == cv->c_ye + 1 && from >= cv->c_xs && from <= cv->c_xe)
  	    {
@@ -54,7 +54,7 @@ Index: screen/display.c
  	      if (cv->c_captev.timeout.tv_sec)
  		evenq(&cv->c_captev);
  	      xx = to > cv->c_xe ? cv->c_xe : to;
-@@ -2358,7 +2367,7 @@
+@@ -2366,7 +2375,7 @@
  	      SetRendition(&mchar_so);
  	      if (l > xx - cv->c_xs + 1)
  		l = xx - cv->c_xs + 1;
diff --git a/debian/patches/59-fix-manpage-warnings.patch b/debian/patches/59-fix-manpage-warnings.patch
index 24b10d2..8730608 100644
--- a/debian/patches/59-fix-manpage-warnings.patch
+++ b/debian/patches/59-fix-manpage-warnings.patch
@@ -7,8 +7,8 @@ Patch to fix minor issues with the man page:
 
 Index: screen/doc/screen.1
 ===================================================================
---- screen.orig/doc/screen.1	2012-06-10 15:07:54.000000000 +0200
-+++ screen/doc/screen.1	2012-06-10 15:12:28.000000000 +0200
+--- screen.orig/doc/screen.1	2014-04-17 14:23:30.806964880 +0200
++++ screen/doc/screen.1	2014-04-17 14:23:30.798964935 +0200
 @@ -245,7 +245,7 @@
  strings identifying your
  .I screen
@@ -52,7 +52,7 @@ Index: screen/doc/screen.1
  For combinations with the \fB\-d\fP/\fB\-D\fP option see there.
  .TP 5
  .BI "\-s " program 
-@@ -359,7 +361,7 @@
+@@ -359,7 +359,7 @@
  .BI "\-S " sessionname
  When creating a new session, this option can be used to specify a
  meaningful name for the session. This name identifies the session for
@@ -61,7 +61,7 @@ Index: screen/doc/screen.1
  default [\fItty.host\fP] suffix.
  .TP 5
  .BI "\-t " name
-@@ -367,7 +369,7 @@
+@@ -367,7 +367,7 @@
  See also the \*Qshelltitle\*U .screenrc command.
  .TP 5
  .BI "\-T " term
@@ -70,7 +70,7 @@ Index: screen/doc/screen.1
  opposed to the defualt setting of \fBscreen\fP.
  .TP 5
  .B \-U
-@@ -379,7 +381,7 @@
+@@ -379,7 +379,7 @@
  Print version number.
  .TP 5
  .BR \-wipe " [" \fImatch ]
@@ -79,7 +79,7 @@ Index: screen/doc/screen.1
  marking them as `dead'.
  An unreachable session is considered dead, when its name matches either 
  the name of the local host, or the explicitly given parameter, if any.
-@@ -425,7 +427,7 @@
+@@ -427,7 +427,7 @@
  Present a list of all windows for selection.
  .IP "\fBC-a 0\fP	(select 0)"
  .PD 0
@@ -88,7 +88,7 @@ Index: screen/doc/screen.1
  .IP "\fBC-a 9\fP	(select 9)"
  .IP "\fBC-a -\fP	(select -)"
  .PD
-@@ -647,7 +649,7 @@
+@@ -649,7 +649,7 @@
  searches for the environment variable $SYSSCREENRC (this override feature
  may be disabled at compile-time). The user specific
  screenrc file is searched in $SCREENRC, then $HOME/.screenrc.
@@ -97,7 +97,7 @@ Index: screen/doc/screen.1
  precedence over the above user screenrc files.
  .PP
  Commands in these files are used to set options, bind functions to
-@@ -699,7 +701,7 @@
+@@ -701,7 +701,7 @@
  .BI chacl " usernames permbits list"
  .PP
  Change permissions for a comma separated list of users. Permission bits are
@@ -106,7 +106,7 @@ Index: screen/doc/screen.1
  removes it. The third parameter is a comma separated list of commands and/or
  windows (specified either by number or title). The special list `#' refers to 
  all windows, `?' to all commands. if \fIusernames\fP consists of a single `*',
-@@ -709,9 +711,9 @@
+@@ -711,9 +711,9 @@
  user obtains a writelock for this window. 
  Other bits are currently ignored.  
  To withdraw the writelock from another user in window 2:
@@ -118,7 +118,7 @@ Index: screen/doc/screen.1
  .I screen 
  he can attach to the session and (per default) has full permissions for all 
  command and windows. Execution permission for the acl commands, `at' and others
-@@ -746,11 +748,11 @@
+@@ -748,11 +748,11 @@
  .ne 3
  .B aclumask
  .RI [[ users ] +bits 
@@ -132,7 +132,7 @@ Index: screen/doc/screen.1
  .PP
  This specifies the access other users have to windows that will be created by
  the caller of the command.
-@@ -805,7 +807,7 @@
+@@ -807,7 +807,7 @@
  .sp
  .ne 3
  .BR "at " "[\fIidentifier\fP][" "#\fP|\fP*\fP|\fP%\fP] "
@@ -141,7 +141,7 @@ Index: screen/doc/screen.1
  .PP
  Execute a command at other displays or windows as if it had been entered there.
  \*QAt\*U changes the context (the `current window' or `current display'
-@@ -856,7 +858,7 @@
+@@ -858,7 +858,7 @@
  .PP
  Change the color to bright red if bold text is to be printed.
  .IP
@@ -150,7 +150,7 @@ Index: screen/doc/screen.1
  .PP
  Use blue text instead of underline.
  .IP
-@@ -876,7 +878,7 @@
+@@ -878,7 +878,7 @@
  .I screen
  will automatically detach upon hangup, which
  saves all your running programs until they are resumed with a
@@ -159,7 +159,7 @@ Index: screen/doc/screen.1
  command.
  When turned off, a hangup signal will terminate 
  .I screen
-@@ -894,7 +896,7 @@
+@@ -896,7 +896,7 @@
  .I lifespan
  .I autorefresh
  .I cmd
@@ -168,7 +168,7 @@ Index: screen/doc/screen.1
  .br
  .BI "backtick " id
  .PP
-@@ -948,7 +950,7 @@
+@@ -950,7 +950,7 @@
  .sp
  .ne 3
  .BI "bind "
@@ -177,7 +177,7 @@ Index: screen/doc/screen.1
  .IR class ]
  .I key 
  .RI [ command " [" args ]]
-@@ -970,7 +972,7 @@
+@@ -972,7 +972,7 @@
  for this key is removed.
  The \fIcommand\fP argument can be any command listed in this section.
  
@@ -186,7 +186,7 @@ Index: screen/doc/screen.1
  is bound for the specified class. Use the \*Qcommand\*U command
  to activate a class. Command classes can be used to create multiple
  command keys or multi-character bindings.
-@@ -983,7 +985,7 @@
+@@ -985,7 +985,7 @@
  	bind k
  	bind K kill
  	bind ^f screen telnet foobar
@@ -195,7 +195,7 @@ Index: screen/doc/screen.1
  .fi
  .PP
  would bind the space key to the command that displays a list
-@@ -997,29 +999,29 @@
+@@ -999,29 +999,29 @@
  a superuser shell and a scrollback buffer of 1000 lines.
  .PP
  .nf
@@ -238,7 +238,7 @@ Index: screen/doc/screen.1
  .I string
  .RI [ "cmd args" ]]
  .PP
-@@ -1032,9 +1034,9 @@
+@@ -1034,9 +1034,9 @@
  \*QINPUT TRANSLATION\*U for a list of default key bindings.
  .br
  If the
@@ -250,7 +250,7 @@ Index: screen/doc/screen.1
  changes the copy mode table
  and with neither option the user table is selected.
  The argument
-@@ -1042,18 +1044,18 @@
+@@ -1044,18 +1044,18 @@
  is the sequence of characters to which an action is bound. This
  can either be a fixed string or a termcap keyboard capability
  name (selectable with the
@@ -272,7 +272,7 @@ Index: screen/doc/screen.1
  option tells screen not to do inter-character timing. One cannot
  turn off the timing if a termcap capability is used.
  .br
-@@ -1067,18 +1069,18 @@
+@@ -1069,18 +1069,18 @@
  Here are some examples of keyboard bindings:
  .sp
  .nf
@@ -294,7 +294,7 @@ Index: screen/doc/screen.1
  .fi
  Make "foo" an abbreviation of the word "barfoo". Timeout is disabled
  so that users can type slowly.
-@@ -1092,7 +1094,7 @@
+@@ -1094,7 +1094,7 @@
  you have to press the key twice (i.e., escape the escape binding).
  .sp
  .nf
@@ -303,7 +303,7 @@ Index: screen/doc/screen.1
  .fi
  Make the F11 (not F1!) key an alternative screen
  escape (besides ^A).
-@@ -1144,7 +1146,7 @@
+@@ -1146,7 +1146,7 @@
  .PP
  Change the filename used for reading and writing with the paste buffer.
  If the optional argument to the \*Qbufferfile\*U command is omitted, 
@@ -312,7 +312,7 @@ Index: screen/doc/screen.1
  The following example will paste the system's password file into 
  the
  .I screen
-@@ -1213,7 +1215,7 @@
+@@ -1215,7 +1215,7 @@
  to the specified directory or, if called without an argument,
  to your home directory (the value of the environment variable $HOME).
  All windows that are created by means of the \*Qscreen\*U command
@@ -321,7 +321,7 @@ Index: screen/doc/screen.1
  or \*QC-a c\*U use this as their default directory.
  Without a chdir command, this would be the directory from which
  .I screen
-@@ -1239,7 +1241,7 @@
+@@ -1241,7 +1241,7 @@
  specific window creation and changing settings. Note that the \*Qset\*U
  keyword no longer exists! Usually commands affect the current window rather 
  than default settings for future windows. Change defaults with commands
@@ -330,7 +330,7 @@ Index: screen/doc/screen.1
  
  If you consider this as the `Ex command mode' of 
  .IR screen ,
-@@ -1247,12 +1249,12 @@
+@@ -1249,12 +1249,12 @@
  .sp 
  .ne 3
  .B command
@@ -345,7 +345,7 @@ Index: screen/doc/screen.1
  class.  See also \*Qbind\*U and \*Qbindkey\*U.
  .sp 
  .ne 3
-@@ -1443,7 +1445,7 @@
+@@ -1445,7 +1445,7 @@
  .br
  .ti -2n
  \fB>\fP sets the (second) mark and writes the contents of the paste buffer to
@@ -354,7 +354,7 @@ Index: screen/doc/screen.1
  finished. 
  .br
  This example demonstrates how to dump the whole scrollback buffer 
-@@ -1485,7 +1487,7 @@
+@@ -1487,7 +1487,7 @@
  .PP
  Turns runtime debugging on or off. If 
  .I screen
@@ -363,7 +363,7 @@ Index: screen/doc/screen.1
  default. Note that this command only affects debugging output from the main 
  \*QSCREEN\*U process correctly. Debug output from attacher processes can only
  be turned off once and forever.
-@@ -1659,7 +1661,7 @@
+@@ -1661,7 +1661,7 @@
  .PP
  Same as the \fButf8\fP command except that the default setting for new
  windows is changed. Initial setting is `on' if screen was started with
@@ -372,7 +372,7 @@ Index: screen/doc/screen.1
  .sp
  .ne 3
  .BR "defwrap on" | off
-@@ -1682,7 +1684,7 @@
+@@ -1684,7 +1684,7 @@
  .sp
  .ne 3
  .B detach
@@ -381,7 +381,7 @@ Index: screen/doc/screen.1
  .PP
  Detach the 
  .I screen
-@@ -1781,16 +1783,16 @@
+@@ -1783,16 +1783,16 @@
  .br
  (I) Window permissions. Made up of three characters:
        (1st character)
@@ -401,7 +401,7 @@ Index: screen/doc/screen.1
           ‘x’ : execute
  
  \*QDisplays\*U needs a region size of at least 10 characters wide and 5 characters high in
-@@ -1835,14 +1837,14 @@
+@@ -1837,14 +1837,14 @@
  .IR tic .
  .sp
  .ne 3
@@ -418,7 +418,7 @@ Index: screen/doc/screen.1
  See also \*Qsleep\*U.
  Echo is also useful for online checking of environment variables.
  .sp
-@@ -1883,14 +1885,14 @@
+@@ -1885,14 +1885,14 @@
  .B eval
  .I command1
  .RI [ command2
@@ -435,7 +435,7 @@ Index: screen/doc/screen.1
  .PP
  Run a unix subprocess (specified by an executable path \fInewcommand\fP and its 
  optional arguments) in the current window. The flow of data between 
-@@ -1933,7 +1935,7 @@
+@@ -1935,7 +1935,7 @@
  .sp
  Examples:
  .IP
@@ -444,7 +444,7 @@ Index: screen/doc/screen.1
  .br
  exec /bin/sh
  .br
-@@ -1969,7 +1971,7 @@
+@@ -1971,7 +1971,7 @@
  .I pg
  still works.
  .IP
@@ -453,7 +453,7 @@ Index: screen/doc/screen.1
  .PP
  Sends window output to both, the user and the sed command. The sed inserts an
  additional bell character (oct. 007) to the window output seen by
-@@ -2045,14 +2047,14 @@
+@@ -2047,14 +2047,14 @@
  .sp
  .ne 3
  .B hardcopy
@@ -470,7 +470,7 @@ Index: screen/doc/screen.1
  scrollback buffer.
  .sp
  .ne 3
-@@ -2123,22 +2125,22 @@
+@@ -2125,22 +2125,22 @@
  .sp
  .ne 3
  .B height
@@ -497,7 +497,7 @@ Index: screen/doc/screen.1
  .IR class ]
  .PP
  Not really a online help, but 
-@@ -2149,7 +2151,7 @@
+@@ -2151,7 +2151,7 @@
  bindings.
  Subsequent pages will display the custom commands, one command per key.
  Press space when you're done reading each page, or return to exit early.
@@ -506,7 +506,7 @@ Index: screen/doc/screen.1
  display all bound commands for the specified command class.
  See also \*QDEFAULT KEY BINDINGS\*U section.
  .sp
-@@ -2160,7 +2162,7 @@
+@@ -2162,7 +2162,7 @@
  For example csh has the command \*Q!!\*U to repeat the last command executed. 
  .I Screen
  allows you to have a primitive way of re-calling \*Qthe command that
@@ -515,7 +515,7 @@ Index: screen/doc/screen.1
  `C-a {' and
  .I screen
  tries to find a previous line that matches with the `prompt character' 
-@@ -2202,11 +2204,11 @@
+@@ -2204,11 +2204,11 @@
  
  .nf
    +flow     automatic flow control, currently on.
@@ -531,7 +531,7 @@ Index: screen/doc/screen.1
  .fi
  
  The current line wrap setting (`+wrap' indicates enabled, `\-wrap' not) is
-@@ -2467,7 +2469,7 @@
+@@ -2469,7 +2469,7 @@
  a second time-stamp is added to document the restart of the
  output. You can change this timeout with the second form
  of the command. The third form is used for customizing the time-stamp
@@ -540,7 +540,7 @@ Index: screen/doc/screen.1
  default).
  .sp
  .ne 3
-@@ -2611,11 +2613,11 @@
+@@ -2613,11 +2613,11 @@
  the display and redisplay the updated window contents.
  .sp
  .ne 3
@@ -554,7 +554,7 @@ Index: screen/doc/screen.1
  will change the window's number by the relative amount specified.
  .sp
  .ne 3
-@@ -2771,18 +2773,18 @@
+@@ -2773,18 +2773,18 @@
  .sp
  .ne 3
  .B readbuf
@@ -576,7 +576,7 @@ Index: screen/doc/screen.1
  .IR encoding ]
  .RI [ register " [" filename ]]
  .PP
-@@ -2791,7 +2793,7 @@
+@@ -2793,7 +2793,7 @@
  or entered at the prompt. With two arguments it reads the contents of the named 
  file into the register, just as \fIreadbuf\fP reads the screen-exchange file
  into the paste buffer.
@@ -585,7 +585,7 @@ Index: screen/doc/screen.1
  The following example will paste the system's password file into 
  the 
  .I screen 
-@@ -2810,12 +2812,12 @@
+@@ -2812,12 +2812,12 @@
  .sp
  .ne 3
  .B register
@@ -600,7 +600,7 @@ Index: screen/doc/screen.1
  See also the \*Qpaste\*U command.
  .sp
  .ne 3
-@@ -2853,7 +2855,7 @@
+@@ -2855,7 +2855,7 @@
  .IP
  resize +N	increase current region height by N
  .IP
@@ -609,7 +609,7 @@ Index: screen/doc/screen.1
  .IP
  resize  N	set current region height to N
  .IP
-@@ -2865,15 +2867,15 @@
+@@ -2867,15 +2867,15 @@
  .PP
  .sp
  .ne 3
@@ -631,7 +631,7 @@ Index: screen/doc/screen.1
  If an optional number \fIn\fP in the range 0..MAXWIN-1 is given,
  the window number \fIn\fP is assigned to the newly created window
  (or, if this number is already in-use, the next available number).
-@@ -2887,7 +2889,7 @@
+@@ -2889,7 +2889,7 @@
  .nf
  	# example for .screenrc:
  	screen 1
@@ -640,7 +640,7 @@ Index: screen/doc/screen.1
  .fi
  .sp
  .I screen
-@@ -2927,19 +2929,19 @@
+@@ -2929,19 +2929,19 @@
  Thus, the first window can be activated by \*Qselect 0\*U.
  The number of windows is limited at compile-time by the MAXWIN
  configuration parameter (which defaults to 40).
@@ -664,7 +664,7 @@ Index: screen/doc/screen.1
  name a new session.
  The default is constructed from the tty and host names.
  .sp
-@@ -2969,7 +2971,7 @@
+@@ -2971,7 +2971,7 @@
  This overrides the value of the environment variable $SHELL.
  This is useful if you'd like to run a tty-enhancer which is expecting to
  execute the program specified in $SHELL. If the command begins with
@@ -673,7 +673,7 @@ Index: screen/doc/screen.1
  .sp
  .ne 3
  .B "shelltitle \fItitle\fP"
-@@ -3036,12 +3038,12 @@
+@@ -3038,12 +3038,12 @@
  .sp
  .ne 3
  .B split
@@ -688,7 +688,7 @@ Index: screen/doc/screen.1
  to delete regions. Use \*Qfocus\*U to toggle between regions.
  .sp
  .ne 3
-@@ -3058,7 +3060,7 @@
+@@ -3060,7 +3060,7 @@
  .I string
  in the input buffer of the current window.
  This is like the \*Qpaste\*U command but with much less overhead.
@@ -697,7 +697,7 @@ Index: screen/doc/screen.1
  You cannot paste
  large buffers with the \*Qstuff\*U command. It is most useful for key
  bindings. See also \*Qbindkey\*U.
-@@ -3108,17 +3110,17 @@
+@@ -3110,17 +3110,17 @@
  is VT100/ANSI compatible.
  The use of the \*Qterm\*U command is discouraged for non-default purpose.
  That is, one may want to specify special $TERM settings (e.g. vt100) for the
@@ -719,7 +719,7 @@ Index: screen/doc/screen.1
  .RI [ window-tweaks ]
  .PP
  Use this command to modify your terminal's termcap entry without going
-@@ -3234,7 +3236,7 @@
+@@ -3236,7 +3236,7 @@
  Unbind all the bindings. This can be useful when
  screen is used solely for its detaching abilities, such as when
  letting a console application run as a daemon. If, for some reason,
@@ -728,7 +728,7 @@ Index: screen/doc/screen.1
  .sp
  .ne 3
  .BI "unsetenv " var
-@@ -3249,7 +3251,7 @@
+@@ -3251,7 +3251,7 @@
  Change the encoding used in the current window. If utf8 is enabled, the
  strings sent to the window will be UTF-8 encoded and vice versa. Omitting the
  parameter toggles the setting. If a second parameter is given, the display's
@@ -737,7 +737,7 @@ Index: screen/doc/screen.1
  option).
  See also \*Qdefutf8\*U, which changes the default setting of a new
  window.
-@@ -3306,7 +3308,7 @@
+@@ -3308,7 +3308,7 @@
  .sp
  .ne 3
  .B width
@@ -746,7 +746,7 @@ Index: screen/doc/screen.1
  .RI [ cols " [" lines ]]
  .PP
  Toggle the window width between 80 and 132 columns or set it to \fIcols\fP 
-@@ -3315,17 +3317,17 @@
+@@ -3317,17 +3317,17 @@
  See the \*Qtermcap\*U command for more information. You can also specify
  a new height if you want to change both values.
  The
@@ -769,7 +769,7 @@ Index: screen/doc/screen.1
  .br
  .B windowlist
  .B string
-@@ -3339,15 +3341,15 @@
+@@ -3341,15 +3341,15 @@
  If screen was in a window group, screen will
  back out of the group and then display the windows in that group.
  If the 
@@ -788,7 +788,7 @@ Index: screen/doc/screen.1
  option will show the windows inside any groups in that level
  and downwards.
  
-@@ -3435,7 +3437,7 @@
+@@ -3437,7 +3437,7 @@
  Each window is listed by number with the name of process that has been
  started in the window (or its title);
  the current window is marked with a `*';
@@ -797,7 +797,7 @@ Index: screen/doc/screen.1
  all the windows that are \*Qlogged in\*U are marked with a `$';
  a background window that has received a bell is marked with a `!';
  a background window that is being monitored and has had activity occur
-@@ -3458,17 +3460,17 @@
+@@ -3460,17 +3460,17 @@
  .sp
  .ne 3
  .B writebuf
@@ -818,7 +818,7 @@ Index: screen/doc/screen.1
  .sp
  .ne 3
  .BR "writelock " [ on | "off\fR|\fBauto\fR]"
-@@ -3582,13 +3584,13 @@
+@@ -3584,13 +3584,13 @@
  The normal window contains a shell (default, if no parameter is given) or any
  other system command that could be executed from a shell (e.g.  
  .BR slogin ,
@@ -834,7 +834,7 @@ Index: screen/doc/screen.1
  Read and write access is required on the device node, an exclusive open is
  attempted on the node to mark the connection line as busy.
  An optional parameter is allowed consisting of a comma separated list of flags
-@@ -3598,11 +3600,11 @@
+@@ -3600,11 +3600,11 @@
  Usually 300, 1200, 9600 or 19200. This affects transmission as well as receive speed.
  .IP "cs8 or cs7"
  Specify the transmission of eight (or seven) bits per byte.
@@ -849,7 +849,7 @@ Index: screen/doc/screen.1
  Clear (or keep) the eight bit in each received byte.
  .PP
  You may want to specify as many of these options as applicable. Unspecified
-@@ -3727,7 +3729,7 @@
+@@ -3729,7 +3729,7 @@
  .IP u
  all other users on this window
  .IP w
@@ -858,7 +858,7 @@ Index: screen/doc/screen.1
  window; with '+' qualifier: starting with the window after the current
  one.
  .IP W
-@@ -3747,7 +3749,7 @@
+@@ -3749,7 +3749,7 @@
  A '0' qualifier tells screen to treat the number as absolute position.
  You can specify to pad relative to the last absolute pad position
  by adding a '+' qualifier or to pad relative to the right margin
@@ -867,7 +867,7 @@ Index: screen/doc/screen.1
  position lies before the current position. Add the 'L' qualifier
  to change this.
  .IP <
-@@ -3759,7 +3761,7 @@
+@@ -3761,7 +3761,7 @@
  the output area. (The area starts from the last absolute pad
  position and ends with the position specified by the truncation
  operator.) The 'L' qualifier tells screen to mark the truncated
@@ -876,7 +876,7 @@ Index: screen/doc/screen.1
  .IP {
  attribute/color modifier string terminated by the next \*Q}\*U
  .IP `
-@@ -3782,7 +3784,7 @@
+@@ -3784,7 +3784,7 @@
  a color description. The following change types are known:
  .IP +
  add the specified set to the current attributes
@@ -885,7 +885,7 @@ Index: screen/doc/screen.1
  remove the set from the current attributes
  .IP !
  invert the set in the current attributes
-@@ -3843,7 +3845,7 @@
+@@ -3845,7 +3845,7 @@
  the same behavior for two-letter color descriptions, also prefix them
  with a \*Q.\*U.
  .br
@@ -894,7 +894,7 @@ Index: screen/doc/screen.1
  were set before the last change was made (i.e., pops one level of the
  color-change stack).
  .PP
-@@ -3854,7 +3856,7 @@
+@@ -3856,7 +3856,7 @@
  use bold red
  .IP "\*Q= yd\*U"
  clear all attributes, write in default color on yellow background.
@@ -903,7 +903,7 @@ Index: screen/doc/screen.1
  The available windows centered at the current window and truncated to
  the available width. The current window is displayed white on blue.
  This can be used with \*Qhardstatus alwayslastline\*U.
-@@ -3985,7 +3987,7 @@
+@@ -3987,7 +3987,7 @@
  .PP
  Here's some .screenrc examples:
  .IP
@@ -912,7 +912,7 @@ Index: screen/doc/screen.1
  .PP
  Adding this line to your .screenrc would start a nice-d version of the
  \*Qtop\*U command in window 2 named \*Qtop\*U rather than \*Qnice\*U.
-@@ -4005,7 +4007,7 @@
+@@ -4007,7 +4007,7 @@
  The window status would show the name \*Qtrn\*U while the command was
  running, and revert to \*Qcsh\*U upon completion.
  .IP
@@ -921,7 +921,7 @@ Index: screen/doc/screen.1
  .PP
  Having this command in your .screenrc would bind the key
  sequence \*QC-a R\*U to the \*Qsu\*U command and give it an
-@@ -4091,7 +4093,7 @@
+@@ -4093,7 +4093,7 @@
  the contents of your $TERM variable.
  If no such entry exists,
  .I screen
@@ -930,7 +930,7 @@ Index: screen/doc/screen.1
  (132 cols or more)).
  If even this entry cannot be found, \*Qvt100\*U is used as a
  substitute.
-@@ -4134,7 +4136,7 @@
+@@ -4136,7 +4136,7 @@
  When the is latter defined, its value will be copied verbatim into each
  window's $TERMCAP variable.
  This can either be the full terminal definition, or a filename where the
@@ -939,7 +939,7 @@ Index: screen/doc/screen.1
  .PP
  Note that 
  .I screen
-@@ -4286,7 +4288,7 @@
+@@ -4288,7 +4288,7 @@
  .BR "ESC ] 83 ; cmd ^G" "	(A)"
  Execute screen command. This only works if multi-user support is
  compiled into screen. The pseudo-user \*Q:window:\*U is used to
@@ -948,7 +948,7 @@ Index: screen/doc/screen.1
  create a user with no rights and allow only the needed commands.
  .TP 27
  .BR "Control-N" "	(A)"
-@@ -4379,7 +4381,7 @@
+@@ -4381,7 +4381,7 @@
  .B "ESC [ \fPPn\fB d"
  Cursor vertical position
  .TP 27
@@ -957,7 +957,7 @@ Index: screen/doc/screen.1
  Select Graphic Rendition
  .TP 27
  \h'\w'ESC [ 'u'Ps = None or \fB0\fP
-@@ -4448,8 +4450,8 @@
+@@ -4450,8 +4450,8 @@
  \h'\w'ESC [ Ps = 'u'\fB40\fP	(A)
  Background Black
  .TP 27
@@ -968,7 +968,7 @@ Index: screen/doc/screen.1
  .TP 27
  \h'\w'ESC [ Ps = 'u'\fB49\fP	(A)
  Background Default
-@@ -4493,10 +4495,10 @@
+@@ -4495,10 +4495,10 @@
  .B "ESC [ \fPPn\fB ^"
  same as above
  .TP 27
@@ -981,7 +981,7 @@ Index: screen/doc/screen.1
  Reset Mode
  .TP 27
  \h'\w'ESC [ 'u'Ps = \fB4\fP	(A)
-@@ -4639,7 +4641,7 @@
+@@ -4641,7 +4641,7 @@
  		stuff \e033Oy	(A)
  Keypad +	f+	stuff +
  		stuff \e033Ok	(A)
@@ -990,7 +990,7 @@ Index: screen/doc/screen.1
  		stuff \e033Om	(A)
  Keypad *	f*	stuff *
  		stuff \e033Oj	(A)
-@@ -4844,8 +4846,8 @@
+@@ -4846,8 +4846,8 @@
  
  .SH FILES
  .PD 0
@@ -1001,7 +1001,7 @@ Index: screen/doc/screen.1
  Examples in the 
  .I screen
  distribution package for private and global initialization files.
-@@ -4856,16 +4858,16 @@
+@@ -4858,16 +4858,16 @@
  .IP $SCREENRC
  .IP $HOME/.screenrc
  Read in after /etc/screenrc
@@ -1023,7 +1023,7 @@ Index: screen/doc/screen.1
  .I screen
  `interprocess communication buffer'
  .IP hardcopy.[0-9]
-@@ -4894,16 +4896,16 @@
+@@ -4896,16 +4896,16 @@
  .SH COPYLEFT
  .nf
  Copyright (c) 2010
@@ -1045,7 +1045,7 @@ Index: screen/doc/screen.1
  Copyright (C) 1987 Oliver Laumann
  .fi
  .PP
-@@ -4925,8 +4927,8 @@
+@@ -4927,8 +4927,8 @@
  .SH CONTRIBUTORS
  .nf
  Ken Beal (kbeal@amber.ssd.csd.harris.com),
@@ -1056,7 +1056,7 @@ Index: screen/doc/screen.1
  Wayne Davison (davison@borland.com),
  Patrick Wolfe (pat@kai.com, kailand!pat),
  Bart Schaefer (schaefer@cse.ogi.edu),
-@@ -4967,10 +4969,10 @@
+@@ -4969,10 +4969,10 @@
  .I GNU 
  distribution site. The home site of
  .I screen
@@ -1069,7 +1069,7 @@ Index: screen/doc/screen.1
  
  .SH BUGS
  .PD
-@@ -5015,9 +5017,9 @@
+@@ -5017,9 +5017,9 @@
  unless the device driver is configured to send a HANGUP signal. 
  To detach a 
  .I screen
@@ -1081,7 +1081,7 @@ Index: screen/doc/screen.1
  session without asking.
  .IP \(bu
  Both \*Qbreaktype\*U and \*Qdefbreaktype\*U change the break generating
-@@ -5032,5 +5034,5 @@
+@@ -5034,5 +5034,5 @@
  A weird imagination is most useful to gain full advantage of all the features.
  .IP \(bu
  Send bug-reports, fixes, enhancements, t-shirts, money, beer & pizza to
diff --git a/debian/patches/61-allow-dev-console-to-be-a-symlink.patch b/debian/patches/61-allow-dev-console-to-be-a-symlink.patch
new file mode 100644
index 0000000..0733084
--- /dev/null
+++ b/debian/patches/61-allow-dev-console-to-be-a-symlink.patch
@@ -0,0 +1,36 @@
+Description: /dev/console may be a symlink
+ See http://lists.debian.org/debian-devel/2013/01/msg00576.html
+ In case of SunOS kernel (illumos) it is not possible for a device
+ file to have st_nlink != 1, so do not bother with "/devices/"
+Debian-Bug: 701173
+Author: Igor Pashev <pashev.igor@gmail.com>
+
+Index: screen/tty.sh
+===================================================================
+--- screen.orig/tty.sh	2013-01-27 02:16:57.916935245 +0000
++++ screen/tty.sh	2013-01-27 02:33:12.831241123 +0000
+@@ -1506,11 +1506,21 @@
+ char *tty;
+ {
+   struct stat st;
++  char * real;
++  int rc;
+ 
+-  if (lstat(tty, &st) || !S_ISCHR(st.st_mode) ||
+-     (st.st_nlink > 1 && strncmp(tty, "/dev/", 5)))
++  real = realpath(tty, NULL);
++  if (!real)
+     return -1;
+-  return 0;
++  
++  if (lstat(real, &st) || !S_ISCHR(st.st_mode) ||
++    (st.st_nlink > 1 && strncmp(real, "/dev/", 5)))
++    rc = -1;
++  else
++    rc = 0;
++
++  free(real);
++  return rc;
+ }
+ 
+ /*
diff --git a/debian/patches/62-prevent-repeated-title-prompt.patch b/debian/patches/62-prevent-repeated-title-prompt.patch
new file mode 100644
index 0000000..37d2ecf
--- /dev/null
+++ b/debian/patches/62-prevent-repeated-title-prompt.patch
@@ -0,0 +1,44 @@
+Description: Ensure that the title prompt only appears once
+ Windows in screen can be renamed using C-a A (title). This can be done
+ repeatedly so that any number of prompts for a new window name overlay
+ each other. Once the user entered a name in the topmost prompt and
+ presses enter, he has to do it again for all the prompts underneath.
+ This can be very confusing in case the user hit C-a A several times
+ without noticing or realizing.
+Author: Tobias Wulff <tobi@swulff.de>
+Debian-Bug: 625866
+
+Index: screen/process.c
+===================================================================
+--- screen.orig/process.c	2013-07-14 23:43:28.058810093 +0200
++++ screen/process.c	2013-07-14 23:43:28.050810057 +0200
+@@ -478,6 +478,8 @@
+ 
+ char *noargs[1];
+ 
++int enter_window_name_mode = 0;
++
+ void
+ InitKeytab()
+ {
+@@ -5745,6 +5747,8 @@
+   ASSERT(display);
+   if (len && fore)
+     ChangeAKA(fore, buf, strlen(buf));
++
++  enter_window_name_mode = 0;
+ }
+ 
+ static void
+@@ -5752,6 +5756,11 @@
+ {
+   char *s, *ss;
+   int n;
++
++  if (enter_window_name_mode == 1) return;
++
++  enter_window_name_mode = 1;
++
+   Input("Set window's title to: ", sizeof(fore->w_akabuf) - 1, INP_COOKED, AKAfin, NULL, 0);
+   s = fore->w_title;
+   if (!s)
diff --git a/debian/patches/series b/debian/patches/series
index 8246498..303c7bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,6 +27,8 @@
 58-show-encoding-hardstatus.patch
 59-fix-manpage-warnings.patch
 60-644788-screen-4.1.0-4.0.3-interoperability.patch
+61-allow-dev-console-to-be-a-symlink.patch
+62-prevent-repeated-title-prompt.patch
 # 80-99: experimental patches, new features etc.
 80EXP_session_creation_time.patch
 solaris-dev-console.patch