mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 02:26:38 -04:00
43808d10e2
This is in preparation for the import of screen 5.0.0. I've tried screen-devel (5.0.0 prelrelease). There were some bugs and inconsistencies with screen 4.9.1. So we move screen to screen49 to maintain a version of screen that is known to work. This implements the concept of a master screen port by renaming it to screen49 and creating a slave port called screen. The idea of this is similar in concept used with the cfengine or krb5 family of ports. Users should never need to change port origins when a new stable version of screen is committed. People can install the screen port or package as before. However if they choose to use the other screen port/package they may remove screen and install the versioned "master" port/package directly. This is in preparation for import of screen 5.0.0 into the ports collection. Unfortunately my initial testing of screen 5.0.0 using the screen-devel port uncovered an annoying (to me) bug, which I have opened an issue with our upstream. I have not found the time to test their patches enough to feel comfortalbe replacing the existing screen 4.9.1 with 5.0.0. When 5.0.0 will be imported as sysutils/screen50, it will not become the default master port until we believe it won't become a source of many bugzilla bugs.
24 lines
917 B
C
24 lines
917 B
C
--- attacher.c.orig 2003-09-08 07:24:48.000000000 -0700
|
|
+++ attacher.c 2011-01-02 21:42:39.547897531 -0800
|
|
@@ -662,7 +662,7 @@
|
|
printf("\n");
|
|
|
|
prg = getenv("LOCKPRG");
|
|
- if (prg && strcmp(prg, "builtin") && !access(prg, X_OK))
|
|
+ if (prg && (strcmp(prg, "builtin") || strcmp(prg,"builtin-passwd")) && !access(prg, X_OK))
|
|
{
|
|
signal(SIGCHLD, SIG_DFL);
|
|
debug1("lockterminal: '%s' seems executable, execl it!\n", prg);
|
|
@@ -676,7 +676,11 @@
|
|
setuid(real_uid); /* this should be done already */
|
|
#endif
|
|
closeallfiles(0); /* important: /etc/shadow may be open */
|
|
- execl(prg, "SCREEN-LOCK", NULL);
|
|
+ if (strcmp(prg,"builtin-passwd"))
|
|
+ /* use system passsword for lock */
|
|
+ execl(prg, "SCREEN-LOCK", "-p", "-n", NULL);
|
|
+ else
|
|
+ execl(prg, "SCREEN-LOCK", NULL);
|
|
exit(errno);
|
|
}
|
|
if (pid == -1)
|