gentoo resync : 28.07.2021

7 files changed, 13 insertions, 5 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index c87334856e4c..df67043f37af 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 6d6f79320826..0316013d0c21 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,5 +3,5 @@ AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
-EBUILD apache-2.4.48-r2.ebuild 7993 BLAKE2B 8c32f3bb85832186986812db2135cbc920b68e0b6ecc87a4a735463fd4696a232de13d014a2b3bf160d4146ac96bd103eea0c13517b0459e8fcd09efb205a1fb SHA512 b0b4ebd398164bfaa028f2de08a36a2b80bad91b6635f67c0d456bd91544051e5dc738ee3499be56aaff9cb579df00c2b00cbdc4cbaee7981779cf1165d19e0f
+EBUILD apache-2.4.48-r3.ebuild 8246 BLAKE2B 96030fe4dc22adaa182893a2f4b5b0768ef06ae0dd6748bec489b6cf78f65ba8c4dda9bd6b333777ef41c1f4851b234e5300319a6d43a68001eeeb9f3c869940 SHA512 8d693bed1da56e2255c98e16d580ad1b2fae91d0eafa3db25ad7b75a22c257a57e35d667ba8ec6d9311e94956cccdfd19e2720636cf98c1224d39d4cbd74c177
 MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/apache-2.4.48-r2.ebuild b/www-servers/apache/apache-2.4.48-r3.ebuild
