gentoo resync : 12.05.2022

3 files changed, 127 insertions, 3 deletions

diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index 949bcb704302..db7bc0638eef 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -1,5 +1,6 @@
+AUX detachtty-11.0.0-sparc.patch 2669 BLAKE2B c1912520e5e7388bd905059a0d3f0d28726533884c4eafa89b1f6800feb2e05740dd96ee0b501f76d4f2329cf0e49b7b349d6990e12c359be13615f84e77670b SHA512 b62b7f809d79ba8f391f4f3b0c84eb969884b9de1f8ef27a50e1af84f6fe6f699c17321a6f4b225ae8c64d463c090a1bb5d105bf450a01aec4ccf8bb189449f5
 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
 DIST detachtty_9.tar.gz 13081 BLAKE2B 28bb6a946d04717bc60ac7f65b791a8bb59a5ce1a2f7d7fabb63776538ade3fe046e874007effe7dd6ba7ebac8d739e16b0b0e2372ce4154385164d7939b498c SHA512 8ae7edc1a1c7727eb4d32a1a4327932e374ac838b441f34aee99cfe83e922f1d70383ab0aab2299808f28fea6229f5c122a7624b7ff992ab92b9c3f53483d035
-EBUILD detachtty-11.0.0.ebuild 589 BLAKE2B d4762a79e440d4eb3df0c0b1aafcbdc2e943b3f0239e087d8b90d7a07199c8a301b889d8f829cad666ac515d8292415589f10f189bc8453d00f414ee96884816 SHA512 cb394dd6de35e718c86ada3fa5da7aabfa6a9dd14953f7006b7e1cb3ffd16522f97c98be69e92503967121ca2ecd86c27154c3ce6ff81575886c3f9b5b847f77
+EBUILD detachtty-11.0.0.ebuild 632 BLAKE2B 0a118db31a6f4dc05bb848f53d1949728deaa4956458bd9ca0848f16e49516605bc0a7e2ed494d090a16c3b6f6d6a6096ff0533059cb69df6fb4b9d83108a1c8 SHA512 6cdbf7fcfb37ec030344cf6ac68b544bbe8f68bad4fefde6f565c85a7ccc9cea6c825a09c0cd96bf7c6539c4019c665548d4a9971a81e2a00ea504417ca55b2f
 EBUILD detachtty-9-r1.ebuild 600 BLAKE2B 26747aa2903250488781353bcf93ecb0f66b086e63a691cd84725f3e9b7e7717927509aada2d64b017ca4a12c6cafb0c566ea7cf354b076c8a88032d8b6f0315 SHA512 4902bab8a023b424d9d6f1d583ab431b50375e878d0ed5e7e08840a762e4176dd56c681e632b01fb8a0bd20220c254af0b945561cbf272f5bdeae1f6a0759cda
 MISC metadata.xml 704 BLAKE2B 605242d690a156e4b0bccb2114e76b8c9d6578e6c12a5bdfe87479df2703001d9d20d8996548505f60382086d4f8dfbe78b66f54f654e196f50af46c8ee1b774 SHA512 c38ba5cde4e76e557ff6d63746b1488a1669910865b629fa222bc63cb9974e68dfc2b7467f421beac7dd893bd0f8230dcb74f5bf22162c73ac4251c8d8999de6
