keks-overlay.git

@@ -1,24 +1,8 @@

 AUX 2.2.22-envvars-std.in 1071 RMD160 4613555ac600a4941ccd43128f98a9f6a95ba57d SHA1 b69dc500bb49fb14c801c6ab130a624c24e4d7fa SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee

 AUX apache-2.2.14-staticdhparameters.diff 11745 RMD160 3aa5d2a5fd56b55fbfac372241ed47431146b262 SHA1 ae91f275450cce294f6700bcb12fb7851fd7070f SHA256 1fecd496f7df6438cf44b331a0b15d6ceaa0522fcb20d7246772f10f7c3c41df

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

-AUX apache-tlsext-workaround.diff 395 RMD160 c756f0e935e4392d44c57a202fd73af173b3b9b2 SHA1 f9619250609d4bd1bddc3e28e23f61cfedb93c09 SHA256 ee0b535bc401ae6b4028d4fa238198f067cacab936d69596c4d8b4ca1ea23619

 AUX httpd-2.2.16-ecc.diff 8236 RMD160 604f1124c168805b7702a6ca4a26ee7004fbab0b SHA1 3badbccc36c21710ef1c60f47963bcc631c00917 SHA256 e7fe97852875de06372d8413248fa20419946e2ab7de5198c93bffa6b5a68461

-AUX httpd-2.2.x-sni.diff 13866 RMD160 ae21ae0ebc2c0d263b5290d67aeefd56b145ed73 SHA1 b8b8dcc56e6a7bb5c07d95fa46683db4170dd7ba SHA256 092aaa998f2b15e6b89b0785c237ce3bb40d4bf188509fcf58470ce5731380e9

-DIST gentoo-apache-2.2.16-20100828.tar.bz2 63742 RMD160 c001f1f55099977c41b03346e449c95629f6b9be SHA1 bcb607199244948ffbb883aa36cabe54865ccfea SHA256 2820546adc7b3b3a38ae5173c75cab7ac42cc611570f0ffd814f833ee464f608

-DIST gentoo-apache-2.2.17-20110218.tar.bz2 62615 RMD160 05b57ab08e1938e5bf41ead2ce53c71c59303d60 SHA1 2a877d8269c3df5bb11f1a3c30953b38e8a17119 SHA256 8cc3cfe47d55877eaff15d6688d9ced1e7e54c93f012f4d84561d7ef7a3118ad

-DIST gentoo-apache-2.2.20-20110901.tar.bz2 63251 RMD160 279438975a3890ac5c14f882c2ffa436b2841912 SHA1 012db5dc78129b627f633c4fd5ff0319d6d0bba2 SHA256 3b4e809673516efb7c78d904d1d776e243e03437227c472eb08e6ec3688fc067

-DIST gentoo-apache-2.2.21-20110915.tar.bz2 63319 RMD160 797b3236145631fb18236cbc120775e5a634d82e SHA1 e0bbd052d7ccab1eb32887489aaad27990c1e355 SHA256 5cad94064254f00ffd561a3cf4e736b41aeaa082815450463cd4face6ded0f27

-DIST gentoo-apache-2.2.21-r1-20111018.tar.bz2 64196 RMD160 fb3d4c1716ecf2763caef5f5d927d8276ebaca47 SHA1 347138d7738c6bbfc0eab1d520f101ac1bb0fa35 SHA256 8c78505a34184b526099db5edb36b6b4ab57b6d2a43eec537ca7984f94639ec7

 DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 RMD160 d4d5ac58156e10cdbbfaeb3e7a7569bda81f6f7e SHA1 0c0e80bfddc0fb4b9df3b736239392be9fbc40fb SHA256 737730dabf1e1ccfe9d409067dc3c4d37d16f7fa1e792f5bf39268d904ce1c31

-DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf58112095 SHA1 ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9 SHA256 9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52

-DIST httpd-2.2.17.tar.bz2 4951247 RMD160 4a2f16f2891094d4176565fadf0e8fcadf7dbaff SHA1 5c9b44620dee449a86ba1bcba1715033c2c26b08 SHA256 868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04

-DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f17 SHA1 c8f00a505af6ed3f89f45b640217c388f5cd32b0 SHA256 1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e

-DIST httpd-2.2.21.tar.bz2 5324905 RMD160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 SHA1 c02f9b05da9a7e316ff37d9053dc76a57ba51cb4 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f

 DIST httpd-2.2.22.tar.bz2 5378934 RMD160 237a26a7759e7e1af175900d598e25fb082a4eb9 SHA1 766cd0843050a8dfb781e48b976f3ba6ebcf8696 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231

-EBUILD apache-2.2.16.ebuild 2474 RMD160 b5932b7fb8f535a04f3bbaf9914d762faa227376 SHA1 e128d51edff342e06454912b26b5bfae780201d7 SHA256 946feaa6a54d19e0d17acb277ab9e77173e62218a209cea4adb2f39f187fb8af

-EBUILD apache-2.2.17.ebuild 2800 RMD160 c2aa5d7da738e45373e0cc7339e413bad3557e5a SHA1 c6879641f80082b8f75b4f42a846874f556aee94 SHA256 83f31753eebda1c74392e74b3520475d227ffb31da41f4b2057e10b1401f3fe1

-EBUILD apache-2.2.20.ebuild 2787 RMD160 33bcf018695ad8e6ce3beca2e1ce1479b7839f5a SHA1 5cb5d1cc61539e4c1bcb55fee6f5dff3b417bae4 SHA256 85f904c57696b368656837e5b195f8b2210ac703103d1a46ce7801f9983cd9ef

-EBUILD apache-2.2.21-r1.ebuild 2878 RMD160 aebdac0ad671ac05b1c7bf112a4a4e855012608a SHA1 d0ec2d7e7c4ffa517e6f7102886363f493e4b48c SHA256 e492085938fba74ae3e623f4bc8916986a0260db7666db3dee6fbcdcef71d8d2

-EBUILD apache-2.2.21.ebuild 2783 RMD160 18b86737a93ad332064e358b4078fea9c078c301 SHA1 7c8c3ac29b59c08823971f663bb4fde46ec9f3f6 SHA256 6695358dcc6ff20aec9508aaa2dca7df1fcbca92250df269a5b810b4dd129e75

 EBUILD apache-2.2.22-r1.ebuild 3206 RMD160 2fe9d60ea36de0540bce18cba003a4c18191802a SHA1 3e26be46b7480b5cf2e4341f37c7ea81002062d7 SHA256 4c72b2164c32c34e85c6a8e99c68464e5505eeb79bf94eed7ad1d62ba2045c0e

 EBUILD apache-2.2.22.ebuild 3001 RMD160 aa73c429658766b1ff9361259939794d8f267d78 SHA1 03d45671feb3621197c4a7c3d2e5550df7386db5 SHA256 cf930cea2f7e8a8bd2f7cabe7de9ecf56efb33d10bd3fe2d70acaa6e86cebb0c

@@ -1,98 +0,0 @@

-# Copyright 1999-2010 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.16.ebuild,v 1.1 2010/08/28 15:03:47 hollow Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20100828"

-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 cgi cgid 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 ~x86 ~sparc-fbsd ~x86-fbsd"

-IUSE="ecc"

-

-DEPEND="${DEPEND}

-	>=dev-libs/openssl-0.9.8m

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	>=dev-libs/openssl-0.9.8m

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

-

-src_prepare() {

-	apache-2_src_prepare

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

-	use ecc && epatch "${FILESDIR}/httpd-2.2.16-ecc.diff"

-}

@@ -1,106 +0,0 @@

-# Copyright 1999-2011 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.17.ebuild,v 1.2 2011/03/26 20:01:03 angelos Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20110218"

-GENTOO_DEVELOPER="hollow"

-# We want the patch from r0

-GENTOO_PATCHNAME="gentoo-${P}"

-

-# 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 cgi cgid 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 proxy_scgi rewrite

-reqtimeout setenvif speling status substitute unique_id userdir usertrack

-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

-	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

