keks-overlay.git

@@ -1,12 +1,7 @@

 AUX apache-noip.diff 417 RMD160 8e16f7ff130cea52449a25aafbbdeb78919d9eae SHA1 7c19a0236e4eff23bee6e69ee6708a24529a974c SHA256 c9ed84fec20e69f711600261a395a3d4b3ae2685318f6354c4d2ebd01c0ec4cc

-AUX apache-ssl-fix.diff 2993 RMD160 6a7627b2c957254e1a1bfc27e8101ff5da04fab5 SHA1 eb45f1d0ccffb8852315df621376e56a7880c1ba SHA256 150fdbd8ab5f45943c76b5244c9e3ef0ed30c6f70a5fd46981edb983de7ec02f

-DIST gentoo-apache-2.2.6-r6-20071215.tar.bz2 60964 RMD160 b2ea87d18117566a644fe012d23affd38d1f7ef6 SHA1 7a03af24bddf7e9b300eaad891a467ba25ab53ad SHA256 e2ec95dbfd3d406d16a5694746ade43863712037c12ac70f3433b16c75bf5638

-DIST gentoo-apache-2.2.6-r7-20080107.tar.bz2 61536 RMD160 b08af8e9d840b49685bf7a67243b80dc4e346efa SHA1 27278395f5ad01aef0f9c9fcf1c25565866422a0 SHA256 b2116b2b09ba3a5d4e1130bf7e202cc95312ac5b4f78f8653f15e2842bbbf92f

-DIST gentoo-apache-2.2.8-20080119.tar.bz2 60363 RMD160 c54970fdbd8e5906db5a86d383e15d5f542f2ab2 SHA1 48e98685c38e6940f2ea120419ce8d3c216a054e SHA256 6086dcf40451c348305e100551ebb1516050b50803e837cfcf53fa53ffd4d292

 DIST gentoo-apache-2.2.8-r3-20080601.tar.bz2 60383 RMD160 f7d662ac9bce6bcc0e0506503be166fdb7a95eba SHA1 1d87d6ed727a8b7074446a472eb46d2b1a9eb532 SHA256 bc1bdc87aab4cfc377e2016e69f715495097bf37c47112ac6d52929adf0fbc40

-DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c

+DIST gentoo-apache-2.2.9-20080615.tar.bz2 60183 RMD160 924b6268324aa679b5ff624ece159dad323028aa SHA1 6c8e053a33a561df2417e718803b65f7ac55b640 SHA256 c3bb95e339d7bdfdcd3bd71927287843df0d34ad2740ddc7913cbb0200fc8072

 DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39

-EBUILD apache-2.2.6-r6.ebuild 5217 RMD160 6411c458a443de97e94a3fa328b05b100245844f SHA1 3848dc1b562fc29322c3452e9fd5820284ed08d3 SHA256 2f51672862d7b3d12c15c8c0ea05006da7b279b226c98aafd7d090c61e0520a4

-EBUILD apache-2.2.6-r7.ebuild 5232 RMD160 0a8bff32137361ea80ac2e3e3a03b92ce651ea62 SHA1 ecf0af05b58a7a21fb9d684402b1257b0d9a6701 SHA256 1c055ad9e7a8ebeeb43bf749a0d09b44e1b076a1c743365f15e3086289e06cc8

+DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61

 EBUILD apache-2.2.8-r3.ebuild 5288 RMD160 096b8185d25c485fd2bd13c09de9de8b5e11dcc8 SHA1 5aff0c23059bb10346c1b2988f496becc28f3a19 SHA256 2cb835468f5968a42b86924909b50cdbd9e0c4e24f0fe30e8c547d82fe49e97a

-EBUILD apache-2.2.8.ebuild 5232 RMD160 7f823a8c01d09cb40e307db2da939a43f190b46e SHA1 be9a8841b41f21d4cce7c788b8cfd91f50219a35 SHA256 88c6b8321e7b24fa0cc677cff9b4735ff29e28d494d85fe5e3311ba070e48a2e

+EBUILD apache-2.2.9.ebuild 2812 RMD160 91b5a44a2db30a6d85e3302bfe9dc16bfcbaf045 SHA1 764bb36273e23745f2ba2cb6a36184096c650f12 SHA256 1302cc772b0404fd65eb9ea7a970558ecc8b0861049a07e122dc95387d45b6e4

