diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2019-10-09 01:03:04 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2019-10-09 01:03:04 +0000 |
| commit | 8dadaadc903e02d7f8608f1fac88b8907f225fe5 (patch) | |
| tree | 0012a35059dbcc86ac97c3fb87b4ea98389fb9f5 /sysutils | |
| parent | 49c23f29df6a59946559d35475a95e67f9f10517 (diff) | |
| download | ports-8dadaadc903e02d7f8608f1fac88b8907f225fe5.tar.gz ports-8dadaadc903e02d7f8608f1fac88b8907f225fe5.zip | |
Resolve a segfault in utmp.c:519 at some installations.
Notes
Notes:
svn path=/head/; revision=514110
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/screen/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/screen/files/patch-utmp.c | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 611f0a2d3d6d..6d727543cf7a 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -3,6 +3,7 @@ PORTNAME= screen PORTVERSION= 4.7.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GNU \ ftp://ftp.gnu.org/gnu/screen/ \ diff --git a/sysutils/screen/files/patch-utmp.c b/sysutils/screen/files/patch-utmp.c index 0892ad3be256..64550c88add5 100644 --- a/sysutils/screen/files/patch-utmp.c +++ b/sysutils/screen/files/patch-utmp.c @@ -1,6 +1,6 @@ --- utmp.c.orig 2019-10-01 15:08:00.000000000 -0700 -+++ utmp.c 2019-10-08 12:08:46.535155000 -0700 -@@ -26,6 +26,7 @@ ++++ utmp.c 2019-10-08 17:56:32.853627000 -0700 +@@ -26,9 +26,13 @@ **************************************************************** */ @@ -8,16 +8,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -@@ -88,6 +89,9 @@ - static void makedead __P((struct utmp *)); - static int pututslot __P((slot_t, struct utmp *, char *, struct win *)); - static struct utmp *getutslot __P((slot_t)); +#ifdef __FreeBSD_version +#define GETUTENT +#endif - #ifndef GETUTENT - static struct utmp *getutent __P((void)); - static void endutent __P((void)); + + #include "config.h" + #include "screen.h" @@ -102,7 +106,7 @@ static int utmpok; |