[gentoo-commits] gentoo-x86 commit in www-servers/apache: metadata.xml ChangeLog apache-2.2.11-r3.ebuild apache-2.2.11.ebuild apache-2.2.10.ebuild apache-2.2.11-r1.ebuild

[Benedikt Boehm (hollow)]

hollow      09/07/24 18:38:38

  Modified:             metadata.xml ChangeLog
  Added:                apache-2.2.11-r3.ebuild
  Removed:              apache-2.2.11.ebuild apache-2.2.10.ebuild
                        apache-2.2.11-r1.ebuild
  Log:
  add support for perusers dc branch; breaks old peruser configuration!
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.3                  www-servers/apache/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	22 Aug 2008 22:21:41 -0000	1.2
+++ metadata.xml	24 Jul 2009 18:38:38 -0000	1.3
@@ -12,6 +12,8 @@
 		provides HTTP services in sync with the current HTTP standards.
 	</longdescription>
 	<use>
+		<flag name="peruser_dc">Enable support for the dc branch of peruser.
+			EXPERIMENTAL!</flag>
 		<flag name='sni'>Enable TLS Server Name Indication (SNI) -
 			EXPERIMENTAL!</flag>
 		<flag name='suexec'>Install suexec with apache</flag>



1.115                www-servers/apache/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog	11 Jul 2009 19:08:44 -0000	1.114
+++ ChangeLog	24 Jul 2009 18:38:38 -0000	1.115
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.114 2009/07/11 19:08:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.115 2009/07/24 18:38:38 hollow Exp $
+
+*apache-2.2.11-r3 (24 Jul 2009)
+
+  24 Jul 2009; Benedikt Böhm <hollow@g.o> -apache-2.2.10.ebuild,
+  -apache-2.2.11.ebuild, -apache-2.2.11-r1.ebuild, +apache-2.2.11-r3.ebuild,
+  metadata.xml:
+  add support for perusers dc branch; breaks old peruser configuration!
 
   11 Jul 2009; Raúl Porcel <armin76@g.o> apache-2.2.11-r2.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #276589



1.1                  www-servers/apache/apache-2.2.11-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild?rev=1.1&content-type=text/plain

Index: apache-2.2.11-r3.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.11-r3.ebuild,v 1.1 2009/07/24 18:38:38 hollow Exp $

# latest gentoo apache files
GENTOO_PATCHSTAMP="20090724"
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="sni peruser_dc"

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="${EPATCH_EXCLUDE} 04_all_mod_ssl_tls_sni.patch"
	fi

	if use peruser_dc ; then
		if ! use apache2_mpms_peruser ; then
			die "USE=peruser_dc requires APACHE2_MPMS=peruser"
		fi
	else
		EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 22_all_peruser_0.3.0-dc3.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
}