diff --git a/app-misc/detachtty/detachtty-11.0.0.ebuild b/app-misc/detachtty/detachtty-11.0.0.ebuild
index 2a826d210e63..66c9920eb6a9 100644
--- a/app-misc/detachtty/detachtty-11.0.0.ebuild
+++ b/app-misc/detachtty/detachtty-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,9 @@ SRC_URI="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
+
+PATCHES=( "${FILESDIR}/${P}-sparc.patch" )
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/app-misc/detachtty/files/detachtty-11.0.0-sparc.patch b/app-misc/detachtty/files/detachtty-11.0.0-sparc.patch
new file mode 100644
index 000000000000..a65907abf92b
--- /dev/null
+++ b/app-misc/detachtty/files/detachtty-11.0.0-sparc.patch
@@ -0,0 +1,121 @@
+Fix compilation on sparc.
+Patch from upstream, backported to the 11.0.0 release.
+
+commit db785c7975e364acbf76a4db90296820d36b0740
+Author: matoro <matoro@users.noreply.github.com>
+Date:   Wed May 4 08:28:11 2022 -0400
+
+    check for signal existence before registering in handler (#5)
+
+    Some signals are only defined on certain platforms.  For example,
+    SIGSTKFLT does not exist on sparc.  Use preprocessor macros to check for
+    signal's existence before registering signal handler for it.
+
+    Note that this is the same technique cpython uses:
+    https://github.com/python/cpython/blob/3.10/Modules/signalmodule.c#L1427
+
+    See: https://bugs.gentoo.org/807184
+
+--- detachtty-11.0.0/attachtty.c
++++ detachtty-11.0.0/attachtty.c
+@@ -94,8 +94,45 @@
+ static void init_signal_handlers(void) {
+     struct sigaction act;
+     int i, fatal_sig[] = {
+-        SIGHUP, SIGQUIT, SIGILL, SIGABRT, SIGBUS, SIGFPE, SIGSEGV, SIGPIPE,
+-        SIGTERM, SIGSTKFLT, SIGCHLD, SIGXCPU, SIGXFSZ,
++#ifdef SIGHUP
++        SIGHUP,
++#endif
++#ifdef SIGQUIT
++        SIGQUIT,
++#endif
++#ifdef SIGILL
++        SIGILL,
++#endif
++#ifdef SIGABRT
++        SIGABRT,
++#endif
++#ifdef SIGBUS
++        SIGBUS,
++#endif
++#ifdef SIGFPE
++        SIGFPE,
++#endif
++#ifdef SIGSEGV
++        SIGSEGV,
++#endif
++#ifdef SIGPIPE
++        SIGPIPE,
++#endif
++#ifdef SIGTERM
++        SIGTERM,
++#endif
++#ifdef SIGSTKFLT
++        SIGSTKFLT,
++#endif
++#ifdef SIGCHLD
++        SIGCHLD,
++#endif
++#ifdef SIGXCPU
++        SIGXCPU,
++#endif
++#ifdef SIGXFSZ
++        SIGXFSZ,
++#endif
+     };
+     
+     /* catch SIGINT and send character \003 over the link */
+--- detachtty-11.0.0/detachtty.c
++++ detachtty-11.0.0/detachtty.c
+@@ -392,9 +392,47 @@
+ 
+ static void init_signal_handlers(void) {
+     struct  sigaction act;
+-    int i, fatal_sig[] = { SIGHUP, SIGQUIT, SIGILL, SIGABRT, SIGBUS, SIGFPE,
+-                           SIGSEGV, /*SIGPIPE,*/ SIGTERM, SIGSTKFLT, SIGCHLD,
+-                           SIGXCPU, SIGXFSZ, };
++    int i, fatal_sig[] = {
++#ifdef SIGHUP
++        SIGHUP,
++#endif
++#ifdef SIGQUIT
++        SIGQUIT,
++#endif
++#ifdef SIGILL
++        SIGILL,
++#endif
++#ifdef SIGABRT
++        SIGABRT,
++#endif
++#ifdef SIGBUS
++        SIGBUS,
++#endif
++#ifdef SIGFPE
++        SIGFPE,
++#endif
++#ifdef SIGSEGV
++        SIGSEGV,
++#endif
++#ifdef SIGPIPE
++        /*SIGPIPE,*/
++#endif
++#ifdef SIGTERM
++        SIGTERM,
++#endif
++#ifdef SIGSTKFLT
++        SIGSTKFLT,
++#endif
++#ifdef SIGCHLD
++        SIGCHLD,
++#endif
++#ifdef SIGXCPU
++        SIGXCPU,
++#endif
++#ifdef SIGXFSZ
++        SIGXFSZ,
++#endif
++    };
+ 
+     /* catch SIGCHLD, SIGQUIT, SIGTERM, SIGILL, SIGFPE... and exit */
+     act.sa_handler = fatal_signal_handler;