cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add license comment above PERMIT_* lines

Browse Source 
- add includes so openpty is not implicitly declared
- use (void*) NULL in execl to make sure it 64-bit where it needs to be

OK brad (maintainer)
This commit is contained in:
jolan 2003-10-14 23:05:28 +00:00
parent f4794ebd6d
commit 7c2d12a5a4
4 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc/screen/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2003/10/10 01:27:38 brad Exp $
# $OpenBSD: Makefile,v 1.48 2003/10/14 23:05:28 jolan Exp $
COMMENT= "multi-screen window manager"
@ -12,6 +12,7 @@ HOMEPAGE= http://www.gnu.org/software/screen/
MAINTAINER= Brad Smith <brad@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

12
misc/screen/patches/patch-attacher_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-attacher_c,v 1.1 2003/10/14 23:05:28 jolan Exp $
--- attacher.c.orig 2003-09-08 09:24:48.000000000 -0500
+++ attacher.c 2003-10-14 14:10:14.000000000 -0500
@@ -676,7 +676,7 @@ LockTerminal()
setuid(real_uid); /* this should be done already */
#endif
closeallfiles(0); /* important: /etc/shadow may be open */
- execl(prg, "SCREEN-LOCK", NULL);
+ execl(prg, "SCREEN-LOCK", (void*)NULL);
exit(errno);
}
if (pid == -1)

12
misc/screen/patches/patch-fileio_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-fileio_c,v 1.1 2003/10/14 23:05:28 jolan Exp $
--- fileio.c.orig 2003-09-08 09:25:28.000000000 -0500
+++ fileio.c 2003-10-14 14:09:39.000000000 -0500
@@ -779,7 +779,7 @@ char *cmd;
#ifdef SIGPIPE
signal(SIGPIPE, SIG_DFL);
#endif
- execl("/bin/sh", "sh", "-c", cmd, 0);
+ execl("/bin/sh", "sh", "-c", cmd, (void*)NULL);
Panic(errno, "/bin/sh");
default:
break;

18
misc/screen/patches/patch-pty_c
View File

@ -1,7 +1,13 @@
$OpenBSD: patch-pty_c,v 1.1 2003/09/26 23:50:55 brad Exp $
--- pty.c.orig 2003-09-08 10:26:18.000000000 -0400
+++ pty.c 2003-09-13 04:18:35.000000000 -0400
@@ -29,6 +29,23 @@
$OpenBSD: patch-pty_c,v 1.2 2003/10/14 23:05:28 jolan Exp $
--- pty.c.orig 2003-09-08 09:26:18.000000000 -0500
+++ pty.c 2003-10-14 14:31:29.000000000 -0500
@@ -25,10 +25,29 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
+#include <termios.h>
+#include <util.h>
#include "config.h"
#include "screen.h"
@ -25,7 +31,7 @@ $OpenBSD: patch-pty_c,v 1.1 2003/09/26 23:50:55 brad Exp $
#ifndef sun
# include <sys/ioctl.h>
#endif
@@ -337,25 +354,25 @@ int
@@ -337,25 +356,25 @@ int
OpenPTY(ttyn)
char **ttyn;
{
@ -64,7 +70,7 @@ $OpenBSD: patch-pty_c,v 1.1 2003/09/26 23:50:55 brad Exp $
if (eff_uid && access(TtyName, R_OK | W_OK))
{
close(f);
@@ -378,9 +395,11 @@ char **ttyn;
@@ -378,9 +397,11 @@ char **ttyn;
#endif
initmaster(f);
*ttyn = TtyName;