summaryrefslogtreecommitdiff
path: root/sysutils/screen49/files/patch-misc.c
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2024-08-28 19:33:47 -0700
committerCy Schubert <cy@FreeBSD.org>2024-08-28 20:35:49 -0700
commit43808d10e2359ee97c2a37d851bbb78e72eeabe3 (patch)
tree605052d61d9e0dff7b1d08c72fd6b0a22bbd940e /sysutils/screen49/files/patch-misc.c
parentirc/soju: Update to 0.8.2 (diff)
sysutils/screen*: Rename screen and introduce a meta port
This is in preparation for the import of screen 5.0.0. I've tried screen-devel (5.0.0 prelrelease). There were some bugs and inconsistencies with screen 4.9.1. So we move screen to screen49 to maintain a version of screen that is known to work. This implements the concept of a master screen port by renaming it to screen49 and creating a slave port called screen. The idea of this is similar in concept used with the cfengine or krb5 family of ports. Users should never need to change port origins when a new stable version of screen is committed. People can install the screen port or package as before. However if they choose to use the other screen port/package they may remove screen and install the versioned "master" port/package directly. This is in preparation for import of screen 5.0.0 into the ports collection. Unfortunately my initial testing of screen 5.0.0 using the screen-devel port uncovered an annoying (to me) bug, which I have opened an issue with our upstream. I have not found the time to test their patches enough to feel comfortalbe replacing the existing screen 4.9.1 with 5.0.0. When 5.0.0 will be imported as sysutils/screen50, it will not become the default master port until we believe it won't become a source of many bugzilla bugs.
Diffstat (limited to 'sysutils/screen49/files/patch-misc.c')
-rw-r--r--sysutils/screen49/files/patch-misc.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/sysutils/screen49/files/patch-misc.c b/sysutils/screen49/files/patch-misc.c
new file mode 100644
index 000000000000..1364b230d55a
--- /dev/null
+++ b/sysutils/screen49/files/patch-misc.c
@@ -0,0 +1,31 @@
+--- misc.c.orig 2022-01-28 14:06:02 UTC
++++ misc.c
+@@ -28,8 +28,10 @@
+
+ #include <poll.h>
+ #include <sys/types.h>
++#include <sys/user.h>
+ #include <sys/stat.h> /* mkdir() declaration */
+ #include <signal.h>
++#include <libutil.h>
+
+ #include "config.h"
+ #include "screen.h"
+@@ -796,3 +798,17 @@
+ }
+
+ #endif
++
++time_t
++SessionCreationTime(fifo)
++const char *fifo;
++{
++ int pid = atoi(fifo);
++ if (pid <= 0) return 0;
++
++ struct kinfo_proc * kip = kinfo_getproc(pid);
++ if (kip == 0) return 0;
++ time_t start = kip->ki_start.tv_sec;
++ free (kip);
++ return start;
++}