commit:     c98474c0eabe2f0ccc7407d0499d89fa323c311d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 16:48:56 2023 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 16:50:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98474c0

www-servers/apache: fix IfDefine PROXY for proxy_uwsgi due to typo

proxy_uwsgi was mis-spelt in MODULE_DEFINES, causing it to not be
wrapped with <IfDefine PROXY>.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/819552

 www-servers/apache/apache-2.4.57-r4.ebuild                          | 2 +-
 www-servers/apache/apache-2.4.57-r5.ebuild                          | 2 +-
 .../apache/{apache-2.4.57-r4.ebuild => apache-2.4.58-r1.ebuild}     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-servers/apache/apache-2.4.57-r4.ebuild 
b/www-servers/apache/apache-2.4.57-r4.ebuild
index fc874c565bd1..95756998cd15 100644
--- a/www-servers/apache/apache-2.4.57-r4.ebuild
+++ b/www-servers/apache/apache-2.4.57-r4.ebuild
@@ -118,7 +118,7 @@ MODULE_DEFINES="
        proxy_http:PROXY
        proxy_http2:PROXY
        proxy_scgi:PROXY
-       proxy_uswgi:PROXY
+       proxy_uwsgi:PROXY
        proxy_wstunnel:PROXY
        socache_shmcb:SSL
        socache_memcache:CACHE

diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild 
b/www-servers/apache/apache-2.4.57-r5.ebuild
index eed9c9add8b2..649085501170 100644
--- a/www-servers/apache/apache-2.4.57-r5.ebuild
+++ b/www-servers/apache/apache-2.4.57-r5.ebuild
@@ -118,7 +118,7 @@ MODULE_DEFINES="
        proxy_http:PROXY
        proxy_http2:PROXY
        proxy_scgi:PROXY
-       proxy_uswgi:PROXY
+       proxy_uwsgi:PROXY
        proxy_wstunnel:PROXY
        socache_shmcb:SSL
        socache_memcache:CACHE

diff --git a/www-servers/apache/apache-2.4.57-r4.ebuild 
b/www-servers/apache/apache-2.4.58-r1.ebuild
similarity index 98%
copy from www-servers/apache/apache-2.4.57-r4.ebuild
copy to www-servers/apache/apache-2.4.58-r1.ebuild
index fc874c565bd1..9ca9e8c742c0 100644
--- a/www-servers/apache/apache-2.4.57-r4.ebuild
+++ b/www-servers/apache/apache-2.4.58-r1.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20230903"
+GENTOO_PATCHSTAMP="20231019"
 GENTOO_DEVELOPER="graaff"
-GENTOO_PATCHNAME="gentoo-apache-2.4.57-r3"
+GENTOO_PATCHNAME="gentoo-apache-2.4.58"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="prefork"
@@ -118,7 +118,7 @@ MODULE_DEFINES="
        proxy_http:PROXY
        proxy_http2:PROXY
        proxy_scgi:PROXY
-       proxy_uswgi:PROXY
+       proxy_uwsgi:PROXY
        proxy_wstunnel:PROXY
        socache_shmcb:SSL
        socache_memcache:CACHE

Reply via email to