Ticket #20862: patch-screen.diff

files/patch-process.c

@@ +1 @@
+diff -r -u screen-4.0.3.orig/process.c screen-4.0.3/process.c
+--- process.c   2008-07-06 23:40:16.000000000 -0700
++++ process.c   2008-07-06 23:47:55.000000000 -0700
+@@ -5466,7 +5466,7 @@
+       *buf = 0;
+       return;
+     }
+-  act.nr = (int)data;
++  act.nr = (int)(intptr_t)data;
+   act.args = noargs;
+   act.argl = 0;
+   DoAction(&act, -1);
+

files/patch-screen.c

@@ -1 @@
---- screen.c.orig       2009-01-21 12:06:11.000000000 +0800
-+++ screen.c    2009-01-21 12:08:27.000000000 +0800
+--- screen.c    2003-09-08 07:26:41.000000000 -0700
++++ screen.c    2009-02-13 12:05:05.000000000 -0800
 @@ -101,6 +101,11 @@
  
- #include "logfile.h"   /* islogfile, logfflush */
+ #include "logfile.h"   /* islogfile, logfflush */
  
 +#ifdef __APPLE__
 +#include <vproc.h>
-+#include "vproc_priv.h"
++#include <vproc_priv.h>
 +#endif
 +
  #ifdef DEBUG
  FILE *dfp;
  #endif
-@@ -1211,6 +1216,11 @@
+@@ -929,6 +934,16 @@
+    Panic(0, "No $SCREENDIR with multi screens, please.");
+ #endif
+     }
++#ifdef __APPLE__
++    else if (!multi && real_uid == eff_uid) {
++      static char DarwinSockDir[PATH_MAX];
++      if (confstr(_CS_DARWIN_USER_TEMP_DIR, DarwinSockDir, sizeof(DarwinSockDir))) {
++       strlcat(DarwinSockDir, ".screen", sizeof(DarwinSockDir));
++       SockDir = DarwinSockDir;
++      }
++    }
++#endif /* __APPLE__ */
++
+ #ifdef MULTIUSER
+   if (multiattach)
+     {
+@@ -1211,6 +1226,11 @@
    freopen("/dev/null", "w", stderr);
    debug("-- screen.back debug started\n");
  
 +#ifdef __APPLE__
-+  if (_vprocmgr_move_subset_to_user(real_uid, "Background") != NULL)
-+      errx(1, "can't migrate to background session");
++       if (_vprocmgr_detach_from_console(0) != NULL)
++               errx(1, "can't detach from console");
 +#endif
 +
    /* 
     * This guarantees that the session owner is listed, even when we
     * start detached. From now on we should not refer to 'LoginName'
+

Portfile

@@ -67 +67 @@
     patchfiles-append   patch-Makefile.in patch-config.h.in patch-configure patch-pty.c patch-window.c patch-screen.c
 }
 
+platform darwin 10 {
+    # post-patch {
+        # reinplace s|^deflogin|#deflogin| ${workpath}/${distname}/etc/etcscreenrc
+    # }
+
+    # These patches are based on http://www.opensource.apple.com/source/screen/screen-16/patches/
+    # The vproc_priv.h is the private header from launchd, used in Apple's 10.6 screen patches
+    # We copied the header file from http://launchd.macosforge.org/trac/browser/trunk/launchd/src/vproc_priv.h, r23776 
+    master_sites-append http://www.cis.nctu.edu.tw/~is85005/dports/screen/r23776/:launchd_priv_header
+    distfiles-append    vproc_priv.h:launchd_priv_header
+    checksums-append    vproc_priv.h md5 50800817fa688e7e6ae379cd599f15ca
+    post-extract        { file copy ${distpath}/vproc_priv.h ${workpath}/${distname} }
+    patchfiles-append   patch-Makefile.in patch-config.h.in patch-configure patch-pty.c patch-window.c patch-screen.c patch-process.c
+}
+
 post-install {
 ui_msg "===============================================================================\n"
 ui_msg "Any screens running before upgrading, will not be available, post-install.\n"