/[gentoo-x86]/eclass/apache-2.eclass
Gentoo

Diff of /eclass/apache-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.3 Revision 1.24
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.3 2007/12/15 14:00:19 hollow Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.24 2010/12/22 10:02:05 hollow Exp $
4 4
5EAPI="2"
6
5# @ECLASS: apache-2 7# @ECLASS: apache-2.eclass
8# @MAINTAINER:
6# @MAINTAINER: apache-devs@gentoo.org 9# apache-devs@gentoo.org
7# @BLURB: Provides a common set of functions for >=apache-2.2* ebuilds 10# @BLURB: Provides a common set of functions for apache-2.x ebuilds
8# @DESCRIPTION: 11# @DESCRIPTION:
9# This eclass handles common apache ebuild functions in a sane way and providing 12# This eclass handles apache-2.x ebuild functions such as LoadModule generation
10# information about where certain interfaces are located such as LoadModule
11# generation and inter-module dependency checking. 13# and inter-module dependency checking.
12 14
13inherit depend.apache eutils flag-o-matic multilib autotools 15inherit autotools eutils flag-o-matic multilib ssl-cert
14 16
15# ============================================================================== 17# ==============================================================================
16# INTERNAL VARIABLES 18# INTERNAL VARIABLES
17# ============================================================================== 19# ==============================================================================
18 20
19# @ECLASS-VARIABLE: GENTOO_PATCHNAME 21# @ECLASS-VARIABLE: GENTOO_PATCHNAME
20# @DESCRIPTION: 22# @DESCRIPTION:
21# This internal variable contains the prefix for the patch tarball 23# This internal variable contains the prefix for the patch tarball.
22GENTOO_PATCHNAME="gentoo-${PF}" 24# Defaults to the full name and version (including revision) of the package.
25# If you want to override this in an ebuild, use:
26# ORIG_PR="(revision of Gentoo stuff you want)"
27# GENTOO_PATCHNAME="gentoo-${PN}-${PV}${ORIG_PR:+-${ORIG_PR}}"
28[[ -n "$GENTOO_PATCHNAME" ]] || GENTOO_PATCHNAME="gentoo-${PF}"
23 29
24# @ECLASS-VARIABLE: GENTOO_PATCHDIR 30# @ECLASS-VARIABLE: GENTOO_PATCHDIR
25# @DESCRIPTION: 31# @DESCRIPTION:
26# This internal variable contains the working directory where patches and config 32# This internal variable contains the working directory where patches and config
27# files are located 33# files are located.
34# Defaults to the patchset name appended to the working directory.
28GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}" 35[[ -n "$GENTOO_PATCHDIR" ]] || GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
29 36
30# @ECLASS-VARIABLE: GENTOO_DEVELOPER 37# @VARIABLE: GENTOO_DEVELOPER
31# @DESCRIPTION: 38# @DESCRIPTION:
32# This variable needs to be set in the ebuild and contains the name of the 39# This variable needs to be set in the ebuild and contains the name of the
33# gentoo developer who created the patch tarball 40# gentoo developer who created the patch tarball
34 41
35# @ECLASS-VARIABLE: GENTOO_PATCHSTAMP 42# @VARIABLE: GENTOO_PATCHSTAMP
36# @DESCRIPTION: 43# @DESCRIPTION:
37# This variable needs to be set in the ebuild and contains the date the patch 44# This variable needs to be set in the ebuild and contains the date the patch
38# tarball was created at in YYMMDD format 45# tarball was created at in YYYYMMDD format
46
47# @VARIABLE: GENTOO_PATCH_A
48# @DESCRIPTION:
49# This variable should contain the entire filename of patch tarball.
50# Defaults to the name of the patchset, with a datestamp.
51[[ -n "$GENTOO_PATCH_A" ]] || GENTOO_PATCH_A="${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
39 52
40SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 53SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
41 http://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" 54 http://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCH_A}"
42 55
43# @ECLASS-VARIABLE: IUSE_MPMS_FORK 56# @VARIABLE: IUSE_MPMS_FORK
44# @DESCRIPTION: 57# @DESCRIPTION:
45# This variable needs to be set in the ebuild and contains a list of forking 58# This variable needs to be set in the ebuild and contains a list of forking
46# (i.e. non-threaded) MPMS 59# (i.e. non-threaded) MPMs
47 60
48# @ECLASS-VARIABLE: IUSE_MPMS_THREAD 61# @VARIABLE: IUSE_MPMS_THREAD
49# @DESCRIPTION: 62# @DESCRIPTION:
50# This variable needs to be set in the ebuild and contains a list of threaded 63# This variable needs to be set in the ebuild and contains a list of threaded
51# MPMS 64# MPMs
52 65
53# @ECLASS-VARIABLE: IUSE_MODULES 66# @VARIABLE: IUSE_MODULES
54# @DESCRIPTION: 67# @DESCRIPTION:
55# This variable needs to be set in the ebuild and contains a list of available 68# This variable needs to be set in the ebuild and contains a list of available
56# built-in modules 69# built-in modules
57 70
58IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}" 71IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
… …
66 IUSE="${IUSE} apache2_mpms_${mpm}" 79 IUSE="${IUSE} apache2_mpms_${mpm}"
67done 80done
68 81
69DEPEND="dev-lang/perl 82DEPEND="dev-lang/perl
70 =dev-libs/apr-1* 83 =dev-libs/apr-1*
71 =dev-libs/apr-util-1* 84 =dev-libs/apr-util-1*[ldap?]
72 dev-libs/libpcre 85 dev-libs/libpcre
73 ldap? ( =net-nds/openldap-2* ) 86 ldap? ( =net-nds/openldap-2* )
74 selinux? ( sec-policy/selinux-apache ) 87 selinux? ( sec-policy/selinux-apache )
75 ssl? ( dev-libs/openssl ) 88 ssl? ( >=dev-libs/openssl-0.9.8f )
76 !=www-servers/apache-1*" 89 !=www-servers/apache-1*"
77RDEPEND="${DEPEND}" 90RDEPEND="${DEPEND}"
78PDEPEND="~app-admin/apache-tools-${PV}" 91PDEPEND="~app-admin/apache-tools-${PV}"
79 92
80S="${WORKDIR}/httpd-${PV}" 93S="${WORKDIR}/httpd-${PV}"
… …
82# ============================================================================== 95# ==============================================================================
83# INTERNAL FUNCTIONS 96# INTERNAL FUNCTIONS
84# ============================================================================== 97# ==============================================================================
85 98
86# @ECLASS-VARIABLE: MY_MPM 99# @ECLASS-VARIABLE: MY_MPM
87# DESCRIPTION: 100# @DESCRIPTION:
88# This internal variable contains the selected MPM after a call to setup_mpm() 101# This internal variable contains the selected MPM after a call to setup_mpm()
89 102
90# @FUNCTION: setup_mpm 103# @FUNCTION: setup_mpm
91# @DESCRIPTION: 104# @DESCRIPTION:
92# This internal function makes sure that only one of APACHE2_MPMS was selected 105# This internal function makes sure that only one of APACHE2_MPMS was selected
93# or a default based on USE=threads is selected if APACHE2_MPMS is empty 106# or a default based on USE=threads is selected if APACHE2_MPMS is empty
94setup_mpm() { 107setup_mpm() {
108 MY_MPM=""
95 for x in ${IUSE_MPMS} ; do 109 for x in ${IUSE_MPMS} ; do
96 if use apache2_mpms_${x} ; then 110 if use apache2_mpms_${x} ; then
97 if [[ -z "${MY_MPM}" ]] ; then 111 if [[ -z "${MY_MPM}" ]] ; then
98 MY_MPM=${x} 112 MY_MPM=${x}
99 elog 113 elog
… …
130 eerror "You have selected a non-threaded MPM but USE=threads is enabled" 144 eerror "You have selected a non-threaded MPM but USE=threads is enabled"
131 die "invalid use flag combination" 145 die "invalid use flag combination"
132 fi 146 fi
133} 147}
134 148
135# @ECLASS-VARIABLE: MODULE_CRITICAL 149# @VARIABLE: MODULE_CRITICAL
136# @DESCRIPTION: 150# @DESCRIPTION:
137# This variable needs to be set in the ebuild and contains a space-separated 151# This variable needs to be set in the ebuild and contains a space-separated
138# list of modules critical for the default apache. A user may still 152# list of modules critical for the default apache. A user may still
139# disable these modules for custom minimal installation at their own risk. 153# disable these modules for custom minimal installation at their own risk.
140 154
… …
161 ewarn 175 ewarn
162 ebeep 10 176 ebeep 10
163 fi 177 fi
164} 178}
165 179
166# @ECLASS-VARIABLE: MODULE_DEPENDS 180# @VARIABLE: MODULE_DEPENDS
167# @DESCRIPTION: 181# @DESCRIPTION:
168# This variable needs to be set in the ebuild and contains a space-separated 182# This variable needs to be set in the ebuild and contains a space-separated
169# list of dependency tokens each with a module and the module it depends on 183# list of dependency tokens each with a module and the module it depends on
170# separated by a colon 184# separated by a colon
171 185
… …
176check_module_depends() { 190check_module_depends() {
177 local err=0 191 local err=0
178 192
179 for m in ${MY_MODS} ; do 193 for m in ${MY_MODS} ; do
180 for dep in ${MODULE_DEPENDS} ; do 194 for dep in ${MODULE_DEPENDS} ; do
181 if [[ "${m}" == "${dep%:*}" ]]; then 195 if [[ "${m}" == "${dep%:*}" ]] ; then
182 if ! use apache2_modules_${dep#*:} ; then 196 if ! use apache2_modules_${dep#*:} ; then
183 eerror "Module '${m}' depends on '${dep#*:}'" 197 eerror "Module '${m}' depends on '${dep#*:}'"
184 err=1 198 err=1
185 fi 199 fi
186 fi 200 fi
… …
191 die "invalid use flag combination" 205 die "invalid use flag combination"
192 fi 206 fi
193} 207}
194 208
195# @ECLASS-VARIABLE: MY_CONF 209# @ECLASS-VARIABLE: MY_CONF
196# DESCRIPTION: 210# @DESCRIPTION:
197# This internal variable contains the econf options for the current module 211# This internal variable contains the econf options for the current module
198# selection after a call to setup_modules() 212# selection after a call to setup_modules()
199 213
200# @ECLASS-VARIABLE: MY_MODS 214# @ECLASS-VARIABLE: MY_MODS
201# DESCRIPTION: 215# @DESCRIPTION:
202# This internal variable contains a sorted, space separated list of currently 216# This internal variable contains a sorted, space separated list of currently
203# selected modules after a call to setup_modules() 217# selected modules after a call to setup_modules()
204 218
205# @FUNCTION: setup_modules 219# @FUNCTION: setup_modules
206# @DESCRIPTION: 220# @DESCRIPTION:
… …
216 fi 230 fi
217 231
218 MY_CONF="--enable-so=static" 232 MY_CONF="--enable-so=static"
219 233
220 if use ldap ; then 234 if use ldap ; then
221 if ! built_with_use 'dev-libs/apr-util' ldap ; then
222 eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
223 eerror "ldap support, apr-util must be built with the ldap USE-flag"
224 eerror "enabled."
225 die "ldap USE-flag enabled while not supported in apr-util"
226 fi
227 MY_CONF="${MY_CONF} --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}" 235 MY_CONF="${MY_CONF} --enable-authnz_ldap=${mod_type} --enable-ldap=${mod_type}"
228 MY_MODS="${MY_MODS} ldap authnz_ldap" 236 MY_MODS="${MY_MODS} ldap authnz_ldap"
229 else 237 else
230 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap" 238 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
231 fi 239 fi
… …
233 if use ssl ; then 241 if use ssl ; then
234 MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}" 242 MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}"
235 MY_MODS="${MY_MODS} ssl" 243 MY_MODS="${MY_MODS} ssl"
236 else 244 else
237 MY_CONF="${MY_CONF} --without-ssl --disable-ssl" 245 MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
238 fi
239
240 if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
241 MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
242 MY_MODS="${MY_MODS} cgid"
243 else
244 MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
245 MY_MODS="${MY_MODS} cgi"
246 fi 246 fi
247 247
248 if use suexec ; then 248 if use suexec ; then
249 elog "You can manipulate several configure options of suexec" 249 elog "You can manipulate several configure options of suexec"
250 elog "through the following environment variables:" 250 elog "through the following environment variables:"
… …
287 MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u) 287 MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u)
288 check_module_depends 288 check_module_depends
289 check_module_critical 289 check_module_critical
290} 290}
291 291
292# @ECLASS-VARIABLE: MODULE_DEFINES 292# @VARIABLE: MODULE_DEFINES
293# @DESCRIPTION: 293# @DESCRIPTION:
294# This variable needs to be set in the ebuild and contains a space-separated 294# This variable needs to be set in the ebuild and contains a space-separated
295# list of tokens each mapping a module to a runtime define which can be 295# list of tokens each mapping a module to a runtime define which can be
296# specified in APACHE2_OPTS in /etc/conf.d/apache2 to enable this particular 296# specified in APACHE2_OPTS in /etc/conf.d/apache2 to enable this particular
297# module. 297# module.
… …
299# @FUNCTION: generate_load_module 299# @FUNCTION: generate_load_module
300# @DESCRIPTION: 300# @DESCRIPTION:
301# This internal function generates the LoadModule lines for httpd.conf based on 301# This internal function generates the LoadModule lines for httpd.conf based on
302# the current module selection and MODULE_DEFINES 302# the current module selection and MODULE_DEFINES
303generate_load_module() { 303generate_load_module() {
304 local endit=0 mod_lines= mod_dir="${D}${APACHE2_MODULESDIR}" 304 local endit=0 mod_lines= mod_dir="${D}/usr/$(get_libdir)/apache2/modules"
305 305
306 if use static; then 306 if use static; then
307 sed -i -e "/%%LOAD_MODULE%%/d" \ 307 sed -i -e "/%%LOAD_MODULE%%/d" \
308 "${GENTOO_PATCHDIR}"/conf/httpd.conf 308 "${GENTOO_PATCHDIR}"/conf/httpd.conf
309 return 309 return
… …
361# creates the apache user and group and informs about CONFIG_SYSVIPC being 361# creates the apache user and group and informs about CONFIG_SYSVIPC being
362# needed (we don't depend on kernel sources and therefore cannot check). 362# needed (we don't depend on kernel sources and therefore cannot check).
363apache-2_pkg_setup() { 363apache-2_pkg_setup() {
364 check_upgrade 364 check_upgrade
365 365
366 setup_mpm
367 setup_modules
368
369 if use debug; then
370 MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
371 fi
372
373 # setup apache user and group 366 # setup apache user and group
374 enewgroup apache 81 367 enewgroup apache 81
375 enewuser apache 81 -1 /var/www apache 368 enewuser apache 81 -1 /var/www apache
376 369
370 setup_mpm
371 setup_modules
372
373 if use debug; then
374 MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
375 fi
376
377 elog "Please note that you need SysV IPC support in your kernel." 377 elog "Please note that you need SysV IPC support in your kernel."
378 elog "Make sure CONFIG_SYSVIPC=y is set." 378 elog "Make sure CONFIG_SYSVIPC=y is set."
379 elog 379 elog
380}
381 380
381 if use userland_BSD; then
382 elog "On BSD systems you need to add the following line to /boot/loader.conf:"
383 elog " accf_http_load=\"YES\""
384 elog
385 fi
386}
387
382# @FUNCTION: apache-2_src_unpack 388# @FUNCTION: apache-2_src_prepare
383# @DESCRIPTION: 389# @DESCRIPTION:
384# This function applies patches, configures a custom file-system layout and 390# This function applies patches, configures a custom file-system layout and
385# rebuilds the configure scripts. 391# rebuilds the configure scripts.
386apache-2_src_unpack() { 392apache-2_src_prepare() {
387 unpack ${A} 393 # 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
388 cd "${S}" 394 # idea for everyone
395 case ${CHOST} in
396 *-linux-gnu|*-solaris*|*-freebsd*)
397 # do nothing, these use GNU binutils
398 :
399 ;;
400 *-darwin*)
401 sed -i -e 's/-Wl,-z,now/-Wl,-bind_at_load/g' \
402 "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch
403 ;;
404 *)
405 # patch it out to be like upstream
406 sed -i -e 's/-Wl,-z,now//g' \
407 "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch
408 ;;
409 esac
389 410
390 # Use correct multilib libdir in gentoo patches 411 # Use correct multilib libdir in gentoo patches
391 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 412 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
392 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 413 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
393 || die "libdir sed failed" 414 || die "libdir sed failed"
… …
403 mv docs/man/{httpd,apache2}.8 424 mv docs/man/{httpd,apache2}.8
404 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in 425 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in
405 426
406 # patched-in MPMs need the build environment rebuilt 427 # patched-in MPMs need the build environment rebuilt
407 sed -i -e '/sinclude/d' configure.in 428 sed -i -e '/sinclude/d' configure.in
408 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf 429 AT_M4DIR=build eautoreconf
409} 430}
410 431
411# @FUNCTION: apache-2_src_compile 432# @FUNCTION: apache-2_src_configure
412# @DESCRIPTION: 433# @DESCRIPTION:
413# This function adds compiler flags and runs econf and emake based on MY_MPM and 434# This function adds compiler flags and runs econf and emake based on MY_MPM and
414# MY_CONF 435# MY_CONF
415apache-2_src_compile() { 436apache-2_src_configure() {
416 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 437 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
417 # Thanks to Harald van Dijk 438 # Thanks to Harald van Dijk
418 append-ldflags -Wl,--no-as-needed 439 append-ldflags $(no-as-needed)
419 440
420 # peruser MPM debugging with -X is nearly impossible 441 # peruser MPM debugging with -X is nearly impossible
421 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 442 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
422 use debug && append-flags -DMPM_PERUSER_DEBUG 443 use debug && append-flags -DMPM_PERUSER_DEBUG
423 fi 444 fi
… …
429 --libexecdir=/usr/$(get_libdir)/apache2/modules \ 450 --libexecdir=/usr/$(get_libdir)/apache2/modules \
430 --datadir=/var/www/localhost \ 451 --datadir=/var/www/localhost \
431 --sysconfdir=/etc/apache2 \ 452 --sysconfdir=/etc/apache2 \
432 --localstatedir=/var \ 453 --localstatedir=/var \
433 --with-mpm=${MY_MPM} \ 454 --with-mpm=${MY_MPM} \
434 --with-perl=/usr/bin/perl \
435 --with-apr=/usr \ 455 --with-apr=/usr \
436 --with-apr-util=/usr \ 456 --with-apr-util=/usr \
437 --with-pcre=/usr \ 457 --with-pcre=/usr \
438 --with-z=/usr \ 458 --with-z=/usr \
439 --with-port=80 \ 459 --with-port=80 \
440 --with-program-name=apache2 \ 460 --with-program-name=apache2 \
441 --enable-layout=Gentoo \ 461 --enable-layout=Gentoo \
442 ${MY_CONF} || die "econf failed!" 462 ${MY_CONF} || die "econf failed!"
443 463
444 sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h 464 sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
445
446 emake || die "emake failed"
447} 465}
448 466
449# @FUNCTION: apache-2_src_install 467# @FUNCTION: apache-2_src_install
450# @DESCRIPTION: 468# @DESCRIPTION:
451# This function runs emake install and generates, install and adapts the gentoo 469# This function runs `emake install' and generates, installs and adapts the gentoo
452# specific configuration files found in the tarball 470# specific configuration files found in the tarball
453apache-2_src_install() { 471apache-2_src_install() {
454 emake DESTDIR="${D}" install || die "emake install failed" 472 make DESTDIR="${D}" install || die "make install failed"
455 473
456 # install our configuration files 474 # install our configuration files
457 keepdir /etc/apache2/vhosts.d 475 keepdir /etc/apache2/vhosts.d
458 keepdir /etc/apache2/modules.d 476 keepdir /etc/apache2/modules.d
459 477
460 generate_load_module 478 generate_load_module
461 insinto /etc/apache2 479 insinto /etc/apache2
462 doins -r "${GENTOO_PATCHDIR}"/conf/* 480 doins -r "${GENTOO_PATCHDIR}"/conf/*
463 doins docs/conf/magic 481 use apache2_modules_mime_magic && doins docs/conf/magic
464 482
465 insinto /etc/logrotate.d 483 insinto /etc/logrotate.d
466 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2 484 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
467 485
468 # generate a sane default APACHE2_OPTS 486 # generate a sane default APACHE2_OPTS
469 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" 487 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
470 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" 488 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
471 use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" 489 use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
472 use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" 490 use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
491 if hasq negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then
492 APACHE2_OPTS="${APACHE2_OPTS} -D LANGUAGE"
493 fi
473 494
474 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ 495 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
475 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" 496 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
476 497
477 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 498 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
478 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2 499 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
479 500
480 # link apache2ctl to the init script 501 # install apache2ctl wrapper for our init script if available
502 if test -e "${GENTOO_PATCHDIR}"/scripts/apache2ctl; then
503 exeinto /usr/sbin
504 doexe "${GENTOO_PATCHDIR}"/scripts/apache2ctl
505 else
481 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl 506 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
507 fi
482 508
483 # provide symlinks for all the stuff we no longer rename, bug 177697 509 # provide legacy symlink for apxs, bug 177697
484 for i in suexec apxs; do
485 dosym /usr/sbin/${i} /usr/sbin/${i}2 510 dosym /usr/sbin/apxs /usr/sbin/apxs2
486 done
487
488 # install some thirdparty scripts
489 exeinto /usr/sbin
490 use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
491 511
492 # install some documentation 512 # install some documentation
493 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING 513 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
494 dodoc "${GENTOO_PATCHDIR}"/docs/* 514 dodoc "${GENTOO_PATCHDIR}"/docs/*
495 515
… …
499 else 519 else
500 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf" 520 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
501 rm -Rf "${D}/usr/share/doc/${PF}/manual" 521 rm -Rf "${D}/usr/share/doc/${PF}/manual"
502 fi 522 fi
503 523
504 # the default webroot gets stored in /usr/share/doc 524 # the default icons and error pages get stored in
505 ebegin "Installing default webroot to /usr/share/doc/${PF}" 525 # /usr/share/apache2/{error,icons}
526 dodir /usr/share/apache2
506 mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot" 527 mv -f "${D}/var/www/localhost/error" "${D}/usr/share/apache2/error"
528 mv -f "${D}/var/www/localhost/icons" "${D}/usr/share/apache2/icons"
529 rm -rf "${D}/var/www/localhost/"
507 eend $? 530 eend $?
508 keepdir /var/www/localhost/htdocs
509 531
510 # set some sane permissions for suexec 532 # set some sane permissions for suexec
511 if use suexec ; then 533 if use suexec ; then
512 fowners 0:apache /usr/sbin/suexec 534 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
513 fperms 4710 /usr/sbin/suexec 535 fperms 4710 /usr/sbin/suexec
536 # provide legacy symlink for suexec, bug 177697
537 dosym /usr/sbin/suexec /usr/sbin/suexec2
514 fi 538 fi
515 539
516 # empty dirs 540 # empty dirs
517 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do 541 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
518 keepdir ${i} 542 keepdir ${i}
519 fowners apache:apache ${i} 543 fowners apache:apache ${i}
520 fperms 0755 ${i} 544 fperms 0755 ${i}
521 done 545 done
522
523 # we need /etc/apache2/ssl if USE=ssl
524 use ssl && keepdir /etc/apache2/ssl
525} 546}
526 547
527# @FUNCTION: apache-2_pkg_postinst 548# @FUNCTION: apache-2_pkg_postinst
528# @DESCRIPTION: 549# @DESCRIPTION:
529# This function creates test certificates if SSL is enabled and installs the 550# This function creates test certificates if SSL is enabled and installs the
530# default webroot if /var/www/localhost does not exist. We do this here because 551# default index.html to /var/www/localhost if it does not exist. We do this here
531# the default webroot is a copy of the files that exist elsewhere and we don't 552# because the default webroot is a copy of the files that exist elsewhere and we
532# want them to be managed/removed by portage when apache is upgraded. 553# don't want them to be managed/removed by portage when apache is upgraded.
533apache-2_pkg_postinst() { 554apache-2_pkg_postinst() {
534 if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then 555 if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
535 cd "${ROOT}"/etc/apache2/ssl 556 SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
536 einfo 557 install_cert /etc/ssl/apache2/server
537 einfo "Generating self-signed test certificate in ${ROOT}etc/apache2/ssl ..." 558 ewarn
538 yes "" 2>/dev/null | \ 559 ewarn "The location of SSL certificates has changed. If you are"
539 "${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ 560 ewarn "upgrading from ${CATEGORY}/${PN}-2.2.13 or earlier (or remerged"
540 die "gentestcrt.sh failed" 561 ewarn "*any* apache version), you might want to move your old"
541 einfo 562 ewarn "certificates from /etc/apache2/ssl/ to /etc/ssl/apache2/ and"
563 ewarn "update your config files."
564 ewarn
542 fi 565 fi
543 566
544 if [[ -e "${ROOT}/var/www/localhost" ]] ; then 567 if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then
545 elog "The default webroot has not been installed into"
546 elog "${ROOT}var/www/localhost because the directory already exists"
547 elog "and we do not want to overwrite any files you have put there."
548 elog
549 elog "If you would like to install the latest webroot, please run"
550 elog "emerge --config =${PF}"
551 elog
552 else
553 einfo "Installing default webroot to ${ROOT}var/www/localhost"
554 mkdir -p "${ROOT}"/var/www/localhost 568 mkdir -p "${ROOT}/var/www/localhost/htdocs"
555 cp -R "${ROOT}"/usr/share/doc/${PF}/webroot/* "${ROOT}"/var/www/localhost 569 echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html"
556 chown -R apache:0 "${ROOT}"/var/www/localhost
557 fi 570 fi
558}
559 571
560# @FUNCTION: apache-2_pkg_config 572 echo
561# @DESCRIPTION: 573 elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags"
562# This function installs -- and removes a previously existing -- default webroot 574 elog "in /etc/make.conf. Make sure to enable those in order to compile them."
563# to /var/www/localhost 575 elog "In general, you should use 'cgid' with threaded MPMs and 'cgi' otherwise."
564apache-2_pkg_config() { 576 echo
565 einfo "Installing default webroot to ${ROOT}var/www/localhost"
566 mkdir "${ROOT}"var{,/www{,/localhost}}
567 cp -R "${ROOT}"usr/share/doc/${PF}/webroot/* "${ROOT}"var/www/localhost/
568}
569 577
578}
579
570EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_config 580EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.24
  ViewVC Help
Powered by ViewVC 1.1.17