@@ -1,179 +0,0 @@

-# Copyright 1999-2007 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6-r6.ebuild,v 1.1 2007/12/15 14:32:52 hollow Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20071215"

-GENTOO_DEVELOPER="hollow"

-

-# IUSE/USE_EXPAND magic

-IUSE_MPMS_FORK="itk peruser prefork"

-IUSE_MPMS_THREAD="event worker"

-

-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon

-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default

-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta

-charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires

-ext_filter file_cache filter headers ident imagemap include info log_config

-log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp

-proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling

-status unique_id userdir usertrack version vhost_alias"

-

-# inter-module dependencies

-# TODO: this may still be incomplete

-MODULE_DEPENDS="

-	dav_fs:dav

-	dav_lock:dav

-	deflate:filter

-	disk_cache:cache

-	ext_filter:filter

-	file_cache:cache

-	log_forensic:log_config

-	logio:log_config

-	mem_cache:cache

-	mime_magic:mime

-	proxy_ajp:proxy

-	proxy_balancer:proxy

-	proxy_connect:proxy

-	proxy_ftp:proxy

-	proxy_http:proxy

-	usertrack:unique_id

-"

-

-# module<->define mappings

-MODULE_DEFINES="

-	auth_digest:AUTH_DIGEST

-	authnz_ldap:AUTHNZ_LDAP

-	cache:CACHE

-	dav:DAV

-	dav_fs:DAV

-	dav_lock:DAV

-	disk_cache:CACHE

-	file_cache:CACHE

-	info:INFO

-	ldap:LDAP

-	mem_cache:CACHE

-	proxy:PROXY

-	proxy_ajp:PROXY

-	proxy_balancer:PROXY

-	proxy_connect:PROXY

-	proxy_http:PROXY

-	ssl:SSL

-	status:INFO

-	suexec:SUEXEC

-	userdir:USERDIR

-"

-

-MODULE_CRITICAL="

-authz_host

-dir

-mime

-"

-

-inherit apache-2

-

-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"

-IUSE="sni"

-

-DEPEND="${DEPEND}

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	apache2_modules_mime? ( app-misc/mime-types )"

-

-src_unpack() {

-	if ! use sni ; then

-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"

-	fi

-

-	apache-2_src_unpack

-

-	cd "${S}"

-	epatch "${FILESDIR}/apache-noip.diff"

-}

-

-pkg_postinst() {

-	apache-2_pkg_postinst

-

-	# previous installations of apache-2.2 installed the upstream configuration

-	# files, which shouldn't even have been installed!

-	if has_version '>=www-servers/apache-2.2.4' ; then

-		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then

-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1

-		fi

-

-		for i in extra original ; do

-			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then

-				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1

-			fi

-		done

-	fi

-

-	# note regarding IfDefine changes

-	if has_version '<www-servers/apache-2.2.6-r1' ; then

-		elog

-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"

-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"

-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"

-		elog "with AUTH_DIGEST now."

-		elog

-	fi

-

-	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST

-	if has_version '<www-servers/apache-2.2.4-r7' ; then

-		elog

-		elog "Listen directives have been moved into the default virtual host"

-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"

-		elog "(depending on your USE-flags.)"

-		elog

-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"

-		elog "be no listening sockets available."

-		elog

-	fi

-

-	# note the user of the config changes

-	if has_version '<www-servers/apache-2.2.4-r5' ; then

-		elog

-		elog "Please make sure that you update your /etc directory."

-		elog "Between the versions, we had to changes some config files"

-		elog "and move some stuff out of the main httpd.conf file to a seperate"

-		elog "modules.d entry."

-		elog

-		elog "Thus please update your /etc directory either via etc-update,"

-		elog "dispatch-conf or conf-update !"

-		elog

-	fi

-

-	# check for dual/upgrade install

-	if has_version '<www-servers/apache-2.2.0' ; then

-		elog

-		elog "When upgrading from versions below 2.2.0 to this version, you"

-		elog "need to rebuild all your modules. Please do so for your modules"

-		elog "to continue working correctly."

-		elog

-		elog "Also note that some configuration directives have been"

-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"

-		elog "and that some modules, foremost the authentication related ones,"

-		elog "have been renamed."

-		elog

-		elog "Some examples:"

-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."

-		elog

-		elog "For more information on what you may need to change, please"

-		elog "see the overview of changes at:"

-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"

-		elog "and the upgrading guide at:"

-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"

-		elog

-	fi

-

-	# cleanup the vim backup files, placed in /etc/apache2 by the last

-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)

