Refresh 49long-usernames.patch

1 files changed, 26 insertions, 27 deletions

diff --git a/debian/patches/49long-usernames.patch b/debian/patches/49long-usernames.patch
index 2be3bcd..58ce4f6 100644
--- a/debian/patches/49long-usernames.patch
+++ b/debian/patches/49long-usernames.patch
@@ -5,10 +5,10 @@ Upstream-Bug: http://savannah.gnu.org/bugs/?21653
 Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560231
 Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/582153
 
-diff --git a/acconfig.h b/acconfig.h
-index 2e46985..05ec534 100644
---- a/acconfig.h
-+++ b/acconfig.h
+Index: screen/acconfig.h
+===================================================================
+--- screen.orig/acconfig.h	2011-10-08 21:20:48.000000000 +0200
++++ screen/acconfig.h	2011-10-08 21:20:57.000000000 +0200
 @@ -39,6 +39,13 @@
  #endif
  
@@ -23,11 +23,11 @@ index 2e46985..05ec534 100644
   * Define SOCKDIR to be the directory to contain the named sockets
   * screen creates. This should be in a common subdirectory, such as
   * /usr/local or /tmp. It makes things a little more secure if you
-diff --git a/acls.c b/acls.c
-index e728bb8..4d0c20f 100644
---- a/acls.c
-+++ b/acls.c
-@@ -182,7 +182,7 @@ struct acluser **up;
+Index: screen/acls.c
+===================================================================
+--- screen.orig/acls.c	2011-10-08 21:20:48.000000000 +0200
++++ screen/acls.c	2011-10-08 21:20:57.000000000 +0200
+@@ -182,7 +182,7 @@
  #endif
    (*up)->u_Esc = DefaultEsc;
    (*up)->u_MetaEsc = DefaultMetaEsc;
@@ -36,7 +36,7 @@ index e728bb8..4d0c20f 100644
    (*up)->u_password = NULL;
    if (pass)
      (*up)->u_password = SaveStr(pass);
-@@ -318,8 +318,8 @@ struct acluser **up;
+@@ -318,8 +318,8 @@
      return UserAdd(name, pass, up);
    if (!strcmp(name, "nobody"))		/* he remains without password */
      return -1;
@@ -47,11 +47,11 @@ index e728bb8..4d0c20f 100644
    return 0;
  }
  #endif
-diff --git a/acls.h b/acls.h
-index 907e953..0f6a5e5 100644
---- a/acls.h
-+++ b/acls.h
-@@ -78,7 +78,7 @@ struct plop
+Index: screen/acls.h
+===================================================================
+--- screen.orig/acls.h	2011-10-08 21:20:48.000000000 +0200
++++ screen/acls.h	2011-10-08 21:20:57.000000000 +0200
+@@ -78,7 +78,7 @@
  typedef struct acluser
  {
    struct acluser *u_next;		/* continue the main user list */
@@ -60,11 +60,11 @@ index 907e953..0f6a5e5 100644
    char *u_password;		/* his password (may be NullStr). */
    int  u_checkpassword;		/* nonzero if this u_password is valid */
    int  u_detachwin;		/* the window where he last detached */
-diff --git a/screen.c b/screen.c
-index 3dde3b4..91889f6 100644
---- a/screen.c
-+++ b/screen.c
-@@ -978,7 +978,7 @@ char **av;
+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 @@
  
    if (home == 0 || *home == '\0')
      home = ppp->pw_dir;
@@ -73,11 +73,11 @@ index 3dde3b4..91889f6 100644
      Panic(0, "LoginName too long - sorry.");
  #ifdef MULTIUSER
    if (multi && strlen(multi) > 20)
-diff --git a/screen.h b/screen.h
-index 5c93f32..73c17ba 100644
---- a/screen.h
-+++ b/screen.h
-@@ -207,7 +207,7 @@ struct msg
+Index: screen/screen.h
+===================================================================
+--- screen.orig/screen.h	2011-10-08 21:20:48.000000000 +0200
++++ screen/screen.h	2011-10-08 21:20:57.000000000 +0200
+@@ -207,7 +207,7 @@
        create;
        struct
  	{
@@ -86,7 +86,7 @@ index 5c93f32..73c17ba 100644
  	  int apid;		/* pid of frontend */
  	  int adaptflag;	/* adapt window size? */
  	  int lines, columns;	/* display size */
-@@ -221,13 +221,13 @@ struct msg
+@@ -221,13 +221,13 @@
        attach;
        struct 
  	{
@@ -102,4 +102,3 @@ index 5c93f32..73c17ba 100644
  	  int nargs;
  	  char cmd[MAXPATHLEN];	/* command */
  	  int apid;		/* pid of frontend */
-