index 8012fad06ea6..be666634be72 100644
--- a/www-servers/apache/apache-2.4.48-r2.ebuild
+++ b/www-servers/apache/apache-2.4.48-r3.ebuild
@@ -211,6 +211,14 @@ src_install() {
 }
 
 pkg_postinst() {
+	echo
+	ewarn "Downgrading to pre-GLEP 81 user for now."
+	ewarn "See bug #802495 and bug #803500 for more information."
+	ewarn ""
+	ewarn "You will need to run the following command to unlock the user:"
+	ewarn "usermod -e '' -U apache 2>/dev/null"
+	echo
+
 	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
 
 	tmpfiles_process apache.conf #662544
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 2ab6263c3945..3848478ccda0 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,5 +1,5 @@
 AUX gunicorn-20.1.0-new-eventlet.patch 1103 BLAKE2B 3329864c05238c3b2a6e38727991f7273bb0fe5aa8e3e4c09cd2f7132b5d47fb9ee02fde171abbfc64d84ab0bf11b6712101e8510935d284175ea46771bc8f5b SHA512 cf404efa930c1e6948a8d2508107315d380bbd55a54df1e2a2e8472bbf392383a8505cc7dc15077f1d182f7be9ece558676470a6dbedbfcb0d873438b82fa9b8
 AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861
 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
-EBUILD gunicorn-20.1.0.ebuild 1471 BLAKE2B 5cbcf5ae0de263945a67b67adb8f4f0bc7f918cd83033da7240ac85c1406c2ecd78e14941fe272fa04256cd25f320f7956db5f61a54185cd8ad73a4bc406eb58 SHA512 fd71234fd75286148c97e95247f7124926a04e1d9ea556efe7edea56326c8821096a5261a76e62ee481f7495faf4835784dffe39392853490f8f3df2784f9a83
+EBUILD gunicorn-20.1.0.ebuild 1478 BLAKE2B ef0236d45bff759644b1f17e1e3ddc2bfc3ee2a697760ec05b81efc9568bed8c8eccb9315c65745f8e9bba962b9143c9fdb583361bfcf0d9d2d461fcec35106b SHA512 349e7c4c1a5979a3bc65da18e0189e2d91938e215813c407ef69003beafbb9c0bc92e67c26c0769704a69086349c0fdf73c6e28b8c7b666b9a4256cd45529498
 MISC metadata.xml 820 BLAKE2B d0d69bf646aea74e6b85daee66e739857ff027050bf3085c6f56eadaaca90297825234477d0b4b9540646edf92d7b5daabe523336545e756b5d1a9d17e34c95c SHA512 fc0e570d92321b0255fecb3511fa313a3caa8686f7956438e18ccaff802b0ea0edccc9a196f356fd9d24370100edfae0470d0afdeafa6a7398330829d8a95644
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
index 462bfab82950..6984d7900984 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/benoitc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6239281cf8ee..01340cdb4ad0 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -37,7 +37,7 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.6.0.tar.gz 528419 BLAKE2B 7b3c9dd4be8182298cc283e8b19eb4efeef66416d26332ae73dde66b5b67ad980c3e07f12fe0006dfb9710f3df449ac2598bfd1803f6c86d721f48697d975087 SHA512 fa569623fd594e859c535c75041be443ef6329a4ee33d9e0f29eeb56e69ae2f3c44264ccba736b4a97ab0b33700f381acb65a884889d6f644f3fbce7c1bc586e
 DIST njs-0.6.1.tar.gz 529124 BLAKE2B a24b6542dcef6599d18b86d38dbaeb554beeddb5c100f5bfb97c87c81bd66842afc6f77f23ef2c542ba32da96d5c2f999d3c869fa8d76d919a4f964020d19e30 SHA512 996cdc11d65af5e3d5b3a8f28087868c40409a062e6e1ed3eac8e516cb60b13f88a945c86bea5dde1bc089fe5f96f3ba351d87dbfd513f7140ea4ce98119959f
-EBUILD nginx-1.20.1-r2.ebuild 40245 BLAKE2B 7bb6e7f24268391af5402b22d94ce867af44061c85055254cdae0cec46a5121239fd31950b1dd1786be2a857ea3cfa9eadab26e26fcd0879f77425d03334a9dd SHA512 30178fe5ef5c97caf0d69e78702f8c218a595803f90ee5b535ce9297c8a85da2809f6f2479561563123d30c4dbe3f27434dc4d930c6c847dd10167066d86b521
+EBUILD nginx-1.20.1-r2.ebuild 40244 BLAKE2B 0e325b379b27a89daad78d3b5267d166cc011e7436525170f816718806fe04fe008665f97cc6863100a2a4e3c0b024ccb67277bd324b77a6f2d365d885dfdee0 SHA512 3ce05cf4102b39f1dc02313063dba64011ca8dc4b78550d7492abbabfbd241691c044f57e12d906bbed67b23eb2cfbde1a82192902de62e9b7c58e1d83dc94b4
 EBUILD nginx-1.21.0-r2.ebuild 40247 BLAKE2B 030d4299eb71c2c15c128d6999de8e37a82b231c2944cacd2d43b86c7b192f2abe43bd87aec89d28b343e9f915947850efc2a05eae9d77083c84de9915c8107f SHA512 39e598591c3ecf5d0b28558375a04c53188b6dfaf44b301ea55a5fe5354bc0e2bf800f0d3167414713369c57627beaa9d7a92242e59eacb30ca3c3d36b586377
 EBUILD nginx-1.21.1.ebuild 40247 BLAKE2B e0913a7d4ce26d71fbdb6f318e7e9c0787a66e7f310d8561e55359f60554cb2d384d11ae85f3c47ca5359db4c82d31242b95c4e5c95b3f8c0c5430ac28815b46 SHA512 238608eeebf243d5baff375a388bdfca4f6b09fa3bc49ca45aa2d5a493e84753bd009156e5a749c77c22562784b869b3358b373231e607618501ef9afd4ca2d5
 MISC metadata.xml 1045 BLAKE2B e439ddfd1104b92548cc094a890152297ff81e1c4c3d04e58df8c2f1ebef01daadf317d3d22047c22c1c907fdfb3ed844d279a4692b837d8afb1149da4205538 SHA512 33b75c84396551de2559a56efb9922284991e5ebaa9a18c9d7088b49290f4225a08302c917090dafd6805bb717aa8bd24cdab8fa6d2a0b12050d43f7cb936847
diff --git a/www-servers/nginx/nginx-1.20.1-r2.ebuild b/www-servers/nginx/nginx-1.20.1-r2.ebuild
index 9153b8279b56..dab635dce9c2 100644
--- a/www-servers/nginx/nginx-1.20.1-r2.ebuild
+++ b/www-servers/nginx/nginx-1.20.1-r2.ebuild
@@ -203,7 +203,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"