From: Benedikt Boehm Date: Sun, 7 Mar 2010 11:48:33 +0000 (+0000) Subject: version bump. fixes #293783, #294098, #295916 and #308049 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f338aae08c0f7867b4ace3e4fa843865029aa307;p=gentoo.git version bump. fixes #293783, #294098, #295916 and #308049 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 0a01d0ce1241..53f8d3434ce2 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/apache # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.128 2010/01/11 08:09:14 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.129 2010/03/07 11:48:33 hollow Exp $ + +*apache-2.2.15 (07 Mar 2010) + + 07 Mar 2010; Benedikt Böhm +apache-2.2.15.ebuild: + version bump. fixes #293783, #294098, #295916 and #308049 11 Jan 2010; Benedikt Böhm -apache-2.2.11-r2.ebuild, metadata.xml: diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index e3f0e3c6e61f..f12517099f0d 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,5 +1,8 @@ DIST gentoo-apache-2.2.14-r1-20091008.tar.bz2 62359 RMD160 0e78de9a61265be2ef797e02bce0cf89f0a5fd2a SHA1 357316581f7d7d289655992216be6c5f5342f32c SHA256 99db378884b33af1c97713f63d92f0bb1d02eef6dc1f8f47a9addd258b3f7233 +DIST gentoo-apache-2.2.15-20100307.tar.bz2 63716 RMD160 aa16c46ec930c020820293b884876946b81bd476 SHA1 20fa102d6094d00d3c874b0b1df69d0ddcf34339 SHA256 b3c4ca6eed24ea82ff37bfa331403b09c94f3b2a8b5b1058761651c6824787c1 DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6 +DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfdf SHA1 5f0e973839ed2e38a4d03adba109ef5ce3381bc2 SHA256 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7 EBUILD apache-2.2.14-r1.ebuild 2268 RMD160 7d889a8a82554e4aa7f512d8b5860b8bc8e3b3df SHA1 a0748f9e31319b0da47b2fd29398e615d8208079 SHA256 5403b4b520041ab1538bfefceca454a1fc38d7d095b20f3f2aec2b21816030b9 -MISC ChangeLog 109883 RMD160 23819c34b780527ef2abcb45b45a29721f9d7ad6 SHA1 36877b0a675eebd6e6e75b9e531c2572bf9eb11f SHA256 9d1141943bfa01b7e67776f2161ac91d7da2b83cd306de7f763aaa7d79d4f176 +EBUILD apache-2.2.15.ebuild 2274 RMD160 35c4732e3aa7e6f69fe06fca632eecea83933c01 SHA1 e312bdcdb9a4a0456ccbdd70fca31a19756815d1 SHA256 f6e2dca95e6e1fa54c00ced603c341a8c408adcb43a2dd5d36890b1ed7a430d5 +MISC ChangeLog 110047 RMD160 d0ca9a49c3dfc061dc117a789fcb042d67e99e77 SHA1 e903e21559897aeea592ffda7a2ea203d0b1c9da SHA256 0a3a4d691f939d58ac393860157e865b3b111de97c08a1b635968683e4a92d9c MISC metadata.xml 622 RMD160 217aba625932dbcfcb8bcee1f8a38e6f248e65a7 SHA1 1e7494fe8e49166c8b87a178aca78c9a658f92c7 SHA256 eb6d4f305a170e97bf29e5c6e9d1df6edea8fcdabd35ac2d99ebc8fe5bbd71b4 diff --git a/www-servers/apache/apache-2.2.15.ebuild b/www-servers/apache/apache-2.2.15.ebuild new file mode 100644 index 000000000000..19656ac5620d --- /dev/null +++ b/www-servers/apache/apache-2.2.15.ebuild @@ -0,0 +1,90 @@ +# 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.15.ebuild,v 1.1 2010/03/07 11:48:33 hollow Exp $ + +# latest gentoo apache files +GENTOO_PATCHSTAMP="20100307" +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 ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +DEPEND="${DEPEND} + apache2_modules_deflate? ( sys-libs/zlib )" + +RDEPEND="${RDEPEND} + apache2_modules_mime? ( app-misc/mime-types )"