Refresh some patches after patch reordering

Mention all patches in the changelog without .patch at the end

11 files changed, 128 insertions, 79 deletions

diff --git a/debian/patches/10norootpassword.patch b/debian/patches/10norootpassword.patch
index 6fa9ecc..fa24c8f 100644
--- a/debian/patches/10norootpassword.patch
+++ b/debian/patches/10norootpassword.patch
@@ -2,9 +2,12 @@ Author: Martin Pitt <martin.pitt@ubuntu.com>
 Description: When locking a root-owned screen, check that root has a
 password set. If not, ask for an unlocking key.
 See https://bugs.launchpad.net/bugs/6760
---- a/attacher.c
-+++ b/attacher.c
-@@ -862,10 +862,14 @@
+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
+@@ -847,11 +847,15 @@
+ #ifdef USE_PAM
    pam_handle_t *pamh = 0;
    int pam_error;
 -#else
@@ -22,7 +25,7 @@ See https://bugs.launchpad.net/bugs/6760
    pass = ppp->pw_passwd;
    if (pass == 0 || *pass == 0)
      {
-@@ -899,6 +903,8 @@
+@@ -884,6 +888,8 @@
        pass = crypt(mypass, salt);
        pass = ppp->pw_passwd = SaveStr(pass);
      }
@@ -31,7 +34,7 @@ See https://bugs.launchpad.net/bugs/6760
  #endif
  
    debug("screen_builtin_lck looking in gcos field\n");
-@@ -928,6 +934,8 @@
+@@ -913,6 +919,8 @@
            AttacherFinit(SIGARG);
            /* NOTREACHED */
          }
@@ -40,7 +43,7 @@ See https://bugs.launchpad.net/bugs/6760
  #ifdef USE_PAM
        PAM_conversation.appdata_ptr = cp1;
        pam_error = pam_start("screen", ppp->pw_name, &PAM_conversation, &pamh);
-@@ -947,10 +955,13 @@
+@@ -923,10 +931,13 @@
        PAM_conversation.appdata_ptr = 0;
        if (pam_error == PAM_SUCCESS)
  	break;
diff --git a/debian/patches/11replace_doc_paths.patch b/debian/patches/11replace_doc_paths.patch
index 2383d3a..a65dd51 100644
--- a/debian/patches/11replace_doc_paths.patch
+++ b/debian/patches/11replace_doc_paths.patch
@@ -1,8 +1,10 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: Fix the references to configuration and pipe paths to match the
 locations Debian uses.
---- a/doc/screen.1
-+++ b/doc/screen.1
+Index: screen/doc/screen.1
+===================================================================
+--- screen.orig/doc/screen.1	2011-10-08 19:54:22.000000000 +0200
++++ screen/doc/screen.1	2011-10-08 19:58:19.000000000 +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.
@@ -21,7 +23,7 @@ locations Debian uses.
  This can also be defined through the \*Qdeflogin\*U .screenrc command.
  .TP 5
  .BR \-ls " [" \fImatch ]
-@@ -626,7 +626,7 @@
+@@ -620,7 +620,7 @@
  
  .SH CUSTOMIZATION
  The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to
@@ -30,7 +32,7 @@ locations Debian uses.
  .I screen
  is installed setuid-root, then the administrator
  should compile
-@@ -639,7 +639,7 @@
+@@ -633,7 +633,7 @@
  When
  .I screen
  is invoked, it executes initialization commands from the files
@@ -39,7 +41,7 @@ locations Debian uses.
  \*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 
-@@ -1841,7 +1841,7 @@
+@@ -1835,7 +1835,7 @@
  The echo command may be used to annoy 
  .I screen
  users with a 'message of the
@@ -48,7 +50,7 @@ locations Debian uses.
  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.
-@@ -4848,14 +4848,14 @@
+@@ -4842,14 +4842,14 @@
  .I screen
  distribution package for private and global initialization files.
  .IP $SYSSCREENRC 
@@ -66,7 +68,7 @@ locations Debian uses.
  Socket directories (default)
  .IP /usr/tmp/screens/S-<login>
  Alternate socket directories.
