diff options
| -rw-r--r-- | app-misc/screen/Manifest | 3 | ||||
| -rw-r--r-- | app-misc/screen/files/screen-4.4.0-utmp-musl.patch | 62 | ||||
| -rw-r--r-- | app-misc/screen/screen-4.4.0.ebuild | 4 |
3 files changed, 66 insertions, 3 deletions
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 0a0403b3..17f3d3b1 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -13,6 +13,7 @@ AUX screen-4.0.3-crosscompile.patch 18900 SHA256 7e4109cd3f6d58ea799fe069472a58f AUX screen-4.0.3-setenv_autoconf.patch 2485 SHA256 091eb224a097bbc1b5f1b3dd8048dbb04b8c7476818a9444eae5bdb8b52bce75 SHA512 72dcfd9180d05edf85ce9f459e69ccd709a6c0a4593802d0f4e88ffe2daf56215ce8049a641701693dafeab3cc8a0df796338d92338ee0d39c51d46ed718af7b WHIRLPOOL fa7645c3488f75c8acdb2305864459e3eada89e7a29e39a6048cdda7459c707b090c68ce93023a53c57a7beabb3c66f9f9f26237126e68d00cc888a7581b867c AUX screen-4.3.0-no-utempter.patch 363 SHA256 c8e4b1a03175fb2af3e13fa514b8a5456b53905a7ca51587195a62cb8d60e1c9 SHA512 0b2e6a2b54e6155e217ab44a0d8314afafd97fae684fbc2875c0f4d21df29cb259ea4023343e92da16dd3a2bf11ec6d06e677d765748299d1633aa1b9261a604 WHIRLPOOL c59a0c3f32ad50e15cd5e902b7b600cda18d2b676209628e7b96120866e7aba968264fbf8b35dc3e252b9fd63f21611005c9ec46cddc5e42b30c8da29a5e5186 AUX screen-4.3.1-ansi.c.patch 657 SHA256 806fa628fbbfcf4a63153e0f2a4979ad02d9531151817ef5183c34c4d12adb26 SHA512 ca746103856afd2e93eff8b5b81fa1f4f83c9a89511ce2bd88a6ebfb4becd858da97df48c2939ec2bc631d17e98613f252ca92f1e53f5ad5358f118c449ab545 WHIRLPOOL 39ff78cb6aadf4fe8a7a3cdfb44f7fb656d497a60d3809bd751b7ba0fdb3ae9ebf11ee93e663a1f713fe3e16e34792e10670825eda36754be46dc7fcecc0e810 +AUX screen-4.4.0-utmp-musl.patch 1762 SHA256 77fee8810702cf33f1a9ca7d9d692607ccdac68f51be5b49f7ab05ef4f540cfd SHA512 9720128e1c4849330b3e7ae8163beb0bf5b4c17e9c8d003a142db59d22dcce2bff0dd437afa209b3b1538c0f28f9d4521f54134d4e28104ee74ba73d57dc2314 WHIRLPOOL 666e9bc41a4eacd73ab4c5c1be0a3d1befc0a627f52a5c12f6c31e21b8cab45905c121a46298161229021898701e40edc66e4da4f928fe006c9c968824d8f816 AUX screen-4.5.0-logfile-access-revert.patch 635 SHA256 38306621e931a78976fb3e3c197b628b8cddb477056bd412895f53994f607a4e SHA512 69c0a4052a451eb33b48a2fb6760f311e167ea2049164d6df66ae0b4401a2aea1a4bc91c19f8b4ee78e1886393abc8bc59fd18c3345abab4e0cb00c4eb019140 WHIRLPOOL 6c4b14cb0ff65b085be759fc4c779e0b23079b1a78b12dcc225b8ab467c82ed75a80e12648389f6ffc033748f1be4bb303924b5021f518603ea5c1134cdedccf AUX screen-4.5.0-solaris-PATH_MAX.patch 249 SHA256 ec82e1da6b425f68f9dcdb4e1bd672d03ced2baf4a6489750150eac0d4e2c279 SHA512 ddceb7a3d1dffb85a89242ea03cc4037ef6a072182d69ea3d397938956affce13aeb35b71b99251e563bf4f018609d47d42990023e24909abf09b3fb4b745a6b WHIRLPOOL 79c41757ef6da883efcdd52e71a26c476cd2f4c17bbb294d949f7691aaf176c5ae2a11687ad3063e840027e0e5ae5815c7c12d2f32d5387b54eaf2a8e19da687 AUX screen-4.5.1-texinfo.patch 436 SHA256 173b9cfddcd1aecffef365910ef5d9b372244a917fa04fa3fe864836bf165260 SHA512 78b6e831414ef8cfc1f747f7eb9232ae907db4fa507967fb4b43b0266d045461f799ae37e71f8d93fed78e72bc0e7d90b93d131c9e24e47892468e96b880b0c4 WHIRLPOOL 8ce25e3048be51a7772cd08ed0e74374f6e3b2bd85a6bb18607156a8f6317cd296ad106f71204c0e5d794316f5c719a59b0b0973495ed22c24599329eb202fa4 @@ -29,7 +30,7 @@ EBUILD screen-4.2.1-r2.ebuild 4325 SHA256 c9795d6daf9921e42bad070da5cd638377ad71 EBUILD screen-4.3.0.ebuild 4390 SHA256 8ce0a5f0ecd2fe141bcc6b3bfb0000edc15f7d357c15d10e268a610f62cecfb6 SHA512 1e10f1c9590eee3c1c1d8a1467aad3410590318815f91d23de4cac6fe59c46c60c50e05126247a16ee2e3582c9a2d991dd24c75561829a543af43878d716522c WHIRLPOOL 7c70cda25fe0ff5d11740179dab0ce27062cde58b594899a465ccee6e1c8ad283db0b72d0189b1c7eb50579ea0dbe46fd85c34e507a3d72e32a7a86568cb89ad EBUILD screen-4.3.1-r1.ebuild 5346 SHA256 4e4afa0313fd3f2615e6e84c1211e452bb58d8efffbdff45e25c929b886600ce SHA512 90f340aafb0fec3b87153e550e03d2bcda93c7b9b9964ec3bd6dddced8bfc65bf3b87bac80e2b3ccbdc5c4c4a2f0c8cd64dfe3996eb8ac31590aa8c7d88312d3 WHIRLPOOL 44a3bfeb7ce32ff5b512b90571c8c860566bbad5a79c158a104a734d290f0a8b275f12b1468c2f4b4ebaef4c4dd995f72840649ab329a300d128cb9ceee441dd EBUILD screen-4.3.1.ebuild 5181 SHA256 5a7d6c1c6a29634f568a83d5be45d3ceedcf1f67f5e21f27c240ed82c60bc59d SHA512 c0a8bce4172524af6a0cf7b0bd26ff2def151ebcd61f8f33cd3ae73c2272a790f013c24d81b0b4a531b9241651ac4c431ef361f537b4cbca6cc3cc2a5c88bc92 WHIRLPOOL bff0e254f4a0a9536e5324cf3743d2d6d1d6197091b1b202317fb0240c3a69e2f6e96dccfa063769274d06f30412282369ee5a29d637df0952a365ffcaef7d43 -EBUILD screen-4.4.0.ebuild 5905 SHA256 b8ae60d129f3f97c69e58462bbf18060a0f43b47477205b44a099b8032773139 SHA512 5d2b050770d7515d1cfb903381079f6b8a8789cf82cdc3484fe520ceefe6f0cab1d81c6d22c06a42ba5805d9f6bacae3dbc70f02d865b1eeb4f22381e62303ff WHIRLPOOL bbbdb8c6caa004ca67db98fbebe9b27ff76aedec7cfc887c7fa68758db852cd73e9c3b7bafa76f2a1163e87ce95781d763d7c559e322efe6747e0928f629ad9e +EBUILD screen-4.4.0.ebuild 5891 SHA256 34a39649a3154ee67747d37c154ef6bd8f8991a32a1e5bb8c36cfd08a2a90d6d SHA512 6e0e7c68b6ae763844fb6ffef937903563002788b64e7e8c486003fc37e89309b3467fac7aa30c78b75377bb7033e43c97fb757fa6098c44620973b0342c45c7 WHIRLPOOL 46dfd643a2c6f591a8b391dc6cff45acf06ee89a17197c414a957fc474ecf675508d1c68eb521ff878a22e88d8f039e781657d3f7394959f372b8221e80caa6b EBUILD screen-4.5.0-r1.ebuild 6024 SHA256 d3456d00f92591c762f233184f703881aa79e3b9194eec08667cdf9ee28e2edf SHA512 6cc3c3abb9886e6732e8f03d38407a416879f5d259b5399d8a7d1203ffe7414f12c357eaebcaf9a6b76a63b997937639f75168eb36b90d5db320d918e7f50c3c WHIRLPOOL 312092e7568f24627aa336b178be99ef81ee3546988e925f1c472ec6ece590ff60cd11f81c12d057a1d4312fd48bf88667d75b6409f8d5309639bf32bb12eb61 EBUILD screen-4.5.0.ebuild 5942 SHA256 698ab65f00fa9c25950687284d0a1c0942a8950f6ded2b6871e37bb3422bdefc SHA512 4964340b566dbf16bbc48af985b9f71a37863c063bec6b03bb646a839ad3aab443f8e622f9a9a1ddd293d2b5e71197a5e14d3437cfe99f57de9abad600589927 WHIRLPOOL 8aba2c127fc002d96d691ef212b6d5e8acd28111e7ba55764f78fd30b29963afdcf501fd1568e8a03f0be33e88cf4ae136eda6b9490a752ef5d507ed9298005b EBUILD screen-4.5.1.ebuild 5894 SHA256 eed69210c161ab7c6c71692b42f759a2f8b01ce59b4505dd408061394cabc35b SHA512 a43c5f7640cebbbde23a6b41f2201aef65f19fbd5a23da9d13f2195a67480c85c92eba2ee621d007733ae461dd59caed78c34a7f5a48ded77d7006d6306c1db3 WHIRLPOOL cbc3891baa8c6567aa4c1e56b8a2f17a0afa35146b4c4b8160389135ec99d5dd99fe676b6d65caa921f885d95bda4825f45af177109c706f02b1131b609143fd 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 new file mode 100644 index 00000000..990c7304 --- /dev/null +++ b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch @@ -0,0 +1,62 @@ +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/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild index 5962c4a2..9c09cac8 100644 --- a/app-misc/screen/screen-4.4.0.ebuild +++ b/app-misc/screen/screen-4.4.0.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: 94cf34c9e1370e9ad45d2b5c9a10929e80c5b250 $ EAPI=5 @@ -27,6 +26,7 @@ DEPEND="${CDEPEND} # - Don't use utempter even if it is found on the system. PATCHES=( "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + "${FILESDIR}"/${P}-utmp-musl.patch ) pkg_setup() { |