gentoo auto-resync : 11:05:2023 - 23:47:37

4 files changed, 40 insertions, 1 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5c00dff2c7a6..9b7ae5fda2d1 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 28777e9e30bc..24a203bf1447 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -1,9 +1,10 @@
 AUX pam-1.5.1-musl.patch 626 BLAKE2B 2fe46e9aa8ceaee40308277ab5eddc63d4d188c53feffcbc61b77c871f576532a62bcdbcf6a29a5cb4669abea6b0454585bb40c8a8c9e85a450064a17dc45ca2 SHA512 6053a8901083de1e2a6f2246f7e6959a2de7f7e773f2b761ce73f09aa0a2023d05614d2462b2e4a55ebe6cd8a02daef4d350ab050b462f73154fb591d6780c0c
 AUX pam-1.5.2-clang-15-configure-implicit-func.patch 965 BLAKE2B 8ce9f8c52eed90da7015a297ab5a86f2946536e3f7f672de5dd4aecc1c73b2eddf8b0d0a64199765799ca60b90b7ce3a9a863de8a863f94a88199b63e097a8a8 SHA512 e62bc7ae278d4494bbd7ba11d1fcb01fd3d10a1954d39161a6dad0c30ebc52db723a9c99016635f7f1c2a0b380280d2d4990b4950f3ceeb8d8f5f78eb038ce01
+AUX pam-1.5.3-termios.patch 913 BLAKE2B 3fdb9c6320c56fd2c10b76b58700263a1c190dde4a62bb33fdfe2e59e2aebedffe87bd14fb7f02ca9c3df8f9ca21af13a1e5b42cd4eb0b112bb03f311e975288 SHA512 c432af010b188ff8a3f1fb08cc7e68b12651f8a2592fa43c5aec8c60e938c04a62ae67bc0fdb6704df3ec39aa3b40a56c1abbf07e0e5105a7b7ca4af7e44c715
 DIST Linux-PAM-1.5.2-docs.tar.xz 443276 BLAKE2B eb0376022bd17d472cfbb7d757acd9a7743d68929ac604bc7fbc27e87b35f0424e9459afff8110ee094c6914cef6e6f483e6eeb2fc2ec24909477ec53f600fa2 SHA512 69bbb52b3855a1ff3066ffe3ae1890440516311260ddfb20a7a7ea7beeb42484ea085080e3206f23933edf4a695a13f2317e33dffcab2b29f6e9e210d493e1f0
 DIST Linux-PAM-1.5.2.tar.xz 988784 BLAKE2B a835034cd239bc9377419c13dda45276e8e64a33fcf714a1957ff41112fbb6dce0be8e9773afc82458a04d54bf146a0c26117d7170521fecdc0c98184cef5f4f SHA512 fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144
 DIST Linux-PAM-1.5.3-docs.tar.xz 466340 BLAKE2B 6bade3c63ebe6b6ca7a86d7385850bb87bf1d6526add3ac5aad140533516c1d27b594a17d09c4127ff985c42e6c571618785d6b2a2913e6575678c4dcf947dc0 SHA512 a9082823da88e0054d74e13aef872519ced5fbef25c8cc1a7e3a99160f835aa09c9ef701b6ec507acd3b540da0019288424bb4c8ebd828181ea90450db1494a9
 DIST Linux-PAM-1.5.3.tar.xz 1020076 BLAKE2B 362c939f3afc343e6f4e78e7f6ba6f7a9c6ee0a9948bb5a4fc34cecfd29e9fa974082534d4ceedd04d8d3e34c7b3ef43d2a07ba5f41d26da04ec8330fc3790fb SHA512 af88e8c1b6a9b737ffaffff7dd9ed8eec996d1fbb5804fb76f590bed66d8a1c2c6024a534d7a7b6d18496b300f3d6571a08874cf406cd2e8cea1d5eff49c136a
 EBUILD pam-1.5.2-r3.ebuild 4274 BLAKE2B 348f6a36bee14c91966d1c628eaebf227b1c75384ddd68c6038811383888173d35634a1fcf722d21b3a585e34f80e3342b1e2d26c5dc265f8eb27d9b5081f4b8 SHA512 19c7b5889f1af2720e6d330171168a6d2a884c441a440a68f4966e5d7bba088fd680e93681121f5ebb4f0bd4892c0348484cdba1e83564b48387cf8b5759f3f5
