commit:     e9aa7438841a2a6a7e9d388bd5f040caef49fbce
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 08:08:30 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 08:09:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9aa7438

www-servers/apache: Move APACHE_MODULES USE descs to correct file

Closes: https://bugs.gentoo.org/689484
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 profiles/desc/apache2_modules.desc | 22 ++++++++++++++++------
 www-servers/apache/metadata.xml    | 25 -------------------------
 2 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/profiles/desc/apache2_modules.desc 
b/profiles/desc/apache2_modules.desc
index 031c1896c95..a414540a3cf 100644
--- a/profiles/desc/apache2_modules.desc
+++ b/profiles/desc/apache2_modules.desc
@@ -4,7 +4,7 @@
 # This file contains descriptions of APACHE2_MODULES USE_EXPAND flags.
 
 # Keep it sorted.
-access_compat - Backwards-compatibility for obsolete authorization directives
+access_compat - Group authorizations based on host (name or IP address). 
Available as a compatibility module with previous versions
 actions - Provides for executing CGI scripts based on media type or request 
method
 alias - Provides for mapping different parts of the host filesystem in the 
document tree and for URL redirection
 asis - Sends files that contain their own HTTP headers
@@ -12,12 +12,13 @@ auth_basic - Basic authentication
 auth_digest - User authentication using MD5 Digest Authentication
 authn_alias - Provides the ability to create extended authentication providers 
based on actual providers
 authn_anon - Allows "anonymous" user access to authenticated areas
-authn_core - Provides core authentication capabilities
+authn_core - Provides core authentication capabilities common to all 
authentication providers (functionality provided by authn_alias in previous 
versions)
 authn_dbd - User authentication using an SQL database
 authn_dbm - User authentication using DBM files
 authn_default - Authentication fallback module
 authn_file - User authentication using text files
-authz_core - Provides core authorization capabilities
+authz_core - Provides core authorization capabilities to various 
authorization/authorization modules, such as authn_file and authz_user
+authz_dbd - Provides authorization capabilities via SQL database so that 
authenticated users can be allowed or denied access to portions of the web site 
by group membership
 authz_dbm - Group authorization using DBM files
 authz_default - Authorization fallback module
 authz_groupfile - Group authorization using plaintext files
@@ -25,8 +26,10 @@ authz_host - Group authorizations based on host (name or IP 
address)
 authz_owner - Authorization based on file ownership
 authz_user - User Authorization
 autoindex - Generates directory indexes, automatically, similar to the Unix ls 
command
+brotli - Enable brotli compression support
 cache - Content cache keyed to URIs
-cache_disk - Disk based storage module for the HTTP caching filter
+cache_disk - Disk based storage module for the HTTP caching filter (similar to 
mem_cache in previous versions)
+cache_socache - Shared object cache (socache) based storage module for the 
HTTP caching filter
 cern_meta - CERN httpd metafile semantics
 cgi - Enable CGI module (used by non-multithreaded MPMs, for eg. prefork)
 cgid - Enable CGI module (used by multithreaded MPMs, for eg. worker)
@@ -45,6 +48,7 @@ ext_filter - Pass the response body through an external 
program before delivery
 file_cache - Caches a static list of files in memory
 filter - Context-sensitive smart filter configuration module
 headers - Customization of HTTP request and response headers
+http2 - Enable http2/alpn module
 ident - RFC 1413 ident lookups
 imagemap - Server-side imagemap processing
 include - Server-parsed html documents (Server Side Includes)
@@ -56,6 +60,8 @@ lbmethod_heartbeat - Heartbeat Traffic Counting load balancer 
scheduler algorith
 log_config - Logging of the requests made to the server
 log_forensic - Forensic Logging of the requests made to the server
 logio - Logging of input and output bytes per request
+macro - Macros for the Apache config file
+md - Managing domains across virtual hosts, certificate provisioning via the 
ACME protocol
 mem_cache - Content cache keyed to URIs
 mime - Associates the requested filename's extensions with the file's behavior 
(handlers and filters) and content (mime-type, language, character set and 
encoding)
 mime_magic - Determines the MIME type of a file by looking at a few bytes of 
its contents
@@ -66,16 +72,18 @@ proxy_balancer - mod_proxy extension for load balancing
 proxy_connect - mod_proxy extension for CONNECT request handling
 proxy_fcgi - FastCGI support module for mod_proxy
 proxy_ftp - FTP support module for mod_proxy
+proxy_html - Module to rewrite links in html pages behind a reverse proxy
 proxy_http - HTTP support module for mod_proxy
+proxy_http2 - HTTP2 support module for mod_proxy
 proxy_scgi - SCGI gateway module for mod_proxy
