/[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.1 Revision 1.18
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.1 2007/11/28 13:04:12 hollow Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.18 2009/09/20 08:37:23 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}"
59IUSE="debug doc ldap selinux ssl static suexec threads" 72IUSE="${IUSE} debug doc ldap selinux ssl static suexec threads"
60 73
61for module in ${IUSE_MODULES} ; do 74for module in ${IUSE_MODULES} ; do
62 IUSE="${IUSE} apache2_modules_${module}" 75 IUSE="${IUSE} apache2_modules_${module}"
63done 76done
64 77
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
149# @VARIABLE: MODULE_CRITICAL
150# @DESCRIPTION:
151# This variable needs to be set in the ebuild and contains a space-separated
152# list of modules critical for the default apache. A user may still
153# disable these modules for custom minimal installation at their own risk.
154
155# @FUNCTION: check_module_critical
156# @DESCRIPTION:
157# This internal function warns the user about modules critical for the default
158# apache configuration.
159check_module_critical() {
160 local unsupported=0
161
162 for m in ${MODULE_CRITICAL} ; do
163 if ! has ${m} ${MY_MODS} ; then
164 ewarn "Module '${m}' is required in the default apache configuration."
165 unsupported=1
166 fi
167 done
168
169 if [[ ${unsupported} -ne 0 ]] ; then
170 ewarn
171 ewarn "You have disabled one or more required modules"
172 ewarn "for the default apache configuration."
173 ewarn "Although this is not an error, please be"
174 ewarn "aware that this setup is UNSUPPORTED."
175 ewarn
176 ebeep 10
177 fi
178}
179
135# @ECLASS-VARIABLE: MODULE_DEPENDS 180# @VARIABLE: MODULE_DEPENDS
136# @DESCRIPTION: 181# @DESCRIPTION:
137# 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
138# 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
139# separated by a colon 184# separated by a colon
140 185
145check_module_depends() { 190check_module_depends() {
146 local err=0 191 local err=0
147 192
148 for m in ${MY_MODS} ; do 193 for m in ${MY_MODS} ; do
149 for dep in ${MODULE_DEPENDS} ; do 194 for dep in ${MODULE_DEPENDS} ; do
150 if [[ "${m}" == "${dep%:*}" ]]; then 195 if [[ "${m}" == "${dep%:*}" ]] ; then
151 if ! use apache2_modules_${dep#*:} ; then 196 if ! use apache2_modules_${dep#*:} ; then
152 eerror "Module '${m}' depends on '${dep#*:}'" 197 eerror "Module '${m}' depends on '${dep#*:}'"
153 err=1 198 err=1
154 fi 199 fi
155 fi 200 fi
160 die "invalid use flag combination" 205 die "invalid use flag combination"
161 fi 206 fi
162} 207}
163 208
164# @ECLASS-VARIABLE: MY_CONF 209# @ECLASS-VARIABLE: MY_CONF
165# DESCRIPTION: 210# @DESCRIPTION:
166# This internal variable contains the econf options for the current module 211# This internal variable contains the econf options for the current module
167# selection after a call to setup_modules() 212# selection after a call to setup_modules()
168 213
169# @ECLASS-VARIABLE: MY_MODS 214# @ECLASS-VARIABLE: MY_MODS
170# DESCRIPTION: 215# @DESCRIPTION:
171# This internal variable contains a sorted, space separated list of currently 216# This internal variable contains a sorted, space separated list of currently
172# selected modules after a call to setup_modules() 217# selected modules after a call to setup_modules()
173 218
174# @FUNCTION: setup_modules 219# @FUNCTION: setup_modules
175# @DESCRIPTION: 220# @DESCRIPTION:
185 fi 230 fi
186 231
187 MY_CONF="--enable-so=static" 232 MY_CONF="--enable-so=static"
188 233
189 if use ldap ; then 234 if use ldap ; then
190 if ! built_with_use 'dev-libs/apr-util' ldap ; then
191 eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
192 eerror "ldap support, apr-util must be built with the ldap USE-flag"
193 eerror "enabled."
194 die "ldap USE-flag enabled while not supported in apr-util"
195 fi
196 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}"
197 MY_MODS="${MY_MODS} ldap authnz_ldap" 236 MY_MODS="${MY_MODS} ldap authnz_ldap"
198 else 237 else
199 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap" 238 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
200 fi 239 fi
253 done 292 done
254 293
255 # sort and uniquify MY_MODS 294 # sort and uniquify MY_MODS
256 MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u) 295 MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u)
257 check_module_depends 296 check_module_depends
297 check_module_critical
258} 298}
259 299
260# @ECLASS-VARIABLE: MODULE_DEFINES 300# @VARIABLE: MODULE_DEFINES
261# @DESCRIPTION: 301# @DESCRIPTION:
262# This variable needs to be set in the ebuild and contains a space-separated 302# This variable needs to be set in the ebuild and contains a space-separated
263# list of tokens each mapping a module to a runtime define which can be 303# list of tokens each mapping a module to a runtime define which can be
264# specified in APACHE2_OPTS in /etc/conf.d/apache2 to enable this particular 304# specified in APACHE2_OPTS in /etc/conf.d/apache2 to enable this particular
265# module. 305# module.
267# @FUNCTION: generate_load_module 307# @FUNCTION: generate_load_module
268# @DESCRIPTION: 308# @DESCRIPTION:
269# This internal function generates the LoadModule lines for httpd.conf based on 309# This internal function generates the LoadModule lines for httpd.conf based on
270# the current module selection and MODULE_DEFINES 310# the current module selection and MODULE_DEFINES
271generate_load_module() { 311generate_load_module() {
272 local endit=0 mod_lines= mod_dir="${D}${APACHE2_MODULESDIR}" 312 local endit=0 mod_lines= mod_dir="${D}/usr/$(get_libdir)/apache2/modules"
273 313
274 if use static; then 314 if use static; then
275 sed -i -e "/%%LOAD_MODULE%%/d" \ 315 sed -i -e "/%%LOAD_MODULE%%/d" \
276 "${GENTOO_PATCHDIR}"/conf/httpd.conf 316 "${GENTOO_PATCHDIR}"/conf/httpd.conf
277 return 317 return
309 if [[ -e "${ROOT}"etc/apache2/apache2-builtin-mods ]]; then 349 if [[ -e "${ROOT}"etc/apache2/apache2-builtin-mods ]]; then
310 eerror "The previous configuration file for built-in modules" 350 eerror "The previous configuration file for built-in modules"
311 eerror "(${ROOT}etc/apache2/apache2-builtin-mods) exists on your" 351 eerror "(${ROOT}etc/apache2/apache2-builtin-mods) exists on your"
312 eerror "system." 352 eerror "system."
313 eerror 353 eerror
314 eerror "Please read http://www.gentoo.org/proj/en/apache/upgrade.xml" 354 eerror "Please read http://www.gentoo.org/doc/en/apache-upgrading.xml"
315 eerror "for detailed information how to convert this file to the new" 355 eerror "for detailed information how to convert this file to the new"
316 eerror "APACHE2_MODULES USE_EXPAND variable." 356 eerror "APACHE2_MODULES USE_EXPAND variable."
317 eerror 357 eerror
318 die "upgrade not possible with existing ${ROOT}etc/apache2/apache2-builtin-mods" 358 die "upgrade not possible with existing ${ROOT}etc/apache2/apache2-builtin-mods"
319 fi 359 fi
329# creates the apache user and group and informs about CONFIG_SYSVIPC being 369# creates the apache user and group and informs about CONFIG_SYSVIPC being
330# needed (we don't depend on kernel sources and therefore cannot check). 370# needed (we don't depend on kernel sources and therefore cannot check).
331apache-2_pkg_setup() { 371apache-2_pkg_setup() {
332 check_upgrade 372 check_upgrade
333 373
334 setup_mpm
335 setup_modules
336
337 if use debug; then
338 MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
339 fi
340
341 # setup apache user and group 374 # setup apache user and group
342 enewgroup apache 81 375 enewgroup apache 81
343 enewuser apache 81 -1 /var/www apache 376 enewuser apache 81 -1 /var/www apache
344 377
378 setup_mpm
379 setup_modules
380
381 if use debug; then
382 MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
383 fi
384
345 elog "Please note that you need SysV IPC support in your kernel." 385 elog "Please note that you need SysV IPC support in your kernel."
346 elog "Make sure CONFIG_SYSVIPC=y is set." 386 elog "Make sure CONFIG_SYSVIPC=y is set."
347 elog 387 elog
348}
349 388
389 if use userland_BSD; then
390 elog "On BSD systems you need to add the following line to /boot/loader.conf:"
391 elog " accf_http_load=\"YES\""
392 elog
393 fi
394}
395
350# @FUNCTION: apache-2_src_unpack 396# @FUNCTION: apache-2_src_prepare
351# @DESCRIPTION: 397# @DESCRIPTION:
352# This function applies patches, configures a custom file-system layout and 398# This function applies patches, configures a custom file-system layout and
353# rebuilds the configure scripts. The patch names are organized as follows: 399# rebuilds the configure scripts.
354#
355# 00-19 Gentoo specific (00_all_some-title.patch)
356# 20-39 Additional MPMs (20_all_${MPM}_some-title.patch)
357# 40-59 USE-flag based (40_all_${USE}_some-title.patch)
358# 60-79 Version specific (60_all_${PV}_some-title.patch)
359# 80-99 Security patches (80_all_${PV}_cve-####-####.patch)
360apache-2_src_unpack() { 400apache-2_src_prepare() {
361 unpack ${A} 401 # 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
362 cd "${S}" 402 # idea for everyone
403 case ${CHOST} in
404 *-linux-gnu|*-solaris*|*-freebsd*)
405 # do nothing, these use GNU binutils
406 :
407 ;;
408 *-darwin*)
409 sed -i -e 's/-Wl,-z,now/-Wl,-bind_at_load/g' \
410 "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch
411 ;;
412 *)
413 # patch it out to be like upstream
414 sed -i -e 's/-Wl,-z,now//g' \
415 "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch
416 ;;
417 esac
363 418
364 # Use correct multilib libdir in gentoo patches 419 # Use correct multilib libdir in gentoo patches
365 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 420 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
366 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 421 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
367 || die "libdir sed failed" 422 || die "libdir sed failed"
371 # setup the filesystem layout config 426 # setup the filesystem layout config
372 cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \ 427 cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \
373 die "Failed preparing config.layout!" 428 die "Failed preparing config.layout!"
374 sed -i -e "s:version:${PF}:g" "${S}"/config.layout 429 sed -i -e "s:version:${PF}:g" "${S}"/config.layout
375 430
431 # apache2.8 instead of httpd.8 (bug #194828)
432 mv docs/man/{httpd,apache2}.8
433 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in
434
376 # patched-in MPMs need the build environment rebuilt 435 # patched-in MPMs need the build environment rebuilt
377 sed -i -e '/sinclude/d' configure.in 436 sed -i -e '/sinclude/d' configure.in
378 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf 437 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf
379
380 # apache2.8 instead of httpd.8 (bug #194828)
381 mv docs/man/{httpd,apache2}.8
382} 438}
383 439
384# @FUNCTION: apache-2_src_compile 440# @FUNCTION: apache-2_src_configure
385# @DESCRIPTION: 441# @DESCRIPTION:
386# This function adds compiler flags and runs econf and emake based on MY_MPM and 442# This function adds compiler flags and runs econf and emake based on MY_MPM and
387# MY_CONF 443# MY_CONF
388apache-2_src_compile() { 444apache-2_src_configure() {
389 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 445 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
390 # Thanks to Harald van Dijk 446 # Thanks to Harald van Dijk
447 # ... but only on platforms that use a GNU linker!
448 case ${CHOST} in
449 *-solaris* | *-*bsd* | *-linux-gnu)
391 append-ldflags -Wl,--no-as-needed 450 append-ldflags -Wl,--no-as-needed
451 ;;
452 esac
392 453
393 # peruser MPM debugging with -X is nearly impossible 454 # peruser MPM debugging with -X is nearly impossible
394 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 455 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
395 use debug && append-flags -DMPM_PERUSER_DEBUG 456 use debug && append-flags -DMPM_PERUSER_DEBUG
396 fi 457 fi
402 --libexecdir=/usr/$(get_libdir)/apache2/modules \ 463 --libexecdir=/usr/$(get_libdir)/apache2/modules \
403 --datadir=/var/www/localhost \ 464 --datadir=/var/www/localhost \
404 --sysconfdir=/etc/apache2 \ 465 --sysconfdir=/etc/apache2 \
405 --localstatedir=/var \ 466 --localstatedir=/var \
406 --with-mpm=${MY_MPM} \ 467 --with-mpm=${MY_MPM} \
407 --with-perl=/usr/bin/perl \
408 --with-apr=/usr \ 468 --with-apr=/usr \
409 --with-apr-util=/usr \ 469 --with-apr-util=/usr \
410 --with-pcre=/usr \ 470 --with-pcre=/usr \
411 --with-z=/usr \ 471 --with-z=/usr \
412 --with-port=80 \ 472 --with-port=80 \
413 --with-program-name=apache2 \ 473 --with-program-name=apache2 \
414 --enable-layout=Gentoo \ 474 --enable-layout=Gentoo \
415 ${MY_CONF} || die "econf failed!" 475 ${MY_CONF} || die "econf failed!"
416 476
417 sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h 477 sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
418
419 emake || die "emake failed"
420} 478}
421 479
422# @FUNCTION: apache-2_src_install 480# @FUNCTION: apache-2_src_install
423# @DESCRIPTION: 481# @DESCRIPTION:
424# This function runs emake install and generates, install and adapts the gentoo 482# This function runs `emake install' and generates, installs and adapts the gentoo
425# specific configuration files found in the tarball 483# specific configuration files found in the tarball
426apache-2_src_install() { 484apache-2_src_install() {
427 emake DESTDIR="${D}" install || die "emake install failed" 485 make DESTDIR="${D}" install || die "make install failed"
428 486
429 # install our configuration files 487 # install our configuration files
430 keepdir /etc/apache2/vhosts.d 488 keepdir /etc/apache2/vhosts.d
431 keepdir /etc/apache2/modules.d 489 keepdir /etc/apache2/modules.d
432 490
437 495
438 insinto /etc/logrotate.d 496 insinto /etc/logrotate.d
439 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2 497 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
440 498
441 # generate a sane default APACHE2_OPTS 499 # generate a sane default APACHE2_OPTS
442 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" 500 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
443 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" 501 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
444 use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" 502 use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
445 use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" 503 use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
504 if hasq negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then
505 APACHE2_OPTS="${APACHE2_OPTS} -D LANGUAGE"
506 fi
446 507
447 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ 508 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
448 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" 509 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
449 510
450 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 511 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
451 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2 512 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
452 513
453 # link apache2ctl to the init script 514 # install apache2ctl wrapper for our init script if available
515 if test -e "${GENTOO_PATCHDIR}"/scripts/apache2ctl; then
516 exeinto /usr/sbin
517 doexe "${GENTOO_PATCHDIR}"/scripts/apache2ctl
518 else
454 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl 519 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
520 fi
455 521
456 # provide symlinks for all the stuff we no longer rename, bug 177697 522 # provide legacy symlink for apxs, bug 177697
457 for i in suexec apxs; do
458 dosym /usr/sbin/${i} /usr/sbin/${i}2 523 dosym /usr/sbin/apxs /usr/sbin/apxs2
459 done
460
461 # install some thirdparty scripts
462 exeinto /usr/sbin
463 use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
464 524
465 # install some documentation 525 # install some documentation
466 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING 526 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
467 dodoc "${GENTOO_PATCHDIR}"/docs/* 527 dodoc "${GENTOO_PATCHDIR}"/docs/*
468 528
472 else 532 else
473 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf" 533 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
474 rm -Rf "${D}/usr/share/doc/${PF}/manual" 534 rm -Rf "${D}/usr/share/doc/${PF}/manual"
475 fi 535 fi
476 536
477 # the default webroot gets stored in /usr/share/doc 537 # the default icons and error pages get stored in
478 ebegin "Installing default webroot to /usr/share/doc/${PF}" 538 # /usr/share/apache2/{error,icons}
539 dodir /usr/share/apache2
479 mv -f "${D}/var/www/localhost" "${D}/usr/share/doc/${PF}/webroot" 540 mv -f "${D}/var/www/localhost/error" "${D}/usr/share/apache2/error"
541 mv -f "${D}/var/www/localhost/icons" "${D}/usr/share/apache2/icons"
542 rm -rf "${D}/var/www/localhost/"
480 eend $? 543 eend $?
481 keepdir /var/www/localhost/htdocs
482 544
483 # set some sane permissions for suexec 545 # set some sane permissions for suexec
484 if use suexec ; then 546 if use suexec ; then
485 fowners 0:apache /usr/sbin/suexec 547 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
486 fperms 4710 /usr/sbin/suexec 548 fperms 4710 /usr/sbin/suexec
549 # provide legacy symlink for suexec, bug 177697
550 dosym /usr/sbin/suexec /usr/sbin/suexec2
487 fi 551 fi
488 552
489 # empty dirs 553 # empty dirs
490 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do 554 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
491 keepdir ${i} 555 keepdir ${i}
492 fowners apache:apache ${i} 556 fowners apache:apache ${i}
493 fperms 0755 ${i} 557 fperms 0755 ${i}
494 done 558 done
495
496 # we need /etc/apache2/ssl if USE=ssl
497 use ssl && keepdir /etc/apache2/ssl
498} 559}
499 560
500# @FUNCTION: apache-2_pkg_postinst 561# @FUNCTION: apache-2_pkg_postinst
501# @DESCRIPTION: 562# @DESCRIPTION:
502# This function creates test certificates if SSL is enabled and installs the 563# This function creates test certificates if SSL is enabled and installs the
503# default webroot if /var/www/localhost does not exist. We do this here because 564# default index.html to /var/www/localhost if it does not exist. We do this here
504# the default webroot is a copy of the files that exist elsewhere and we don't 565# because the default webroot is a copy of the files that exist elsewhere and we
505# want them to be managed/removed by portage when apache is upgraded. 566# don't want them to be managed/removed by portage when apache is upgraded.
506apache-2_pkg_postinst() { 567apache-2_pkg_postinst() {
507 if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then 568 if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
508 cd "${ROOT}"/etc/apache2/ssl 569 SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
509 einfo 570 install_cert /etc/ssl/apache2/server
510 einfo "Generating self-signed test certificate in ${ROOT}etc/apache2/ssl ..." 571 ewarn
511 yes "" 2>/dev/null | \ 572 ewarn "The location of SSL certificates has changed. If you are"
512 "${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ 573 ewarn "upgrading from ${CATEGORY}/${PN}-2.2.13 or earlier (or remerged"
513 die "gentestcrt.sh failed" 574 ewarn "*any* apache version), you might want to move your old"
514 einfo 575 ewarn "certificates from /etc/apache2/ssl/ to /etc/ssl/apache2/ and"
576 ewarn "update your config files."
577 ewarn
515 fi 578 fi
516 579
517 if [[ -e "${ROOT}/var/www/localhost" ]] ; then 580 if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then
518 elog "The default webroot has not been installed into"
519 elog "${ROOT}var/www/localhost because the directory already exists"
520 elog "and we do not want to overwrite any files you have put there."
521 elog
522 elog "If you would like to install the latest webroot, please run"
523 elog "emerge --config =${PF}"
524 elog
525 else
526 einfo "Installing default webroot to ${ROOT}var/www/localhost"
527 mkdir -p "${ROOT}"/var/www/localhost 581 mkdir -p "${ROOT}/var/www/localhost/htdocs"
528 cp -R "${ROOT}"/usr/share/doc/${PF}/webroot/* "${ROOT}"/var/www/localhost 582 echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html"
529 chown -R apache:0 "${ROOT}"/var/www/localhost
530 fi 583 fi
531} 584}
532 585
533# @FUNCTION: apache-2_pkg_config
534# @DESCRIPTION:
535# This function installs -- and removes a previously existing -- default webroot
536# to /var/www/localhost
537apache-2_pkg_config() {
538 einfo "Installing default webroot to ${ROOT}var/www/localhost"
539 mkdir "${ROOT}"var{,/www{,/localhost}}
540 cp -R "${ROOT}"usr/share/doc/${PF}/webroot/* "${ROOT}"var/www/localhost/
541}
542
543EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst pkg_config 586EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20