-	proxy_scgi: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

-

-src_prepare() {

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

-	epatch "${FILESDIR}"/httpd-2.2.16-ecc.diff

-	apache-2_src_prepare

-}

-

-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 ~sparc-fbsd ~x86-fbsd"

-IUSE=""

-

-DEPEND="${DEPEND}

-	>=dev-libs/openssl-0.9.8m

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	>=dev-libs/openssl-0.9.8m

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

@@ -1,106 +0,0 @@

-# Copyright 1999-2011 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.20.ebuild,v 1.6 2011/09/03 13:34:07 armin76 Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20110901"

-GENTOO_DEVELOPER="pva"

-# We want the patch from r0

-GENTOO_PATCHNAME="gentoo-${P}"

-

-# 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 cgi cgid 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 proxy_scgi rewrite

-reqtimeout setenvif speling status substitute unique_id userdir usertrack

-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

-	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

-	proxy_scgi: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

-

-src_prepare() {

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

-	epatch "${FILESDIR}"/httpd-2.2.16-ecc.diff

-	apache-2_src_prepare

-}

-

-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 ~sparc-fbsd ~x86-fbsd"

-IUSE=""

-

-DEPEND="${DEPEND}

-	>=dev-libs/openssl-0.9.8m

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	>=dev-libs/openssl-0.9.8m

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

@@ -1,110 +0,0 @@

-# Copyright 1999-2012 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.21-r1.ebuild,v 1.8 2012/03/05 08:17:32 patrick Exp $

-

-EAPI="2"

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20111018"

-GENTOO_DEVELOPER="pva"

-# We want the patch from r0

-GENTOO_PATCHNAME="gentoo-${P}-r1"

-

-# 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 cgi cgid 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 proxy_scgi rewrite

-reqtimeout setenvif speling status substitute unique_id userdir usertrack

-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

-	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

-	proxy_scgi: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 x86 ~sparc-fbsd ~x86-fbsd"

-IUSE=""

-

-DEPEND="${DEPEND}

-	>=dev-libs/openssl-0.9.8m

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-# dependency on >=dev-libs/apr-1.4.5 for bug #368651

-RDEPEND="${RDEPEND}

-	>=dev-libs/apr-1.4.5

-	>=dev-libs/openssl-0.9.8m

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

-

-src_prepare() {

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

-	epatch "${FILESDIR}"/httpd-2.2.16-ecc.diff

-	apache-2_src_prepare

-}

@@ -1,106 +0,0 @@

-# Copyright 1999-2011 Gentoo Foundation

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

-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.21.ebuild,v 1.1 2011/09/15 10:41:16 pva Exp $

-

-# latest gentoo apache files

-GENTOO_PATCHSTAMP="20110915"

-GENTOO_DEVELOPER="pva"

-# We want the patch from r0

-GENTOO_PATCHNAME="gentoo-${P}"

-

-# 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 cgi cgid 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 proxy_scgi rewrite

-reqtimeout setenvif speling status substitute unique_id userdir usertrack

-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

-	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

-	proxy_scgi: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

-

-src_prepare() {

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

-	epatch "${FILESDIR}"/httpd-2.2.16-ecc.diff

-	apache-2_src_prepare

-}

-

-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 ~sparc-fbsd ~x86-fbsd"

-IUSE=""

-

-DEPEND="${DEPEND}

-	>=dev-libs/openssl-0.9.8m

-	apache2_modules_deflate? ( sys-libs/zlib )"

-

-RDEPEND="${RDEPEND}

-	>=dev-libs/openssl-0.9.8m

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

@@ -1,14 +0,0 @@

---- httpd-2.2.14/modules/ssl/ssl_engine_init.c.orig     2009-08-16 

-17:53:12.000000000 +0200

-+++ httpd-2.2.14/modules/ssl/ssl_engine_init.c  2009-10-21 18:49:05.000000000 

-+0200

-@@ -382,6 +382,8 @@ static void ssl_init_ctx_tls_extensions(

-         ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s);

-         ssl_die();

-     }

-+

