diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2020-02-27 09:34:33 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-02-27 09:59:36 +0100 |
commit | 538c65e61e6e59fde584412ace81081955e84427 (patch) | |
tree | f7d611bfc6be150c3ae2ce1c9eddb493b5a9e3ba /app-misc/screen/files | |
parent | app-misc/screen: Synced live ebuild (diff) | |
download | gentoo-538c65e61e6e59fde584412ace81081955e84427.tar.gz gentoo-538c65e61e6e59fde584412ace81081955e84427.tar.bz2 gentoo-538c65e61e6e59fde584412ace81081955e84427.zip |
app-misc/screen: Removed old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-misc/screen/files')
-rw-r--r-- | app-misc/screen/files/screen-4.4.0-utmp-musl.patch | 62 | ||||
-rw-r--r-- | app-misc/screen/files/screen-4.5.1-texinfo.patch | 13 |
2 files changed, 0 insertions, 75 deletions
diff --git a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch deleted file mode 100644 index 990c73042cd0..000000000000 --- a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net> -Date: Sat, 13 Jun 2015 17:52:46 +0200 -Subject: [PATCH] change checks for utmp/utmpx in header - -linuxes should've working utmpx, so this check was bit weird -commit 2b1bdf96 mentions some "linux workaround", but nothing specific - -fixes build with musl libc ---- - os.h | 7 ++++--- - utmp.c | 4 ++-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/os.h b/os.h -index 55de249..e827ac9 100644 ---- a/os.h -+++ b/os.h -@@ -250,9 +250,11 @@ extern int errno; - #endif - - #if defined(UTMPOK) || defined(BUGGYGETLOGIN) --# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) -+# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) - # include <utmpx.h> --# define UTMPFILE UTMPX_FILE -+# ifdef UTMPX_FILE /* GNU extension */ -+# define UTMPFILE UTMPX_FILE -+# endif - # define utmp utmpx - # define getutent getutxent - # define getutid getutxid -@@ -260,7 +262,6 @@ extern int errno; - # define pututline pututxline - # define setutent setutxent - # define endutent endutxent --# define ut_time ut_xtime - # else /* SVR4 */ - # include <utmp.h> - # endif /* SVR4 */ -diff --git a/utmp.c b/utmp.c -index fa8b87b..f5d7db8 100644 ---- a/utmp.c -+++ b/utmp.c -@@ -631,7 +631,7 @@ int pid; - /* must use temp variable because of NetBSD/sparc64, where - * ut_xtime is long(64) but time_t is int(32) */ - (void)time(&now); -- u->ut_time = now; -+ u->ut_tv.tv_sec = now; - } - - static slot_t -@@ -743,7 +743,7 @@ int pid; - strncpy(u->ut_line, line, sizeof(u->ut_line)); - strncpy(u->ut_name, user, sizeof(u->ut_name)); - (void)time(&now); -- u->ut_time = now; -+ u->ut_tv.tv_sec = now; - } - - static slot_t diff --git a/app-misc/screen/files/screen-4.5.1-texinfo.patch b/app-misc/screen/files/screen-4.5.1-texinfo.patch deleted file mode 100644 index 8d7a5e527175..000000000000 --- a/app-misc/screen/files/screen-4.5.1-texinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/doc/screen.texinfo -+++ b/doc/screen.texinfo -@@ -5796,8 +5796,8 @@ - ============ - - @example -- Thomas Renninger <treen@suse.com>, -- Axel Beckert <abe@deuxchevaux.org>, -+ Thomas Renninger <treen@@suse.com>, -+ Axel Beckert <abe@@deuxchevaux.org>, - Ken Beal <kbeal@@amber.ssd.csd.harris.com>, - Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>, - Toerless Eckert <eckert@@informatik.uni-erlangen.de>, |