/[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.5 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.5 2007/12/31 23:46:24 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
131 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"
132 die "invalid use flag combination" 143 die "invalid use flag combination"
133 fi 144 fi
134} 145}
135 146
136# @ECLASS-VARIABLE: MODULE_CRITICAL 147# @VARIABLE: MODULE_CRITICAL
137# @DESCRIPTION: 148# @DESCRIPTION:
138# 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
139# 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
140# disable these modules for custom minimal installation at their own risk. 151# disable these modules for custom minimal installation at their own risk.
141 152
162 ewarn 173 ewarn
163 ebeep 10 174 ebeep 10
164 fi 175 fi
165} 176}
166 177
167# @ECLASS-VARIABLE: MODULE_DEPENDS 178# @VARIABLE: MODULE_DEPENDS
168# @DESCRIPTION: 179# @DESCRIPTION:
169# 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
170# 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
171# separated by a colon 182# separated by a colon
172 183
177check_module_depends() { 188check_module_depends() {
178 local err=0 189 local err=0
179 190
180 for m in ${MY_MODS} ; do 191 for m in ${MY_MODS} ; do
181 for dep in ${MODULE_DEPENDS} ; do 192 for dep in ${MODULE_DEPENDS} ; do
182 if [[ "${m}" == "${dep%:*}" ]]; then 193 if [[ "${m}" == "${dep%:*}" ]] ; then
183 if ! use apache2_modules_${dep#*:} ; then 194 if ! use apache2_modules_${dep#*:} ; then
184 eerror "Module '${m}' depends on '${dep#*:}'" 195 eerror "Module '${m}' depends on '${dep#*:}'"
185 err=1 196 err=1
186 fi 197 fi
187 fi 198 fi
192 die "invalid use flag combination" 203 die "invalid use flag combination"
193 fi 204 fi
194} 205}
195 206
196# @ECLASS-VARIABLE: MY_CONF 207# @ECLASS-VARIABLE: MY_CONF
197# DESCRIPTION: 208# @DESCRIPTION:
198# This internal variable contains the econf options for the current module 209# This internal variable contains the econf options for the current module
199# selection after a call to setup_modules() 210# selection after a call to setup_modules()
200 211
201# @ECLASS-VARIABLE: MY_MODS 212# @ECLASS-VARIABLE: MY_MODS
202# DESCRIPTION: 213# @DESCRIPTION:
203# This internal variable contains a sorted, space separated list of currently 214# This internal variable contains a sorted, space separated list of currently
204# selected modules after a call to setup_modules() 215# selected modules after a call to setup_modules()
205 216
206# @FUNCTION: setup_modules 217# @FUNCTION: setup_modules
207# @DESCRIPTION: 218# @DESCRIPTION:
217 fi 228 fi
218 229
219 MY_CONF="--enable-so=static" 230 MY_CONF="--enable-so=static"
220 231
221 if use ldap ; then 232 if use ldap ; then
222 if ! built_with_use 'dev-libs/apr-util' ldap ; then
223 eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
224 eerror "ldap support, apr-util must be built with the ldap USE-flag"
225 eerror "enabled."
226 die "ldap USE-flag enabled while not supported in apr-util"
227 fi
228 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}"
229 MY_MODS="${MY_MODS} ldap authnz_ldap" 234 MY_MODS="${MY_MODS} ldap authnz_ldap"
230 else 235 else
231 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap" 236 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
232 fi 237 fi
234 if use ssl ; then 239 if use ssl ; then
235 MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}" 240 MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}"
236 MY_MODS="${MY_MODS} ssl" 241 MY_MODS="${MY_MODS} ssl"
237 else 242 else
238 MY_CONF="${MY_CONF} --without-ssl --disable-ssl" 243 MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
239 fi
240
241 if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
242 MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
243 MY_MODS="${MY_MODS} cgid"
244 else
245 MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
246 MY_MODS="${MY_MODS} cgi"
247 fi 244 fi
248 245
249 if use suexec ; then 246 if use suexec ; then
250 elog "You can manipulate several configure options of suexec" 247 elog "You can manipulate several configure options of suexec"
251 elog "through the following environment variables:" 248 elog "through the following environment variables:"
288 MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u) 285 MY_MODS=$(echo ${MY_MODS} | tr ' ' '\n' | sort -u)
289 check_module_depends 286 check_module_depends
290 check_module_critical 287 check_module_critical
291} 288}
292 289
293# @ECLASS-VARIABLE: MODULE_DEFINES 290# @VARIABLE: MODULE_DEFINES
294# @DESCRIPTION: 291# @DESCRIPTION:
295# 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
296# 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
297# 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
298# module. 295# module.
300# @FUNCTION: generate_load_module 297# @FUNCTION: generate_load_module
301# @DESCRIPTION: 298# @DESCRIPTION:
302# 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
303# the current module selection and MODULE_DEFINES 300# the current module selection and MODULE_DEFINES
304generate_load_module() { 301generate_load_module() {
305 local endit=0 mod_lines= mod_dir="${D}${APACHE2_MODULESDIR}" 302 local endit=0 mod_lines= mod_dir="${D}/usr/$(get_libdir)/apache2/modules"
306 303
307 if use static; then 304 if use static; then
308 sed -i -e "/%%LOAD_MODULE%%/d" \ 305 sed -i -e "/%%LOAD_MODULE%%/d" \
309 "${GENTOO_PATCHDIR}"/conf/httpd.conf 306 "${GENTOO_PATCHDIR}"/conf/httpd.conf
310 return 307 return
362# 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
363# 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).
364apache-2_pkg_setup() { 361apache-2_pkg_setup() {
365 check_upgrade 362 check_upgrade
366 363
367 setup_mpm
368 setup_modules
369
370 if use debug; then
371 MY_CONF="${MY_CONF} --enable-maintainer-mode --enable-exception-hook"
372 fi
373
374 # setup apache user and group 364 # setup apache user and group
375 enewgroup apache 81 365 enewgroup apache 81
376 enewuser apache 81 -1 /var/www apache 366 enewuser apache 81 -1 /var/www apache
377 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
378 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."
379 elog "Make sure CONFIG_SYSVIPC=y is set." 376 elog "Make sure CONFIG_SYSVIPC=y is set."
380 elog 377 elog
381}
382 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
383# @FUNCTION: apache-2_src_unpack 386# @FUNCTION: apache-2_src_prepare
384# @DESCRIPTION: 387# @DESCRIPTION:
385# This function applies patches, configures a custom file-system layout and 388# This function applies patches, configures a custom file-system layout and
386# rebuilds the configure scripts. 389# rebuilds the configure scripts.
387apache-2_src_unpack() { 390apache-2_src_prepare() {
388 unpack ${A} 391 # 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
389 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
390 408
391 # Use correct multilib libdir in gentoo patches 409 # Use correct multilib libdir in gentoo patches
392 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 410 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
393 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 411 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
394 || die "libdir sed failed" 412 || die "libdir sed failed"
404 mv docs/man/{httpd,apache2}.8 422 mv docs/man/{httpd,apache2}.8
405 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in 423 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in
406 424
407 # patched-in MPMs need the build environment rebuilt 425 # patched-in MPMs need the build environment rebuilt
408 sed -i -e '/sinclude/d' configure.in 426 sed -i -e '/sinclude/d' configure.in
409 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf 427 AT_M4DIR=build eautoreconf
410} 428}
411 429
412# @FUNCTION: apache-2_src_compile 430# @FUNCTION: apache-2_src_configure
413# @DESCRIPTION: 431# @DESCRIPTION:
414# 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
415# MY_CONF 433# MY_CONF
416apache-2_src_compile() { 434apache-2_src_configure() {
417 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 435 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
418 # Thanks to Harald van Dijk 436 # Thanks to Harald van Dijk
419 append-ldflags -Wl,--no-as-needed 437 append-ldflags $(no-as-needed)
420 438
421 # peruser MPM debugging with -X is nearly impossible 439 # peruser MPM debugging with -X is nearly impossible
422 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 440 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
423 use debug && append-flags -DMPM_PERUSER_DEBUG 441 use debug && append-flags -DMPM_PERUSER_DEBUG
424 fi 442 fi
430 --libexecdir=/usr/$(get_libdir)/apache2/modules \ 448 --libexecdir=/usr/$(get_libdir)/apache2/modules \
431 --datadir=/var/www/localhost \ 449 --datadir=/var/www/localhost \
432 --sysconfdir=/etc/apache2 \ 450 --sysconfdir=/etc/apache2 \
433 --localstatedir=/var \ 451 --localstatedir=/var \
434 --with-mpm=${MY_MPM} \ 452 --with-mpm=${MY_MPM} \
435 --with-perl=/usr/bin/perl \
436 --with-apr=/usr \ 453 --with-apr=/usr \
437 --with-apr-util=/usr \ 454 --with-apr-util=/usr \
438 --with-pcre=/usr \ 455 --with-pcre=/usr \
439 --with-z=/usr \ 456 --with-z=/usr \
440 --with-port=80 \ 457 --with-port=80 \
441 --with-program-name=apache2 \ 458 --with-program-name=apache2 \
442 --enable-layout=Gentoo \ 459 --enable-layout=Gentoo \
443 ${MY_CONF} || die "econf failed!" 460 ${MY_CONF} || die "econf failed!"
444 461
445 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
446
447 emake || die "emake failed"
448} 463}
449 464
450# @FUNCTION: apache-2_src_install 465# @FUNCTION: apache-2_src_install
451# @DESCRIPTION: 466# @DESCRIPTION:
452# 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
453# specific configuration files found in the tarball 468# specific configuration files found in the tarball
454apache-2_src_install() { 469apache-2_src_install() {
455 make DESTDIR="${D}" install || die "make install failed" 470 make DESTDIR="${D}" install || die "make install failed"
456 471
457 # install our configuration files 472 # install our configuration files
459 keepdir /etc/apache2/modules.d 474 keepdir /etc/apache2/modules.d
460 475
461 generate_load_module 476 generate_load_module
462 insinto /etc/apache2 477 insinto /etc/apache2
463 doins -r "${GENTOO_PATCHDIR}"/conf/* 478 doins -r "${GENTOO_PATCHDIR}"/conf/*
464 doins docs/conf/magic 479 use apache2_modules_mime_magic && doins docs/conf/magic
465 480
466 insinto /etc/logrotate.d 481 insinto /etc/logrotate.d
467 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2 482 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
468 483
469 # generate a sane default APACHE2_OPTS 484 # generate a sane default APACHE2_OPTS
470 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" 485 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
471 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" 486 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
472 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"
473 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
474 492
475 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ 493 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
476 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" 494 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
477 495
478 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 496 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
479 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2 497 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
480 498
481 # 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
482 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl 504 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
505 fi
483 506
484 # provide symlinks for all the stuff we no longer rename, bug 177697 507 # provide legacy symlink for apxs, bug 177697
485 for i in suexec apxs; do
486 dosym /usr/sbin/${i} /usr/sbin/${i}2 508 dosym /usr/sbin/apxs /usr/sbin/apxs2
487 done
488
489 # install some thirdparty scripts
490 exeinto /usr/sbin
491 use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
492 509
493 # install some documentation 510 # install some documentation
494 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING 511 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
495 dodoc "${GENTOO_PATCHDIR}"/docs/* 512 dodoc "${GENTOO_PATCHDIR}"/docs/*
496 513
500 else 517 else
501 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf" 518 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
502 rm -Rf "${D}/usr/share/doc/${PF}/manual" 519 rm -Rf "${D}/usr/share/doc/${PF}/manual"
503 fi 520 fi
504 521
505 # the default webroot gets stored in /usr/share/doc 522 # the default icons and error pages get stored in
506 ebegin "Installing default webroot to /usr/share/doc/${PF}" 523 # /usr/share/apache2/{error,icons}
524 dodir /usr/share/apache2
507 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/"
508 eend $? 528 eend $?
509 keepdir /var/www/localhost/htdocs
510 529
511 # set some sane permissions for suexec 530 # set some sane permissions for suexec
512 if use suexec ; then 531 if use suexec ; then
513 fowners 0:apache /usr/sbin/suexec 532 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
514 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
515 fi 536 fi
516 537
517 # empty dirs 538 # empty dirs
518 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
519 keepdir ${i} 540 keepdir ${i}
520 fowners apache:apache ${i} 541 fowners apache:apache ${i}
521 fperms 0755 ${i} 542 fperms 0750 ${i}
522 done 543 done
523
524 # we need /etc/apache2/ssl if USE=ssl
525 use ssl && keepdir /etc/apache2/ssl
526} 544}
527 545
528# @FUNCTION: apache-2_pkg_postinst 546# @FUNCTION: apache-2_pkg_postinst
529# @DESCRIPTION: 547# @DESCRIPTION:
530# 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
531# 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
532# 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
533# 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.
534apache-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
535 if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then 559 if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
536 cd "${ROOT}"/etc/apache2/ssl 560 SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
537 einfo 561 install_cert /etc/ssl/apache2/server
538 einfo "Generating self-signed test certificate in ${ROOT}etc/apache2/ssl ..." 562 ewarn
539 yes "" 2>/dev/null | \ 563 ewarn "The location of SSL certificates has changed. If you are"
540 "${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ 564 ewarn "upgrading from ${CATEGORY}/${PN}-2.2.13 or earlier (or remerged"
541 die "gentestcrt.sh failed" 565 ewarn "*any* apache version), you might want to move your old"
542 einfo 566 ewarn "certificates from /etc/apache2/ssl/ to /etc/ssl/apache2/ and"
567 ewarn "update your config files."
568 ewarn
543 fi 569 fi
544 570
545 if [[ -e "${ROOT}/var/www/localhost" ]] ; then 571 if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then
546 elog "The default webroot has not been installed into"
547 elog "${ROOT}var/www/localhost because the directory already exists"
548 elog "and we do not want to overwrite any files you have put there."
549 elog
550 elog "If you would like to install the latest webroot, please run"
551 elog "emerge --config =${PF}"
552 elog
553 else
554 einfo "Installing default webroot to ${ROOT}var/www/localhost"
555 mkdir -p "${ROOT}"/var/www/localhost 572 mkdir -p "${ROOT}/var/www/localhost/htdocs"
556 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"
557 chown -R apache:0 "${ROOT}"/var/www/localhost
558 fi 574 fi
559}
560 575
561# @FUNCTION: apache-2_pkg_config 576 echo
562# @DESCRIPTION: 577 elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags"
563# 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."
564# to /var/www/localhost 579 elog "In general, you should use 'cgid' with threaded MPMs and 'cgi' otherwise."
565apache-2_pkg_config() { 580 echo
566 einfo "Installing default webroot to ${ROOT}var/www/localhost"
567 mkdir "${ROOT}"var{,/www{,/localhost}}
568 cp -R "${ROOT}"usr/share/doc/${PF}/webroot/* "${ROOT}"var/www/localhost/
569}
570 581
582}
583
571EXPORT_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.5  
changed lines
  Added in v.1.28

  ViewVC Help
Powered by ViewVC 1.1.20