[139441] trunk/dports/sysutils/screen
ionic at macports.org
ionic at macports.org
Mon Aug 17 11:47:47 PDT 2015
Revision: 139441
https://trac.macports.org/changeset/139441
Author: ionic at macports.org
Date: 2015-08-17 11:47:47 -0700 (Mon, 17 Aug 2015)
Log Message:
-----------
screen: rename patchfiles to patch-foo.diff.
Modified Paths:
--------------
trunk/dports/sysutils/screen/Portfile
Added Paths:
-----------
trunk/dports/sysutils/screen/files/patch-config.h.in.diff
trunk/dports/sysutils/screen/files/patch-configure.diff
trunk/dports/sysutils/screen/files/patch-maxargs.diff
trunk/dports/sysutils/screen/files/patch-pty.c.diff
trunk/dports/sysutils/screen/files/patch-screen.c-leopard.diff
trunk/dports/sysutils/screen/files/patch-screen.c.diff
trunk/dports/sysutils/screen/files/patch-window.c.diff
Removed Paths:
-------------
trunk/dports/sysutils/screen/files/patch-config.h.in
trunk/dports/sysutils/screen/files/patch-configure
trunk/dports/sysutils/screen/files/patch-maxargs
trunk/dports/sysutils/screen/files/patch-pty.c
trunk/dports/sysutils/screen/files/patch-screen.c
trunk/dports/sysutils/screen/files/patch-screen.c-leopard
trunk/dports/sysutils/screen/files/patch-window.c
Modified: trunk/dports/sysutils/screen/Portfile
===================================================================
--- trunk/dports/sysutils/screen/Portfile 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/Portfile 2015-08-17 18:47:47 UTC (rev 139441)
@@ -76,7 +76,7 @@
post-extract {
file copy ${distpath}/vproc_priv.h ${worksrcpath}
}
- patchfiles-append patch-config.h.in patch-configure patch-window.c patch-screen.c-leopard
+ patchfiles-append patch-config.h.in.diff patch-configure.diff patch-window.c.diff patch-screen.c-leopard.diff
}
if {${os.platform} eq "darwin" && ${os.major} >= 10 && ${os.major} <= 13} {
@@ -87,7 +87,7 @@
post-extract {
file copy ${distpath}/vproc_priv.h ${worksrcpath}
}
- patchfiles-append patch-config.h.in patch-configure patch-window.c patch-screen.c
+ patchfiles-append patch-config.h.in.diff patch-configure.diff patch-window.c.diff patch-screen.c.diff
}
notes "
Deleted: trunk/dports/sysutils/screen/files/patch-config.h.in
===================================================================
--- trunk/dports/sysutils/screen/files/patch-config.h.in 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-config.h.in 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,28 +0,0 @@
---- config.h.in 2014-04-26 12:58:46.000000000 +0200
-+++ config.h.in 2014-05-01 21:36:54.000000000 +0200
-@@ -192,14 +192,14 @@
- * If screen is installed with permissions to update /etc/utmp (such
- * as if it is installed set-uid root), define UTMPOK.
- */
--#define UTMPOK
-+#undef UTMPOK
-
- /* Set LOGINDEFAULT to one (1)
- * if you want entries added to /etc/utmp by default, else set it to
- * zero (0).
- * LOGINDEFAULT will be one (1) whenever LOGOUTOK is undefined!
- */
--#define LOGINDEFAULT 1
-+#undef LOGINDEFAULT
-
- /* Set LOGOUTOK to one (1)
- * if you want the user to be able to log her/his windows out.
-@@ -215,7 +215,7 @@
- * Set CAREFULUTMP to one (1) if you want that users have at least one
- * window per screen session logged in.
- */
--#define LOGOUTOK 1
-+#undef LOGOUTOK
- #undef CAREFULUTMP
-
-
Copied: trunk/dports/sysutils/screen/files/patch-config.h.in.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-config.h.in)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-config.h.in.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-config.h.in.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,28 @@
+--- config.h.in 2014-04-26 12:58:46.000000000 +0200
++++ config.h.in 2014-05-01 21:36:54.000000000 +0200
+@@ -192,14 +192,14 @@
+ * If screen is installed with permissions to update /etc/utmp (such
+ * as if it is installed set-uid root), define UTMPOK.
+ */
+-#define UTMPOK
++#undef UTMPOK
+
+ /* Set LOGINDEFAULT to one (1)
+ * if you want entries added to /etc/utmp by default, else set it to
+ * zero (0).
+ * LOGINDEFAULT will be one (1) whenever LOGOUTOK is undefined!
+ */
+-#define LOGINDEFAULT 1
++#undef LOGINDEFAULT
+
+ /* Set LOGOUTOK to one (1)
+ * if you want the user to be able to log her/his windows out.
+@@ -215,7 +215,7 @@
+ * Set CAREFULUTMP to one (1) if you want that users have at least one
+ * window per screen session logged in.
+ */
+-#define LOGOUTOK 1
++#undef LOGOUTOK
+ #undef CAREFULUTMP
+
+
Deleted: trunk/dports/sysutils/screen/files/patch-configure
===================================================================
--- trunk/dports/sysutils/screen/files/patch-configure 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-configure 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,22 +0,0 @@
---- configure 2014-04-26 12:58:46.000000000 +0200
-+++ configure 2014-05-01 21:36:54.000000000 +0200
-@@ -5413,7 +5413,7 @@
-
- #include <time.h> /* to get time_t on SCO */
- #include <sys/types.h>
--#if defined(SVR4) && !defined(DGUX)
-+#if (defined(SVR4) || defined(__APPLE__)) && !defined(DGUX)
- #include <utmpx.h>
- #define utmp utmpx
- #else
-@@ -5422,6 +5422,10 @@
- #ifdef __hpux
- #define pututline _pututline
- #endif
-+#ifdef __APPLE__
-+#define pututline pututxline
-+#define getutent getutxent
-+#endif
-
- int
- main ()
Copied: trunk/dports/sysutils/screen/files/patch-configure.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-configure)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-configure.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-configure.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,22 @@
+--- configure 2014-04-26 12:58:46.000000000 +0200
++++ configure 2014-05-01 21:36:54.000000000 +0200
+@@ -5413,7 +5413,7 @@
+
+ #include <time.h> /* to get time_t on SCO */
+ #include <sys/types.h>
+-#if defined(SVR4) && !defined(DGUX)
++#if (defined(SVR4) || defined(__APPLE__)) && !defined(DGUX)
+ #include <utmpx.h>
+ #define utmp utmpx
+ #else
+@@ -5422,6 +5422,10 @@
+ #ifdef __hpux
+ #define pututline _pututline
+ #endif
++#ifdef __APPLE__
++#define pututline pututxline
++#define getutent getutxent
++#endif
+
+ int
+ main ()
Deleted: trunk/dports/sysutils/screen/files/patch-maxargs
===================================================================
--- trunk/dports/sysutils/screen/files/patch-maxargs 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-maxargs 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,11 +0,0 @@
---- ansi.c.orig 2014-05-01 12:51:14.000000000 +0200
-+++ ansi.c 2014-05-01 21:33:29.000000000 +0200
-@@ -568,7 +568,7 @@
- {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-- if (curr->w_NumArgs < MAXARGS)
-+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
- {
- if (curr->w_args[curr->w_NumArgs] < 100000000)
- curr->w_args[curr->w_NumArgs] =
Copied: trunk/dports/sysutils/screen/files/patch-maxargs.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-maxargs)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-maxargs.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-maxargs.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,11 @@
+--- ansi.c.orig 2014-05-01 12:51:14.000000000 +0200
++++ ansi.c 2014-05-01 21:33:29.000000000 +0200
+@@ -568,7 +568,7 @@
+ {
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+- if (curr->w_NumArgs < MAXARGS)
++ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
+ {
+ if (curr->w_args[curr->w_NumArgs] < 100000000)
+ curr->w_args[curr->w_NumArgs] =
Deleted: trunk/dports/sysutils/screen/files/patch-pty.c
===================================================================
--- trunk/dports/sysutils/screen/files/patch-pty.c 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-pty.c 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,11 +0,0 @@
---- ./pty.c.orig 2003-09-08 16:26:18.000000000 +0200
-+++ ./pty.c 2007-10-28 16:27:56.000000000 +0100
-@@ -34,7 +34,7 @@
- #endif
-
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
-+#if defined(HAVE_SVR4_PTYS) && !defined(__APPLE__)
- # include <sys/stropts.h>
- #endif
-
Copied: trunk/dports/sysutils/screen/files/patch-pty.c.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-pty.c)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-pty.c.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-pty.c.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,11 @@
+--- ./pty.c.orig 2003-09-08 16:26:18.000000000 +0200
++++ ./pty.c 2007-10-28 16:27:56.000000000 +0100
+@@ -34,7 +34,7 @@
+ #endif
+
+ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
+-#ifdef HAVE_SVR4_PTYS
++#if defined(HAVE_SVR4_PTYS) && !defined(__APPLE__)
+ # include <sys/stropts.h>
+ #endif
+
Deleted: trunk/dports/sysutils/screen/files/patch-screen.c
===================================================================
--- trunk/dports/sysutils/screen/files/patch-screen.c 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-screen.c 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,43 +0,0 @@
---- screen.c 2014-04-26 18:22:09.000000000 +0200
-+++ screen.c 2014-05-01 21:36:54.000000000 +0200
-@@ -109,6 +109,11 @@
-
- #include "logfile.h" /* islogfile, logfflush */
-
-+#ifdef __APPLE__
-+#include <vproc.h>
-+#include <vproc_priv.h>
-+#endif
-+
- #ifdef DEBUG
- FILE *dfp;
- #endif
-@@ -1046,6 +1051,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)
- {
-@@ -1314,6 +1329,11 @@
- freopen("/dev/null", "w", stderr);
- debug("-- screen.back debug started\n");
-
-+#ifdef __APPLE__
-+ 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'
Deleted: trunk/dports/sysutils/screen/files/patch-screen.c-leopard
===================================================================
--- trunk/dports/sysutils/screen/files/patch-screen.c-leopard 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-screen.c-leopard 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,26 +0,0 @@
---- screen.c.orig 2009-01-21 12:06:11.000000000 +0800
-+++ screen.c 2009-01-21 12:08:27.000000000 +0800
-@@ -101,6 +101,11 @@
-
- #include "logfile.h" /* islogfile, logfflush */
-
-+#ifdef __APPLE__
-+#include <vproc.h>
-+#include "vproc_priv.h"
-+#endif
-+
- #ifdef DEBUG
- FILE *dfp;
- #endif
-@@ -1211,6 +1216,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");
-+#endif
-+
- /*
- * This guarantees that the session owner is listed, even when we
- * start detached. From now on we should not refer to 'LoginName'
Copied: trunk/dports/sysutils/screen/files/patch-screen.c-leopard.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-screen.c-leopard)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-screen.c-leopard.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-screen.c-leopard.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,26 @@
+--- screen.c.orig 2009-01-21 12:06:11.000000000 +0800
++++ screen.c 2009-01-21 12:08:27.000000000 +0800
+@@ -101,6 +101,11 @@
+
+ #include "logfile.h" /* islogfile, logfflush */
+
++#ifdef __APPLE__
++#include <vproc.h>
++#include "vproc_priv.h"
++#endif
++
+ #ifdef DEBUG
+ FILE *dfp;
+ #endif
+@@ -1211,6 +1216,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");
++#endif
++
+ /*
+ * This guarantees that the session owner is listed, even when we
+ * start detached. From now on we should not refer to 'LoginName'
Copied: trunk/dports/sysutils/screen/files/patch-screen.c.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-screen.c)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-screen.c.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-screen.c.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,43 @@
+--- screen.c 2014-04-26 18:22:09.000000000 +0200
++++ screen.c 2014-05-01 21:36:54.000000000 +0200
+@@ -109,6 +109,11 @@
+
+ #include "logfile.h" /* islogfile, logfflush */
+
++#ifdef __APPLE__
++#include <vproc.h>
++#include <vproc_priv.h>
++#endif
++
+ #ifdef DEBUG
+ FILE *dfp;
+ #endif
+@@ -1046,6 +1051,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)
+ {
+@@ -1314,6 +1329,11 @@
+ freopen("/dev/null", "w", stderr);
+ debug("-- screen.back debug started\n");
+
++#ifdef __APPLE__
++ 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'
Deleted: trunk/dports/sysutils/screen/files/patch-window.c
===================================================================
--- trunk/dports/sysutils/screen/files/patch-window.c 2015-08-17 18:47:34 UTC (rev 139440)
+++ trunk/dports/sysutils/screen/files/patch-window.c 2015-08-17 18:47:47 UTC (rev 139441)
@@ -1,49 +0,0 @@
---- window.c 2014-04-26 12:58:35.000000000 +0200
-+++ window.c 2014-05-01 21:36:54.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <sys/stat.h>
- #include <signal.h>
- #include <fcntl.h>
-+#include <unistd.h>
- #ifndef sun
- # include <sys/ioctl.h>
- #endif
-@@ -1660,6 +1661,38 @@
- return r;
- }
-
-+#ifdef RUN_LOGIN
-+/*
-+ * All of the logic to maintain utmpx is now built into /usr/bin/login, so
-+ * all we need to do is call it, and pass the shell command to it.
-+ */
-+extern char *LoginName;
-+
-+static int
-+run_login(const char *path, char *const argv[], char *const envp[])
-+{
-+ const char *shargs[MAXARGS + 1 + 3];
-+ const char **fp, **tp;
-+
-+ if (access(path, X_OK) < 0)
-+ return -1;
-+ shargs[0] = "login";
-+ shargs[1] = (*argv[0] == '-') ? "-pfq" : "-pflq";
-+ shargs[2] = LoginName;
-+ shargs[3] = path;
-+ fp = (const char **)argv + 1;
-+ tp = shargs + 4;
-+ /* argv has already been check for length */
-+ while ((*tp++ = *fp++) != NULL) {}
-+ /* shouldn't return unless there was an error */
-+ return (execve("/usr/bin/login", (char *const*)shargs, envp));
-+}
-+
-+/* replace the following occurrences of execve() with run_login() */
-+#define execve run_login
-+
-+#endif /* RUN_LOGIN */
-+
- void
- FreePseudowin(w)
- struct win *w;
Copied: trunk/dports/sysutils/screen/files/patch-window.c.diff (from rev 139440, trunk/dports/sysutils/screen/files/patch-window.c)
===================================================================
--- trunk/dports/sysutils/screen/files/patch-window.c.diff (rev 0)
+++ trunk/dports/sysutils/screen/files/patch-window.c.diff 2015-08-17 18:47:47 UTC (rev 139441)
@@ -0,0 +1,49 @@
+--- window.c 2014-04-26 12:58:35.000000000 +0200
++++ window.c 2014-05-01 21:36:54.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <signal.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #ifndef sun
+ # include <sys/ioctl.h>
+ #endif
+@@ -1660,6 +1661,38 @@
+ return r;
+ }
+
++#ifdef RUN_LOGIN
++/*
++ * All of the logic to maintain utmpx is now built into /usr/bin/login, so
++ * all we need to do is call it, and pass the shell command to it.
++ */
++extern char *LoginName;
++
++static int
++run_login(const char *path, char *const argv[], char *const envp[])
++{
++ const char *shargs[MAXARGS + 1 + 3];
++ const char **fp, **tp;
++
++ if (access(path, X_OK) < 0)
++ return -1;
++ shargs[0] = "login";
++ shargs[1] = (*argv[0] == '-') ? "-pfq" : "-pflq";
++ shargs[2] = LoginName;
++ shargs[3] = path;
++ fp = (const char **)argv + 1;
++ tp = shargs + 4;
++ /* argv has already been check for length */
++ while ((*tp++ = *fp++) != NULL) {}
++ /* shouldn't return unless there was an error */
++ return (execve("/usr/bin/login", (char *const*)shargs, envp));
++}
++
++/* replace the following occurrences of execve() with run_login() */
++#define execve run_login
++
++#endif /* RUN_LOGIN */
++
+ void
+ FreePseudowin(w)
+ struct win *w;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150817/c08085aa/attachment.html>
More information about the macports-changes
mailing list