keks-overlay.git

@@ -1,7 +0,0 @@

-AUX apache-fix-redirect-url.diff 4640 SHA256 1fe5dfc84d7756b1dd0f670ff0d2725dd596dfaeacdd59ca318e1259602e2ce3 SHA512 490b2594c88ab6a0dd3a1010e7a143ee75cef182ab7a41a7c1aceb0d8fd16c8dc2f7d408659ec2c922ea7aba9c3e43052693e0b1024ea4e527c3e008f82f5f77 WHIRLPOOL babb7ef8bb8cd5409419c0c750b5f8ceeac4446d8147b0af5811c05eee75451ea5d671502581a8c67924aa92f7049ddf3e0740d0a6a58b10882457057e420024

-AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0

-AUX apache2.2.service 716 SHA256 e850ad73585fbba52ade58a39ca91adbfd52f56a0bbd426ebcadb340a7dcb62b SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c WHIRLPOOL 776a928422b8f37a12099111a1503674ca901934b60dca8596dc8bc287390be9a0e912d7ba6226dcb22eb7c669fa298ddc20fd7bf5c275b0cf019bae0d594839

-DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839

-DIST httpd-2.4.17.tar.bz2 5157721 SHA256 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 SHA512 d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 WHIRLPOOL f18dd92091e0d7f051f55276dc99656b299f3aaff5375d2fe286e18c33cfeb6887db9c792a426e88655dc0523e66008b2fc534ee1a5ae5b2ae5000bef1509aa8

-EBUILD apache-2.4.17-r1.ebuild 7565 SHA256 57958c32d7525de3061678263967ed51e8110474c7634dd66e94925352905997 SHA512 390d34a0fbc83a9e0183ec96516a98ce933334c678f6f0b1f600994fe936975858729fcba45f9990e680931cb87de9e5aefd0b4e55a447308abd9f93f6b49dad WHIRLPOOL 67fb63708d497c0a12d49a4e300397b8ba696de4dbee1f378c79d4448fa2df3cff20e6dfce0007a412b8daf71c9756d9cb869f128290c916163a6fca5fc5ef7d

-MISC metadata.xml 2882 SHA256 bb1c73d9b53a1049c14b477d4441b09670ecafcf46a0ad114c24bb284d0d194a SHA512 bd9a0a5f26e1420aa6023160208d177e233f97f2265b8fad68772a084cbc9fabb2a186f14916a5a664b5590a6052fe039874ff96b1bd9d3dc530c3750561c7ce WHIRLPOOL 0e92d1cd3fbbf3f75ebd38e356a736061c9ea19afd40b06f58abe0ed86219223cafab188bbfa4ce9c91a8cc6619de47dfc3a68edc2c39e6a38476915ad8d48ba

@@ -1,234 +0,0 @@

-# Copyright 1999-2015 Gentoo Foundation

-# Distributed under the terms of the GNU General Public License v2

-# $Id$

-

-EAPI=5

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20140731"

-GENTOO_DEVELOPER="polynomial-c"

-GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"

-

-# IUSE/USE_EXPAND magic

-IUSE_MPMS_FORK="peruser prefork"

-IUSE_MPMS_THREAD="event worker"

-

-# << obsolete modules:

-# authn_default authz_default mem_cache

-# mem_cache is replaced by cache_disk

-# ?? buggy modules

-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found

-# >> added modules for reason:

-# compat: compatibility with 2.2 access control

-# authz_host: new module for access control

-# authn_core: functionality provided by authn_alias in previous versions

-# authz_core: new module, provides core authorization capabilities

-# cache_disk: replacement for mem_cache

-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3

-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3

-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3

-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3

-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).

-# socache_shmcb: shared object cache provider. Default config with ssl needs it

-# unixd: fixes startup error: Invalid command 'User'

-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest

-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core

-authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex

-cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate

-dir dumpio env expires ext_filter file_cache filter headers http2 ident imagemap

-include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness

-lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation

-proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi

-proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif

-slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack

-unixd version vhost_alias"

-# The following are also in the source as of this version, but are not available

-# for user selection:

-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export

-# optional_fn_import optional_hook_export optional_hook_import

-

-# inter-module dependencies

-# TODO: this may still be incomplete

