diff options
author | apb <apb@pkgsrc.org> | 2012-09-15 09:14:53 +0000 |
---|---|---|
committer | apb <apb@pkgsrc.org> | 2012-09-15 09:14:53 +0000 |
commit | 4ee4e2163dc84ce151dab6ca394c0ca724e588e7 (patch) | |
tree | 6ff9ccab6e95fbebc3cd1b6a385c7087a0963ade /devel | |
parent | 5e1bbccd5aae93054d6a370bf56e9c692e35b43c (diff) | |
download | pkgsrc-4ee4e2163dc84ce151dab6ca394c0ca724e588e7.tar.gz |
Move the NetBSD-specific part of screen's pty.c to the right place.
This commit changes patch-aa so that the patched version
of pty.c contains:
... other OS-specific code
... NetBSD-specific openpty() code (from patch-aa)
... generic openpty() code
... last resort code
instead of the previous:
... other OS-specific code
... generic openpty() code
... NetBSD-specific openpty() code (from patch-aa)
... last resort code
History behind this problem:
The NetBSD-specific openpty() code was added in revision 1.1
of misc/screen/patches/patch-aa. (See PR pkg/16901.) At that
time, pkgsrc used screen-3.9.11, and the upstream version of
screen did not use openpty() at all. The patch added an "#if
defined(__NetBSD__)" block as the last OS-specific section in
pty.c, which then had:
... other OS-specific code
... NetBSD-specific openpty() code (from patch-aa)
... last resort code
In screen-3.9.15, upstream added code in pty.c to use openpty().
This was imported to pkgsrc on 2003-03-15. At that time, pkgsrc's
patch-aa accidentally inserted the NetBSD-specific code below
instead of above the new code, so the patched version of pty.c
had:
... other OS-specific code
... generic openpty() code (from upstream)
... NetBSD-specific openpty() code (from patch-aa)
... last resort code
The above is obviously wrong because the generic openpty() code
would be used instead of the NetBSD-specific code, assuming
HAVE_OPENPTY was defined by the configure script.
This problem was reported in PR pkg/25317, but the patch in the PR
was not understood so it was not applied.
This commit changes patch-aa so that the patched version of pty.c
contains:
... other OS-specific code
... NetBSD-specific openpty() code (from patch-aa)
... generic openpty() code (from upstream)
... last resort code
However, it still doesn't work on NetBSD with ptyfs mounted.
Diffstat (limited to 'devel')
0 files changed, 0 insertions, 0 deletions