/[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.15 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.15 2008/12/10 01:15:47 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.18 2009/09/20 08:37:23 hollow Exp $
4
5EAPI="2"
4 6
5# @ECLASS: apache-2.eclass 7# @ECLASS: apache-2.eclass
6# @MAINTAINER: 8# @MAINTAINER:
7# apache-devs@gentoo.org 9# apache-devs@gentoo.org
8# @BLURB: Provides a common set of functions for apache-2.x ebuilds 10# @BLURB: Provides a common set of functions for apache-2.x ebuilds
9# @DESCRIPTION: 11# @DESCRIPTION:
10# This eclass handles apache-2.x ebuild functions such as LoadModule generation 12# This eclass handles apache-2.x ebuild functions such as LoadModule generation
11# and inter-module dependency checking. 13# and inter-module dependency checking.
12 14
13inherit autotools confutils eutils flag-o-matic multilib 15inherit autotools eutils flag-o-matic multilib ssl-cert
14 16
15# ============================================================================== 17# ==============================================================================
16# INTERNAL VARIABLES 18# INTERNAL VARIABLES
17# ============================================================================== 19# ==============================================================================
18 20
77 IUSE="${IUSE} apache2_mpms_${mpm}" 79 IUSE="${IUSE} apache2_mpms_${mpm}"
78done 80done
79 81
80DEPEND="dev-lang/perl 82DEPEND="dev-lang/perl
81 =dev-libs/apr-1* 83 =dev-libs/apr-1*
82 =dev-libs/apr-util-1* 84 =dev-libs/apr-util-1*[ldap?]
83 dev-libs/libpcre 85 dev-libs/libpcre
84 ldap? ( =net-nds/openldap-2* ) 86 ldap? ( =net-nds/openldap-2* )
85 selinux? ( sec-policy/selinux-apache ) 87 selinux? ( sec-policy/selinux-apache )
86 ssl? ( >=dev-libs/openssl-0.9.8f ) 88 ssl? ( >=dev-libs/openssl-0.9.8f )
87 !=www-servers/apache-1*" 89 !=www-servers/apache-1*"
228 fi 230 fi
229 231
230 MY_CONF="--enable-so=static" 232 MY_CONF="--enable-so=static"
231 233
232 if use ldap ; then 234 if use ldap ; then
233 confutils_use_depend_built_with_all ldap dev-libs/apr-util ldap
234 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}"
235 MY_MODS="${MY_MODS} ldap authnz_ldap" 236 MY_MODS="${MY_MODS} ldap authnz_ldap"
236 else 237 else
237 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap" 238 MY_CONF="${MY_CONF} --disable-authnz_ldap --disable-ldap"
238 fi 239 fi
390 elog " accf_http_load=\"YES\"" 391 elog " accf_http_load=\"YES\""
391 elog 392 elog
392 fi 393 fi
393} 394}
394 395
395# @FUNCTION: apache-2_src_unpack 396# @FUNCTION: apache-2_src_prepare
396# @DESCRIPTION: 397# @DESCRIPTION:
397# This function applies patches, configures a custom file-system layout and 398# This function applies patches, configures a custom file-system layout and
398# rebuilds the configure scripts. 399# rebuilds the configure scripts.
399apache-2_src_unpack() { 400apache-2_src_prepare() {
400 unpack ${A} 401 # 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
401 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
402 418
403 # Use correct multilib libdir in gentoo patches 419 # Use correct multilib libdir in gentoo patches
404 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 420 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
405 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 421 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
406 || die "libdir sed failed" 422 || die "libdir sed failed"
419 # patched-in MPMs need the build environment rebuilt 435 # patched-in MPMs need the build environment rebuilt
420 sed -i -e '/sinclude/d' configure.in 436 sed -i -e '/sinclude/d' configure.in
421 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf 437 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf
422} 438}
423 439
424# @FUNCTION: apache-2_src_compile 440# @FUNCTION: apache-2_src_configure
425# @DESCRIPTION: 441# @DESCRIPTION:
426# 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
427# MY_CONF 443# MY_CONF
428apache-2_src_compile() { 444apache-2_src_configure() {
429 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 445 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
430 # 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)
431 append-ldflags -Wl,--no-as-needed 450 append-ldflags -Wl,--no-as-needed
451 ;;
452 esac
432 453
433 # peruser MPM debugging with -X is nearly impossible 454 # peruser MPM debugging with -X is nearly impossible
434 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 455 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
435 use debug && append-flags -DMPM_PERUSER_DEBUG 456 use debug && append-flags -DMPM_PERUSER_DEBUG
436 fi 457 fi
452 --with-program-name=apache2 \ 473 --with-program-name=apache2 \
453 --enable-layout=Gentoo \ 474 --enable-layout=Gentoo \
454 ${MY_CONF} || die "econf failed!" 475 ${MY_CONF} || die "econf failed!"
455 476
456 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
457
458 emake || die "emake failed"
459} 478}
460 479
461# @FUNCTION: apache-2_src_install 480# @FUNCTION: apache-2_src_install
462# @DESCRIPTION: 481# @DESCRIPTION:
463# This function runs `emake install' and generates, installs and adapts the gentoo 482# This function runs `emake install' and generates, installs and adapts the gentoo
476 495
477 insinto /etc/logrotate.d 496 insinto /etc/logrotate.d
478 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2 497 newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2
479 498
480 # generate a sane default APACHE2_OPTS 499 # generate a sane default APACHE2_OPTS
481 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" 500 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
482 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" 501 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
483 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"
484 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
485 507
486 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ 508 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
487 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" 509 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
488 510
489 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 511 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
498 fi 520 fi
499 521
500 # provide legacy symlink for apxs, bug 177697 522 # provide legacy symlink for apxs, bug 177697
501 dosym /usr/sbin/apxs /usr/sbin/apxs2 523 dosym /usr/sbin/apxs /usr/sbin/apxs2
502 524
503 # install some thirdparty scripts
504 exeinto /usr/sbin
505 use ssl && doexe "${GENTOO_PATCHDIR}"/scripts/gentestcrt.sh
506
507 # install some documentation 525 # install some documentation
508 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING 526 dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
509 dodoc "${GENTOO_PATCHDIR}"/docs/* 527 dodoc "${GENTOO_PATCHDIR}"/docs/*
510 528
511 # drop in a convenient link to the manual 529 # drop in a convenient link to the manual
514 else 532 else
515 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf" 533 rm -f "${D}/etc/apache2/modules.d/00_apache_manual.conf"
516 rm -Rf "${D}/usr/share/doc/${PF}/manual" 534 rm -Rf "${D}/usr/share/doc/${PF}/manual"
517 fi 535 fi
518 536
519 # the default webroot gets stored in /usr/share/${PF}/webroot 537 # the default icons and error pages get stored in
520 ebegin "Installing default webroot to /usr/share/${PF}/webroot" 538 # /usr/share/apache2/{error,icons}
521 dodir /usr/share/${PF} 539 dodir /usr/share/apache2
522 mv -f "${D}/var/www/localhost" "${D}/usr/share/${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/"
523 eend $? 543 eend $?
524 544
525 # set some sane permissions for suexec 545 # set some sane permissions for suexec
526 if use suexec ; then 546 if use suexec ; then
527 fowners 0:apache /usr/sbin/suexec 547 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
528 fperms 4710 /usr/sbin/suexec 548 fperms 4710 /usr/sbin/suexec
529 # provide legacy symlink for suexec, bug 177697 549 # provide legacy symlink for suexec, bug 177697
530 dosym /usr/sbin/suexec /usr/sbin/suexec2 550 dosym /usr/sbin/suexec /usr/sbin/suexec2
531 fi 551 fi
532 552
534 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
535 keepdir ${i} 555 keepdir ${i}
536 fowners apache:apache ${i} 556 fowners apache:apache ${i}
537 fperms 0755 ${i} 557 fperms 0755 ${i}
538 done 558 done
539
540 # we need /etc/apache2/ssl if USE=ssl
541 use ssl && keepdir /etc/apache2/ssl
542} 559}
543 560
544# @FUNCTION: apache-2_pkg_postinst 561# @FUNCTION: apache-2_pkg_postinst
545# @DESCRIPTION: 562# @DESCRIPTION:
546# 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
547# default webroot to /var/www/localhost if it does not exist. We do this here 564# default index.html to /var/www/localhost if it does not exist. We do this here
548# because the default webroot is a copy of the files that exist elsewhere and we 565# because the default webroot is a copy of the files that exist elsewhere and we
549# don't 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.
550apache-2_pkg_postinst() { 567apache-2_pkg_postinst() {
551 einfo
552
553 if use ssl && [[ ! -e "${ROOT}/etc/apache2/ssl/server.crt" ]] ; then 568 if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
554 cd "${ROOT}"/etc/apache2/ssl 569 SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
555 einfo "Generating self-signed test certificate in ${ROOT}etc/apache2/ssl ..." 570 install_cert /etc/ssl/apache2/server
556 yes "" 2>/dev/null | \ 571 ewarn
557 "${ROOT}"/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ 572 ewarn "The location of SSL certificates has changed. If you are"
558 die "gentestcrt.sh failed" 573 ewarn "upgrading from ${CATEGORY}/${PN}-2.2.13 or earlier (or remerged"
559 einfo 574 ewarn "*any* apache version), you might want to move your old"
575 ewarn "certificates from /etc/apache2/ssl/ to /etc/ssl/apache2/ and"
576 ewarn "update your config files."
577 ewarn
560 fi 578 fi
561 579
562 if [[ -e "${ROOT}/var/www/localhost" ]] ; then 580 if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then
563 elog "The default webroot has not been installed into"
564 elog "${ROOT}var/www/localhost because the directory already exists"
565 elog "and we do not want to overwrite any files you have put there."
566 elog
567 elog "If you would like to install the latest webroot, please run"
568 elog "emerge --config =${PF}"
569 elog
570 else
571 einfo "Installing default webroot to ${ROOT}var/www/localhost"
572 mkdir -p "${ROOT}"/var/www/localhost 581 mkdir -p "${ROOT}/var/www/localhost/htdocs"
573 cp -R "${ROOT}"/usr/share/${PF}/webroot/* "${ROOT}"/var/www/localhost/ 582 echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html"
574 einfo
575 fi 583 fi
576} 584}
577 585
578# @FUNCTION: apache-2_pkg_config
579# @DESCRIPTION:
580# This function installs -- and overwrites -- the default webroot to
581# /var/www/localhost
582apache-2_pkg_config() {
583 einfo "Installing default webroot to ${ROOT}var/www/localhost"
584 mkdir -p "${ROOT}"/var/www/localhost
585 cp -R "${ROOT}"/usr/share/${PF}/webroot/* "${ROOT}"/var/www/localhost/
586}
587
588EXPORT_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.15  
changed lines
  Added in v.1.18

  ViewVC Help
Powered by ViewVC 1.1.20