keks-overlay.git

@@ -6,28 +6,20 @@ AUX apache-ssl-fix.diff 2993 RMD160 6a7627b2c957254e1a1bfc27e8101ff5da04fab5 SHA

 MD5 117d11e44ccd6a2408873288b41236bd files/apache-ssl-fix.diff 2993

 RMD160 6a7627b2c957254e1a1bfc27e8101ff5da04fab5 files/apache-ssl-fix.diff 2993

 SHA256 150fdbd8ab5f45943c76b5244c9e3ef0ed30c6f70a5fd46981edb983de7ec02f files/apache-ssl-fix.diff 2993

-DIST gentoo-apache-2.2.6-20070907.tar.bz2 58121 RMD160 d0e5f55a8985f97fcdf646e04d92f6519f968104 SHA1 f9fd830bfb8e6c6e3cbac9d8342cc981032d20c5 SHA256 56f809f93fdcba204e6be271f195095d8ad033aa61447dab607af91d95cde8e6

-DIST gentoo-apache-2.2.6-r3-20071025.tar.bz2 60483 RMD160 3097b088eae160f1196f21abb1488cf54b349ba1 SHA1 1bb261c16e93bb1abc1972b38f73c2726435fb36 SHA256 3f2d0b9d210f3bb22c06901dee7df482c26647562d1a4e98f4196cd649f71d58

 DIST gentoo-apache-2.2.6-r6-20071215.tar.bz2 60964 RMD160 b2ea87d18117566a644fe012d23affd38d1f7ef6 SHA1 7a03af24bddf7e9b300eaad891a467ba25ab53ad SHA256 e2ec95dbfd3d406d16a5694746ade43863712037c12ac70f3433b16c75bf5638

+DIST gentoo-apache-2.2.6-r7-20080107.tar.bz2 61536 RMD160 b08af8e9d840b49685bf7a67243b80dc4e346efa SHA1 27278395f5ad01aef0f9c9fcf1c25565866422a0 SHA256 b2116b2b09ba3a5d4e1130bf7e202cc95312ac5b4f78f8653f15e2842bbbf92f

 DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c

-EBUILD apache-2.2.6-r3.ebuild 15867 RMD160 bc4754a69578b07c0887948e143535ee42d5c494 SHA1 d4cd5d82f69d4b41f1d41d74eb6ab1cbdf25ed43 SHA256 1dc997400c2f2829939da89593ff43733db032df39c2a7b36e5a7e9885808aab

-MD5 51cf3a6d14f5799bc32a220665125641 apache-2.2.6-r3.ebuild 15867

-RMD160 bc4754a69578b07c0887948e143535ee42d5c494 apache-2.2.6-r3.ebuild 15867

-SHA256 1dc997400c2f2829939da89593ff43733db032df39c2a7b36e5a7e9885808aab apache-2.2.6-r3.ebuild 15867

 EBUILD apache-2.2.6-r6.ebuild 5217 RMD160 6411c458a443de97e94a3fa328b05b100245844f SHA1 3848dc1b562fc29322c3452e9fd5820284ed08d3 SHA256 2f51672862d7b3d12c15c8c0ea05006da7b279b226c98aafd7d090c61e0520a4

 MD5 3722ae4b57c51d6efd2989b27c870929 apache-2.2.6-r6.ebuild 5217

 RMD160 6411c458a443de97e94a3fa328b05b100245844f apache-2.2.6-r6.ebuild 5217

 SHA256 2f51672862d7b3d12c15c8c0ea05006da7b279b226c98aafd7d090c61e0520a4 apache-2.2.6-r6.ebuild 5217

-EBUILD apache-2.2.6.ebuild 15409 RMD160 d28d70bee62cf49b4fa03f11af540b4d73f573b6 SHA1 7e745f24c701aa975afeea5ac0dd1a92acc61e0f SHA256 db821b99842d980acbb98f2584f5374103508c8ba9a81fd6837518b19dcd71f1

-MD5 83cc4a3331319d94de3fb5e69f74e4d3 apache-2.2.6.ebuild 15409

-RMD160 d28d70bee62cf49b4fa03f11af540b4d73f573b6 apache-2.2.6.ebuild 15409

-SHA256 db821b99842d980acbb98f2584f5374103508c8ba9a81fd6837518b19dcd71f1 apache-2.2.6.ebuild 15409

-MD5 bf89379d611a34d10b6e0a55eee69f9b files/digest-apache-2.2.6 527

-RMD160 77f2fce54301244724ec61c4a3e0b96dc7106b33 files/digest-apache-2.2.6 527

-SHA256 69de15f758686c7f7977e0b75dd988e247162fb97fb394be4efe40997a53e308 files/digest-apache-2.2.6 527

-MD5 5345564d6f3113af8483954bf52c4209 files/digest-apache-2.2.6-r3 536

-RMD160 7569c275d74b58f38b180e12e19fb2e48608c86c files/digest-apache-2.2.6-r3 536

