From af63ce376223b0b2382c6f883804b9ee3bd7f210 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 19 Jan 2008 19:42:15 +0000 Subject: [PATCH] www-servers/apache: bump git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@347 6952d904-891a-0410-993b-d76249ca496b --- www-servers/apache/ChangeLog | 3 + www-servers/apache/Manifest | 17 +- www-servers/apache/apache-2.2.8-r100.ebuild | 177 ++++++++++++++++++ .../apache/files/digest-apache-2.2.8-r100 | 6 + 4 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 www-servers/apache/apache-2.2.8-r100.ebuild create mode 100644 www-servers/apache/files/digest-apache-2.2.8-r100 diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index af71f380..b7016b37 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Jan 2008; Mario Fetka +apache-2.2.8-r100.ebuild: + bump + 16 Jan 2008; Mario Fetka apache-2.2.6-r107.ebuild: correct IUSE mozldap diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index 454adf94..68adc9af 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -6,7 +6,9 @@ DIST gentoo-apache-2.2.6-r102-20071020.tar.bz2 58752 RMD160 705f6913612dd02b21e0 DIST gentoo-apache-2.2.6-r103-20071110.tar.bz2 61229 RMD160 8ed21ba3d8abb74711fb58498c063de7ed4cadf9 SHA1 34e6eafac4fd08416034f04acde092d47aadf9bc SHA256 1ddb42d76ac4f7deaef42fe5e8b5e6f4a410c6d1f53e64fef84ea58ae03d3d84 DIST gentoo-apache-2.2.6-r107-20080107.tar.bz2 61517 RMD160 8eb40ba3b664d522f331f549b7ae1affbf6bfa31 SHA1 4c43183a69acb8fb41ffcf1f60318596d217d49f SHA256 936c7393bdec160e57a11e43b0de0c08378a8fe4cdaa5ba424d369c8d5950e45 DIST gentoo-apache-2.2.6-r99-20070921.tar.bz2 58066 RMD160 85285c079b6e975c2bfcd8b8ed8070ae6f8ee7cb SHA1 fb3f091b2e5a3cfab912535c50b5286bd65b813a SHA256 d10754cb517ea68a717e5da6bb5897b103a3e5ac864e99ada8e35c69e1da9c89 +DIST gentoo-apache-2.2.8-r100-20080119.tar.bz2 60365 RMD160 8713e314c2813d332a20717b5e792954b3d1b18a SHA1 37e6ae8b93c432c89c9c6350bf2f81bad8aa4962 SHA256 a0876fbcd7892b24cd22ba0f13cc04b023beeae4db7bc558c910c70e8d751453 DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c +DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39 EBUILD apache-2.2.6-r102.ebuild 16331 RMD160 feb61aae899968d8e4f85187e05ca66d2f78c679 SHA1 b203f3caa5ff19826c6b2c5e3efe1f48af22902a SHA256 39160a715f18abf318a01574884d773ddfab32a0c218ffceba3238653ea8715a MD5 9172f6c426d98505ed01dfed8a7ac5e5 apache-2.2.6-r102.ebuild 16331 RMD160 feb61aae899968d8e4f85187e05ca66d2f78c679 apache-2.2.6-r102.ebuild 16331 @@ -23,10 +25,14 @@ EBUILD apache-2.2.6-r99.ebuild 16198 RMD160 c65320efc11db2097567991a198981c74462 MD5 ec61850f97c4061bf1e91de3947bddcd apache-2.2.6-r99.ebuild 16198 RMD160 c65320efc11db2097567991a198981c7446284b6 apache-2.2.6-r99.ebuild 16198 SHA256 be5295da5ede9286b52b2a1f8e167a13814b21abef6d5759fe2ec13abde4e6d4 apache-2.2.6-r99.ebuild 16198 -MISC ChangeLog 709 RMD160 6a6da40f150e41b32f95fb42f98669385536af94 SHA1 fdc5aacd1a92b97c39ac05fe4b4ac5d9535fb675 SHA256 89a25fa6862a5f472f9ef477b692c7ff5b3eab2de518acda761f1de095f712d7 -MD5 3ceae24a78193a46568d2b40ed0672c2 ChangeLog 709 -RMD160 6a6da40f150e41b32f95fb42f98669385536af94 ChangeLog 709 -SHA256 89a25fa6862a5f472f9ef477b692c7ff5b3eab2de518acda761f1de095f712d7 ChangeLog 709 +EBUILD apache-2.2.8-r100.ebuild 5190 RMD160 c4ee16ea7667880e4f3e36e9958dbd6f407bf0c6 SHA1 97213d7196760b83cb69d93f7000727859329b6d SHA256 2f3dafa86dc1914df9dad249e5f9207b9911d259cc480c7376eb31a34e642863 +MD5 fb4b612e6a6f7452d881240da0094952 apache-2.2.8-r100.ebuild 5190 +RMD160 c4ee16ea7667880e4f3e36e9958dbd6f407bf0c6 apache-2.2.8-r100.ebuild 5190 +SHA256 2f3dafa86dc1914df9dad249e5f9207b9911d259cc480c7376eb31a34e642863 apache-2.2.8-r100.ebuild 5190 +MISC ChangeLog 792 RMD160 0a481003eb0847b0191623c7a6f5ad109f0afc35 SHA1 9bed3e5fd8c3db25d0f6a56edd19a659a0f0881c SHA256 78e50fd44ada47ef9b93bace60f4cff966f067337e5cc15ecffcbfcc5dfd88cd +MD5 ac90d42268a0449cc4e888d84c642e70 ChangeLog 792 +RMD160 0a481003eb0847b0191623c7a6f5ad109f0afc35 ChangeLog 792 +SHA256 78e50fd44ada47ef9b93bace60f4cff966f067337e5cc15ecffcbfcc5dfd88cd ChangeLog 792 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -43,3 +49,6 @@ SHA256 678b03595c22405cb78f306091e38e307d850ebe2c0db34f123306d1f3c53cab files/di MD5 5e923f52ede7540a4d8e7fdcefe76042 files/digest-apache-2.2.6-r99 539 RMD160 44b0718fbe6d485d1601a1eb2dc946908e8353d7 files/digest-apache-2.2.6-r99 539 SHA256 76d37e10679163de4e46ffbb1f69112f5403f6271d0e6bc225bb6163e131dd5d files/digest-apache-2.2.6-r99 539 +MD5 88d3f45166d6efaad7ae355c97e2e0c0 files/digest-apache-2.2.8-r100 542 +RMD160 bc54a17943b3881bec5307a869e1bbc27aabc6eb files/digest-apache-2.2.8-r100 542 +SHA256 406bcf7abae68a3d497a134ed399aa3d32fd76fa31344635115d4044d8772891 files/digest-apache-2.2.8-r100 542 diff --git a/www-servers/apache/apache-2.2.8-r100.ebuild b/www-servers/apache/apache-2.2.8-r100.ebuild new file mode 100644 index 00000000..e77c0c72 --- /dev/null +++ b/www-servers/apache/apache-2.2.8-r100.ebuild @@ -0,0 +1,177 @@ +# 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.1 2008/01/19 10:56:36 hollow 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 mozldap" + +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_postinst() { + apache-2_pkg_postinst + + # previous installations of apache-2.2 installed the upstream configuration + # files, which shouldn't even have been installed! + if has_version '>=www-servers/apache-2.2.4' ; 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 has_version '