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