-@@ -4874,7 +4874,7 @@
+@@ -4868,7 +4868,7 @@
  or
  .IP /etc/termcap
  Terminal capability databases
@@ -75,7 +77,7 @@ locations Debian uses.
  Login records
  .IP $LOCKPRG
  Program that locks a terminal.
-@@ -4996,9 +4996,9 @@
+@@ -4990,9 +4990,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.
@@ -87,8 +89,10 @@ locations Debian uses.
  .I screen
  is killed with SIGKILL.
  This will cause some programs (like "w" or "rwho")
---- a/doc/screen.texinfo
-+++ b/doc/screen.texinfo
+Index: screen/doc/screen.texinfo
+===================================================================
+--- screen.orig/doc/screen.texinfo	2011-10-08 19:54:22.000000000 +0200
++++ screen/doc/screen.texinfo	2011-10-08 19:58:19.000000000 +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.
diff --git a/debian/patches/12kfreebsd_ctty.patch b/debian/patches/12kfreebsd_ctty.patch
index cb3b8a9..ef28cec 100644
--- a/debian/patches/12kfreebsd_ctty.patch
+++ b/debian/patches/12kfreebsd_ctty.patch
@@ -1,8 +1,10 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: See inline documentation.
---- a/tty.sh
-+++ b/tty.sh
-@@ -809,18 +809,11 @@
+Index: screen/tty.sh
+===================================================================
+--- screen.orig/tty.sh	2011-10-08 19:54:22.000000000 +0200
++++ screen/tty.sh	2011-10-08 19:58:28.000000000 +0200
+@@ -808,18 +808,11 @@
  
    mypid = getpid();
  
diff --git a/debian/patches/14size_matters.patch b/debian/patches/14size_matters.patch
index f0d6628..1125b23 100644
--- a/debian/patches/14size_matters.patch
+++ b/debian/patches/14size_matters.patch
@@ -1,8 +1,10 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: * Increase the MAXSTR macro to suit present-day needs.
 * Increase the maximum length of the input line buffer likewise.
---- a/input.c
-+++ b/input.c
+Index: screen/input.c
+===================================================================
+--- screen.orig/input.c	2011-10-08 19:54:21.000000000 +0200
++++ screen/input.c	2011-10-08 19:58:34.000000000 +0200
 @@ -43,7 +43,7 @@
  
  struct inpline
@@ -32,8 +34,10 @@ Description: * Increase the MAXSTR macro to suit present-day needs.
    if (!(mode & INP_NOECHO))
      {
        maxlen = flayer->l_width - 1 - strlen(istr);
---- a/process.c
-+++ b/process.c
+Index: screen/process.c
+===================================================================
+--- screen.orig/process.c	2011-10-08 19:54:21.000000000 +0200
++++ screen/process.c	2011-10-08 19:58:34.000000000 +0200
 @@ -2083,7 +2083,7 @@
  	ChangeAKA(fore, *args, strlen(*args));
        break;
@@ -43,8 +47,10 @@ Description: * Increase the MAXSTR macro to suit present-day needs.
        if (*args && **args)
  	{
  	  s = *args;
---- a/screen.h
-+++ b/screen.h
+Index: screen/screen.h
+===================================================================
+--- screen.orig/screen.h	2011-10-08 19:54:21.000000000 +0200
++++ screen/screen.h	2011-10-08 19:58:34.000000000 +0200
 @@ -91,7 +91,7 @@
  
  #define Ctrl(c) ((c)&037)
@@ -54,9 +60,11 @@ Description: * Increase the MAXSTR macro to suit present-day needs.
  #define MAXARGS 	64
  #define MSGWAIT 	5
  #define MSGMINWAIT 	1
---- a/window.c
-+++ b/window.c
-@@ -2235,7 +2235,7 @@
+Index: screen/window.c
+===================================================================
+--- screen.orig/window.c	2011-10-08 19:54:21.000000000 +0200
++++ screen/window.c	2011-10-08 19:58:34.000000000 +0200
+@@ -2231,7 +2231,7 @@
        return;
      }
    flayer = &p->w_layer;
diff --git a/debian/patches/16fix_gcc_warnings.patch b/debian/patches/16fix_gcc_warnings.patch
index 726fe2f..ed4cf72 100644
--- a/debian/patches/16fix_gcc_warnings.patch
+++ b/debian/patches/16fix_gcc_warnings.patch
@@ -1,18 +1,22 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: Get rid of several minor gcc warnings.
---- a/attacher.c
-+++ b/attacher.c
-@@ -863,7 +863,7 @@
+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
+@@ -848,7 +848,7 @@
+   pam_handle_t *pamh = 0;
    int pam_error;
-   char *tty_name;
  #endif
 -  char *pass, mypass[16 + 1], salt[3];
 +  char *pass = 0, mypass[16 + 1], salt[3];
    int using_pam = 1;
  
  #ifdef USE_PAM
---- a/layer.c
-+++ b/layer.c
+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 @@
  void
  LClearLine(l, y, xs, xe, bce, ol)
@@ -22,8 +26,10 @@ Description: Get rid of several minor gcc warnings.
  struct mline *ol;
  {
    struct canvas *cv;
---- a/process.c
-+++ b/process.c
+Index: screen/process.c
+===================================================================
+--- screen.orig/process.c	2011-10-08 19:58:34.000000000 +0200
++++ screen/process.c	2011-10-08 19:58:41.000000000 +0200
 @@ -3302,7 +3302,7 @@
            int newnr, fl = 0, kf = 0, af = 0, df = 0, mf = 0;
  	  struct display *odisp = display;
@@ -33,9 +39,11 @@ Description: Get rid of several minor gcc warnings.
  
  	  for (; *args && **args == '-'; args++, argl++)
  	    {
---- a/screen.c
-+++ b/screen.c
-@@ -2534,7 +2534,7 @@
+Index: screen/screen.c
+===================================================================
+--- screen.orig/screen.c	2011-10-08 19:54:20.000000000 +0200
++++ screen/screen.c	2011-10-08 19:58:41.000000000 +0200
+@@ -2517,7 +2517,7 @@
    int truncpos = -1;
    int truncper = 0;
    int trunclong = 0;
diff --git a/debian/patches/22exchange_file_mode.patch b/debian/patches/22exchange_file_mode.patch
index 1d88949..ccdf3dd 100644
--- a/debian/patches/22exchange_file_mode.patch
+++ b/debian/patches/22exchange_file_mode.patch
@@ -2,9 +2,11 @@ Author: <hesso@pool.math.tu-berlin.de>
 Description: Make it a bit harder to shoot oneself in the foot by
 keeping the umask tight by default when creating the
 screen exchange file. Fearless users may still chmod it.
---- a/fileio.c
-+++ b/fileio.c
-@@ -411,11 +411,6 @@
+Index: screen/fileio.c
+===================================================================
+--- screen.orig/fileio.c	2011-10-08 19:54:19.000000000 +0200
++++ screen/fileio.c	2011-10-08 19:58:46.000000000 +0200
+@@ -413,11 +413,6 @@
    char *mode = "w";
  #ifdef COPY_PASTE
    int public = 0;
@@ -16,7 +18,7 @@ screen exchange file. Fearless users may still chmod it.
  # ifdef HAVE_LSTAT
    struct stat stb, stb2;
    int fd, exists = 0;
-@@ -478,7 +473,6 @@
+@@ -480,7 +475,6 @@
  #ifdef COPY_PASTE
        if (dump == DUMP_EXCHANGE && public)
  	{
@@ -24,7 +26,7 @@ screen exchange file. Fearless users may still chmod it.
  # ifdef HAVE_LSTAT
  	  if (exists)
  	    {
-@@ -499,7 +493,6 @@
+@@ -501,7 +495,6 @@
  # else
            f = fopen(fn, mode);
  # endif
diff --git a/debian/patches/23exitcode_q_ls.patch b/debian/patches/23exitcode_q_ls.patch
index 87177eb..69b9c5c 100644
--- a/debian/patches/23exitcode_q_ls.patch
+++ b/debian/patches/23exitcode_q_ls.patch
@@ -1,9 +1,11 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: Make the exitcode of '-q -ls' and friends ('-qr -ls' and even
 '-qdr -ls') match the documentation.
---- a/screen.c
-+++ b/screen.c
-@@ -1181,8 +1181,12 @@
+Index: screen/screen.c
+===================================================================
+--- screen.orig/screen.c	2011-10-08 19:58:41.000000000 +0200
++++ screen/screen.c	2011-10-08 19:58:51.000000000 +0200
+@@ -1164,8 +1164,12 @@
  #endif
        SET_GUID();
        i = FindSocket((int *)NULL, &fo, &oth, SockMatch);
diff --git a/debian/patches/24option_parser.patch b/debian/patches/24option_parser.patch
index ca13613..5f67987 100644
--- a/debian/patches/24option_parser.patch
+++ b/debian/patches/24option_parser.patch
@@ -1,9 +1,11 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: This is not getopt() and we don't have two leading dashes, so
 parse and match the long options in full.
---- a/screen.c
-+++ b/screen.c
-@@ -667,6 +667,8 @@
+Index: screen/screen.c
+===================================================================
+--- screen.orig/screen.c	2011-10-08 19:58:51.000000000 +0200
++++ screen/screen.c	2011-10-08 19:58:56.000000000 +0200
+@@ -655,6 +655,8 @@
  		    }
  		  break;
  		case 'w':
diff --git a/debian/patches/32misc_minor_fixes.patch b/debian/patches/32misc_minor_fixes.patch
index 5d1dc1c..7f92bef 100644
--- a/debian/patches/32misc_minor_fixes.patch
+++ b/debian/patches/32misc_minor_fixes.patch
@@ -1,8 +1,10 @@
 Author: <hesso@pool.math.tu-berlin.de>
 Description: Remove an unconditional nethack message. (# 512299)
---- a/attacher.c
-+++ b/attacher.c
-@@ -629,7 +629,7 @@
+Index: screen/attacher.c
+===================================================================
+--- screen.orig/attacher.c	2011-10-08 19:58:41.000000000 +0200
++++ screen/attacher.c	2011-10-08 19:59:12.000000000 +0200
+@@ -621,7 +621,7 @@
          {
  	  fcntl(0, F_SETFL, 0);
  	  SetTTY(0, &attach_Mode);
diff --git a/debian/patches/46fix-keybinding-typo-in-manpage.patch b/debian/patches/46fix-keybinding-typo-in-manpage.patch
index 7b6b1fd..3513776 100644
--- a/debian/patches/46fix-keybinding-typo-in-manpage.patch
+++ b/debian/patches/46fix-keybinding-typo-in-manpage.patch
@@ -6,9 +6,9 @@ backspace) (Closes: #541793)
 
 Index: screen/doc/screen.1
 ===================================================================
---- screen.orig/doc/screen.1	2011-10-05 03:03:23.000000000 +0200
-+++ screen/doc/screen.1	2011-10-05 03:04:58.000000000 +0200
-@@ -518,7 +518,7 @@
+--- 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
@@ -17,7 +17,7 @@ Index: screen/doc/screen.1
  .IP "\fBC-a p\fP"
  .IP "\fBC-a C-p\fP	(prev)"
  .PD
-@@ -584,7 +584,7 @@
+@@ -578,7 +578,7 @@
  Write out a \*Q.termcap\*U file.
  .IP "\fBC-a ?\fP	(help)"
  Show key bindings.
@@ -28,8 +28,8 @@ Index: screen/doc/screen.1
  .IP "\fBC-a :\fP	(colon)"
 Index: screen/doc/screen.texinfo
 ===================================================================
---- screen.orig/doc/screen.texinfo	2011-10-05 03:03:23.000000000 +0200
-+++ screen/doc/screen.texinfo	2011-10-05 03:03:26.000000000 +0200
+--- 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 @@
  (help)@*
  Show key bindings.  @xref{Help}.
diff --git a/debian/patches/47screen-cc.patch b/debian/patches/47screen-cc.patch
index 59b9af6..a8f58e6 100644
--- a/debian/patches/47screen-cc.patch
+++ b/debian/patches/47screen-cc.patch
@@ -1,7 +1,9 @@
 Author: <bpkroth@gmail.com>
 Description: Some patches stolen from the fedora package for better error checking and tty security.
---- a/utmp.c
-+++ b/utmp.c
+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
 @@ -361,7 +361,7 @@
        char *tty;
        debug("couln't zap slot -> do mesg n\n");
@@ -38,8 +40,10 @@ Description: Some patches stolen from the fedora package for better error checki
      return NULL;
    tty = stripdev(tty);
    retbuf[0] = '\0';
---- a/extern.h
-+++ b/extern.h
+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
 @@ -110,6 +110,7 @@
  extern struct baud_values *lookup_baud __P((int bps));
  extern int   SetBaud __P((struct mode *, int, int));
@@ -48,9 +52,11 @@ Description: Some patches stolen from the fedora package for better error checki
  
  
  /* mark.c */
---- a/screen.c
-+++ b/screen.c
-@@ -970,8 +970,13 @@
+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
+@@ -972,8 +972,13 @@
  	else \
  	  attach_tty = ""; \
        } \
@@ -66,8 +72,10 @@ Description: Some patches stolen from the fedora package for better error checki
      if (strlen(attach_tty) >= MAXPATHLEN) \
        Panic(0, "TtyName too long - sorry."); \
    } while (0)
---- a/tty.sh
-+++ b/tty.sh
+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
 @@ -60,6 +60,7 @@
  #include <sys/types.h>
  #include <signal.h>
@@ -76,7 +84,7 @@ Description: Some patches stolen from the fedora package for better error checki
  #ifndef sgi
  # include <sys/file.h>
  #endif
-@@ -1506,6 +1507,19 @@
+@@ -1499,6 +1500,19 @@
    return 0;
  }
  
@@ -96,8 +104,10 @@ Description: Some patches stolen from the fedora package for better error checki
  /*
   *  Write out the mode struct in a readable form
   */
---- a/socket.c
-+++ b/socket.c
+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
 @@ -722,6 +722,7 @@
    char *args[MAXARGS];
    register int n;
@@ -114,8 +124,10 @@ Description: Some patches stolen from the fedora package for better error checki
  
        l = strlen(p);
        if (IsNumColon(p, 10, buf, sizeof(buf)))
---- a/braille_tsi.c
-+++ b/braille_tsi.c
+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
 @@ -127,7 +127,6 @@
    r = read(bd.bd_fd,ibuf,1);
    if (r != 1)
@@ -124,8 +136,10 @@ Description: Some patches stolen from the fedora package for better error checki
    if (ibuf[0] == 'V')
      r = read(bd.bd_fd, ibuf, 3);
    else
---- a/fileio.c
-+++ b/fileio.c
+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
 @@ -80,8 +80,6 @@
      }
    else
@@ -135,8 +149,10 @@ Description: Some patches stolen from the fedora package for better error checki
        if ((cp = malloc((unsigned) len1 + add_colon + 1)) == NULL)
  	Panic(0, "%s", strnomem);
        cp[len1 + add_colon] = '\0';
---- a/attacher.c
-+++ b/attacher.c
+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
 @@ -185,8 +185,8 @@
  	  if (ret == SIG_POWER_BYE)
  	    {
@@ -240,9 +256,9 @@ Description: Some patches stolen from the fedora package for better error checki
    int pam_error;
 +  char *tty_name;
  #endif
-   char *pass, mypass[16 + 1], salt[3];
+   char *pass = 0, mypass[16 + 1], salt[3];
    int using_pam = 1;
-@@ -918,6 +933,15 @@
+@@ -926,6 +941,15 @@
        pam_error = pam_start("screen", ppp->pw_name, &PAM_conversation, &pamh);
        if (pam_error != PAM_SUCCESS)
  	AttacherFinit(SIGARG);		/* goodbye */