-+    SSL_CTX_set_options(mctx->ssl_ctx, SSL_OP_NO_TICKET);

- }

- #endif

- 

-

@@ -1,380 +0,0 @@

-# httpd-2.2.x-sni.patch - server name indication support for Apache 2.2

-# (see RFC 4366, "Transport Layer Security (TLS) Extensions")

-

-# based on a patch from the EdelKey project

-# (http://www.edelweb.fr/EdelKey/files/apache-2.2.0+0.9.9+servername.patch)

-

-# Needs openssl-SNAP-20060330 / OpenSSL 0.9.8f or later

-# to work properly (ftp://ftp.openssl.org/snapshot/). The 0.9.8 versions

-# must be configured explicitly for TLS extension support at compile time

-# ("./config enable-tlsext").

-

-Index: httpd-2.2.x/modules/ssl/ssl_private.h

-===================================================================

---- httpd-2.2.x/modules/ssl/ssl_private.h	(revision 663014)

-+++ httpd-2.2.x/modules/ssl/ssl_private.h	(working copy)

-@@ -35,6 +35,7 @@

- #include "http_connection.h"

- #include "http_request.h"

- #include "http_protocol.h"

-+#include "http_vhost.h"

- #include "util_script.h"

- #include "util_filter.h"

- #include "util_ebcdic.h"

-@@ -555,6 +556,9 @@ int          ssl_callback_NewSessionCach

- SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);

- void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);

- void         ssl_callback_LogTracingState(MODSSL_INFO_CB_ARG_TYPE, int, int);

-+#ifndef OPENSSL_NO_TLSEXT

-+int          ssl_callback_ServerNameIndication(SSL *, int *, modssl_ctx_t *);

-+#endif

- 

- /**  Session Cache Support  */

- void         ssl_scache_init(server_rec *, apr_pool_t *);

-Index: httpd-2.2.x/modules/ssl/ssl_engine_init.c

-===================================================================

---- httpd-2.2.x/modules/ssl/ssl_engine_init.c	(revision 663014)

-+++ httpd-2.2.x/modules/ssl/ssl_engine_init.c	(working copy)

-@@ -355,6 +355,33 @@ static void ssl_init_server_check(server

-     }

- }

- 

-+#ifndef OPENSSL_NO_TLSEXT

-+static void ssl_init_ctx_tls_extensions(server_rec *s,

-+                                        apr_pool_t *p,

-+                                        apr_pool_t *ptemp,

-+                                        modssl_ctx_t *mctx)

-+{

-+    /*

-+     * Configure TLS extensions support

-+     */

-+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,

-+                 "Configuring TLS extension handling");

-+

-+    /*

-+     * Server name indication (SNI)

-+     */

-+    if (!SSL_CTX_set_tlsext_servername_callback(mctx->ssl_ctx,

-+                          ssl_callback_ServerNameIndication) ||

-+        !SSL_CTX_set_tlsext_servername_arg(mctx->ssl_ctx, mctx)) {

-+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,

-+                     "Unable to initialize TLS servername extension "

-+                     "callback (incompatible OpenSSL version?)");

-+        ssl_log_ssl_error(APLOG_MARK, APLOG_ERR, s);

-+        ssl_die();

-+    }

-+}

-+#endif

-+

