gentoo resync : 05.01.2018

5 files changed, 125 insertions, 4 deletions

diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 78da16514362..1932b5369bac 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,15 +1,17 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
+AUX screen-4.4.0-utmp-musl.patch 1762 BLAKE2B 10244e1f2a13a3ffa9833ae16b9d58508bbc6cce62b1971b2b0f967e9642fe12fcf96b48cf79e20db186d92cf0b41c2870640f90f25a62d71e4e9fc7e3b390e3 SHA512 9720128e1c4849330b3e7ae8163beb0bf5b4c17e9c8d003a142db59d22dcce2bff0dd437afa209b3b1538c0f28f9d4521f54134d4e28104ee74ba73d57dc2314
 AUX screen-4.5.1-texinfo.patch 436 BLAKE2B bba167b64c504219a8ef893c4e2761b7fba607ce4801bf751ee900abf9be3884d2e6df753979762043faca03af2e590edd4d851b792b99c58fabe3a3836113bb SHA512 78b6e831414ef8cfc1f747f7eb9232ae907db4fa507967fb4b43b0266d045461f799ae37e71f8d93fed78e72bc0e7d90b93d131c9e24e47892468e96b880b0c4
+AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b
 DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f225d34394170572e79ab9a8b49beac6c054021db367a01b6da91deaa726284a25c86eb57e11dcd09ad5dc44cb4 SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
 DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
-EBUILD screen-4.4.0.ebuild 3956 BLAKE2B 759cef4d2db818124b4ed3acbf48b2f371b0bd0d87cf15b2199d1cb00abde2b32338f558ab4158e710b77aa424d41e4e8fe572ca6701828a6038889763231505 SHA512 e143bf0d0f01d1f505ec84b4c55f36ba70391b117cf78694373fdd7b892d5df4b208b27a3d711daac0a3edbf05debfd9aed03eaff961083bca791df504c07185
+EBUILD screen-4.4.0.ebuild 3992 BLAKE2B 9da66bdf4a45c12a3edb864ce7d818a8c04f9b14667017ffd4b12d078f5dfb6522ef0e99132adb6582721857a7736e47977eaf74fc426c88eaf5c24731dd089d SHA512 e729eb11f867eca28ba9fdbf00be2f6a545994ce880e03e8efb79b1c789f431b5c195020365e9f3d7d0db24178dc38b465a30e55190512d2df46b6634cbb8513
 EBUILD screen-4.5.1.ebuild 4139 BLAKE2B 78aa003685d14551cf61b8359193680b480c7513296735ddbeeaa23ccf54f551043b98a7f0891b44868b9d634b31af1ed3e8a8884ef7d6f36f061cc76ec97778 SHA512 11e9a7ad1a85dfa67dc6fb6a1e738529c74cb0b82ea96d6fa023b4e6b71cfa14046b318e42d742595e9bda33af1d7514d1a6b0efc48696975b5d939db177471e
 EBUILD screen-4.6.0.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
 EBUILD screen-4.6.1.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
-EBUILD screen-4.6.2.ebuild 4087 BLAKE2B b227ee979c0b357b20aff909f266276a2c5232a822607ac3af60f00f33b94cbd148112b711d9db203fd811df21cb470e53a3d4f85283ea722e5041c524856507 SHA512 6c9b164723d23fffff0cf5a4fc346e2da8edf53fb877755c36c6106ab59b60b191ce17996597458df11b2a423a4a26db14b78e6e13d1c247ff2fbe4db2742968
+EBUILD screen-4.6.2.ebuild 4123 BLAKE2B bae379a637baf0f7007fc2e87178727a8d94695a0a00c27197420d6713a1ab2ecbe81537faf9d70ccbd0a7ab8bdad4fd4704ef4e56c5bd9ef847d365a63d7027 SHA512 47db3610117484aad073d69eb1cdd3f084fc2c07b720e7a3454d7441f4794fc1b1675e7ea54042e0a7b483731e0d147f20e41311cf2cfe38e130d220ed85f7ab
 EBUILD screen-9999.ebuild 3680 BLAKE2B 2a30c6e1703a49390dd01132f03865a3fb355014f18e9f2bdf488ff58610d0d2e38bc397afb83804b6d69dc2bf32715c0b9c31e694c791def50096f91d051cd8 SHA512 f27332b033f31450f6cd66ea8e9a39866470633e17eac7d6ea26bc093aaa62f85dc5001875478592c417889e298c2eb87f16954735e015405f4d4ba712cf09e5
 MISC metadata.xml 1886 BLAKE2B 7e3e98299946589016013172efe577871d7dd1f364fde617842650bf262d5e3c49623fab5cd6640560a50f65ed0be875802dbdcd9cbe3450da01e8177da0678a SHA512 2fe77ff502ba653cf53a4a03159f085339881e23ce48b30f1bfc8638c3d0e33a4230dc82819464fd9566e42e8546e5a4011811902adfb2ed5e96938a8cfe5785
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 000000000000..990c73042cd0
--- /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/files/screen-4.6.2-utmp-exit.patch b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch
new file mode 100644
index 000000000000..11adf69a5368
--- /dev/null
+++ b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch
@@ -0,0 +1,55 @@
+From 2f1b9dfe03133c9b77ea450aed088d65128dc547 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Tue, 5 Apr 2016 12:47:08 +0200
+Subject: [PATCH] check if we have ut_exit in utmpx struct
+
+---
+ acconfig.h   | 5 +++++
+ configure.ac | 4 ++++
+ utmp.c       | 2 ++
+ 3 files changed, 11 insertions(+)
+
+diff --git a/acconfig.h b/acconfig.h
+index 656e117..d173c9c 100644
+--- a/acconfig.h
++++ b/acconfig.h
+@@ -215,6 +215,11 @@
+ #undef HAVE_UTEMPTER
+ 
+ /*
++ * Define if your utmpx has ut_exit struct
++ */
++#undef HAVE_UT_EXIT
++
++/*
+  * If your system has the calls setreuid() and setregid(),
+  * define HAVE_SETREUID. Otherwise screen will use a forked process to
+  * safely create output files without retaining any special privileges.
+diff --git a/configure.ac b/configure.ac
+index 1a75020..8457619 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -374,6 +374,10 @@ if test "$have_utempter" = yes; then
+   AC_DEFINE(HAVE_UTEMPTER)
+   LIBS="$LIBS -lutempter"
+ fi
++AC_CHECKING(ut_exit)
++AC_TRY_COMPILE([
++#include <utmpx.h>
++],[struct utmpx u; u.ut_exit.e_exit;], AC_DEFINE(HAVE_UT_EXIT))
+ 
+ dnl
+ dnl    ****  signal handling  ****
+diff --git a/utmp.c b/utmp.c
+index da8d7ff..c864d07 100644
+--- a/utmp.c
++++ b/utmp.c
+@@ -381,7 +381,7 @@ static int pututslot(slot_t slot, struct utmpx *u, char *host, Window *win)
+ struct utmp *u;
+ {
+   u->ut_type = DEAD_PROCESS;
+-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__)
++#if defined(HAVE_UT_EXIT)
+   u->ut_exit.e_termination = 0;
+   u->ut_exit.e_exit = 0;
+ #endif
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
index 0ee4276016c3..0dfbfbc066c0 100644
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,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() {
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild
index 01169b42901c..7b571355fa99 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,7 @@ DEPEND="${CDEPEND}
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
 	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${P}-utmp-exit.patch
 )
 
 pkg_setup() {