From 60f80aad4f27f88ea75b992ae293d0f8eb54912b Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 13 Jan 2008 09:57:53 +0000 Subject: [PATCH] www-servers/apache: Bump mozpatch to new apache build system git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@325 6952d904-891a-0410-993b-d76249ca496b --- www-servers/apache/ChangeLog | 5 +- www-servers/apache/Manifest | 16 +- www-servers/apache/apache-2.2.6-r107.ebuild | 177 ++++++++++++++++++ .../apache/files/digest-apache-2.2.6-r107 | 6 + 4 files changed, 199 insertions(+), 5 deletions(-) create mode 100644 www-servers/apache/apache-2.2.6-r107.ebuild create mode 100644 www-servers/apache/files/digest-apache-2.2.6-r107 diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index d0b01695..6a573d07 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for www-servers/apache -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Jan 2008; Mario Fetka +apache-2.2.6-r107.ebuild: + Bump mozpatch to new apache build system + 11 Nov 2007; Mario Fetka files/apache-2.2.6-r102.patch, +apache-2.2.6-r103.ebuild: bump diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index cc594930..ad3766cb 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -4,6 +4,7 @@ RMD160 24d27bf6c9f9f7b6656d3bdbc72cdbf63d454250 files/apache-2.2.6-r102.patch 25 SHA256 8770598b10ba86dfac7ac414049e6367718cdcc75da8567fe2c5266e4fa10ffe files/apache-2.2.6-r102.patch 2593 DIST gentoo-apache-2.2.6-r102-20071020.tar.bz2 58752 RMD160 705f6913612dd02b21e0ce0399a80899be688ac2 SHA1 26bffdc3490261c8abd9826e8dc0934fd4f148ee SHA256 e208bd87a3cd0708ade1176bda1d5ea95c250dc1260c1a231b00ce32d4028467 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 httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c EBUILD apache-2.2.6-r102.ebuild 16331 RMD160 feb61aae899968d8e4f85187e05ca66d2f78c679 SHA1 b203f3caa5ff19826c6b2c5e3efe1f48af22902a SHA256 39160a715f18abf318a01574884d773ddfab32a0c218ffceba3238653ea8715a @@ -14,14 +15,18 @@ EBUILD apache-2.2.6-r103.ebuild 16331 RMD160 9bc077436e2dde5c8288717219a5b04447a MD5 236a72eb998e4db49f2da6f5fdfc8fbe apache-2.2.6-r103.ebuild 16331 RMD160 9bc077436e2dde5c8288717219a5b04447a3440e apache-2.2.6-r103.ebuild 16331 SHA256 45a2303ad6e444e037ced407a1161b4f2fddb3b552ed1d4a88c43d754826bcee apache-2.2.6-r103.ebuild 16331 +EBUILD apache-2.2.6-r107.ebuild 5174 RMD160 3690d1344099aa9b86031e6e9fe5e23ba2f4ac1d SHA1 f22d46a0fe920e4663e6e5bdfa86f7b0bbb72f46 SHA256 31a86ae520764ed9eda31733b7779e46b81406ce66fe1a07aa6b0b4c3e7fd917 +MD5 3196517522b9fad080afbccb1e53d6cd apache-2.2.6-r107.ebuild 5174 +RMD160 3690d1344099aa9b86031e6e9fe5e23ba2f4ac1d apache-2.2.6-r107.ebuild 5174 +SHA256 31a86ae520764ed9eda31733b7779e46b81406ce66fe1a07aa6b0b4c3e7fd917 apache-2.2.6-r107.ebuild 5174 EBUILD apache-2.2.6-r99.ebuild 16198 RMD160 c65320efc11db2097567991a198981c7446284b6 SHA1 bcad52bbb6ef4fb2280ae80c2b2d1362540f1580 SHA256 be5295da5ede9286b52b2a1f8e167a13814b21abef6d5759fe2ec13abde4e6d4 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 492 RMD160 6e056f1c9fac5fe8c1f6caff926c75a2bee81c7a SHA1 f20175f30a2262acb5fc99161c14e3ecd8641530 SHA256 442d773cfcc30347d486f0a607370ac503e72d80c04e4ce9c69c20d2ef7bccee -MD5 fcff0cc64c1bbd3e95bdd4cca864d6c5 ChangeLog 492 -RMD160 6e056f1c9fac5fe8c1f6caff926c75a2bee81c7a ChangeLog 492 -SHA256 442d773cfcc30347d486f0a607370ac503e72d80c04e4ce9c69c20d2ef7bccee ChangeLog 492 +MISC ChangeLog 611 RMD160 e218663a3a1b60465f95f1f223d259a046f0593c SHA1 9f26a13680a77afc5ad2cb17bb918bf2752b2e1f SHA256 3da9934dfca2d399cbb4cfc0d66a17ae7c8a4190dc0e2aa5ecf5d95cd8dfb479 +MD5 2e786ac063ec21b4b559dbd5dd97bf33 ChangeLog 611 +RMD160 e218663a3a1b60465f95f1f223d259a046f0593c ChangeLog 611 +SHA256 3da9934dfca2d399cbb4cfc0d66a17ae7c8a4190dc0e2aa5ecf5d95cd8dfb479 ChangeLog 611 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 @@ -32,6 +37,9 @@ SHA256 28e9143218044c4503121bc966793a1aade78d5fda6bdb99e143ff1c8879ff1d files/di MD5 ea1c388881a1a939d806a49fcc4820be files/digest-apache-2.2.6-r103 542 RMD160 f5a893d642e71f2f61dcda7f4ba10d191f4f7960 files/digest-apache-2.2.6-r103 542 SHA256 3132dbfe954d68e2b62d8d1704765daaff30214bf9ff110ca548e5635ec95e8f files/digest-apache-2.2.6-r103 542 +MD5 facdc39230bdbc7ac62601b09d6c7480 files/digest-apache-2.2.6-r107 542 +RMD160 ef3d58649196ad610c3a604484f43b82b828059b files/digest-apache-2.2.6-r107 542 +SHA256 678b03595c22405cb78f306091e38e307d850ebe2c0db34f123306d1f3c53cab files/digest-apache-2.2.6-r107 542 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 diff --git a/www-servers/apache/apache-2.2.6-r107.ebuild b/www-servers/apache/apache-2.2.6-r107.ebuild new file mode 100644 index 00000000..c95243aa --- /dev/null +++ b/www-servers/apache/apache-2.2.6-r107.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.6-r7.ebuild,v 1.9 2008/01/12 18:46:18 hollow Exp $ + +# latest gentoo apache files +GENTOO_PATCHSTAMP="20080107" +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_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 '