-SHA256 6de6aef20a1588fb17fdcfda567ee9e7b08fd700ffc823c83c88aeb88c43a51b files/digest-apache-2.2.6-r3 536

+EBUILD apache-2.2.6-r7.ebuild 5231 RMD160 3abf52692b806c556a1b1d7574b8e9e4e79ee2b0 SHA1 b497618a3a293b3730c2f5fed54a1337367b4da2 SHA256 b674d92066cf4ce5ee2fd28a6b5c7b0a51627622c488b464a2bfd4e736ea5b23

+MD5 9b12894d95d7ccecf7b0c770b9f8ca0a apache-2.2.6-r7.ebuild 5231

+RMD160 3abf52692b806c556a1b1d7574b8e9e4e79ee2b0 apache-2.2.6-r7.ebuild 5231

+SHA256 b674d92066cf4ce5ee2fd28a6b5c7b0a51627622c488b464a2bfd4e736ea5b23 apache-2.2.6-r7.ebuild 5231

 MD5 d6e528b4934cf191516f6053c9f63c97 files/digest-apache-2.2.6-r6 536

 RMD160 f32d00e581a61a1b1e183f9229da0ca2048c5a9f files/digest-apache-2.2.6-r6 536

 SHA256 b96912d1eb1d3325b98daf7aa5314bf5eb5826206ba24add0d9840904497c541 files/digest-apache-2.2.6-r6 536

+MD5 b75641abc20af74044985f8f16784fb5 files/digest-apache-2.2.6-r7 536

+RMD160 218080b6f024cc12529e6e7b280fac1256ec869e files/digest-apache-2.2.6-r7 536

+SHA256 a8b137170b4785953fb3ced4a48db1c61e7fda926ae0842df00b26d57232411e files/digest-apache-2.2.6-r7 536

@@ -1,497 +0,0 @@

-# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/10/25 02:07:54 hollow Exp $

-

-inherit eutils flag-o-matic multilib autotools

-

-# latest gentoo apache files

-GENTOO_PATCHNAME="gentoo-${PF}"

-GENTOO_PATCHSTAMP="20071025"

-GENTOO_DEVSPACE="hollow"

-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"

-

-DESCRIPTION="The Apache Web Server."

-HOMEPAGE="http://httpd.apache.org/"

-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2

-		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"

-

-# 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="debug doc ldap mpm-event mpm-itk mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads"

-

-DEPEND="dev-lang/perl

-	=dev-libs/apr-1*

-	=dev-libs/apr-util-1*

-	dev-libs/expat

-	dev-libs/libpcre

-	sys-libs/zlib

-	ldap? ( =net-nds/openldap-2* )

-	selinux? ( sec-policy/selinux-apache )

-	ssl? ( dev-libs/openssl )

-	!=www-servers/apache-1*

-	!=app-admin/apache-tools-2.2.4-r2"

-

-RDEPEND="${DEPEND}

-	app-misc/mime-types"

-

-PDEPEND="~app-admin/apache-tools-${PV}"

-

-S="${WORKDIR}/httpd-${PV}"

-

-pkg_setup() {

-	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap ; then

-		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"

-		eerror "ldap support, apr-util must be built with the ldap USE-flag"

-		eerror "enabled."

-		die "ldap USE-flag enabled while not supported in apr-util"

-	fi

-

-	# Select the default MPM module

-	MPM_LIST="event itk peruser prefork worker"

-	for x in ${MPM_LIST} ; do

-		if use mpm-${x} ; then

-			if [[ "x${mpm}" == "x" ]] ; then

-				mpm=${x}

-				elog

-				elog "Selected MPM: ${mpm}"

-				elog

-			else

-				eerror "You have selected more then one mpm USE-flag."

-				eerror "Only one MPM is supported."

-				die "more then one mpm was specified"

-			fi

-		fi

-	done

-

-	if [[ "x${mpm}" == "x" ]] ; then

-		if use threads ; then

-			mpm=worker

-			elog

-			elog "Selected default threaded MPM: ${mpm}";

-			elog

-		else

-			mpm=prefork

-			elog

-			elog "Selected default MPM: ${mpm}";

-			elog

-		fi

-	fi

-

-	# setup apache user and group

-	enewgroup apache 81

-	enewuser apache 81 -1 /var/www apache

-

-	if ! use no-suexec ; then

-		elog

-		elog "You can manipulate several configure options of suexec"

-		elog "through the following environment variables:"

-		elog

-		elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: /usr/local/bin:/usr/bin:/bin)"

-		elog "  SUEXEC_LOGFILE: Path to the suexec logfile (default: /var/log/apache2/suexec_log)"

-		elog "   SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"

-		elog "  SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: /var/www)"

-		elog "   SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"

-		elog "   SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"

-		elog "  SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"

-		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"

-		elog

-	fi

-}

-