-	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"

-}

@@ -1,180 +0,0 @@

-# Copyright 1999-2008 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.6-r7.ebuild,v 1.6 2008/01/08 22:19:14 jer Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20080107"

-GENTOO_DEVELOPER="hollow"

-

-# IUSE/USE_EXPAND magic

-IUSE_MPMS_FORK="itk peruser prefork"

-IUSE_MPMS_THREAD="event worker"

-

-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon

-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default

-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta

-charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires

-ext_filter file_cache filter headers ident imagemap include info log_config

-log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp

-proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling

-status unique_id userdir usertrack version vhost_alias"

-

-# inter-module dependencies

-# TODO: this may still be incomplete

-MODULE_DEPENDS="

-	dav_fs:dav

-	dav_lock:dav

-	deflate:filter

-	disk_cache:cache

-	ext_filter:filter

-	file_cache:cache

-	log_forensic:log_config

-	logio:log_config

-	mem_cache:cache

-	mime_magic:mime

-	proxy_ajp:proxy

-	proxy_balancer:proxy

-	proxy_connect:proxy

-	proxy_ftp:proxy

-	proxy_http:proxy

-	usertrack:unique_id

-"

-

-# module<->define mappings

-MODULE_DEFINES="

-	auth_digest:AUTH_DIGEST

-	authnz_ldap:AUTHNZ_LDAP

-	cache:CACHE

-	dav:DAV

-	dav_fs:DAV

-	dav_lock:DAV

-	disk_cache:CACHE

-	file_cache:CACHE

-	info:INFO

-	ldap:LDAP

-	mem_cache:CACHE

-	proxy:PROXY

-	proxy_ajp:PROXY

-	proxy_balancer:PROXY

-	proxy_connect:PROXY

-	proxy_ftp:PROXY

-	proxy_http:PROXY

-	ssl:SSL

-	status:STATUS

-	suexec:SUEXEC

-	userdir:USERDIR

-"

-

-MODULE_CRITICAL="

-authz_host

-dir

-mime

-"

-

-inherit apache-2

-

-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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"

-IUSE="sni"

-

-DEPEND="${DEPEND}

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	apache2_modules_mime? ( app-misc/mime-types )"

-

-src_unpack() {

-	if ! use sni ; then

-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"

-	fi

-

-	apache-2_src_unpack

-

-	cd "${S}"

-	epatch "${FILESDIR}/apache-noip.diff" || die

-}

-

-pkg_postinst() {

-	apache-2_pkg_postinst

-

-	# previous installations of apache-2.2 installed the upstream configuration

-	# files, which shouldn't even have been installed!

-	if has_version '>=www-servers/apache-2.2.4' ; then

-		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then

-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1

-		fi

-

-		for i in extra original ; do

-			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then

-				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1

-			fi

-		done

-	fi

-

-	# note regarding IfDefine changes

-	if has_version '<www-servers/apache-2.2.6-r1' ; then

-		elog

-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"

-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"

-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"

-		elog "with AUTH_DIGEST now."

-		elog

-	fi

-

-	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST

-	if has_version '<www-servers/apache-2.2.4-r7' ; then

-		elog

-		elog "Listen directives have been moved into the default virtual host"

-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"

-		elog "(depending on your USE-flags.)"

-		elog

-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"

-		elog "be no listening sockets available."

-		elog

-	fi

-

-	# note the user of the config changes

-	if has_version '<www-servers/apache-2.2.4-r5' ; then

-		elog

-		elog "Please make sure that you update your /etc directory."

-		elog "Between the versions, we had to changes some config files"

-		elog "and move some stuff out of the main httpd.conf file to a seperate"

-		elog "modules.d entry."

-		elog

-		elog "Thus please update your /etc directory either via etc-update,"

-		elog "dispatch-conf or conf-update !"

-		elog

-	fi

-

-	# check for dual/upgrade install

-	if has_version '<www-servers/apache-2.2.0' ; then

-		elog

-		elog "When upgrading from versions below 2.2.0 to this version, you"

-		elog "need to rebuild all your modules. Please do so for your modules"

-		elog "to continue working correctly."

-		elog

-		elog "Also note that some configuration directives have been"

-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"

-		elog "and that some modules, foremost the authentication related ones,"

-		elog "have been renamed."

-		elog

-		elog "Some examples:"

-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."

-		elog

-		elog "For more information on what you may need to change, please"

-		elog "see the overview of changes at:"

-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"

-		elog "and the upgrading guide at:"

-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"

-		elog

-	fi

-

-	# cleanup the vim backup files, placed in /etc/apache2 by the last

-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)

