diff options
Diffstat (limited to 'sysutils/screen/files')
-rw-r--r-- | sysutils/screen/files/patch-doc__Makefile.in | 34 | ||||
-rw-r--r-- | sysutils/screen/files/patch-doc_screen.1 | 11 | ||||
-rw-r--r-- | sysutils/screen/files/patch-misc.c | 39 | ||||
-rw-r--r-- | sysutils/screen/files/patch-os.h | 19 | ||||
-rw-r--r-- | sysutils/screen/files/patch-socket.c | 76 | ||||
-rw-r--r-- | sysutils/screen/files/patch-terminfo__checktc.c | 18 | ||||
-rw-r--r-- | sysutils/screen/files/patch-utmp.c | 20 | ||||
-rw-r--r-- | sysutils/screen/files/screenrc.sample | 10 |
8 files changed, 227 insertions, 0 deletions
diff --git a/sysutils/screen/files/patch-doc__Makefile.in b/sysutils/screen/files/patch-doc__Makefile.in new file mode 100644 index 000000000000..8666be063fe5 --- /dev/null +++ b/sysutils/screen/files/patch-doc__Makefile.in @@ -0,0 +1,34 @@ +--- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700 ++++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700 +@@ -31,7 +31,10 @@ + $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info + + install: installdirs ++ifeq (${WITH_MAN},1) + $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 ++endif ++ifeq (${WITH_INFO},1) + -$(MAKE) screen.info + -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ + if test -f $$d/screen.info; then \ +@@ -40,13 +43,19 @@ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ + else true; fi; \ + fi ++endif + + uninstall: + rm -f $(DESTDIR)$(mandir)/man1/screen.1 + rm -f $(DESTDIR)$(infodir)/screen.info* + + installdirs: +- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) ++ifeq (${WITH_MAN},1) ++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 ++endif ++ifeq (${WITH_INFO},1) ++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir) ++endif + + mostlyclean: + -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr diff --git a/sysutils/screen/files/patch-doc_screen.1 b/sysutils/screen/files/patch-doc_screen.1 new file mode 100644 index 000000000000..59077d7be443 --- /dev/null +++ b/sysutils/screen/files/patch-doc_screen.1 @@ -0,0 +1,11 @@ +--- doc/screen.1.orig 2023-08-15 11:01:59 UTC ++++ doc/screen.1 +@@ -241,7 +241,7 @@ + .IR screen , + but prints a list of + .I pid.tty.host +-strings identifying your ++strings and creation timestamps identifying your + .I screen + sessions. + Sessions marked `detached' can be resumed with \*Qscreen \-r\*U. Those marked diff --git a/sysutils/screen/files/patch-misc.c b/sysutils/screen/files/patch-misc.c new file mode 100644 index 000000000000..238359b03671 --- /dev/null +++ b/sysutils/screen/files/patch-misc.c @@ -0,0 +1,39 @@ +--- misc.c.orig 2024-03-26 16:41:57.000000000 -0700 ++++ misc.c 2024-04-03 11:32:35.844473000 -0700 +@@ -32,8 +32,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 <stdint.h> + #include <string.h> + #include <stdbool.h> +@@ -225,6 +227,7 @@ + char *p; + + if (str == NULL) { ++ + *buf = 0; + return 0; + } +@@ -238,3 +241,17 @@ + *p = 0; + return p - buf; + } ++ ++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; ++} diff --git a/sysutils/screen/files/patch-os.h b/sysutils/screen/files/patch-os.h new file mode 100644 index 000000000000..a03d22029f93 --- /dev/null +++ b/sysutils/screen/files/patch-os.h @@ -0,0 +1,19 @@ +--- os.h.orig 2024-07-27 07:09:11.000000000 -0700 ++++ os.h 2024-08-19 08:47:21.152670000 -0700 +@@ -148,7 +148,7 @@ + */ + + #ifndef TERMCAP_BUFSIZE +-# define TERMCAP_BUFSIZE 1023 ++# define TERMCAP_BUFSIZE 1024 + #endif + + /* +@@ -161,6 +161,6 @@ + /* Changing those you won't be able to attach to your old sessions + * when changing those values in official tree don't forget to bump + * MSG_VERSION */ +-#define MAXTERMLEN 32 ++#define MAXTERMLEN 63 + #define MAXLOGINLEN 256 + diff --git a/sysutils/screen/files/patch-socket.c b/sysutils/screen/files/patch-socket.c new file mode 100644 index 000000000000..abd96ac9cb49 --- /dev/null +++ b/sysutils/screen/files/patch-socket.c @@ -0,0 +1,76 @@ +--- socket.c.orig 2024-03-26 16:41:57.000000000 -0700 ++++ socket.c 2024-04-03 07:52:07.474617000 -0700 +@@ -122,11 +122,13 @@ + char *firstn = NULL; + int nfound = 0, ngood = 0, ndead = 0, nwipe = 0, npriv = 0; + int nperfect = 0; ++ char timestr[64]; + struct sent { + struct sent *next; + int mode; + char *name; +- } *slist, **slisttail, *sent, *nsent; ++ time_t time_created; ++ } *slist, **slisttail, *sent, *nsent, *schosen; + + if (match) { + matchlen = strlen(match); +@@ -203,8 +205,12 @@ + sent->next = NULL; + sent->name = SaveStr(name); + sent->mode = mode; ++ sent->time_created = SessionCreationTime(name); ++ for (slisttail = &slist; *slisttail; slisttail = &((*slisttail)->next)) { ++ if ((*slisttail)->time_created < sent->time_created) break; ++ } ++ sent->next = *slisttail; + *slisttail = sent; +- slisttail = &sent->next; + nfound++; + sockfd = MakeClientSocket(0); + /* MakeClientSocket sets ids back to eff */ +@@ -283,31 +289,36 @@ + break; + } + for (sent = slist; sent; sent = sent->next) { ++ if (sent->time_created == 0) { ++ sprintf(timestr, "??" "?"); ++ } else { ++ strftime(timestr, 64, "%x %X", localtime(&sent->time_created)); ++ } + switch (sent->mode) { + case 0700: +- printf("\t%s\t(Attached)\n", sent->name); ++ printf("\t%s\t(%s)\t(Attached)\n", sent->name, timestr); + break; + case 0600: +- printf("\t%s\t(Detached)\n", sent->name); ++ printf("\t%s\t(%s)\t(Detached)\n", sent->name, timestr); + break; + case 0701: +- printf("\t%s\t(Multi, attached)\n", sent->name); ++ printf("\t%s\t(%s)\t(Multi, attached)\n", sent->name, timestr); + break; + case 0601: +- printf("\t%s\t(Multi, detached)\n", sent->name); ++ printf("\t%s\t(%s)\t(Multi, detached)\n", sent->name, timestr); + break; + case -1: + /* No trigraphs here! */ +- printf("\t%s\t(Dead ?%c?)\n", sent->name, '?'); ++ printf("\t%s\t(%s)\t(Dead ?%c?)\n", sent->name, timestr, '?'); + break; + case -2: +- printf("\t%s\t(Removed)\n", sent->name); ++ printf("\t%s\t(%s)\t(Removed)\n", sent->name, timestr); + break; + case -3: +- printf("\t%s\t(Remote or dead)\n", sent->name); ++ printf("\t%s\t(%s)\t(Remote or dead)\n", sent->name, timestr); + break; + case -4: +- printf("\t%s\t(Private)\n", sent->name); ++ printf("\t%s\t(%s)\t(Private)\n", sent->name, timestr); + break; + } + } diff --git a/sysutils/screen/files/patch-terminfo__checktc.c b/sysutils/screen/files/patch-terminfo__checktc.c new file mode 100644 index 000000000000..d4ffb75cc0c1 --- /dev/null +++ b/sysutils/screen/files/patch-terminfo__checktc.c @@ -0,0 +1,18 @@ +--- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 ++++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 +@@ -171,6 +171,7 @@ + fflush(stdout); + } + ++#ifndef __FreeBSD__ + void CPutStr(s, c) + char *s; + int c; +@@ -178,6 +179,7 @@ + tputs(tgoto(s, 0, c), 1, putcha); + fflush(stdout); + } ++#endif /* __FreeBSD__ */ + + void CCPutStr(s, x, y) + char *s; diff --git a/sysutils/screen/files/patch-utmp.c b/sysutils/screen/files/patch-utmp.c new file mode 100644 index 000000000000..3157dffa0a90 --- /dev/null +++ b/sysutils/screen/files/patch-utmp.c @@ -0,0 +1,20 @@ +--- utmp.c.orig 2024-03-26 16:41:57.000000000 -0700 ++++ utmp.c 2024-04-03 11:21:49.696125000 -0700 +@@ -30,6 +30,7 @@ + + #include "utmp.h" + ++#include <sys/param.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -64,9 +65,7 @@ + + static int utmpok; + static char UtmpName[] = UTMPXFILE; +-#ifndef UTMP_HELPER + static int utmpfd = -1; +-#endif + + #undef D_loginhost + #define D_loginhost D_utmp_logintty.ut_host diff --git a/sysutils/screen/files/screenrc.sample b/sysutils/screen/files/screenrc.sample new file mode 100644 index 000000000000..8bfb5906d20c --- /dev/null +++ b/sysutils/screen/files/screenrc.sample @@ -0,0 +1,10 @@ +startup_message off +defscrollback 5000 +termcapinfo xterm ti@:te@ +termcapinfo xterm-color ti@:te@ +hardstatus alwayslastline +hardstatus string '%{2;0}[%{+b10;0}%H%{-}][%= %{7;0}%?%-Lw%?%{+9;0}(%{+15;0}%n%f %t%?(%u)%?%{-})%{-} ^H%?%+Lw%?%= %{-}]%{+b14;0}[%m/%d/%y %c]%{-}%{-}' +vbell off +shell -$SHELL +logtstamp on +logtstamp after 1 |