-src_unpack() {

-	unpack ${A}

-	cd "${S}"

-	epatch "${FILESDIR}/apache-noip.diff"

-	epatch "${FILESDIR}/apache-ssl-fix.diff"

-

-	# Use correct multilib libdir in gentoo patches

-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \

-		"${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \

-		|| die "libdir sed failed"

-

-	#### Patch Organization

-	# 00-19 Gentoo specific  (00_all_some-title.patch)

-	# 20-39 Additional MPMs  (20_all_${MPM}_some-title.patch)

-	# 40-59 USE-flag based   (40_all_${USE}_some-title.patch)

-	# 60-79 Version specific (60_all_${PV}_some-title.patch)

-	# 80-99 Security patches (80_all_${PV}_cve-####-####.patch)

-

-	epatch "${GENTOO_PATCHDIR}"/patches/*.patch

-

-	# setup the filesystem layout config

-	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \

-		die "Failed preparing config.layout!"

-	sed -i -e "s:version:${PF}:g" "${S}"/config.layout

-

-	# patched-in MPMs need the build environment rebuilt

-	sed -i -e '/sinclude/d' configure.in

-	AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf

-

-	# apache2.8 instead of httpd.8 (bug #194828)

-	mv docs/man/{httpd,apache2}.8

-}

-

-src_compile() {

-	local modtype="shared" myconf=""

-	cd "${S}"

-

-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed

-	# Thanks to Harald van Dijk

-	append-ldflags -Wl,--no-as-needed

-

-	# peruser MPM debugging with -X is nearly impossible

-	use mpm-peruser && use debug && append-flags -DMPM_PERUSER_DEBUG

-

-	use static-modules && modtype="static"

-	select_modules_config || die "determining modules failed"

-

-	if use ldap ; then

-		mods="${mods} ldap authnz_ldap"

-		myconf="${myconf} --enable-authnz-ldap=${modtype} --enable-ldap=${modtype}"

-	fi

-

-	if use threads || use mpm-worker || use mpm-event; then

-		mods="${mods} cgid"

-		myconf="${myconf} --enable-cgid=${modtype}"

-	else

-		mods="${mods} cgi"

-		myconf="${myconf} --enable-cgi=${modtype}"

-	fi

-

-	if use ssl; then

-		mods="${mods} ssl"

-		myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}"

-	fi

-

-	if use debug; then

-		myconf="${myconf} --enable-maintainer-mode --enable-exception-hook"

-	fi

-

-	# Only build suexec with USE=-no-suexec

-	if use no-suexec ; then

-		myconf="${myconf} --disable-suexec"

-	else

-		myconf="${myconf} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"

-		myconf="${myconf} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"

-		myconf="${myconf} --with-suexec-bin=/usr/sbin/suexec"

-		myconf="${myconf} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"

-		myconf="${myconf} --with-suexec-caller=${SUEXEC_CALLER:-apache}"

-		myconf="${myconf} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"

-		myconf="${myconf} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"

-		myconf="${myconf} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"

-		myconf="${myconf} --with-suexec-umask=${SUEXEC_UMASK:-077}"

-		myconf="${myconf} --enable-suexec=${modtype}"

-		mods="${mods} suexec"

-	fi

-

-	# econf overwrites the stuff from config.layout, so we have to put them into

-	# our myconf line too

-

-	econf \

-		--includedir=/usr/include/apache2 \

-		--libexecdir=/usr/$(get_libdir)/apache2/modules \

-		--datadir=/var/www/localhost \

-		--sysconfdir=/etc/apache2 \

-		--localstatedir=/var \

-		--with-mpm=${mpm} \

-		--with-perl=/usr/bin/perl \

-		--with-expat=/usr \

-		--with-z=/usr \

-		--with-apr=/usr \

-		--with-apr-util=/usr \

-		--with-pcre=/usr \

-		--with-port=80 \

-		--with-program-name=apache2 \

-		--enable-layout=Gentoo \

-		${myconf} ${MY_BUILTINS} || die "econf failed!"

-

-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h

-

-	emake || die "emake failed"

-}

-

-src_install () {

-	emake DESTDIR="${D}" install || die "emake install failed"

-

-	# This is a mapping of module names to the -D options in APACHE2_OPTS

-	# Used for creating optional LoadModule lines

-	mod_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_http:PROXY

-		ssl:SSL

-		status:INFO

-		suexec:SUEXEC

-		userdir:USERDIR

-	"

-

-	# create our LoadModule lines

-	if ! use static-modules ; then

-		load_module=""

-		moddir="${D}/usr/$(get_libdir)/apache2/modules"

-		for m in $(echo ${mods}|tr ' ' '\n'|sort -u) ; do

-			endid="no"

-

-			if [[ -e "${moddir}/mod_${m}.so" ]] ; then

-				for def in ${mod_defines} ; do

-					if [[ "${m}" == "${def%:*}" ]] ; then

-						load_module="${load_module}\n<IfDefine ${def#*:}>"

-						endid="yes"

-					fi

-				done

-				load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so"

-				if [[ "${endid}" == "yes" ]] ; then

-					load_module="${load_module}\n</IfDefine>"

-				fi

-			fi

-		done

-	fi

-	sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \

-		"${GENTOO_PATCHDIR}"/conf/httpd.conf || die "sed failed"

-

-	# Install our configuration files

-	insinto /etc/apache2

-	doins docs/conf/magic

-	doins -r "${GENTOO_PATCHDIR}"/conf/*

-	insinto /etc/logrotate.d

-	newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2

-

-	# generate a sane default APACHE2_OPTS

-	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE"

-	use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"

-	use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"

-	use no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"

-

-	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \

-		"${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"

-

-	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2

-	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2

-

-	# Link apache2ctl to the init script

-	dosym /etc/init.d/apache2 /usr/sbin/apache2ctl

-

-	# provide symlinks for all the stuff we no longer rename, bug 177697

-	for i in suexec apxs; do

-		dosym /usr/sbin/${i} /usr/sbin/${i}2

-	done

-

-	# Install some thirdparty scripts

-	exeinto /usr/sbin

-	use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh

-

-	# Install some documentation

-	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING

-	dodoc "${GENTOO_PATCHDIR}"/docs/*

-

-	# drop in a convenient link to the manual

-	if use doc ; then

-		sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"

-	else

-		rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"

-		rm -Rf "${D}/usr/share/doc/${PF}/manual"

-	fi

-

-	# the default webroot gets stored in /usr/share/doc

-	ebegin "Installing default webroot to /usr/share/doc/${PF}"

-	mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot"

-	eend $?

-	keepdir /var/www/localhost/htdocs

-

-	if ! use no-suexec ; then

-		# Set some sane permissions for suexec

-		fowners 0:apache /usr/sbin/suexec

-		fperms 4710 /usr/sbin/suexec

-	fi

-

-	keepdir /etc/apache2/vhosts.d

-	keepdir /etc/apache2/modules.d

-

-	# empty dirs

-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do

-		keepdir ${i}

-		fowners apache:apache ${i}

-		fperms 0755 ${i}

-	done

-

-	# We'll be needing /etc/apache2/ssl if USE=ssl

-	use ssl && keepdir /etc/apache2/ssl

-}

-

-pkg_postinst() {

-	# Automatically generate test certificates if ssl USE flag is being set

-	if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then

-		cd "${ROOT}"/etc/apache2/ssl

-		einfo

-		einfo "Generating self-signed test certificate in ${ROOT}etc/apache2/ssl ..."

-		yes "" 2>/dev/null | \

-			"${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \

-			die "gentestcrt.sh failed"

-		einfo

-	fi

-

-	# we do this here because the default webroot is a copy of the files

-	# that exist elsewhere and we don't want them managed/removed by portage

-	# when apache is upgraded.

-

-	if [[ -e "${ROOT}/var/www/localhost" ]] ; then

-		elog "The default webroot has not been installed into"

-		elog "${ROOT}var/www/localhost because the directory already exists"

-		elog "and we do not want to overwrite any files you have put there."

-		elog

-		elog "If you would like to install the latest webroot, please run"

-		elog "emerge --config =${PF}"

-	else

-		einfo "Installing default webroot to ${ROOT}var/www/localhost"

-		mkdir -p "${ROOT}"/var/www/localhost

-		cp -R "${ROOT}"/usr/share/doc/${PF}/webroot/* "${ROOT}"/var/www/localhost

-		chown -R apache:0 "${ROOT}"/var/www/localhost

-	fi

-

-	# 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

-		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \

-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1

-

-		for i in extra original ; do

-			[ -d "${ROOT}"/etc/apache2/$i ] && \

-				rm -rf "${ROOT}"/etc/apache2/$i >/dev/null 2>&1

-		done

-	fi

-

-	# Note regarding IfDefine changes

-	if has_version '<www-servers/apache-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

-

-	# Note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST

-	if has_version '<www-servers/apache-2.2.4-r7' ; then

-		elog

-		elog "Listen directives have been moved into the default virtual host"

-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"

-		elog "(depending on your USE-flags."

-		elog

-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there would"

-		elog "be no listening sockets available."

-		elog

-	fi

-

-	# Note the user of the config changes

-	if has_version '<www-servers/apache-2.2.4-r5' ; then

-		elog

-		elog "Please make sure that you update your /etc directory."

-		elog "Between the versions, we had to changes some config files"

-		elog "and move some stuff out of the main httpd.conf file to a seperate"

-		elog "modules.d entry."

-		elog

-		elog "Thus please update your /etc directory either via etc-update,"

-		elog "dispatch-conf or conf-update !"

-		elog

-	fi

-

-	# Check for dual/upgrade install

-	if has_version '<www-servers/apache-2.2.0' ; then

-		elog

-		elog "When upgrading from versions below 2.2.0 to this version, you"

-		elog "need to rebuild all your modules. Please do so for your modules"

-		elog "to continue working correctly."

-		elog

-		elog "Also note that some configuration directives have been"

-		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"

-		elog "and that some modules, foremost the authentication related ones,"

-		elog "have been renamed."

-		elog

-		elog "Some examples:"

-		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."

-		elog

-		elog "For more information on what you may need to change, please"

-		elog "see the overview of changes at:"

-		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"

-		elog "and the upgrading guide at:"

-		elog "http://httpd.apache.org/docs/2.2/upgrading.html"

-		elog

-	fi

-

-	# Cleanup the vim backup files, placed in /etc/apache2 by the last

-	# patchtarball (gentoo-apache-2.2.4-r7-20070615)

-	rm -f "${ROOT}/etc/apache2/modules.d/*.conf~"

-}

-

-pkg_config() {

-	einfo "Installing default webroot to ${ROOT}var/www/localhost"

-	mkdir "${ROOT}"var{,/www{,/localhost}}

-	cp -R "${ROOT}"usr/share/doc/${PF}/webroot/* "${ROOT}"var/www/localhost/

-}

-

-parse_modules_config() {

-	local name=""

-	local disable=""

-	local version="undef"

-	MY_BUILTINS=""

-	mods=""

-	[[ -f "${1}" ]] || return 1

-

-	for i in $(sed 's/#.*//' < $1) ; do

-		if [[ "$i" == "VERSION:" ]] ; then

-			version="select"

-		elif [[ "${version}" == "select" ]] ; then

-			version="$i"

-		# start with - option for backwards compatibility only

-		elif [[ "$i" == "-" ]] ; then

-			disable="true"

-		elif [[ -z "${name}" ]] && [[ "$i" != "${i/mod_/}" ]] ; then

-			name="${i/mod_/}"

-		elif [[ -n "${disable}" ]] || [[ "$i" == "disabled" ]] ; then

-			MY_BUILTINS="${MY_BUILTINS} --disable-${name}"

-			name="" ; disable=""

-		elif [[ "$i" == "static" ]] || use static-modules ; then

-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=static"

-			name="" ; disable=""

-		elif [[ "$i" == "shared" ]] ; then

-			MY_BUILTINS="${MY_BUILTINS} --enable-${name}=shared"

-			mods="${mods} ${name}"

-			name="" ; disable=""

-		else

-			ewarn "Parse error in ${1} - unknown option: $i"

-		fi

-	done

-

-	# reject the file if it's unversioned or doesn't match our

-	# package major.minor. This is to make upgrading work smoothly.

-	if [[ "${version}" != "${PV%.*}" ]] ; then

-		mods=""

-		MY_BUILTINS=""

-		return 1

-	fi

-

-	einfo "Using ${1}"

-	einfo "options: ${MY_BUILTINS}"

-	einfo "LoadModules: ${mods}"

-}