-	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"

-}

@@ -1,180 +0,0 @@

-# Copyright 1999-2008 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8.ebuild,v 1.1 2008/01/19 10:56:36 hollow Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20080119"

-GENTOO_DEVELOPER="hollow"

-

-# IUSE/USE_EXPAND magic

-IUSE_MPMS_FORK="itk peruser prefork"

-IUSE_MPMS_THREAD="event worker"

-

-IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon

-authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default

-authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta

-charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires

-ext_filter file_cache filter headers ident imagemap include info log_config

-log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp

-proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling

-status unique_id userdir usertrack version vhost_alias"

-

-# inter-module dependencies

-# TODO: this may still be incomplete

-MODULE_DEPENDS="

-	dav_fs:dav

-	dav_lock:dav

-	deflate:filter

-	disk_cache:cache

-	ext_filter:filter

-	file_cache:cache

-	log_forensic:log_config

-	logio:log_config

-	mem_cache:cache

-	mime_magic:mime

-	proxy_ajp:proxy

-	proxy_balancer:proxy

-	proxy_connect:proxy

-	proxy_ftp:proxy

-	proxy_http:proxy

-	usertrack:unique_id

-"

-

-# module<->define mappings

-MODULE_DEFINES="

-	auth_digest:AUTH_DIGEST

-	authnz_ldap:AUTHNZ_LDAP

-	cache:CACHE

-	dav:DAV

-	dav_fs:DAV

-	dav_lock:DAV

-	disk_cache:CACHE

-	file_cache:CACHE

-	info:INFO

-	ldap:LDAP

-	mem_cache:CACHE

-	proxy:PROXY

-	proxy_ajp:PROXY

-	proxy_balancer:PROXY

-	proxy_connect:PROXY

-	proxy_ftp:PROXY

-	proxy_http:PROXY

-	ssl:SSL

-	status:STATUS

-	suexec:SUEXEC

-	userdir:USERDIR

-"

-

-MODULE_CRITICAL="

-authz_host

-dir

-mime

-"

-

-inherit apache-2

-

-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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"

-IUSE="sni"

-

-DEPEND="${DEPEND}

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	apache2_modules_mime? ( app-misc/mime-types )"

-

-src_unpack() {

-	if ! use sni ; then

-		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"

-	fi

-

-	apache-2_src_unpack

-

-	cd "${S}"

-	epatch "${FILESDIR}/apache-noip.diff" || die

-}

-