-MODULE_DEPENDS="

-	dav_fs:dav

-	dav_lock:dav

-	deflate:filter

-	cache_disk:cache

-	ext_filter:filter

-	file_cache:cache

-	lbmethod_byrequests:proxy_balancer

-	lbmethod_byrequests:slotmem_shm

-	lbmethod_bytraffic:proxy_balancer

-	lbmethod_bybusyness:proxy_balancer

-	lbmethod_heartbeat:proxy_balancer

-	log_forensic:log_config

-	logio:log_config

-	cache_disk:cache

-	mime_magic:mime

-	proxy_ajp:proxy

-	proxy_balancer:proxy

-	proxy_balancer:slotmem_shm

-	proxy_connect:proxy

-	proxy_ftp:proxy

-	proxy_http:proxy

-	proxy_scgi:proxy

-	proxy_fcgi:proxy

-	proxy_wstunnel:proxy

-	substitute:filter

-"

-

-# module<->define mappings

-MODULE_DEFINES="

-	auth_digest:AUTH_DIGEST

-	authnz_ldap:AUTHNZ_LDAP

-	cache:CACHE

-	cache_disk:CACHE

-	dav:DAV

-	dav_fs:DAV

-	dav_lock:DAV

-	file_cache:CACHE

-	http2:HTTP2

-	info:INFO

-	ldap:LDAP

-	proxy:PROXY

-	proxy_ajp:PROXY

-	proxy_balancer:PROXY

-	proxy_connect:PROXY

-	proxy_ftp:PROXY

-	proxy_http:PROXY

-	proxy_fcgi:PROXY

-	proxy_scgi:PROXY

-	proxy_wstunnel:PROXY

-	socache_shmcb:SSL

-	ssl:SSL

-	status:STATUS

-	suexec:SUEXEC

-	userdir:USERDIR

-"

-

-# critical modules for the default config

-MODULE_CRITICAL="

-	authn_core

-	authz_core

-	authz_host

-	dir

-	mime

-	unixd

-"

-inherit eutils apache-2 systemd toolchain-funcs

-

-DESCRIPTION="The Apache Web Server"

-HOMEPAGE="http://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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"

-

-DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.0.0 )"

-

-pkg_setup() {

-	# dependend critical modules which are not allowed in global scope due

-	# to USE flag conditionals (bug #499260)

-	use ssl && MODULE_CRITICAL+=" socache_shmcb"

-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"

-	apache-2_pkg_setup

-}

-

-src_prepare() {

-	epatch "${FILESDIR}/apache-fix-redirect-url.diff"

-	apache-2_src_prepare

-}

-

-src_configure() {

-	# Brain dead check.

-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"

-

-	apache-2_src_configure

-}

-

-src_compile() {

-	if tc-is-cross-compiler; then

-		# This header is the same across targets, so use the build compiler.

-		pushd server >/dev/null

-		emake gen_test_char

-		tc-export_build_env BUILD_CC

-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \

-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die

-		popd >/dev/null

-	fi

-

-	default

-}

-

-src_install() {

-	apache-2_src_install

-	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do

-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"

-	done

-	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do

-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"

-	done

-	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do

-		rm "${ED}"/$i || die "Failed to prune apache-tools bits"

-	done

-	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do

-		rm "${ED}/"$i || die "Failed to prune apache-tools bits"

-	done

-

-	# install apxs in /usr/bin (bug #502384) and put a symlink into the

-	# old location until all ebuilds and eclasses have been modified to

-	# use the new location.

-	local apxs="/usr/bin/apxs"

-	cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"

-	ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die

-	chmod 0755 "${ED}"${apxs} || die

-

-	# Note: wait for mod_systemd to be included in the next release,

-	# then apache2.4.service can be used and systemd support controlled

-	# through --enable-systemd

-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"

-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"

-	#insinto /etc/apache2/modules.d

-	#doins "${FILESDIR}/00_systemd.conf"

-}

-

-pkg_postinst()