-

-select_modules_config() {

-	parse_modules_config "${ROOT}"/etc/apache2/apache2-builtin-mods || \

-	parse_modules_config "${GENTOO_PATCHDIR}"/conf/apache2-builtin-mods || \

-	return 1

-}

@@ -0,0 +1,180 @@

+# 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.6 2008/01/08 22:19:14 jer 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:INFO

+	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

+

+	cd "${S}"

+	epatch "${FILESDIR}/apache-noip.diff" || die

+}

+

+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 '<www-servers/apache-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

+

+	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST

+	if has_version '<www-servers/apache-2.2.4-r7' ; then

+		elog

+		elog "Listen directives have been moved into the default virtual host"

+		elog "configuation. At least DEFAULT_VHOST has been enabled for you"

+		elog "(depending on your USE-flags.)"

+		elog

+		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there will"

+		elog "be no listening sockets available."

+		elog

+	fi

+

+	# note the user of the config changes

+	if has_version '<www-servers/apache-2.2.4-r5' ; then

+		elog

+		elog "Please make sure that you update your /etc directory."

+		elog "Between the versions, we had to changes some config files"

+		elog "and move some stuff out of the main httpd.conf file to a seperate"

+		elog "modules.d entry."

+		elog

+		elog "Thus please update your /etc directory either via etc-update,"

