Attachment #86304 for bug #122718

View | Details | Raw Unified | Return to bug 122718
Collapse All | Expand All

Lines 22-28 Link Here

(-)1/ports/sysutils/screen/Makefile (-1 / +6 lines)
22	INFO "Build and install info documentation" ON \	22	INFO "Build and install info documentation" ON \
23	MAN "Build and install man pages" ON \	23	MAN "Build and install man pages" ON \
24	NETHACK "Enable nethack-style messages" ON \	24	NETHACK "Enable nethack-style messages" ON \
25	XTERM_256 "Enable support for 256 colour xterm" OFF	25	XTERM_256 "Enable support for 256 colour xterm" OFF \
		26	HOSTINLOCKED "Print user@host in locked message" OFF
26		27
27	NO_PACKAGE= Tends to loop using 100% CPU when used from package - perhaps it hard-codes information about the build host	28	NO_PACKAGE= Tends to loop using 100% CPU when used from package - perhaps it hard-codes information about the build host
28		29
Lines 62-67 Link Here
62	EXTRA_PATCHES+= ${FILESDIR}/opt-cjkwidth	63	EXTRA_PATCHES+= ${FILESDIR}/opt-cjkwidth
63	.endif	64	.endif
64		65
		66	.if defined(WITH_HOSTINLOCKED)
		67	EXTRA_PATCHES+= ${FILESDIR}/opt-hostinlocked
		68	.endif
		69
65	post-patch:	70	post-patch:
66	@${RM} ${WRKSRC}/doc/screen.info*	71	@${RM} ${WRKSRC}/doc/screen.info*
67		72




--- attacher.c	Sun Oct  2 10:29:36 2005
+++ attacher.c	Sun Oct  2 10:30:18 2005
@@ -809,6 +809,7 @@
 #else
   char *pass, mypass[16 + 1], salt[3];
 #endif
+  extern char HostName[];
 
 #ifndef USE_PAM
   pass = ppp->pw_passwd;
@@ -859,8 +860,8 @@
 	*cp1 -= 'a' - 'A';
     }
 
-  sprintf(message, "Screen used by %s <%s>.\nPassword:\007",
-          fullname, ppp->pw_name);
+  sprintf(message, "Screen used by %s@%s.\nPassword:\007",
+          ppp->pw_name, HostName);
 
   /* loop here to wait for correct password */
   for (;;)

Lines 79-85 Link Here

(-)1/ports/sysutils/screen/files/patch-ad (-1 / +1 lines)
79	+	79	+
80	cat >>confdefs.h <<_ACEOF	80	cat >>confdefs.h <<_ACEOF
81	-#define PTYRANGE0 "$p0"	81	-#define PTYRANGE0 "$p0"
82	+#define PTYRANGE0 "pqrsPQRS"	82	+#define PTYRANGE0 "pqrsPQRSlmnoLMNO"
83	_ACEOF	83	_ACEOF
84		84
85	cat >>confdefs.h <<_ACEOF	85	cat >>confdefs.h <<_ACEOF

Return to bug 122718

Line 0 Link Here

(-)1/ports/sysutils/screen/files/opt-hostinlocked (+21 lines)
	1	--- attacher.c Sun Oct 2 10:29:36 2005
	2	+++ attacher.c Sun Oct 2 10:30:18 2005
	3	@@ -809,6 +809,7 @@
	4	#else
	5	char *pass, mypass[16 + 1], salt[3];
	6	#endif
	7	+ extern char HostName[];
	8
	9	#ifndef USE_PAM
	10	pass = ppp->pw_passwd;
	11	@@ -859,8 +860,8 @@
	12	*cp1 -= 'a' - 'A';
	13	}
	14
	15	- sprintf(message, "Screen used by %s <%s>.\nPassword:\007",
	16	- fullname, ppp->pw_name);
	17	+ sprintf(message, "Screen used by %s@%s.\nPassword:\007",
	18	+ ppp->pw_name, HostName);
	19
	20	/* loop here to wait for correct password */
	21	for (;;)