Important fix for the namelength fix

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 121 insertions, 3 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index f0b78a946689..fc2d6628b92c 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.150 2010/11/17 14:51:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.151 2010/11/17 16:42:00 jlec Exp $
+
+*screen-4.0.3-r3 (17 Nov 2010)
+
+  17 Nov 2010; Justin Lecher <jlec@gentoo.org>
+  +files/4.0.3-extend-d_termname-ng.patch, -screen-4.0.3-r2.ebuild,
+  +screen-4.0.3-r3.ebuild:
+  Important fix for the namelength fix
 
 *screen-4.0.3-r2 (17 Nov 2010)
 
diff --git a/app-misc/screen/files/4.0.3-extend-d_termname-ng.patch b/app-misc/screen/files/4.0.3-extend-d_termname-ng.patch
new file mode 100644
index 000000000000..497cb8f2f912
--- /dev/null
+++ b/app-misc/screen/files/4.0.3-extend-d_termname-ng.patch
@@ -0,0 +1,111 @@
+diff --git a/display.h b/display.h
+index ef99954..563fcd0 100644
+--- a/display.h
++++ b/display.h
+@@ -22,6 +22,16 @@
+  * $Id: 4.0.3-extend-d_termname-ng.patch,v 1.1 2010/11/17 16:42:00 jlec Exp $ FAU
+  */
+ 
++#include <limits.h>
++
++#ifndef NAME_MAX
++# ifndef MAXNAMELEN
++#  define NAME_MAX 255
++# else
++#  define NAME_MAX MAXNAMELEN
++# endif
++#endif
++
+ #ifdef MAPKEYS
+ 
+ #define KMAP_KEYS (T_OCAPS-T_CAPS)
+@@ -85,7 +95,7 @@ struct display
+   struct win *d_other;		/* pointer to other window */
+   int   d_nonblock;		/* -1 don't block if obufmax reached */
+ 				/* >0: block after nonblock secs */
+-  char  d_termname[20 + 1];	/* $TERM */
++  char  d_termname[NAME_MAX + 1]; /* $TERM */
+   char	*d_tentry;		/* buffer for tgetstr */
+   char	d_tcinited;		/* termcap inited flag */
+   int	d_width, d_height;	/* width/height of the screen */
+diff --git a/screen.h b/screen.h
+index 4f9f354..bcaaaf6 100644
+--- a/screen.h
++++ b/screen.h
+@@ -43,6 +43,15 @@
+ #include "comm.h"
+ #include "layer.h"
+ #include "term.h"
++#include <limits.h>
++
++#ifndef NAME_MAX
++# ifndef MAXNAMELEN
++#  define NAME_MAX 255
++# else
++#  define NAME_MAX MAXNAMELEN
++# endif
++#endif
+ 
+ 
+ #ifdef DEBUG
+@@ -195,26 +204,26 @@ struct msg
+       create;
+       struct
+ 	{
+-	  char auser[20 + 1];	/* username */
++	  char auser[NAME_MAX + 1];	/* username */
+ 	  int apid;		/* pid of frontend */
+ 	  int adaptflag;	/* adapt window size? */
+ 	  int lines, columns;	/* display size */
+ 	  char preselect[20];
+ 	  int esc;		/* his new escape character unless -1 */
+ 	  int meta_esc;		/* his new meta esc character unless -1 */
+-	  char envterm[20 + 1];	/* terminal type */
++	  char envterm[NAME_MAX + 1];	/* terminal type */
+ 	  int encoding;		/* encoding of display */
+ 	}
+       attach;
+       struct 
+ 	{
+-	  char duser[20 + 1];	/* username */
++	  char duser[NAME_MAX + 1];	/* username */
+ 	  int dpid;		/* pid of frontend */
+ 	}
+       detach;
+       struct 
+ 	{
+-	  char auser[20 + 1];	/* username */
++	  char auser[NAME_MAX + 1];	/* username */
+ 	  int nargs;
+ 	  char cmd[MAXPATHLEN];	/* command */
+ 	  int apid;		/* pid of frontend */
+diff --git a/socket.c b/socket.c
+index 62a73af..1cc9c27 100644
+--- a/socket.c
++++ b/socket.c
+@@ -45,6 +45,16 @@
+ 
+ #include "extern.h"
+ 
++#include <limits.h>
++
++#ifndef NAME_MAX
++# ifndef MAXNAMELEN
++#  define NAME_MAX 255
++# else
++#  define NAME_MAX MAXNAMELEN
++# endif
++#endif
++
+ static int   CheckPid __P((int));
+ static void  ExecCreate __P((struct msg *));
+ static void  DoCommandMsg __P((struct msg *));
+@@ -1248,7 +1258,7 @@ static void PasswordProcessInput __P((char *, int));
+ 
+ struct pwdata {
+   int l;
+-  char buf[20 + 1];
++  char buf[NAME_MAX + 1];
+   struct msg m;
+ };
+ 
diff --git a/app-misc/screen/screen-4.0.3-r2.ebuild b/app-misc/screen/screen-4.0.3-r3.ebuild
index efba5f21a3dc..5d47e115cd9d 100644
--- a/app-misc/screen/screen-4.0.3-r2.ebuild
+++ b/app-misc/screen/screen-4.0.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r2.ebuild,v 1.1 2010/11/17 14:51:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r3.ebuild,v 1.1 2010/11/17 16:42:00 jlec Exp $
 
 EAPI="3"
 
@@ -86,7 +86,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
 
 	# Allow TERM string large enough to use with rxvt-unicode-256color
-	epatch "${FILESDIR}"/${PV}-extend-d_termname.patch
+	epatch "${FILESDIR}"/${PV}-extend-d_termname-ng.patch
 
 	# reconfigure
 	eautoconf