-{

-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"

-	# warnings that default config might not work out of the box

-	for mod in $MODULE_CRITICAL; do

-		if ! use "apache2_modules_${mod}"; then

-			echo

-			ewarn "Warning: Critical module not installed!"

-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"

-			ewarn "are highly recomended but might not be in the base profile yet."

-			ewarn "Default config for ssl needs module 'socache_shmcb'."

-			ewarn "Enabling the following flags is highly recommended:"

-			for cmod in $MODULE_CRITICAL; do

-				use "apache2_modules_${cmod}" || \

-					ewarn "+ apache2_modules_${cmod}"

-			done

-			echo

-			break

-		fi

-	done

-	# warning for proxy_balancer and missing load balancing scheduler

-	if use apache2_modules_proxy_balancer; then

-		local lbset=

-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do

-			if use "apache2_modules_${mod}"; then

-				lbset=1 && break

-			fi

-		done

-		if [ ! $lbset ]; then

-			echo

-			ewarn "Info: Missing load balancing scheduler algorithm module"

-			ewarn "(They were split off from proxy_balancer in 2.3)"

-			ewarn "In order to get the ability of load balancing, at least"

-			ewarn "one of these modules has to be present:"

-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"

-			echo

-		fi

-	fi

-}

@@ -1,123 +0,0 @@

-diff --git a/include/http_core.h b/include/http_core.h

-index 6ca53f7..8535455 100644

---- a/include/http_core.h

-+++ b/include/http_core.h

-@@ -465,6 +465,17 @@ typedef unsigned long etag_components_t;

- /* This is the default value used */

- #define ETAG_BACKWARD (ETAG_MTIME | ETAG_SIZE)

- 

-+/* Generic ON/OFF/UNSET for unsigned int foo :2 */

-+#define AP_CORE_CONFIG_OFF   (0)

-+#define AP_CORE_CONFIG_ON    (1)

-+#define AP_CORE_CONFIG_UNSET (2)

-+

-+/* Generic merge of flag */

-+#define AP_CORE_MERGE_FLAG(field, to, base, over) to->field = \

-+               over->field != AP_CORE_CONFIG_UNSET            \

-+               ? over->field                                  \

-+               : base->field                                   

-+

- /**

-  * @brief Server Signature Enumeration

-  */

-@@ -630,6 +641,8 @@ typedef struct {

-      * advice

-      */

-     unsigned int cgi_pass_auth : 2;

-+    unsigned int qualify_redirect_url :2;

-+

- } core_dir_config;

- 

- /* macro to implement off by default behaviour */

-diff --git a/server/core.c b/server/core.c

-index 37484b6..803d4d4 100644

---- a/server/core.c

-+++ b/server/core.c

-@@ -191,6 +191,7 @@ static void *create_core_dir_config(apr_pool_t *a, char *dir)

-     conf->max_reversals = AP_MAXRANGES_UNSET;

- 

-     conf->cgi_pass_auth = AP_CGI_PASS_AUTH_UNSET;

-+    conf->qualify_redirect_url = AP_CORE_CONFIG_UNSET; 

- 

-     return (void *)conf;

- }

-@@ -405,6 +406,8 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)

- 

-     conf->cgi_pass_auth = new->cgi_pass_auth != AP_CGI_PASS_AUTH_UNSET ? new->cgi_pass_auth : base->cgi_pass_auth;

- 

-+    AP_CORE_MERGE_FLAG(qualify_redirect_url, conf, base, new);

-+

-     return (void*)conf;

- }

- 

-@@ -1707,6 +1710,15 @@ static const char *set_cgi_pass_auth(cmd_parms *cmd, void *d_, int flag)

-     return NULL;

- }

- 

-+static const char *set_qualify_redirect_url(cmd_parms *cmd, void *d_, int flag)

-+{

-+    core_dir_config *d = d_;

-+

-+    d->qualify_redirect_url = flag ? AP_CORE_CONFIG_ON : AP_CORE_CONFIG_OFF;

-+

-+    return NULL;

-+}

-+

- static const char *set_override_list(cmd_parms *cmd, void *d_, int argc, char *const argv[])