+		elog "dispatch-conf or conf-update !"

+		elog

+	fi

+

+	# check for dual/upgrade install

+	if has_version '<www-servers/apache-2.2.0' ; then

+		elog

+		elog "When upgrading from versions below 2.2.0 to this version, you"

+		elog "need to rebuild all your modules. Please do so for your modules"

+		elog "to continue working correctly."

+		elog

+		elog "Also note that some configuration directives have been"

+		elog "split into their own files under ${ROOT}etc/apache2/modules.d/"

+		elog "and that some modules, foremost the authentication related ones,"

+		elog "have been renamed."

+		elog

+		elog "Some examples:"

+		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."

+		elog

+		elog "For more information on what you may need to change, please"

+		elog "see the overview of changes at:"

+		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"

+		elog "and the upgrading guide at:"

+		elog "http://httpd.apache.org/docs/2.2/upgrading.html"

+		elog

+	fi

+

+	# cleanup the vim backup files, placed in /etc/apache2 by the last

+	# patchtarball (gentoo-apache-2.2.4-r7-20070615)

+	rm -f "${ROOT}etc/apache2/modules.d/*.conf~"

+}

@@ -1,482 +0,0 @@

-# Copyright 1999-2007 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.ebuild,v 1.11 2007/09/25 14:31:47 armin76 Exp $

