diff options
| -rw-r--r-- | www-servers/apache/ChangeLog | 11 | ||||
| -rw-r--r-- | www-servers/apache/Manifest | 24 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.2.11.ebuild (renamed from www-servers/apache/apache-2.2.9.ebuild) | 8 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.2.8-r3.ebuild | 195 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.2.8-r4.ebuild | 195 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.2.8.ebuild | 194 |
6 files changed, 17 insertions, 610 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 9aa76471e1e1..74a7afb6c5b4 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-servers/apache -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.91 2008/10/25 14:42:49 hollow Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.92 2009/01/01 13:54:58 hollow Exp $ + +*apache-2.2.11 (01 Jan 2009) + + 01 Jan 2009; Benedikt Böhm <hollow@gentoo.org> -apache-2.2.8.ebuild, + -apache-2.2.8-r3.ebuild, -apache-2.2.8-r4.ebuild, -apache-2.2.9.ebuild, + +apache-2.2.11.ebuild: + version bump wrt #251342; also fixes #252363, #252194 *apache-2.2.10 (25 Oct 2008) diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 88acbe7a5390..7f0fc1b1cf0c 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,27 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST gentoo-apache-2.2.10-20081025.tar.bz2 60296 RMD160 bc6d9e05a5924cf104e0a07b18ab6c9da526a1dc SHA1 f3ea7bda13b57b9f622890b2d9288cb096472a96 SHA256 e7704ac9a645bb722d8063735c7de17a4041d76cc72244fc928a0a5ad1ee1ccd -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 gentoo-apache-2.2.8-r4-20080611.tar.bz2 60580 RMD160 81b0713d86f2856670fb75999f8e248a9c71622e SHA1 ed0ad64cf7eef057e23515571d4b6a3111e6fc01 SHA256 48509b3846c04c9c31db00a7d2a98a8156e839f895635ad398f84e73ce9e91c7 -DIST gentoo-apache-2.2.9-20080615.tar.bz2 60183 RMD160 924b6268324aa679b5ff624ece159dad323028aa SHA1 6c8e053a33a561df2417e718803b65f7ac55b640 SHA256 c3bb95e339d7bdfdcd3bd71927287843df0d34ad2740ddc7913cbb0200fc8072 +DIST gentoo-apache-2.2.11-20090101.tar.bz2 60721 RMD160 2a2342bcff3778f44ecb148c333da49f71b5ed57 SHA1 6bb963fa73bf2c26d89dc6b808454d1541f103db SHA256 88a24a6e600024386db5cfd704b11cd7a408ba6ef067a2ffe2dc0923993149ca DIST gentoo-apache-2.2.9-r1-20080829.tar.bz2 60376 RMD160 0133e1d06417079f10941f52ef839c05b242d634 SHA1 fdeed5aea3a34fcd5b138612e0e58496dd4f9820 SHA256 6f8724a61e5c304b8f16e5d07a71adeece63511bd976aaee6e191d59fed24324 DIST httpd-2.2.10.tar.bz2 5068069 RMD160 30f240222a775efa14b104a2b8df1e1dc65f4b8a SHA1 3a71f4904e359603c3338b07a1178ddfacfaa8c6 SHA256 681d5787288e4e527877f415acce198be96ce7de0dc6e354646b1df4aae21383 -DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39 +DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61 EBUILD apache-2.2.10.ebuild 2763 RMD160 4ccf7783540632e5966a35ab987473f86d0afffe SHA1 1acf4811b5cc31e3e67895efbae71dc85720d9ba SHA256 78ef0e392db5aa82bf95a5f58a9713a697c2e40a9d58720f833e50ae69756351 -EBUILD apache-2.2.8-r3.ebuild 5577 RMD160 4419dc4ae639acca1a64406384adb2ae95e4fbc6 SHA1 043dea9a5ec336df862e25c14437e5b736584013 SHA256 b3a6695936d1b9a91f54ae81c0c8eeefbe68b8312e80dbab76911545635e6680 -EBUILD apache-2.2.8-r4.ebuild 5588 RMD160 21e69bf007a79785150a6e8303e638db5317a6c4 SHA1 eb42962370f7b213c385b3bfb22cd97d34b6d3c6 SHA256 74a60193269b6e6fcfe2f1212205731a65658ed7233a9543b6d07429336adb50 -EBUILD apache-2.2.8.ebuild 5508 RMD160 11127bc5789faf304e3edd620db3ae3d91eba420 SHA1 6340e4ee01aacb8a95b971f75d57de6a512f07e9 SHA256 298ce4a20742f73a9400675acba2d2671828b150ce1e4de2b38919a35d50c049 +EBUILD apache-2.2.11.ebuild 2763 RMD160 3fcb0b0243356be980410edbab089fd7e112da14 SHA1 71c3ae814f1f682c791357695e95fd6caac29396 SHA256 52861ef373eed39be2deff06c67f9052c817a83a085151c3807cdcac5e878be9 EBUILD apache-2.2.9-r1.ebuild 2754 RMD160 39933201be3e40daf3c7b1b903bda3424b16b3e9 SHA1 aac23bb3fd4bd5101c9eb9becfb0d872f3b31a75 SHA256 bb3bcce3aa230379298915588504dd28c00aab4e444ee1c3aa7d12c161902f9b -EBUILD apache-2.2.9.ebuild 2751 RMD160 2014a004faf71a39f34fb843d5987de33ddd0563 SHA1 053303909c492c94fd9399ceb5c327ae1725bec2 SHA256 751ecf752a0480ecc81bea0e881c3ce37b255a0bf71e6d9f5222bb080cf00a30 -MISC ChangeLog 105130 RMD160 1c39188e7bbe0672e20c893c0f79160dad8ea9eb SHA1 1cb87f80886227c03195880b03af282e4c7219a3 SHA256 c202f3d85520b638ab95f20dbdce282462a95c0b59967b97c557030a49fdc240 +MISC ChangeLog 105388 RMD160 7ac4d8857a68842482fad8122de67e12a761ba45 SHA1 f6f0e0c1b4629dca9bdd55c571828a9abc1a6df8 SHA256 20ad55d074969cf579c5822cee39ba35c3fa19a44305a82d2c6acb9041fa6ed9 MISC metadata.xml 707 RMD160 677af9851f39ffbce95448b9dcca095ec30724a1 SHA1 8354b35e30c99bda1312ed0c2a0cdb630c8a17ff SHA256 dd3c8b528c6623fd9d9ab521471c5b6d775fb78fdd00f1b200b18b6ee95e150d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkkQ69AACgkQ67wieSYcaxcndACgpVmSuNjP49K640RXltZO0YQu -/p0AoOnkJgCrz/5SFchKsnQ+z1rXQ/H8 -=MGuC ------END PGP SIGNATURE----- diff --git a/www-servers/apache/apache-2.2.9.ebuild b/www-servers/apache/apache-2.2.11.ebuild index 80f9c38770fc..1410490c91f8 100644 --- a/www-servers/apache/apache-2.2.9.ebuild +++ b/www-servers/apache/apache-2.2.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 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.9 2008/11/05 00:41:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.11.ebuild,v 1.1 2009/01/01 13:54:58 hollow Exp $ # latest gentoo apache files -GENTOO_PATCHSTAMP="20080615" +GENTOO_PATCHSTAMP="20090101" GENTOO_DEVELOPER="hollow" # IUSE/USE_EXPAND magic @@ -80,7 +80,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="sni" DEPEND="${DEPEND} diff --git a/www-servers/apache/apache-2.2.8-r3.ebuild b/www-servers/apache/apache-2.2.8-r3.ebuild deleted file mode 100644 index dfba9104458d..000000000000 --- a/www-servers/apache/apache-2.2.8-r3.ebuild +++ /dev/null @@ -1,195 +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-r3.ebuild,v 1.10 2008/11/05 00:41:50 vapier Exp $ - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20080601" -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 -} - -pkg_preinst() { - has_version ">=${CATEGORY}/${PN}-2.2.4" - remove_upstream_configs=$? - - has_version "<${CATEGORY}/${PN}-2.2.6-r1" - auth_ldap_define_changed=$? - - has_version "<${CATEGORY}/${PN}-2.2.4-r7" - vhost_directives_moved=$? - - has_version "<${CATEGORY}/${PN}-2.2.4-r5" - config_layout_changed=$? - - has_version "<${CATEGORY}/${PN}-2.2.0" - previous_less_than_2_2_0=$? -} - -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 [[ $remove_upstream_configs = 0 ]] ; 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 [[ $auth_ldap_define_changed = 0 ]] ; 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 [[ $vhost_directives_moved = 0 ]] ; 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 [[ $config_layout_changed = 0 ]] ; 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 [[ $previous_less_than_2_2_0 = 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~" -} diff --git a/www-servers/apache/apache-2.2.8-r4.ebuild b/www-servers/apache/apache-2.2.8-r4.ebuild deleted file mode 100644 index 7cff1fe095d5..000000000000 --- a/www-servers/apache/apache-2.2.8-r4.ebuild +++ /dev/null @@ -1,195 +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-r4.ebuild,v 1.2 2008/06/14 13:13:42 zmedico Exp $ - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20080611" -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 -} - -pkg_preinst() { - has_version ">=${CATEGORY}/${PN}-2.2.4" - remove_upstream_configs=$? - - has_version "<${CATEGORY}/${PN}-2.2.6-r1" - auth_ldap_define_changed=$? - - has_version "<${CATEGORY}/${PN}-2.2.4-r7" - vhost_directives_moved=$? - - has_version "<${CATEGORY}/${PN}-2.2.4-r5" - config_layout_changed=$? - - has_version "<${CATEGORY}/${PN}-2.2.0" - previous_less_than_2_2_0=$? -} - -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 [[ $remove_upstream_configs = 0 ]] ; 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 [[ $auth_ldap_define_changed = 0 ]] ; 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 [[ $vhost_directives_moved = 0 ]] ; 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 [[ $config_layout_changed = 0 ]] ; 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 [[ $previous_less_than_2_2_0 = 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~" -} diff --git a/www-servers/apache/apache-2.2.8.ebuild b/www-servers/apache/apache-2.2.8.ebuild deleted file mode 100644 index 1df3ea3fcb02..000000000000 --- a/www-servers/apache/apache-2.2.8.ebuild +++ /dev/null @@ -1,194 +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.9 2008/06/14 13:13:42 zmedico 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 -} - -pkg_preinst() { - has_version ">=${CATEGORY}/${PN}-2.2.4" - remove_upstream_configs=$? - - has_version "<${CATEGORY}/${PN}-2.2.6-r1" - auth_ldap_define_changed=$? - - has_version "<${CATEGORY}/${PN}-2.2.4-r7" - vhost_directives_moved=$? - - has_version "<${CATEGORY}/${PN}-2.2.4-r5" - config_layout_changed=$? - - has_version "<${CATEGORY}/${PN}-2.2.0" - previous_less_than_2_2_0=$? -} - -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 [[ $remove_upstream_configs = 0 ]] ; 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 [[ $auth_ldap_define_changed = 0 ]] ; 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 [[ $vhost_directives_moved = 0 ]] ; 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 [[ $config_layout_changed = 0 ]] ; 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 [[ $previous_less_than_2_2_0 = 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~" -} |