--- apache-1.3.31-r3.ebuild.orig 2004-09-28 22:09:06.083399200 +0200 +++ apache-1.3.31-r3.ebuild 2004-09-28 21:59:51.141763152 +0200 @@ -1,10 +1,10 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r3.ebuild,v 1.10 2004/09/01 17:10:57 lv Exp $ +# $Header: $ inherit eutils fixheadtails -IUSE="pam" +IUSE="pam lingerd" mod_ssl_ver=2.8.19 PATCH_LEVEL="${PV}-r2" @@ -25,7 +25,8 @@ >=dev-libs/expat-1.95.2 >=sys-apps/sed-4 =sys-libs/db-1.85-r1 - selinux? ( sec-policy/selinux-apache )" + selinux? ( sec-policy/selinux-apache ) + lingerd? ( net-www/lingerd )" LICENSE="Apache-2.0" SLOT="1" @@ -35,13 +36,16 @@ src_unpack() { local myssl unpack ${A} || die + cd ${S} || die + + use lingerd && cp ${FILESDIR}/lingerd/{ap_lingerd.c,li_config.h} src/main/ epatch ${FILESDIR}/patches/${PATCH_LEVEL}/00_gentoo_base.patch epatch ${FILESDIR}/patches/${PATCH_LEVEL}/00_gentoo_db4_detect.patch epatch ${FILESDIR}/patches/${PATCH_LEVEL}/00_gentoo_apachectl.patch epatch ${FILESDIR}/patches/${PATCH_LEVEL}/00_apache_proxy_security_fix.patch - + if use pam ; then epatch ${FILESDIR}/patches/${PATCH_LEVEL}/00_gentoo_suexec_pam.patch fi @@ -58,6 +62,11 @@ # set a reasonable MM_CORE_PATH location.. sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \ src/include/httpd.h + + if use lingerd ; then + cd src/ + epatch ${FILESDIR}/lingerd/aplinger.diff + fi; } src_compile() { @@ -175,6 +184,9 @@ insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods + use lingerd && sed -i 's/\(need net.*\)/\1 lingerd/g' ${D}/etc/init.d/apache + + if use pam; then insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec fi