diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2008-08-29 13:31:04 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2008-08-29 13:31:04 +0000 |
commit | 5f69508921db70e9ba312f0e4d556861556dbb39 (patch) | |
tree | 34b632d9580fedcd60949eb2769f905ff1ddb61f /www-servers | |
parent | remove unsupported --with-perl; add message for BSD users (diff) | |
download | historical-5f69508921db70e9ba312f0e4d556861556dbb39.tar.gz historical-5f69508921db70e9ba312f0e4d556861556dbb39.tar.bz2 historical-5f69508921db70e9ba312f0e4d556861556dbb39.zip |
fix #230690, #232083, #234088, #235152
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.22-vs2.2.0.6-gentoo x86_64
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/apache/ChangeLog | 7 | ||||
-rw-r--r-- | www-servers/apache/Manifest | 14 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.9-r1.ebuild | 110 |
3 files changed, 119 insertions, 12 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 871997a4e258..3d0ecf4f5639 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,11 @@ # 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.83 2008/08/22 22:21:41 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.84 2008/08/29 13:31:04 hollow Exp $ + +*apache-2.2.9-r1 (29 Aug 2008) + + 29 Aug 2008; Benedikt Böhm <hollow@gentoo.org> +apache-2.2.9-r1.ebuild: + fix #230690, #232083, #234088, #235152 22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: add GLEP 56 USE flag desc from use.local.desc diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 28897729c7d6..1e25ea0e1c13 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,22 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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.9-r1-20080829.tar.bz2 60376 RMD160 0133e1d06417079f10941f52ef839c05b242d634 SHA1 fdeed5aea3a34fcd5b138612e0e58496dd4f9820 SHA256 6f8724a61e5c304b8f16e5d07a71adeece63511bd976aaee6e191d59fed24324 DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39 DIST httpd-2.2.9.tar.bz2 4943462 RMD160 8fd62ae78271aa0ded6ba2f5bfeea8c63b79060a SHA1 71715d81e7a5ace4499803df7369c78b85251083 SHA256 d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61 EBUILD apache-2.2.8-r3.ebuild 5580 RMD160 c608b5208169d4f7ba2d14db10e5ba7613cd5fb7 SHA1 758a746fc2a0fbc1b3280ddf09c1cadb6041b1ef SHA256 02153c8ca731edb22f5cea6d56c8229267ae1df14afc88b072ac08478ce5d9e9 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.9-r1.ebuild 2765 RMD160 fb29cab3e16bb4c0cc1149592357d26f7b2c6173 SHA1 d9891ddd31ed8483e703b690c6d973518525a962 SHA256 7c6927ec1e163ed84a2e2e2e07d752df32f274ae24dc41bc22c1701f8610b75f EBUILD apache-2.2.9.ebuild 2754 RMD160 49d014456d4d8e3fb21b69c7986bf48b35e6e0d0 SHA1 988473476632cf4984fce57d39542c6e3c172f79 SHA256 e1f1a4ac794cf0ff3201c57452f52aced54f96aea1d644e7f789ed711cd9ec3b -MISC ChangeLog 104199 RMD160 1f023d6e4b21b7ec7955e903cb5ed23e1ef6caa0 SHA1 3a1fe51b4b6c134ec459fc0cbda7c686c1eaff1c SHA256 3f5ece6ff632485a1a38fb3650e55788484bebe31371505a1c786f265d0141b8 +MISC ChangeLog 104348 RMD160 0f0fc9c7dd76157298fd856d25892c7225c613ce SHA1 a5bf73c86d9ad52a453bf19f07494633dd22ef6f SHA256 db912a2fff20a19f25f47008426739d69c81bf68a57b28db373b8e98ba0d8c1f MISC metadata.xml 707 RMD160 677af9851f39ffbce95448b9dcca095ec30724a1 SHA1 8354b35e30c99bda1312ed0c2a0cdb630c8a17ff SHA256 dd3c8b528c6623fd9d9ab521471c5b6d775fb78fdd00f1b200b18b6ee95e150d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkivO/oACgkQoeSe8B0zEfyasACfYmJW6NIoMWFVOTRvhWkylXQA -5ysAmgK9l5eiBCGhGpuTeNA+zRy+UQ2a -=+jOz ------END PGP SIGNATURE----- diff --git a/www-servers/apache/apache-2.2.9-r1.ebuild b/www-servers/apache/apache-2.2.9-r1.ebuild new file mode 100644 index 000000000000..3ceb5d6b3f54 --- /dev/null +++ b/www-servers/apache/apache-2.2.9-r1.ebuild @@ -0,0 +1,110 @@ +# 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-r1.ebuild,v 1.1 2008/08/29 13:31:04 hollow Exp $ + +# latest gentoo apache files +GENTOO_PATCHSTAMP="20080829" +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() { + # 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 +} |