- static void ssl_init_ctx_protocol(server_rec *s,

-                                   apr_pool_t *p,

-                                   apr_pool_t *ptemp,

-@@ -687,6 +714,9 @@ static void ssl_init_ctx(server_rec *s,

-     if (mctx->pks) {

-         /* XXX: proxy support? */

-         ssl_init_ctx_cert_chain(s, p, ptemp, mctx);

-+#ifndef OPENSSL_NO_TLSEXT

-+        ssl_init_ctx_tls_extensions(s, p, ptemp, mctx);

-+#endif

-     }

- }

- 

-@@ -1036,9 +1066,19 @@ void ssl_init_CheckServers(server_rec *b

-         klen = strlen(key);

- 

-         if ((ps = (server_rec *)apr_hash_get(table, key, klen))) {

--            ap_log_error(APLOG_MARK, APLOG_WARNING, 0,

-+            ap_log_error(APLOG_MARK, 

-+#ifdef OPENSSL_NO_TLSEXT

-+                         APLOG_WARNING, 

-+#else

-+                         APLOG_DEBUG, 

-+#endif

-+                         0,

-                          base_server,

-+#ifdef OPENSSL_NO_TLSEXT

-                          "Init: SSL server IP/port conflict: "

-+#else

-+                         "Init: SSL server IP/port overlap: "

-+#endif

-                          "%s (%s:%d) vs. %s (%s:%d)",

-                          ssl_util_vhostid(p, s),

-                          (s->defn_name ? s->defn_name : "unknown"),

-@@ -1055,8 +1095,14 @@ void ssl_init_CheckServers(server_rec *b

- 

-     if (conflict) {

-         ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server,

-+#ifdef OPENSSL_NO_TLSEXT

-                      "Init: You should not use name-based "

-                      "virtual hosts in conjunction with SSL!!");

-+#else

-+                     "Init: Name-based SSL virtual hosts only "

-+                     "work for clients with TLS server name indication "

-+                     "support (RFC 4366)");

-+#endif

-     }

- }

- 

-Index: httpd-2.2.x/modules/ssl/ssl_engine_vars.c

-===================================================================

---- httpd-2.2.x/modules/ssl/ssl_engine_vars.c	(revision 663014)

-+++ httpd-2.2.x/modules/ssl/ssl_engine_vars.c	(working copy)

-@@ -320,6 +320,12 @@ static char *ssl_var_lookup_ssl(apr_pool

-     else if (ssl != NULL && strcEQ(var, "COMPRESS_METHOD")) {

-         result = ssl_var_lookup_ssl_compress_meth(ssl);

-     }

-+#ifndef OPENSSL_NO_TLSEXT

-+    else if (ssl != NULL && strcEQ(var, "TLS_SNI")) {

-+        result = apr_pstrdup(p, SSL_get_servername(ssl,

-+                                                   TLSEXT_NAMETYPE_host_name));

-+    }

-+#endif

-     return result;

- }

- 

-Index: httpd-2.2.x/modules/ssl/ssl_engine_kernel.c

-===================================================================

---- httpd-2.2.x/modules/ssl/ssl_engine_kernel.c	(revision 663014)

-+++ httpd-2.2.x/modules/ssl/ssl_engine_kernel.c	(working copy)

-@@ -31,6 +31,9 @@

- #include "ssl_private.h"

- 

- static void ssl_configure_env(request_rec *r, SSLConnRec *sslconn);

-+#ifndef OPENSSL_NO_TLSEXT

-+static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s);

-+#endif

- 

- /*

-  *  Post Read Request Handler

-@@ -39,6 +42,9 @@ int ssl_hook_ReadReq(request_rec *r)

- {

-     SSLConnRec *sslconn = myConnConfig(r->connection);

-     SSL *ssl;

-+#ifndef OPENSSL_NO_TLSEXT

-+    const char *servername;

-+#endif

- 

-     if (!sslconn) {

-         return DECLINED;

-@@ -87,6 +93,14 @@ int ssl_hook_ReadReq(request_rec *r)

-     if (!ssl) {

-         return DECLINED;

-     }

-+#ifndef OPENSSL_NO_TLSEXT

-+    if (!r->hostname &&

-+        (servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name))) {

-+        /* Use the SNI extension as the hostname if no Host: header was sent */

-+        r->hostname = apr_pstrdup(r->pool, servername);

-+        ap_update_vhost_from_headers(r);

-+    }

-+#endif

-     SSL_set_app_data2(ssl, r);

- 

-     /*

-@@ -353,6 +367,11 @@ int ssl_hook_Access(request_rec *r)

-      * currently active/remembered verify depth (because this means more

-      * restriction on the certificate chain).

-      */

-+    if ((sc->server->auth.verify_depth != UNSET) &&

-+        (dc->nVerifyDepth == UNSET)) {

-+        /* apply per-vhost setting, if per-directory config is not set */

-+        dc->nVerifyDepth = sc->server->auth.verify_depth;

-+    }

-     if (dc->nVerifyDepth != UNSET) {

-         /* XXX: doesnt look like sslconn->verify_depth is actually used */

-         if (!(n = sslconn->verify_depth)) {

-@@ -382,6 +401,11 @@ int ssl_hook_Access(request_rec *r)

-      * verification but at least skip the I/O-intensive renegotation

-      * handshake.

-      */

-+    if ((sc->server->auth.verify_mode != SSL_CVERIFY_UNSET) &&

-+        (dc->nVerifyClient == SSL_CVERIFY_UNSET)) {

-+        /* apply per-vhost setting, if per-directory config is not set */

-+        dc->nVerifyClient = sc->server->auth.verify_mode;

-+    }

-     if (dc->nVerifyClient != SSL_CVERIFY_UNSET) {

-         /* remember old state */

-         verify_old = SSL_get_verify_mode(ssl);

-@@ -997,6 +1021,9 @@ int ssl_hook_Fixup(request_rec *r)

-     SSLDirConfigRec *dc = myDirConfig(r);

-     apr_table_t *env = r->subprocess_env;

-     char *var, *val = "";

-+#ifndef OPENSSL_NO_TLSEXT

-+    const char *servername;

-+#endif

-     STACK_OF(X509) *peer_certs;

-     SSL *ssl;

-     int i;

-@@ -1018,6 +1045,13 @@ int ssl_hook_Fixup(request_rec *r)

-     /* the always present HTTPS (=HTTP over SSL) flag! */

-     apr_table_setn(env, "HTTPS", "on");

- 

-+#ifndef OPENSSL_NO_TLSEXT

-+    /* add content of SNI TLS extension (if supplied with ClientHello) */

-+    if ((servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name))) {

-+        apr_table_set(env, "SSL_TLS_SNI", servername);

-+    }

-+#endif

-+

-     /* standard SSL environment variables */

-     if (dc->nOptions & SSL_OPT_STDENVVARS) {

-         for (i = 0; ssl_hook_Fixup_vars[i]; i++) {

-@@ -1810,3 +1844,141 @@ void ssl_callback_LogTracingState(MODSSL

-     }

- }

- 

-+#ifndef OPENSSL_NO_TLSEXT

-+/*

-+ * This callback function is executed when OpenSSL encounters an extended

-+ * client hello with a server name indication extension ("SNI", cf. RFC 4366).

-+ */

-+int ssl_callback_ServerNameIndication(SSL *ssl, int *al, modssl_ctx_t *mctx)

-+{

-+    const char *servername =

-+                SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);

-+

-+    if (servername) {

-+        conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);

-+        if (c) {

-+            if (ap_vhost_iterate_given_conn(c, ssl_find_vhost,

-+                                            (void *)servername)) {

-+                ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,

-+                              "SSL virtual host for servername %s found",

-+                              servername);

-+                return SSL_TLSEXT_ERR_OK;

-+            }

-+            else {

-+                ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c,

-+                              "No matching SSL virtual host for servername "

-+                              "%s found (using default/first virtual host)",

-+                              servername);

-+                return SSL_TLSEXT_ERR_ALERT_WARNING;

-+            }

-+        }

-+    }

-+

-+    return SSL_TLSEXT_ERR_NOACK;

-+}

