diff options
author | Patrick Lauer <patrick@gentoo.org> | 2012-03-28 15:04:37 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2012-03-28 15:04:37 +0000 |
commit | bedb0685b29dd982a4247bfdfd5a545e2b1fdfbe (patch) | |
tree | b721330d39ac36fc4be74a0bd6259558d843af34 /www-servers | |
parent | Bump for #401761 (diff) | |
download | historical-bedb0685b29dd982a4247bfdfd5a545e2b1fdfbe.tar.gz historical-bedb0685b29dd982a4247bfdfd5a545e2b1fdfbe.tar.bz2 historical-bedb0685b29dd982a4247bfdfd5a545e2b1fdfbe.zip |
Bump for #401761. init script fix for #389965
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/apache/ChangeLog | 7 | ||||
-rw-r--r-- | www-servers/apache/Manifest | 5 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.22.ebuild | 109 |
3 files changed, 119 insertions, 2 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index 78bb422f05b9..6336f9b6b8b9 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/apache # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.177 2012/03/05 08:17:32 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.178 2012/03/28 15:04:37 patrick Exp $ + +*apache-2.2.22 (28 Mar 2012) + + 28 Mar 2012; Patrick Lauer <patrick@gentoo.org> +apache-2.2.22.ebuild: + Bump for #401761. init script fix for #389965 05 Mar 2012; Patrick Lauer <patrick@gentoo.org> apache-2.2.21-r1.ebuild, apache-2.2.21-r2.ebuild: diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 4a372ee2f9c4..03a94910fd3b 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,8 +1,11 @@ DIST gentoo-apache-2.2.21-r1-20111018.tar.bz2 64196 RMD160 fb3d4c1716ecf2763caef5f5d927d8276ebaca47 SHA1 347138d7738c6bbfc0eab1d520f101ac1bb0fa35 SHA256 8c78505a34184b526099db5edb36b6b4ab57b6d2a43eec537ca7984f94639ec7 DIST gentoo-apache-2.2.21-r2-20120213.tar.bz2 64529 RMD160 85a3c8a3c260a03f35c6d36e347176c5e7bd536e SHA1 e9c99bdf5d6bb1a51b0a4ca383ee41eab9f54290 SHA256 dfd8d83483681473efbd2aad5c0b3f3e76a62f8cba600e8bb75b745ed397d901 +DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 RMD160 d4d5ac58156e10cdbbfaeb3e7a7569bda81f6f7e SHA1 0c0e80bfddc0fb4b9df3b736239392be9fbc40fb SHA256 737730dabf1e1ccfe9d409067dc3c4d37d16f7fa1e792f5bf39268d904ce1c31 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.21-r1.ebuild 2754 RMD160 0aff5594a9a8d5155255eacc08463a4e4ac8d21a SHA1 46b377446354d5f139eb1f6572b108025267a3cc SHA256 fab891049f8d174c592348c6fff981a19908a79908fe039f390627d0d2fb9cc5 EBUILD apache-2.2.21-r2.ebuild 2711 RMD160 1debb13ca577ca8f799f15be22a22d1c0c484c0f SHA1 76f455ec29b823bb65ace1872409abbe45c5cf60 SHA256 3bfcafd961393ecdaeff2d596f53ac636dc5764da69f39cc20d72fec72fdc83f -MISC ChangeLog 12209 RMD160 d05738ba4d2db72177e7bebfe1e4ec654fd1d3da SHA1 e17eea2fd9c25bf0b597d924213f92b6856c72e9 SHA256 1d0aeb97fa42e9849a8bbbc50cd42bdc8280c26306bb60a2c0132eea77538124 +EBUILD apache-2.2.22.ebuild 2924 RMD160 3557e88a6db3cd6d207a1260168104a6f3db6a53 SHA1 eb568f9e24306527932195a29350cd91dd1260c9 SHA256 0305c431940938578cc591ab13a45bff73504df3b9ce7f66f0bbe248890fbd2b +MISC ChangeLog 12361 RMD160 773801c03561bd0850530d134251ad50e869fba2 SHA1 8294516aed94f1455ec5d3e90bf0ade0355e0697 SHA256 6f577ca3df67e96cb9cc3c02c47ba6942ee3fe5b8374cd3cca4be30e574db1dd MISC ChangeLog-2008 105137 RMD160 0ee2162a0e57feab08fd8ee0c04b43bcf63ba9b4 SHA1 28bc5fda825c08a5a2b1d03dbfbc128d083507cf SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf MISC metadata.xml 767 RMD160 3b4215160698916a68964b0bcbd63907fef5b124 SHA1 a27777ba897768cfbcebf7779a6cf8be2029ed9b SHA256 8378ce2aa8e0adbe9d7b2f093f115a11d0ec170c74232111b7f46bd692e5aa5c diff --git a/www-servers/apache/apache-2.2.22.ebuild b/www-servers/apache/apache-2.2.22.ebuild new file mode 100644 index 000000000000..cfb9cbfbd883 --- /dev/null +++ b/www-servers/apache/apache-2.2.22.ebuild @@ -0,0 +1,109 @@ +# 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.22.ebuild,v 1.1 2012/03/28 15:04:37 patrick Exp $ + +EAPI="2" + +# latest gentoo apache files +GENTOO_PATCHSTAMP="20120213" +GENTOO_DEVELOPER="jmbsvicetto" + +# 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 )" + + +# init script fixup - should be rolled into next tarball #389965 +src_prepare() { + apache-2_src_prepare + sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script" +} |