-EBUILD pam-1.5.3.ebuild 4442 BLAKE2B 29481124e3fdf7d1acacb1272f32ca7ea424037c973f961ba8b54fd7ee230771f4d5034ce84349a6db2130a733238800c01a38d77e56d0bcd2f8f3861497ea62 SHA512 ef2c13c6f3a1e9e7bfa8dc253a460c7a822f3c7140bd8658aeedbbf44725d7a63b05468a4a720714f596a11dc3226d5ae87ab826c23839fc15e1733fe68bcfb2
+EBUILD pam-1.5.3.ebuild 4489 BLAKE2B 90f97b55e592f86d97e560f2039ab9c79697d1b5d8851a865867504ef6d36f2db64a90c1991a2a45e4eecace038c5e645a9f42210a8a9af3cbba29d89a7ef846 SHA512 61c1d5f4d02e2f921038b6d9796cebbdd805b86fb6d0b7bdbcc8f847021421e2a51a88fdbe11bc44fec67edbb45353424e185f685ca1c2e711f3e9459b039e36
 MISC metadata.xml 846 BLAKE2B e236bd8c7a53097d96164d9063d1dbb9372cef4ec92731dc43df6731cc7f4fc2935aeeb2e069b6da1d4bce3f1cc6a657e0361208581da615f3f41ec72c02261e SHA512 e2e28deadb2c941f8fa31447ec20c95ccb340d638f8b1e742a89ccc2dbb3c8d88e764f750d6e13c5a6320a612d6f2447689c02862a5e897919d1e9bca7857089
diff --git a/sys-libs/pam/files/pam-1.5.3-termios.patch b/sys-libs/pam/files/pam-1.5.3-termios.patch
new file mode 100644
index 000000000000..8f7baf76fee4
--- /dev/null
+++ b/sys-libs/pam/files/pam-1.5.3-termios.patch
@@ -0,0 +1,34 @@
+Replace System V termio.h with POSIX termios.h for musl
+Upstream: https://github.com/linux-pam/linux-pam/pull/576
+Bug: https://bugs.gentoo.org/906137
+
+From 5658105b04ad4df212baf302898ee2cca99516a6 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Thu, 11 May 2023 10:27:53 -0400
+Subject: [PATCH] fix build on musl
+
+--- a/examples/tty_conv.c
++++ b/examples/tty_conv.c
+@@ -6,8 +6,9 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <security/pam_appl.h>
++#include <sys/ioctl.h>
+ 
+ /***************************************
+  * @brief echo off/on
+@@ -16,7 +17,7 @@
+  ***************************************/
+ static void echoOff(int fd, int off)
+ {
+-    struct termio tty;
++    struct termios tty;
+     if (ioctl(fd, TCGETA, &tty) < 0)
+     {
+         fprintf(stderr, "TCGETA failed: %s\n", strerror(errno));
+-- 
+2.40.1
+
diff --git a/sys-libs/pam/pam-1.5.3.ebuild b/sys-libs/pam/pam-1.5.3.ebuild
index 6ac576c5eb0b..3f5a98a6d7df 100644
--- a/sys-libs/pam/pam-1.5.3.ebuild
+++ b/sys-libs/pam/pam-1.5.3.ebuild
@@ -45,6 +45,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 PDEPEND=">=sys-auth/pambase-20200616"
 
+PATCHES=(
+	"${FILESDIR}/${P}-termios.patch"
+)
+
 src_prepare() {
 	default
 	touch ChangeLog || die