PR/25317 CVS commit: pkgsrc/misc/screen

["Alan Barrett" <apb%netbsd.org@localhost>]

The following reply was made to PR pkg/25317; it has been noted by GNATS.

From: "Alan Barrett" <apb%netbsd.org@localhost>
To: gnats-bugs%gnats.NetBSD.org@localhost
Cc: 
Subject: PR/25317 CVS commit: pkgsrc/misc/screen
Date: Sat, 15 Sep 2012 09:14:53 +0000

 Module Name:   pkgsrc
 Committed By:  apb
 Date:          Sat Sep 15 09:14:53 UTC 2012
 
 Modified Files:
        pkgsrc/misc/screen: Makefile distinfo
        pkgsrc/misc/screen/patches: patch-aa
 
 Log Message:
 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.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.83 -r1.84 pkgsrc/misc/screen/Makefile
 cvs rdiff -u -r1.32 -r1.33 pkgsrc/misc/screen/distinfo
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/screen/patches/patch-aa
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.