-pkg_postinst() {

-	apache-2_pkg_postinst

-

-	# previous installations of apache-2.2 installed the upstream configuration

-	# files, which shouldn't even have been installed!

-	if has_version '>=www-servers/apache-2.2.4' ; then

-		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then

-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1

-		fi

-

-		for i in extra original ; do

-			if [[ -d "${ROOT}"/etc/apache2/${i} ]] ; then

-				rm -rf "${ROOT}"/etc/apache2/${i} >/dev/null 2>&1

-			fi

-		done

-	fi

-

-	# note regarding IfDefine changes

-	if has_version '<www-servers/apache-2.2.6-r1' ; then

-		elog

-		elog "When upgrading from versions 2.2.6 or earlier, please be aware"

-		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"

-		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"

-		elog "with AUTH_DIGEST now."

-		elog

-	fi

-

-	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST

-	if has_version '<www-servers/apache-2.2.4-r7' ; then

-		elog

-		elog "Listen directives have been moved into the default virtual host"

-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"

-		elog "(depending on your USE-flags.)"

-		elog

-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"

-		elog "be no listening sockets available."

-		elog

-	fi

-

-	# note the user of the config changes

-	if has_version '<www-servers/apache-2.2.4-r5' ; then

-		elog

-		elog "Please make sure that you update your /etc directory."

-		elog "Between the versions, we had to changes some config files"

-		elog "and move some stuff out of the main httpd.conf file to a seperate"

-		elog "modules.d entry."

-		elog

-		elog "Thus please update your /etc directory either via etc-update,"

-		elog "dispatch-conf or conf-update !"

-		elog

-	fi

-

-	# check for dual/upgrade install

-	if has_version '<www-servers/apache-2.2.0' ; then

-		elog

-		elog "When upgrading from versions below 2.2.0 to this version, you"

-		elog "need to rebuild all your modules. Please do so for your modules"

-		elog "to continue working correctly."

-		elog

-		elog "Also note that some configuration directives have been"

-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"

-		elog "and that some modules, foremost the authentication related ones,"

-		elog "have been renamed."

-		elog

-		elog "Some examples:"

-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."

-		elog

-		elog "For more information on what you may need to change, please"

-		elog "see the overview of changes at:"

-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"

-		elog "and the upgrading guide at:"

-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"

-		elog

-	fi

-

-	# cleanup the vim backup files, placed in /etc/apache2 by the last

-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)

-	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"

-}

@@ -0,0 +1,113 @@

+# Copyright 1999-2008 Gentoo Foundation

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

+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.9.ebuild,v 1.8 2008/06/16 16:12:41 ranger Exp $

+

+# latest gentoo apache files

+GENTOO_PATCHSTAMP="20080615"

+GENTOO_DEVELOPER="hollow"

+

+# IUSE/USE_EXPAND magic

+IUSE_MPMS_FORK="itk peruser prefork"

+IUSE_MPMS_THREAD="event worker"

+

+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon

+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default

+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta

+charset_lite dav dav_fs dav_lock dbd deflate dir disk_cache dumpio env expires

+ext_filter file_cache filter headers ident imagemap include info log_config

+log_forensic logio mem_cache mime mime_magic negotiation proxy proxy_ajp

+proxy_balancer proxy_connect proxy_ftp proxy_http rewrite setenvif speling

+status substitute unique_id userdir usertrack version vhost_alias"

+

+# inter-module dependencies

+# TODO: this may still be incomplete

+MODULE_DEPENDS="

+	dav_fs:dav

+	dav_lock:dav

+	deflate:filter

+	disk_cache:cache

+	ext_filter:filter

+	file_cache:cache

+	log_forensic:log_config

+	logio:log_config

+	mem_cache:cache

+	mime_magic:mime

+	proxy_ajp:proxy

+	proxy_balancer:proxy

+	proxy_connect:proxy

+	proxy_ftp:proxy

+	proxy_http:proxy

+	substitute:filter

+"

+

+# module<->define mappings

+MODULE_DEFINES="

+	auth_digest:AUTH_DIGEST

+	authnz_ldap:AUTHNZ_LDAP

+	cache:CACHE

+	dav:DAV

+	dav_fs:DAV

+	dav_lock:DAV

+	disk_cache:CACHE

+	file_cache:CACHE

+	info:INFO

+	ldap:LDAP

+	mem_cache:CACHE

+	proxy:PROXY

+	proxy_ajp:PROXY

+	proxy_balancer:PROXY

+	proxy_connect:PROXY

+	proxy_ftp:PROXY

+	proxy_http:PROXY

+	ssl:SSL

+	status:STATUS

+	suexec:SUEXEC

+	userdir:USERDIR

+"

+

+# critical modules for the default config

+MODULE_CRITICAL="

+	authz_host

+	dir

+	mime

+"

+

+inherit apache-2

+

+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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"

+IUSE="sni"

+

+DEPEND="${DEPEND}

+	apache2_modules_deflate? ( sys-libs/zlib )"

+

+RDEPEND="${RDEPEND}

