e006bded2d
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.
21 lines
1.2 KiB
Text
21 lines
1.2 KiB
Text
$NetBSD: distinfo,v 1.33 2012/09/15 09:14:53 apb Exp $
|
|
|
|
SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545
|
|
RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754
|
|
Size (screen-4.0.3.tar.gz) = 840602 bytes
|
|
SHA1 (patch-aa) = e8894dffc4a6d05fddcdb1f4091c5f41b7639fcf
|
|
SHA1 (patch-ab) = f4fc914ad9c48cb83cf3633630cb83e4a8e90ff5
|
|
SHA1 (patch-ac) = 36a1f3e465b511dc795ee9e7f016416b5312d6f0
|
|
SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
|
|
SHA1 (patch-ah) = 10af05907e368af17fa3bb5e24101aa4d260ab8a
|
|
SHA1 (patch-ai) = 0775c95da8bab6d0c9218328aadcd30e3aa81885
|
|
SHA1 (patch-aj) = 220ae716eb7b59dd76c7d7f111cc61cb17d0a414
|
|
SHA1 (patch-ak) = f9029f0f49ea3b2ca8d15dea03b209e4c2fa4ef1
|
|
SHA1 (patch-al) = 6ee93058847f3894a886346676e4a613c0bd134e
|
|
SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
|
|
SHA1 (patch-an) = 44712ae5875c60eac0d4d6ba5cc3731dbfd4458b
|
|
SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4
|
|
SHA1 (patch-ap) = fd3717b70f3ade08de486e4ffad9cac39c11d3bf
|
|
SHA1 (patch-aq) = 997a0ce76086f1dd966868b1fc9ca3bb96b4b4fb
|
|
SHA1 (patch-ar) = cbbcb6e098e966d73c4f0bbbb26e655d88152224
|
|
SHA1 (patch-as) = a6105d64d46df079d3f80965140c1d83b3e72268
|