-+

-+/*

-+ * Find a (name-based) SSL virtual host where either the ServerName

-+ * or one of the ServerAliases matches the supplied name (to be used

-+ * with ap_vhost_iterate_given_conn())

-+ */

-+static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s) 

-+{

-+    SSLSrvConfigRec *sc;

-+    SSL *ssl;

-+    BOOL found = FALSE;

-+    apr_array_header_t *names;

-+    int i;

-+

-+    /* check ServerName */

-+    if (!strcasecmp(servername, s->server_hostname)) {

-+        found = TRUE;

-+    }

-+

-+    /* 

-+     * if not matched yet, check ServerAlias entries

-+     * (adapted from vhost.c:matches_aliases())

-+     */

-+    if (!found) {

-+        names = s->names;

-+        if (names) {

-+            char **name = (char **)names->elts;

-+            for (i = 0; i < names->nelts; ++i) {

-+                if (!name[i])

-+                    continue;

-+                if (!strcasecmp(servername, name[i])) {

-+                    found = TRUE;

-+                    break;

-+                }

-+            }

-+        }

-+    }

-+

-+    /* if still no match, check ServerAlias entries with wildcards */

-+    if (!found) {

-+        names = s->wild_names;

-+        if (names) {

-+            char **name = (char **)names->elts;

-+            for (i = 0; i < names->nelts; ++i) {

-+                if (!name[i])

-+                    continue;

-+                if (!ap_strcasecmp_match(servername, name[i])) {

-+                    found = TRUE;

-+                    break;

-+                }

-+            }

-+        }

-+    }

-+

-+    /* set SSL_CTX (if matched) */

-+    if (found && (ssl = ((SSLConnRec *)myConnConfig(c))->ssl) &&

-+        (sc = mySrvConfig(s))) {

-+        SSL_set_SSL_CTX(ssl, sc->server->ssl_ctx);

-+        /*

-+         * SSL_set_SSL_CTX() only deals with the server cert,

-+         * so we need to duplicate a few additional settings

-+         * from the ctx by hand

-+         */

-+        SSL_set_options(ssl, SSL_CTX_get_options(ssl->ctx));

-+        if ((SSL_get_verify_mode(ssl) == SSL_VERIFY_NONE) ||

-+            (SSL_num_renegotiations(ssl) == 0)) {

-+           /*

-+            * Only initialize the verification settings from the ctx

-+            * if they are not yet set, or if we're called when a new

-+            * SSL connection is set up (num_renegotiations == 0).

-+            * Otherwise, we would possibly reset a per-directory

-+            * configuration which was put into effect by ssl_hook_Access.

-+            */

-+            SSL_set_verify(ssl, SSL_CTX_get_verify_mode(ssl->ctx),

-+                           SSL_CTX_get_verify_callback(ssl->ctx));

-+        }

-+

-+        /*

-+         * We also need to make sure that the correct mctx

-+         * (accessed through the c->base_server->module_config vector)

-+         * is assigned to the connection - the CRL callback e.g.

-+         * makes use of it for retrieving its store (mctx->crl).

-+         * Since logging in callbacks uses c->base_server in many

-+         * cases, it also ensures that these messages are routed

-+         * to the proper log.

-+         */

-+        c->base_server = s;

-+

-+        /*

-+         * There is one special filter callback, which is set

-+         * very early depending on the base_server's log level.

-+         * If this is not the first vhost we're now selecting

-+         * (and the first vhost doesn't use APLOG_DEBUG), then

-+         * we need to set that callback here.

-+         */

-+        if (c->base_server->loglevel >= APLOG_DEBUG) {

-+            BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);

-+            BIO_set_callback_arg(SSL_get_rbio(ssl), (void *)ssl);

-+        }

-+

-+        return 1;

-+    }

-+

-+    return 0;

-+}

-+#endif

-Index: httpd-2.2.x/modules/ssl/ssl_toolkit_compat.h

-===================================================================

---- httpd-2.2.x/modules/ssl/ssl_toolkit_compat.h	(revision 663014)

-+++ httpd-2.2.x/modules/ssl/ssl_toolkit_compat.h	(working copy)

-@@ -264,6 +264,12 @@ typedef void (*modssl_popfree_fn)(char *

- #define SSL_SESS_CACHE_NO_INTERNAL  SSL_SESS_CACHE_NO_INTERNAL_LOOKUP

- #endif

- 

-+#ifndef OPENSSL_NO_TLSEXT

-+#ifndef SSL_CTRL_SET_TLSEXT_HOSTNAME

-+#define OPENSSL_NO_TLSEXT

-+#endif

-+#endif

-+

- #endif /* SSL_TOOLKIT_COMPAT_H */

- 

- /** @} */