+	apache2_modules_mime? ( app-misc/mime-types )"

+

+src_unpack() {

+	if ! use sni ; then

+		EPATCH_EXCLUDE="04_all_mod_ssl_tls_sni.patch"

+	fi

+

+	apache-2_src_unpack

+

+	cd "${S}"

+	epatch "${FILESDIR}/apache-noip.diff" || die

+}

+

+pkg_preinst() {

+	# note regarding IfDefine changes

+	if has_version "<${CATEGORY}/${PN}-2.2.6-r1"; then

+		elog

+		elog "When upgrading from versions 2.2.6 or earlier, please be aware"

+		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"

+		elog "to AUTHNZ_LDAP. Additionally mod_auth_digest needs to be enabled"

+		elog "with AUTH_DIGEST now."

+		elog

+	fi

+}

@@ -1,71 +0,0 @@

---- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c	2007/06/12 20:55:57	546632

-+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c	2007/11/02 16:45:46	591393

-@@ -1539,14 +1539,25 @@

- 

-     apr_brigade_destroy(tempb);

- 

--    /* Insert the filter which will supply the buffered data. */

-+    /* After consuming all protocol-level input, remove all protocol-level

-+     * filters.  It should strictly only be necessary to remove filters

-+     * at exactly ftype == AP_FTYPE_PROTOCOL, since this filter will 

-+     * precede all > AP_FTYPE_PROTOCOL anyway. */

-+    while (r->proto_input_filters->frec->ftype < AP_FTYPE_CONNECTION) {

-+        ap_remove_input_filter(r->proto_input_filters);

-+    }

-+

-+    /* Insert the filter which will supply the buffered content. */

-     ap_add_input_filter(ssl_io_buffer, ctx, r, c);

- 

-     return 0;

- }

- 

- /* This input filter supplies the buffered request body to the caller

-- * from the brigade stored in f->ctx. */

-+ * from the brigade stored in f->ctx.  Note that the placement of this

-+ * filter in the filter stack is important; it must be the first

-+ * r->proto_input_filter; lower-typed filters will not be preserved

-+ * across internal redirects (see PR 43738).  */

- static apr_status_t ssl_io_filter_buffer(ap_filter_t *f,

-                                          apr_bucket_brigade *bb,

-                                          ap_input_mode_t mode,

-@@ -1565,6 +1576,19 @@

-         return APR_ENOTIMPL;

-     }

- 

-+    if (APR_BRIGADE_EMPTY(ctx->bb)) {

-+        /* Suprisingly (and perhaps, wrongly), the request body can be

-+         * pulled from the input filter stack more than once; a

-+         * handler may read it, and ap_discard_request_body() will

-+         * attempt to do so again after *every* request.  So input

-+         * filters must be prepared to give up an EOS if invoked after

-+         * initially reading the request. The HTTP_IN filter does this

-+         * with its ->eos_sent flag. */

-+

-+        APR_BRIGADE_INSERT_TAIL(bb, apr_bucket_eos_create(f->c->bucket_alloc));

-+        return APR_SUCCESS;

-+    }

-+

-     if (mode == AP_MODE_READBYTES) {

-         apr_bucket *e;

- 

-@@ -1619,8 +1643,9 @@

-         }

- 

-         ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c,

--                      "buffered SSL brigade now exhausted; removing filter");

--        ap_remove_input_filter(f);

-+                      "buffered SSL brigade exhausted");

-+        /* Note that the filter must *not* be removed here; it may be

-+         * invoked again, see comment above. */

-     }

- 

-     return APR_SUCCESS;

-@@ -1695,7 +1720,7 @@

-     ap_register_input_filter  (ssl_io_filter, ssl_io_filter_input,  NULL, AP_FTYPE_CONNECTION + 5);

-     ap_register_output_filter (ssl_io_filter, ssl_io_filter_output, NULL, AP_FTYPE_CONNECTION + 5);

- 

--    ap_register_input_filter  (ssl_io_buffer, ssl_io_filter_buffer, NULL, AP_FTYPE_PROTOCOL - 1);

-+    ap_register_input_filter  (ssl_io_buffer, ssl_io_filter_buffer, NULL, AP_FTYPE_PROTOCOL);

- 

-     return;

- }