-

-inherit eutils flag-o-matic multilib autotools

-

-# latest gentoo apache files

-GENTOO_PATCHNAME="gentoo-${PF}"

-GENTOO_PATCHSTAMP="20070907"

-GENTOO_DEVSPACE="hollow"

-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"

-

-DESCRIPTION="The Apache Web Server."

-HOMEPAGE="http://httpd.apache.org/"

-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2

-		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"

-

-# 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="debug doc ldap mpm-event mpm-itk mpm-peruser mpm-prefork mpm-worker no-suexec selinux ssl static-modules threads"

-

-DEPEND="dev-lang/perl

-	=dev-libs/apr-1*

-	=dev-libs/apr-util-1*

-	dev-libs/expat

-	dev-libs/libpcre

-	sys-libs/zlib

-	ldap? ( =net-nds/openldap-2* )

-	selinux? ( sec-policy/selinux-apache )

-	ssl? ( dev-libs/openssl )

-	!=www-servers/apache-1*

-	!=app-admin/apache-tools-2.2.4-r2"

-

-RDEPEND="${DEPEND}

-	app-misc/mime-types"

-

-PDEPEND="~app-admin/apache-tools-${PV}"

-

-S="${WORKDIR}/httpd-${PV}"

-

-pkg_setup() {

-	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap ; then

-		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"

-		eerror "ldap support, apr-util must be built with the ldap USE-flag"

-		eerror "enabled."

-		die "ldap USE-flag enabled while not supported in apr-util"

-	fi

-

-	# Select the default MPM module

-	MPM_LIST="event itk peruser prefork worker"

-	for x in ${MPM_LIST} ; do

-		if use mpm-${x} ; then

-			if [[ "x${mpm}" == "x" ]] ; then

-				mpm=${x}

-				elog

-				elog "Selected MPM: ${mpm}"

-				elog

-			else

-				eerror "You have selected more then one mpm USE-flag."

-				eerror "Only one MPM is supported."

-				die "more then one mpm was specified"

-			fi

-		fi

-	done

-

-	if [[ "x${mpm}" == "x" ]] ; then

-		if use threads ; then

-			mpm=worker

-			elog

-			elog "Selected default threaded MPM: ${mpm}";

-			elog

-		else

-			mpm=prefork

-			elog

-			elog "Selected default MPM: ${mpm}";

-			elog

-		fi

-	fi

-

-	# setup apache user and group

-	enewgroup apache 81

-	enewuser apache 81 -1 /var/www apache

-

-	if ! use no-suexec ; then

-		elog

-		elog "You can manipulate several configure options of suexec"

-		elog "through the following environment variables:"

-		elog

-		elog " SUEXEC_SAFEPATH: Default PATH for suexec (default: /usr/local/bin:/usr/bin:/bin)"

-		elog "  SUEXEC_LOGFILE: Path to the suexec logfile (default: /var/log/apache2/suexec_log)"

-		elog "   SUEXEC_CALLER: Name of the user Apache is running as (default: apache)"

-		elog "  SUEXEC_DOCROOT: Directory in which suexec will run scripts (default: /var/www)"

-		elog "   SUEXEC_MINUID: Minimum UID, which is allowed to run scripts via suexec (default: 1000)"

-		elog "   SUEXEC_MINGID: Minimum GID, which is allowed to run scripts via suexec (default: 100)"

-		elog "  SUEXEC_USERDIR: User subdirectories (like /home/user/html) (default: public_html)"

-		elog "    SUEXEC_UMASK: Umask for the suexec process (default: 077)"

-		elog

-	fi

-}

-