-proxy_wstunnel - Websockets support module for mod_proxy
+proxy_wstunnel - Provides support for the tunnelling of web socket connections 
to a backend websockets server
 ratelimit - Bandwidth Rate Limiting for Clients
 remoteip - Replaces the original client IP address for the connection with the 
useragent IP address list presented by a proxies or a load balancer via the 
request headers
 reqtimeout - Set timeout and minimum data rate for receiving requests
 rewrite - Provides a rule-based rewriting engine to rewrite requested URLs on 
the fly
 setenvif - Allows the setting of environment variables based on 
characteristics of the request
 slotmem_shm - Slot-based shared memory provider
-socache_shmcb - Cyclic buffer shared-memory-based shared object cache provider
+socache_shmcb - A shared object cache provider using a high-performance cyclic 
buffer inside a shared memory segment
 speling - Attempts to correct mistaken URLs that users might have entered by 
ignoring capitalization and by allowing up to one misspelling
 status - Provides information on server activity and performance
 substitute - Perform search and replace operations on response bodies
@@ -85,3 +93,5 @@ userdir - User-specific directories
 usertrack - Clickstream logging of user activity on a site
 version - Version dependent configuration
 vhost_alias - Provides for dynamically configured mass virtual hosting
+watchdog - Provides infrastructure for other modules to periodically run tasks
+xml2enc - Enable xml2 encoding module

diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index 2ecf0bfc8f7..9327ed014ad 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -20,30 +20,5 @@
                <flag name="suexec-caps">Install suexec with capabilities 
instead of SUID</flag>
                <flag name="suexec-syslog">Log suexec to syslog instead of to a 
separate file</flag>
                <flag name="static">Link in apache2 modules statically rather 
then plugins</flag>
-               <flag name="apache2_modules_access_compat">Group authorizations 
based on host (name or IP address). Available as a compatibility module with 
previous versions.</flag>
-               <flag name="apache2_modules_authn_core">Provides core 
authentication capabilities common to all authentication providers 
(functionality provided by authn_alias in previous versions).</flag>
-               <flag name="apache2_modules_authz_core">Provides core 
authorization capabilities to various authorization/authorization modules, such 
as authn_file and authz_user.</flag>
-               <flag name="apache2_modules_authz_dbd">Provides authorization 
capabilities via SQL database so that authenticated users can be allowed or 
denied access to portions of the web site by group membership.</flag>
-               <flag name="apache2_modules_brotli">Enable brotli compression 
support</flag>
-               <flag name="apache2_modules_cache_disk">Disk based storage 
module for the HTTP caching filter (similar to mem_cache in previous 
versions).</flag>
-               <flag name="apache2_modules_cache_socache">Shared object cache 
(socache) based storage module for the HTTP caching filter.</flag>
-               <flag name="apache2_modules_proxy_html">Module to rewrite links 
in html pages behind a reverse proxy</flag>
-               <flag name="apache2_modules_http2">Enable http2/alpn 
module</flag>
-               <flag name="apache2_modules_lbmethod_byrequests">Request 
counting load balancer scheduler algorithm for proxy_balancer.</flag>
-               <flag name="apache2_modules_lbmethod_bytraffic">Weighted 
traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
-               <flag name="apache2_modules_lbmethod_bybusyness">Pending 
request counting load balancer scheduler algorithm for proxy_balancer.</flag>
-               <flag name="apache2_modules_lbmethod_heartbeat">Heartbeat 
traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
-               <flag name="apache2_modules_macro">Macros for the Apache config 
file.</flag>
-               <flag name="apache2_modules_md">Managing domains across virtual 
hosts, certificate provisioning via the ACME protocol.</flag>
-               <flag name="apache2_modules_slotmem_shm">Slot-based shared 
memory provider.</flag>
-               <flag name="apache2_modules_socache_shmcb">A shared object 
cache provider using a high-performance cyclic buffer inside a shared memory 
segment.</flag>
-               <flag name="apache2_modules_unixd">Basic (required) security 
for Unix-family platforms.</flag>
-               <flag name="apache2_modules_proxy_fcgi">FCGI support module for 
mod_proxy.</flag>
-               <flag name="apache2_modules_proxy_http2">HTTP2 support module 
for mod_proxy.</flag>
-               <flag name="apache2_modules_proxy_wstunnel">Provides support 
for the tunnelling of web socket connections to a backend websockets 
server.</flag>
-               <flag name="apache2_modules_ratelimit">Ratelimit module for 
transfer rate management</flag>
-               <flag name="apache2_modules_remoteip">Remotip module for 
logging</flag>
-               <flag name="apache2_modules_watchdog">Provides infrastructure 
for other modules to periodically run tasks</flag>
-               <flag name="apache2_modules_xml2enc">Enable xml2 encoding 
module</flag>
        </use>
 </pkgmetadata>

Reply via email to