gentoo resync : 25.08.2018

9 files changed, 230 insertions, 12 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d284a3fb3348..911f266ed383 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 1f1863ce1115..de7bfc3f4ee8 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,5 +1,6 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
 AUX apache-2.4.33-libressl-compatibility.patch 4026 BLAKE2B 6220ac8de57df3146b51d1fc23cbeae1f5e9a2db5e2dd0e5ac16c40939b1396b658de97e6ec4fa12b1932deb3e13147f57446ae8e89f2da10e4e233833bf1152 SHA512 582a3f8b9839e4f4d9d368634b8d499f73d9f06ce171061435aa82331d93d32819f69d887115d07b88b216628bcdcee583df8cf6d27cde815711adc355b330a7
+AUX apache-2.4.34-PR62557.patch 8393 BLAKE2B 2e87763186f63be89d28b68d5a9fbec55afa883f1d8cf42b7ea2182365fe81a5681b2a7ca722074f1cfb79bdea3361d68f37e02a9152a45392e93546669375ea SHA512 d87fc2942c7ada9b91c8ab495b4bbc91b3fefa376586b76a1975f3bb1ef2bb4ac2a73b30c2538aa5af10ef1d1d0e33b3de39b2bb0f00c3e44a432d0adea14196
 AUX apache-2.4.34-suexec_parallel_install.patch 578 BLAKE2B f0d89b8f2d29017d653db1cf562a476db6e841d132588b895c48db35fedc1a3a5c21bd4f0d3fc877138d05001802353411cb608fa4daa4c8cc2d8cd1fe14f6ca SHA512 8e07c444eb0e1130bdd73540da7bd2ea4e9d261f4d3700e8183cd49ec309f667a93aeea9afb70a83e8f1e4d92e982b45ad29ac2c00c2760271129a4dfdc0381b
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
@@ -15,5 +16,5 @@ DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682
 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7
 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2
 EBUILD apache-2.4.33-r1.ebuild 8285 BLAKE2B 380d88d720559b28dc0d3b999e1ac233fb8da49f07bb2bd91f8f4214b1012da6428b44d9324b42c1ee0c52280bd2171e0a04b9eda3b57ad1f913a3a1f016811f SHA512 9ede39ce930d909ed942dfa22462f3c50e4b83eb1a23646a2f702dc4081233ac6944ad135f813d0a94563267e29730ba73ca6a29a834a8f269379f559f49683d
-EBUILD apache-2.4.34-r1.ebuild 8157 BLAKE2B f7bb3bb3c9052ff45462283a012889fa0a732661a3bb8edea8243dc366e8e3ea9a49007a2a871a2ec4736ad7868541c5521f112b9fb5d9fbcdf38b6b4f9c8c91 SHA512 3cbbbc662f7aaf16cdf2585e30f6d3526aca50eab36e6c34f50381184b6d99c0d3f45b4e7bec62286f6ba1073924a9e9b3f3dc57fc8710dd491cd0d9f01188eb
+EBUILD apache-2.4.34-r2.ebuild 8247 BLAKE2B 4cd0ac321040bc492d66d496ad34c794c69819956a0bc8bf8842d0137a57f57db6138774cbb0d19e1d2e28909c61af0fd6f6cebf4c2963c34742dafe1df25bc4 SHA512 79a2fb42673d30a9c5ec3f748a103a41806b50da90b1091ac28622ab307dd024e3a2252a8ac5ce1194c55391461f4c90b49f2eb8794f045728f64e2a489ce6b8
 MISC metadata.xml 3852 BLAKE2B 66dc78cb1191b40322dde247b302d5987c10348a0d3b639b3479563b7584df67806e3774d46bf967b5115209b05bdd6e29c1a199b5ff250fd3e140d299e36a8c SHA512 7c3f98caa25850b8321ce7809da866a712f0b7c787b5cfad29ed9a3129bf0c685e57f16b239566bd4c377fde724f20bf49d83881fa805168efde28484d1ddf7f