-src_unpack() {

-	unpack ${A}

-	cd "${S}"

-	epatch "${FILESDIR}/apache-noip.diff"

-

-	# Use correct multilib libdir in gentoo patches

-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \

-		"${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \

-		|| die "libdir sed failed"

-

-	#### Patch Organization

-	# 00-19 Gentoo specific  (00_all_some-title.patch)

-	# 20-39 Additional MPMs  (20_all_${MPM}_some-title.patch)

-	# 40-59 USE-flag based   (40_all_${USE}_some-title.patch)

-	# 60-79 Version specific (60_all_${PV}_some-title.patch)

-	# 80-99 Security patches (80_all_${PV}_cve-####-####.patch)

-

-	epatch "${GENTOO_PATCHDIR}"/patches/*.patch

-

-	# setup the filesystem layout config

-	cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \

-		die "Failed preparing config.layout!"

-	sed -i -e "s:version:${PF}:g" "${S}"/config.layout

-

-	# patched-in MPMs need the build environment rebuilt

-	sed -i -e '/sinclude/d' configure.in

-	AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf

-}

-

-src_compile() {

-	local modtype="shared" myconf=""

-	cd "${S}"

-

-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed

-	# Thanks to Harald van Dijk

-	append-ldflags -Wl,--no-as-needed

-

-	# peruser MPM debugging with -X is nearly impossible

-	use mpm-peruser && use debug && append-flags -DMPM_PERUSER_DEBUG

-

-	use static-modules && modtype="static"

-	select_modules_config || die "determining modules failed"

-

-	if use ldap ; then

-		mods="${mods} ldap authnz_ldap"

-		myconf="${myconf} --enable-authnz-ldap=${modtype} --enable-ldap=${modtype}"

-	fi

-

-	if use threads || use mpm-worker || use mpm-event; then

-		mods="${mods} cgid"

-		myconf="${myconf} --enable-cgid=${modtype}"

-	else

-		mods="${mods} cgi"

-		myconf="${myconf} --enable-cgi=${modtype}"

-	fi

-

-	if use ssl; then

-		mods="${mods} ssl"

-		myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}"

-	fi

-

-	# Only build suexec with USE=-no-suexec

-	if use no-suexec ; then

-		myconf="${myconf} --disable-suexec"

-	else

-		myconf="${myconf} --with-suexec-safepath=${SUEXEC_SAFEPATH:-/usr/local/bin:/usr/bin:/bin}"

-		myconf="${myconf} --with-suexec-logfile=${SUEXEC_LOGFILE:-/var/log/apache2/suexec_log}"

-		myconf="${myconf} --with-suexec-bin=/usr/sbin/suexec"

-		myconf="${myconf} --with-suexec-userdir=${SUEXEC_USERDIR:-public_html}"

-		myconf="${myconf} --with-suexec-caller=${SUEXEC_CALLER:-apache}"

-		myconf="${myconf} --with-suexec-docroot=${SUEXEC_DOCROOT:-/var/www}"

-		myconf="${myconf} --with-suexec-uidmin=${SUEXEC_MINUID:-1000}"

-		myconf="${myconf} --with-suexec-gidmin=${SUEXEC_MINGID:-100}"

-		myconf="${myconf} --with-suexec-umask=${SUEXEC_UMASK:-077}"

-		myconf="${myconf} --enable-suexec=${modtype}"

-		mods="${mods} suexec"

-	fi

-

-	# econf overwrites the stuff from config.layout, so we have to put them into

-	# our myconf line too

-

-	econf \

-		--includedir=/usr/include/apache2 \

-		--libexecdir=/usr/$(get_libdir)/apache2/modules \

-		--datadir=/var/www/localhost \

-		--sysconfdir=/etc/apache2 \

-		--localstatedir=/var \

-		--with-mpm=${mpm} \

-		--with-perl=/usr/bin/perl \

-		--with-expat=/usr \

-		--with-z=/usr \

-		--with-apr=/usr \

-		--with-apr-util=/usr \

-		--with-pcre=/usr \

-		--with-port=80 \

-		--with-program-name=apache2 \

-		--enable-layout=Gentoo \

-		$(use_enable debug maintainer-mode) \

-		$(use_enable debug exception-hook) \

-		${myconf} ${MY_BUILTINS} || die "econf failed!"

-

-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h

-

-	emake || die "emake failed"

-}

-

-src_install () {

-	emake DESTDIR="${D}" install || die "emake install failed"

-

-	# This is a mapping of module names to the -D options in APACHE2_OPTS

-	# Used for creating optional LoadModule lines

-	mod_defines="

-		authnz_ldap:AUTH_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_http:PROXY

-		ssl:SSL

-		status:INFO

-		suexec:SUEXEC

-		userdir:USERDIR

-	"

-

-	# create our LoadModule lines

-	if ! use static-modules ; then

-		load_module=""

-		moddir="${D}/usr/$(get_libdir)/apache2/modules"

-		for m in $(echo ${mods}|tr ' ' '\n'|sort -u) ; do

-			endid="no"

-

-			if [[ -e "${moddir}/mod_${m}.so" ]] ; then

-				for def in ${mod_defines} ; do

-					if [[ "${m}" == "${def%:*}" ]] ; then

-						load_module="${load_module}\n<IfDefine ${def#*:}>"

-						endid="yes"

-					fi

-				done

-				load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so"

-				if [[ "${endid}" == "yes" ]] ; then

-					load_module="${load_module}\n</IfDefine>"

-				fi

-			fi

-		done

-	fi

-	sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \

-		"${GENTOO_PATCHDIR}"/conf/httpd.conf || die "sed failed"

-

-	# Install our configuration files

-	insinto /etc/apache2

-	doins docs/conf/magic

-	doins -r "${GENTOO_PATCHDIR}"/conf/*

-	insinto /etc/logrotate.d

-	newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2

-

-	# generate a sane default APACHE2_OPTS

-	APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE"

-	use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"

-	use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"

-	use no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"

-

-	sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \

-		"${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"

-

-	newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2

-	newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2

-

-	# Link apache2ctl to the init script

-	dosym /etc/init.d/apache2 /usr/sbin/apache2ctl

-

-	# provide symlinks for all the stuff we no longer rename, bug 177697

-	for i in suexec apxs; do

-		dosym /usr/sbin/${i} /usr/sbin/${i}2

-	done

-

-	# Install some thirdparty scripts

-	exeinto /usr/sbin

-	for i in apache2logserverstatus apache2splitlogfile ; do

-		doexe "${GENTOO_PATCHDIR}"/scripts/${i}

-	done

-	use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh

-

-	# Install some documentation

-	dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING

-	dodoc "${GENTOO_PATCHDIR}"/docs/*

-

-	# drop in a convenient link to the manual

-	if use doc ; then

-		sed -i -e "s:VERSION:${PVR}:" "${D}/etc/apache2/modules.d/00_apache_manual.conf"

-	else

-		rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"

-		rm -Rf "${D}/usr/share/doc/${PF}/manual"

-	fi

-

-	# the default webroot gets stored in /usr/share/doc

-	ebegin "Installing default webroot to /usr/share/doc/${PF}"

-	mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot"

-	eend $?

-	keepdir /var/www/localhost/htdocs

-

-	if ! use no-suexec ; then

-		# Set some sane permissions for suexec

-		fowners 0:apache /usr/sbin/suexec

-		fperms 4710 /usr/sbin/suexec

-	fi

-

-	keepdir /etc/apache2/vhosts.d

-	keepdir /etc/apache2/modules.d

-

-	# empty dirs

-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do

-		keepdir ${i}

-		fowners apache:apache ${i}

-		fperms 0755 ${i}

-	done

-

-	# We'll be needing /etc/apache2/ssl if USE=ssl

-	use ssl && keepdir /etc/apache2/ssl

-}

-

-pkg_postinst() {

-	# Automatically generate test certificates if ssl USE flag is being set

-	if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then

-		cd "${ROOT}"/etc/apache2/ssl

-		einfo

-		einfo "Generating self-signed test certificate in ${ROOT}/etc/apache2/ssl ..."

-		yes "" 2>/dev/null | \

-			"${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \

-			die "gentestcrt.sh failed"

-		einfo

-	fi

-

-	# we do this here because the default webroot is a copy of the files

-	# that exist elsewhere and we don't want them managed/removed by portage

-	# when apache is upgraded.

-

-	if [[ -e "${ROOT}/var/www/localhost" ]] ; then

-		elog "The default webroot has not been installed into"

-		elog "${ROOT}/var/www/localhost because the directory already exists"

-		elog "and we do not want to overwrite any files you have put there."

-		elog

-		elog "If you would like to install the latest webroot, please run"

-		elog "emerge --config =${PF}"

-	else

-		einfo "Installing default webroot to ${ROOT}/var/www/localhost"

-		mkdir -p "${ROOT}"/var/www/localhost

-		cp -R "${ROOT}"/usr/share/doc/${PF}/webroot/* "${ROOT}"/var/www/localhost

-		chown -R apache:0 "${ROOT}"/var/www/localhost

-	fi

-

-	# 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

-		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \

-			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1

-

-		for i in extra original ; do

-			[ -d "${ROOT}"/etc/apache2/$i ] && \

-				rm -rf "${ROOT}"/etc/apache2/$i >/dev/null 2>&1

-		done

-	fi

-

-	# Note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST

-	if has_version '<www-servers/apache-2.2.4-r7' ; then

-		elog

-		elog "Listen directives have been moved into the default virtual host"

-		elog "configuation. At least DEFAULT_VHOST has been enabled for you"

-		elog "(depending on your USE-flags."

-		elog

-		elog "If you disable DEFAULT_VHOST or SSL_DEFAULT_VHOST, there would"

-		elog "be no listening sockets available."

-		elog

-	fi

-

-	# Note the user of the config changes

-	if has_version '<www-servers/apache-2.2.4-r5' ; then

-		elog

-		elog "Please make sure that you update your /etc directory."

-		elog "Between the versions, we had to changes some config files"

-		elog "and move some stuff out of the main httpd.conf file to a seperate"

-		elog "modules.d entry."

-		elog

-		elog "Thus please update your /etc directory either via etc-update,"

-		elog "dispatch-conf or conf-update !"

-		elog

-	fi

-

-	# Check for dual/upgrade install

-	if has_version '<www-servers/apache-2.2.0' ; then

-		elog

-		elog "When upgrading from versions below 2.2.0 to this version, you"

-		elog "need to rebuild all your modules. Please do so for your modules"

-		elog "to continue working correctly."

-		elog

-		elog "Also note that some configuration directives have been"