- {

-     core_dir_config *d = d_;

-@@ -4206,6 +4218,10 @@ AP_INIT_TAKE12("LimitInternalRecursion", set_recursion_limit, NULL, RSRC_CONF,

- AP_INIT_FLAG("CGIPassAuth", set_cgi_pass_auth, NULL, OR_AUTHCFG,

-              "Controls whether HTTP authorization headers, normally hidden, will "

-              "be passed to scripts"),

-+AP_INIT_FLAG("QualifyRedirectURL", set_qualify_redirect_url, NULL, OR_FILEINFO,

-+             "Controls whether HTTP authorization headers, normally hidden, will "

-+             "be passed to scripts"),

-+

- AP_INIT_TAKE1("ForceType", ap_set_string_slot_lower,

-        (void *)APR_OFFSETOF(core_dir_config, mime_type), OR_FILEINFO,

-      "a mime type that overrides other configured type"),

-diff --git a/server/util_script.c b/server/util_script.c

-index 14991cd..7ac7930 100644

---- a/server/util_script.c

-+++ b/server/util_script.c

-@@ -282,21 +282,26 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r)

-     /* Apache custom error responses. If we have redirected set two new vars */

- 

-     if (r->prev) {

--        /* PR#57785: reconstruct full URL here */

--        apr_uri_t *uri = &r->prev->parsed_uri;

--        if (!uri->scheme) {

--            uri->scheme = (char*)ap_http_scheme(r->prev);

--        }

--        if (!uri->port) {

--            uri->port = ap_get_server_port(r->prev);

--            uri->port_str = apr_psprintf(r->pool, "%u", uri->port);

--        }

--        if (!uri->hostname) {

--            uri->hostname = (char*)ap_get_server_name_for_url(r->prev);

-+        if (conf->qualify_redirect_url != AP_CORE_CONFIG_ON) { 

-+            add_unless_null(e, "REDIRECT_URL", r->prev->uri);

-+        }

-+        else { 

-+            /* PR#57785: reconstruct full URL here */

-+            apr_uri_t *uri = &r->prev->parsed_uri;

-+            if (!uri->scheme) {

-+                uri->scheme = (char*)ap_http_scheme(r->prev);

-+            }

-+            if (!uri->port) {

-+                uri->port = ap_get_server_port(r->prev);

-+                uri->port_str = apr_psprintf(r->pool, "%u", uri->port);

-+            }

-+            if (!uri->hostname) {

-+                uri->hostname = (char*)ap_get_server_name_for_url(r->prev);

-+            }

-+            add_unless_null(e, "REDIRECT_URL",

-+                            apr_uri_unparse(r->pool, uri, 0));

-         }

-         add_unless_null(e, "REDIRECT_QUERY_STRING", r->prev->args);

--        add_unless_null(e, "REDIRECT_URL",

--                        apr_uri_unparse(r->pool, uri, 0));

-     }

- 

-     if (e != r->subprocess_env) {

@@ -1,2 +0,0 @@

-d /run/apache2 710 root apache

-d /run/apache_ssl_mutex

@@ -1,19 +0,0 @@

-[Unit]

-Description=The Apache HTTP Server

-After=network.target remote-fs.target nss-lookup.target

-

-[Service]

-EnvironmentFile=/etc/conf.d/apache2

-ExecStart=/usr/sbin/apache2 $APACHE2_OPTS -DFOREGROUND

-ExecReload=/usr/sbin/apache2 $APACHE2_OPTS -k graceful

-ExecStop=/usr/sbin/apache2 $APACHE2_OPTS -k graceful-stop

-# We want systemd to give httpd some time to finish gracefully, but still want

-# it to kill httpd after TimeoutStopSec if something went wrong during the

-# graceful stop. Normally, Systemd sends SIGTERM signal right after the

-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give

-# httpd time to finish.

-KillSignal=SIGCONT

-PrivateTmp=true

-

-[Install]

-WantedBy=multi-user.target

@@ -1,34 +0,0 @@

-<?xml version='1.0' encoding='UTF-8'?>

-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">

-<pkgmetadata>

-	<maintainer>

-		<email>polynomial-c@gentoo.org</email>

-		<name>Lars Wendler</name>

-	</maintainer>

-	<longdescription>

-		The Apache HTTP Server Project is an effort to develop and maintain an

-		open-source HTTP server for modern operating systems. The goal of this

-		project is to provide a secure, efficient and extensible server that

-		provides HTTP services in sync with the current HTTP standards.

-	</longdescription>

-	<use>

-		<flag name='suexec'>Install suexec with apache</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_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</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_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_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>

-	</use>

-</pkgmetadata>