diff --git a/www-servers/apache/apache-2.4.34-r1.ebuild b/www-servers/apache/apache-2.4.34-r2.ebuild
index e2a0f8e3d6a1..35e313631f50 100644
--- a/www-servers/apache/apache-2.4.34-r1.ebuild
+++ b/www-servers/apache/apache-2.4.34-r2.ebuild
@@ -122,7 +122,7 @@ MODULE_CRITICAL="
 	mime
 	unixd
 "
-inherit apache-2 systemd toolchain-funcs
+inherit apache-2 systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="The Apache Web Server"
 HOMEPAGE="https://httpd.apache.org/"
@@ -130,7 +130,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
@@ -151,6 +151,7 @@ REQUIRED_USE="apache2_modules_http2? ( ssl )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.34-suexec_parallel_install.patch" #661358
+	"${FILESDIR}"/${P}-PR62557.patch #663312
 )
 
 pkg_setup() {
@@ -219,6 +220,9 @@ src_install() {
 
 pkg_postinst() {
 	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+
+	tmpfiles_process apache.conf #662544
+
 	# warnings that default config might not work out of the box
 	local mod cmod
 	for mod in ${MODULE_CRITICAL} ; do
diff --git a/www-servers/apache/files/apache-2.4.34-PR62557.patch b/www-servers/apache/files/apache-2.4.34-PR62557.patch
new file mode 100644
index 000000000000..d95a9864d1bc
--- /dev/null
+++ b/www-servers/apache/files/apache-2.4.34-PR62557.patch
@@ -0,0 +1,216 @@
+From d7713339dbde7cfa4cfc9914f683b4644dcab92e Mon Sep 17 00:00:00 2001
+From: Ruediger Pluem <rpluem@apache.org>
+Date: Fri, 20 Jul 2018 19:27:31 +0000
+Subject: [PATCH] * mod_proxy: Remove load order and link dependency between
+ mod_lbmethod_*   modules and mod_proxy by providing mod_proxy's
+ ap_proxy_balancer_get_best_worker   as an optional function.
+
+PR: 62557
+
+
+git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836381 13f79535-47bb-0310-9956-ffa450edef68
+---
+ CHANGES                                           |  3 +++
+ include/ap_mmn.h                                  |  5 +++-
+ modules/proxy/balancers/mod_lbmethod_bybusyness.c | 28 ++++++++++++++++++++++-
+ modules/proxy/balancers/mod_lbmethod_byrequests.c | 28 ++++++++++++++++++++++-
+ modules/proxy/balancers/mod_lbmethod_bytraffic.c  | 28 ++++++++++++++++++++++-
+ modules/proxy/mod_proxy.h                         |  8 +++++++
+ modules/proxy/proxy_util.c                        |  1 +
+ 7 files changed, 97 insertions(+), 4 deletions(-)
+
+--- apache2.orig/modules/proxy/balancers/mod_lbmethod_bybusyness.c
++++ apache2/modules/proxy/balancers/mod_lbmethod_bybusyness.c
+@@ -22,6 +22,9 @@
+ 
+ module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;
+ 
++static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
++                            *ap_proxy_balancer_get_best_worker_fn = NULL;
++
+ static int is_best_bybusyness(proxy_worker *current, proxy_worker *prev_best, void *baton)
+ {
+     int *total_factor = (int *)baton;
+@@ -44,7 +47,7 @@ static proxy_worker *find_best_bybusynes
+ {
+     int total_factor = 0;
+     proxy_worker *worker =
+-        ap_proxy_balancer_get_best_worker(balancer, r, is_best_bybusyness,
++        ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bybusyness,
+                                           &total_factor);
+ 
+     if (worker) {
+@@ -82,9 +85,32 @@ static const proxy_balancer_method bybus
+     NULL
+ };
+ 
++/* post_config hook: */
++static int lbmethod_bybusyness_post_config(apr_pool_t *pconf, apr_pool_t *plog,
++        apr_pool_t *ptemp, server_rec *s)
++{
++
++    /* lbmethod_bybusyness_post_config() will be called twice during startup.  So, don't
++     * set up the static data the 1st time through. */
++    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
++        return OK;
++    }
++
++    ap_proxy_balancer_get_best_worker_fn =
++                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
++    if (!ap_proxy_balancer_get_best_worker_fn) {
++        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
++                     "mod_proxy must be loaded for mod_lbmethod_bybusyness");
++        return !OK;
++    }
++
++    return OK;
++}
++
+ static void register_hook(apr_pool_t *p)
+ {
+     ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);
++    ap_hook_post_config(lbmethod_bybusyness_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+ }
+ 
+ AP_DECLARE_MODULE(lbmethod_bybusyness) = {
+--- apache2.orig/modules/proxy/balancers/mod_lbmethod_byrequests.c
++++ apache2/modules/proxy/balancers/mod_lbmethod_byrequests.c
+@@ -22,6 +22,9 @@
+ 
+ module AP_MODULE_DECLARE_DATA lbmethod_byrequests_module;
+ 
++static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
++                            *ap_proxy_balancer_get_best_worker_fn = NULL;
++
+ static int is_best_byrequests(proxy_worker *current, proxy_worker *prev_best, void *baton)
+ {
+     int *total_factor = (int *)baton;
+@@ -81,7 +84,7 @@ static proxy_worker *find_best_byrequest
+                                 request_rec *r)
+ {
+     int total_factor = 0;
+-    proxy_worker *worker = ap_proxy_balancer_get_best_worker(balancer, r, is_best_byrequests, &total_factor);
++    proxy_worker *worker = ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_byrequests, &total_factor);
+ 
+     if (worker) {
+         worker->s->lbstatus -= total_factor;
+@@ -123,6 +126,28 @@ static const proxy_balancer_method byreq
+     NULL
+ };
+ 
++/* post_config hook: */
++static int lbmethod_byrequests_post_config(apr_pool_t *pconf, apr_pool_t *plog,
++        apr_pool_t *ptemp, server_rec *s)
++{
++
++    /* lbmethod_byrequests_post_config() will be called twice during startup.  So, don't
++     * set up the static data the 1st time through. */
++    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
++        return OK;
++    }
++
++    ap_proxy_balancer_get_best_worker_fn =
++                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
++    if (!ap_proxy_balancer_get_best_worker_fn) {
++        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
++                     "mod_proxy must be loaded for mod_lbmethod_byrequests");
++        return !OK;
++    }
++
++    return OK;
++}
++
+ static void register_hook(apr_pool_t *p)
+ {
+     /* Only the mpm_winnt has child init hook handler.
+@@ -130,6 +155,7 @@ static void register_hook(apr_pool_t *p)
+      * initializes and after the mod_proxy
+      */
+     ap_register_provider(p, PROXY_LBMETHOD, "byrequests", "0", &byrequests);
++    ap_hook_post_config(lbmethod_byrequests_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+ }
+ 
+ AP_DECLARE_MODULE(lbmethod_byrequests) = {
+--- apache2.orig/modules/proxy/balancers/mod_lbmethod_bytraffic.c
++++ apache2/modules/proxy/balancers/mod_lbmethod_bytraffic.c
+@@ -22,6 +22,9 @@
+ 
+ module AP_MODULE_DECLARE_DATA lbmethod_bytraffic_module;
+ 
++static APR_OPTIONAL_FN_TYPE(ap_proxy_balancer_get_best_worker)
++                            *ap_proxy_balancer_get_best_worker_fn = NULL;
++
+ static int is_best_bytraffic(proxy_worker *current, proxy_worker *prev_best, void *baton)
+ {
+     apr_off_t *min_traffic = (apr_off_t *)baton;
+@@ -59,7 +62,7 @@ static proxy_worker *find_best_bytraffic
+ {
+     apr_off_t min_traffic = 0;
+ 
+-    return ap_proxy_balancer_get_best_worker(balancer, r, is_best_bytraffic,
++    return ap_proxy_balancer_get_best_worker_fn(balancer, r, is_best_bytraffic,
+                                              &min_traffic);
+ }
+ 
+@@ -93,6 +96,28 @@ static const proxy_balancer_method bytra
+     NULL
+ };
+ 
++/* post_config hook: */
++static int lbmethod_bytraffic_post_config(apr_pool_t *pconf, apr_pool_t *plog,
++        apr_pool_t *ptemp, server_rec *s)
++{
++
++    /* lbmethod_bytraffic_post_config() will be called twice during startup.  So, don't
++     * set up the static data the 1st time through. */
++    if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
++        return OK;
++    }
++
++    ap_proxy_balancer_get_best_worker_fn =
++                 APR_RETRIEVE_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
++    if (!ap_proxy_balancer_get_best_worker_fn) {
++        ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO()
++                     "mod_proxy must be loaded for mod_lbmethod_bytraffic");
++        return !OK;
++    }
++
++    return OK;
++}
++
+ static void register_hook(apr_pool_t *p)
+ {
+     /* Only the mpm_winnt has child init hook handler.
+@@ -100,6 +125,7 @@ static void register_hook(apr_pool_t *p)
+      * initializes and after the mod_proxy
+      */
+     ap_register_provider(p, PROXY_LBMETHOD, "bytraffic", "0", &bytraffic);
++    ap_hook_post_config(lbmethod_bytraffic_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+ }
+ 
+ AP_DECLARE_MODULE(lbmethod_bytraffic) = {
+--- apache2.orig/modules/proxy/mod_proxy.h
++++ apache2/modules/proxy/mod_proxy.h
+@@ -846,6 +846,14 @@ PROXY_DECLARE(proxy_worker *) ap_proxy_b
+                                                                 request_rec *r,
+                                                                 proxy_is_best_callback_fn_t *is_best,
+                                                                 void *baton);
++/*
++ * Needed by the lb modules.
++ */
++APR_DECLARE_OPTIONAL_FN(proxy_worker *, ap_proxy_balancer_get_best_worker,
++                                        (proxy_balancer *balancer,
++                                         request_rec *r,
++                                         proxy_is_best_callback_fn_t *is_best,
++                                         void *baton));
+ 
+ /**
+  * Find the shm of the worker as needed
+--- apache2.orig/modules/proxy/proxy_util.c
++++ apache2/modules/proxy/proxy_util.c
+@@ -4028,4 +4028,5 @@ void proxy_util_register_hooks(apr_pool_
+ {
+     APR_REGISTER_OPTIONAL_FN(ap_proxy_retry_worker);
+     APR_REGISTER_OPTIONAL_FN(ap_proxy_clear_connection);
++    APR_REGISTER_OPTIONAL_FN(ap_proxy_balancer_get_best_worker);
+ }
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 42b1d205e08c..e7c7128543aa 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -2,4 +2,4 @@ DIST caddy-0.10.10.tar.gz 2706112 BLAKE2B 23ba725f3e8530233bc604b8f16342782c349b
 DIST caddy-0.10.11.tar.gz 2860871 BLAKE2B 9050ee76a325c5ae183dcafec05b0d234a1308103f617908ec31a2bd8c3ce55c8d9ced9e30a36d616ff2c6f1581e1496bed4379a6f1ba3d0b5e7f9242edfabf8 SHA512 03539ae59f654d56ad0b441e7f67eb51135b1ffd539f9eb5953445089e72d3eab905ad9b08b001ef27e5054b760887a898b89ea85b48b4f852398b073e6e4924
 EBUILD caddy-0.10.10.ebuild 744 BLAKE2B 23e13762e450d34482608dfa6f7e7f2ae9cbe9b3bc29135dd6904a84014d23457bdfd94bf6e4bbdf583a5661a4c021fc9c938fb79f88951c50732af9eb6d8ce4 SHA512 2b28a0c202d546845fd0106dd235cdb9fd1c45972948c1c190f4843c6ce9464914471308b2320281ee72e4a3ac9eac1c8399ad04ef2332447d1030cbe48b5df7
 EBUILD caddy-0.10.11.ebuild 744 BLAKE2B 6667f8e780c115a5548a6988c3eed2bf2c3e4865fb7d65a3283899bac5b7b2b5803334210cdb5c143e1e98568d8fc7efe3cba642776d327def355d1e79da19be SHA512 1d3e956993342ec4d392e6498cb76a5f1e0030c280265f9a2678f2b95cb3c272626737f82bc5ed71794bcb6faf75d681acbce8fbc4eacf2ad3342b80dceea6a7
-MISC metadata.xml 321 BLAKE2B b5231722b885ec28733f16aae2156ad8357b77a339a999e1c963109a3a9a9991952ef1f08e3b0c65077ac701890b2b1617281683ed0a0f02a45f22cdd37f1561 SHA512 a8a2b851de8db73144acf2bad10a72a8b781bddba0228fa25ed84e5a57559e00efd21e770f1582baec7f0a96885e7a9c767137e9639b1c5277f6560608ee47a0
+MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
diff --git a/www-servers/caddy/metadata.xml b/www-servers/caddy/metadata.xml
index fbfe5a95acbc..2472231237a4 100644
--- a/www-servers/caddy/metadata.xml
+++ b/www-servers/caddy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mholt/caddy</remote-id>
 	</upstream>
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 82c7b27bace7..2a2ca1742d11 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -10,7 +10,7 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d
 DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784
-EBUILD lighttpd-1.4.45-r1.ebuild 5944 BLAKE2B 629426653d2552bcf32d9e8f003b847d30c6692e81625eb1d772929bc4353db4995e8a82241ce645ebb9d9ca3be1482a1d789db4d296e90af0ee771548334966 SHA512 33632d1ab6fd7bb019b1fe8613a931b12e21a7ca79ea486e96c55cbd9529f2c551efcd91f6dc48c663b25087d557a765b729a1bfb93ccbf0ec4d32d4933732b6
-EBUILD lighttpd-1.4.49.ebuild 6324 BLAKE2B be7447a25ce7653d34b744bd5c21aaa653847591ea06616996c7703c22f50481102edd9f0f7b0e6bff42019832efc99c9345760f2cd8b8e50399eba02f64c0ae SHA512 d25bf67fcaf6c28009d45aedf338f93a9848da443c70b745d6e4aa000b547b0d9b53f80d2a430c8b99742dc4988505537916905276d3cfc583f995b0f3e751b3
+EBUILD lighttpd-1.4.45-r1.ebuild 5949 BLAKE2B d511a5945fe9289d5a292da738fd3ace41ceda69e446db929ffd70ae7c7f15135068a779e988b627078d3358172dc51b6c5c471d7d3e0ae753af59f32a945341 SHA512 88fef9582a93e29fced13455934e5a60ff4a7390578dccf7645622e57b71f041c2e63aeea75f5cc2d9ccd809df20b62184daa198c7ab271197a0071d8055ab78
+EBUILD lighttpd-1.4.49.ebuild 6330 BLAKE2B ed954d144848c5f8bfa2e6086478b0e615dae9e2f9226815da642ad2de91f7d8863382dc6f0fc09b57bd0cbe39fe11cd46c89da40456cb4966e2958adda233a1 SHA512 23ee2bbc4df2d512511095c152d11f7ced673af25401c1ed487ecfc6d552599e2537e0bfd07bf0a53262e163c56480fbc9f8269c3284faec7e8c50fa51d310ad
 EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
index 517cf66fb0de..998089c89aff 100644
--- a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.49.ebuild b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
index efcb7010d961..b13d9470ccd1 100644
--- a/www-servers/lighttpd/lighttpd-1.4.49.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.49.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )