<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ed0d9a31d1c1ce57c6c194d83fdfdba7a30615dd">https://github.com/macports/macports-ports/commit/ed0d9a31d1c1ce57c6c194d83fdfdba7a30615dd</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ed0d9a31d1c screen: bump apple patch to screen-24
</span>ed0d9a31d1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ed0d9a31d1c1ce57c6c194d83fdfdba7a30615dd
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Sat May 8 20:19:05 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> screen: bump apple patch to screen-24
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> also fix autoconf and friends, and refresh patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62791
</span>---
sysutils/screen/Portfile | 11 +-----
...atch-config.h.in.diff => patch-acconfig.h.diff} | 12 +++---
sysutils/screen/files/patch-apple.diff | 44 +++++++++++-----------
3 files changed, 29 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/Portfile b/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8378ad9494..1ff90e11c00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name screen
version 4.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> homepage https://www.gnu.org/software/screen/
description Screen manager with VT100/ANSI terminal emulation
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ checksums ${distname}${extract.suffix} \
</span> size 4883
patchfiles patch-apple.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-config.h.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-acconfig.h.diff \
</span> patch-configure_no_implicit_defs.diff \
patch-xcode-12-implicit-function-fixes.diff
depends_lib port:ncurses
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,13 +53,6 @@ post-extract {
</span> }
use_autoconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-autoconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# need for autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span>
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/files/patch-config.h.in.diff b/sysutils/screen/files/patch-acconfig.h.diff
</span>similarity index 84%
rename from sysutils/screen/files/patch-config.h.in.diff
rename to sysutils/screen/files/patch-acconfig.h.diff
<span style='display:block; white-space:pre;color:#808080;'>index ae8dbb212c4..653b0261f0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/files/patch-config.h.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/files/patch-acconfig.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,9 @@ screen's utmp editing.
</span>
This also fixes the "/var/run/utmp: No such file or directory"
errors as a consequence of the above.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rU 3 config.h.in config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in 2020-02-05 15:26:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in 2020-02-07 21:17:08.307798880 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -192,14 +192,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- acconfig.h 2021-05-08 19:39:20.099088823 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ acconfig.h 2021-05-08 20:11:16.299603971 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,14 +191,14 @@
</span> * If screen is installed with permissions to update /etc/utmp (such
* as if it is installed set-uid root), define UTMPOK.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +24,12 @@ diff -rU 3 config.h.in config.h.in
</span>
/* Set LOGOUTOK to one (1)
* if you want the user to be able to log her/his windows out.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,7 +214,7 @@
</span> * 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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/files/patch-apple.diff b/sysutils/screen/files/patch-apple.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8017c51940c..10918744ebe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/files/patch-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/files/patch-apple.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> Apple's changes between upstream screen-4.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-and their release of screen, called screen-22.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-You can view the screen-22 source at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and their release of screen, called screen-24.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+You can view the screen-24 source at
</span> https://opensource.apple.com/tarballs/screen/
Upstream screen-4.0.3 is released under the GPLv2,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,28 +11,27 @@ This patch was then rebased against the latest upstream
</span> GNU Screen, which was version 4.6.2 and no longer required
many of Apple's changes. This was done by David Gilman
for MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rU 3 screen.c screen.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- screen.c 2020-02-05 15:09:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ screen.c 2020-02-07 21:17:51.105940911 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,6 +118,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- screen.c 2021-05-08 19:39:20.092413588 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ screen.c 2021-05-08 19:48:03.152597182 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,6 +118,15 @@
</span>
#include "logfile.h" /* islogfile, logfflush, logfopen/logfclose */
+#ifdef __APPLE__
+#include <TargetConditionals.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !TARGET_OS_EMBEDDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
</span> +#include <vproc.h>
+#include <vproc_priv.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <err.h>
</span> +#endif
+#endif
+
#ifdef DEBUG
FILE *dfp;
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1051,6 +1059,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Panic(0, "No $SCREENDIR with multi screens, please.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1206,6 +1215,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Attacher();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* NOTREACHED */
</span> }
+#ifdef __APPLE__
+ else if (!multi && real_uid == eff_uid) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,14 +42,15 @@ diff -rU 3 screen.c screen.c
</span> + }
+ }
+#endif /* __APPLE__ */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> #ifdef MULTIUSER
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (multiattach) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1314,6 +1331,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (multiattach)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Panic(0, "Can't create sessions of other users.");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1314,6 +1333,11 @@
</span> freopen("/dev/null", "w", stderr);
debug("-- screen.back debug started\n");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && !TARGET_OS_EMBEDDED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && !(TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
</span> + if (_vprocmgr_detach_from_console(0) != NULL)
+ errx(1, "can't detach from console");
+#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +58,8 @@ diff -rU 3 screen.c screen.c
</span> /* This guarantees that the session owner is listed, even when we
* start detached. From now on we should not refer to 'LoginName'
* any more, use users->u_name instead.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -rU 3 gwindow.c gwindow.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- window.c 2020-02-05 15:09:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ window.c 2020-02-07 21:17:51.108845249 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- window.c 2021-05-08 19:39:20.102441294 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ window.c 2021-05-08 19:40:40.447225064 -0400
</span> @@ -33,6 +33,9 @@
#include <sys/stat.h>
#include <signal.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,10 +70,10 @@ diff -rU 3 gwindow.c gwindow.c
</span> #ifndef sun
# include <sys/ioctl.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1484,6 +1487,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1682,6 +1685,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return r;
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef HAVE_EXECVPE
</span> +#ifdef __APPLE__
+#ifdef RUN_LOGIN
+/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,5 +109,5 @@ diff -rU 3 gwindow.c gwindow.c
</span> +#endif /* __APPLE__ */
+
void
<span style='display:block; white-space:pre;background:#ffe0e0;'>- execvpe(prog, args, env)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *prog, **args, **env;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FreePseudowin(w)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct win *w;
</span></pre><pre style='margin:0'>
</pre>