diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-07-17 01:56:38 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-07-17 01:56:38 +0000 |
| commit | ad2de0570ac537a802c585b23e1ed084a7de20e4 (patch) | |
| tree | 8ef01e2875882d2bc994485be0c16090f37508fa /emulators/BasiliskII/patches | |
| parent | bb2b1dfae39de8a238e1454ef24238d534efdd61 (diff) | |
| download | pkgsrc-ad2de0570ac537a802c585b23e1ed084a7de20e4.tar.gz | |
Make this build on NetBSD -current with /dev/ptmx, closes PR pkg/25854.
Diffstat (limited to 'emulators/BasiliskII/patches')
| -rw-r--r-- | emulators/BasiliskII/patches/patch-ad | 68 |
1 files changed, 63 insertions, 5 deletions
diff --git a/emulators/BasiliskII/patches/patch-ad b/emulators/BasiliskII/patches/patch-ad index f64ceb5ef9c..c52973a1db3 100644 --- a/emulators/BasiliskII/patches/patch-ad +++ b/emulators/BasiliskII/patches/patch-ad @@ -1,8 +1,66 @@ -$NetBSD: patch-ad,v 1.1 2004/01/23 08:42:14 agc Exp $ +$NetBSD: patch-ad,v 1.2 2004/07/17 01:56:38 xtraeme Exp $ ---- sshpty.c 2004/01/23 07:41:29 1.1 -+++ sshpty.c 2004/01/23 07:52:50 -@@ -276,7 +276,7 @@ +--- sshpty.c.orig 2003-03-14 20:17:27.000000000 +0100 ++++ sshpty.c 2004-07-17 03:54:38.000000000 +0200 +@@ -18,6 +18,7 @@ + /* Selections from openssh's "includes.h" */ + #include "config.h" + ++#include <signal.h> + #include <stdio.h> + #include <ctype.h> + #include <errno.h> +@@ -144,19 +145,30 @@ + */ + int ptm; + char *pts; ++#ifdef __sunos__ + mysig_t old_signal; +- ++#else ++ sig_t old_signal; ++#endif + ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY); + if (ptm < 0) { + error("/dev/ptmx: %.100s", strerror(errno)); + return 0; + } ++#ifdef __sunos__ + old_signal = mysignal(SIGCHLD, SIG_DFL); ++#else ++ old_signal = signal(SIGCHLD, SIG_DFL); ++#endif + if (grantpt(ptm) < 0) { + error("grantpt: %.100s", strerror(errno)); + return 0; + } ++#ifdef __sunos__ + mysignal(SIGCHLD, old_signal); ++#else ++ signal(SIGCHLD, old_signal); ++#endif + if (unlockpt(ptm) < 0) { + error("unlockpt: %.100s", strerror(errno)); + return 0; +@@ -174,7 +186,7 @@ + close(*ptyfd); + return 0; + } +-#ifndef HAVE_CYGWIN ++#if !defined(__NetBSD__) + /* + * Push the appropriate streams modules, as described in Solaris pts(7). + * HP-UX pts(7) doesn't have ttcompat module. +@@ -183,7 +195,7 @@ + error("ioctl I_PUSH ptem: %.100s", strerror(errno)); + if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0) + error("ioctl I_PUSH ldterm: %.100s", strerror(errno)); +-#ifndef __hpux ++#if !defined(__NetBSD__) + if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0) + error("ioctl I_PUSH ttcompat: %.100s", strerror(errno)); + #endif +@@ -276,7 +288,7 @@ } /* set tty modes to a sane state for broken clients */ if (tcgetattr(*ptyfd, &tio) < 0) @@ -11,7 +69,7 @@ $NetBSD: patch-ad,v 1.1 2004/01/23 08:42:14 agc Exp $ else { tio.c_lflag |= (ECHO | ISIG | ICANON); tio.c_oflag |= (OPOST | ONLCR); -@@ -284,7 +284,7 @@ +@@ -284,7 +296,7 @@ /* Set the new modes for the terminal. */ if (tcsetattr(*ptyfd, TCSANOW, &tio) < 0) |