From d5c03bb7724ca0e2ba9b2cd15c17bdcaef1b5a62 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Mon, 15 Jan 2007 23:54:25 +0000 Subject: [PATCH] Fix bug #161700, remove srvdir USE flag, misc cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- net-www/apache/Manifest | 50 +- net-www/apache/apache-2.2.3-r1.ebuild | 521 -------------------- net-www/apache/apache-2.2.3.ebuild | 493 ------------------ net-www/apache/files/digest-apache-2.2.3 | 6 - net-www/apache/files/digest-apache-2.2.3-r1 | 6 - 5 files changed, 16 insertions(+), 1060 deletions(-) delete mode 100644 net-www/apache/apache-2.2.3-r1.ebuild delete mode 100644 net-www/apache/apache-2.2.3.ebuild delete mode 100644 net-www/apache/files/digest-apache-2.2.3 delete mode 100644 net-www/apache/files/digest-apache-2.2.3-r1 diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 62c5a13f45e1..5bd4b295594d 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,18 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA1 b422fac1dda10baa483e8f4378dff58faf3f85b4 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149 DIST gentoo-apache-1.3.37-20060729.tar.bz2 27992 RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 SHA1 05d3d2b4309365de54adfc5d1aba9ff4758fc3fc SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA1 1f8543ecdba7cef911456757a0d12e9c15abe355 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518 -DIST gentoo-apache-2.2.3-20060729.tar.bz2 51526 RMD160 c5f1e367e73090d378c461134961bc8c0a95396a SHA1 3088502349dd8df36bb97708bbc7bebef11709f0 SHA256 5194ef7b23b18b333b2864ccb45f90cf5bca1cfc4e65f6552eaa4561c107d24c DIST gentoo-apache-2.2.3-r1-20061126.tar.bz2 54107 RMD160 a44c10cd0f0bd7dc4695b1fb7bf79c31397a2791 SHA1 48580fac951d1ae8d3627a791a29519cf998c047 SHA256 18fbdf626494832cc2557b3bef2b6dfc687580d7754d0ea46309a4c00fa80e55 DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029 DIST httpd-2.0.59.tar.bz2 4743549 RMD160 78b802354e338798a6978ece8b3568be97542174 SHA1 908209cd6e52f700d2a841a25de36e44d469c376 SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d DIST httpd-2.2.3.tar.bz2 4905728 RMD160 291e093f48d980daba482140581a525ecbfae4d2 SHA1 30d445302e63326d81705687ee734fdfb692dcde SHA256 dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c -DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 +DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA1 25d32aca3f03fbc9273fca6491444d1920818a1c SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 DIST mod_ssl-2.8.25-1.3.34.tar.gz 820352 RMD160 90a3913d30c7f4d194907463125c90101005837a SHA1 150f726539d74c0d2af02e482be78bbcdb811395 SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 DIST mod_ssl-2.8.28-1.3.37.tar.gz 820417 RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 SHA1 9db2a7240e499da2b99d0df9c1a6fbae0580ba0b SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489 EBUILD apache-1.3.34-r14.ebuild 8891 RMD160 9599e3d0445129959c1b9d2efe6a9e50b7372903 SHA1 2aafa0d192cc48971c68e0257fee4b8332cab1ba SHA256 685ee7e8b67df4864b38b417a2cbf29f9de1eaf2dae60d18dcb1fd0b80b91e0a @@ -31,22 +27,18 @@ EBUILD apache-2.0.59-r2.ebuild 14083 RMD160 6024806347fbcf6a8811cbdaa0ca318d0790 MD5 98a3f55dc44ee407a70d80953a4f3973 apache-2.0.59-r2.ebuild 14083 RMD160 6024806347fbcf6a8811cbdaa0ca318d079060ac apache-2.0.59-r2.ebuild 14083 SHA256 d9c1a0f933542e181098e02c2aa9c251a21feef0ce78a9db109511752ff78112 apache-2.0.59-r2.ebuild 14083 -EBUILD apache-2.2.3-r1.ebuild 15243 RMD160 0f51161eeaed5938c42b3192b1e630239c68e800 SHA1 7859366b40876c4168e2f586cdd25c56ee4ef01d SHA256 22868db37b13008278af5fbbd77e10443ad5e46b23312f1b500c199e4d497c39 -MD5 6088a933232cf9d078ea3f4574d69bb8 apache-2.2.3-r1.ebuild 15243 -RMD160 0f51161eeaed5938c42b3192b1e630239c68e800 apache-2.2.3-r1.ebuild 15243 -SHA256 22868db37b13008278af5fbbd77e10443ad5e46b23312f1b500c199e4d497c39 apache-2.2.3-r1.ebuild 15243 -EBUILD apache-2.2.3.ebuild 14012 RMD160 2e2df793e3ee0e72b9f9a8b2d0e1fae4b215d791 SHA1 b5d3f38ff05ed6c74e258a060dc8837e8e992524 SHA256 71aaea4672afe9e250dcc7a74c5491168248c5b8d494228fc4ebd3057c814b3f -MD5 fcd76089f5aaefdc57b036828368d926 apache-2.2.3.ebuild 14012 -RMD160 2e2df793e3ee0e72b9f9a8b2d0e1fae4b215d791 apache-2.2.3.ebuild 14012 -SHA256 71aaea4672afe9e250dcc7a74c5491168248c5b8d494228fc4ebd3057c814b3f apache-2.2.3.ebuild 14012 -MISC ChangeLog 87141 RMD160 391071ac2dda3432e0291bb4d83766c251a8fcd8 SHA1 6b4ef8d2144df1302724b678eaedbcbd34af4e90 SHA256 a9c538f1a6dd35ee5313b34c3947140c6158c96e86f2e4ea2ca3281f2d74fefc -MD5 86be574895ec09956f2301637489db8f ChangeLog 87141 -RMD160 391071ac2dda3432e0291bb4d83766c251a8fcd8 ChangeLog 87141 -SHA256 a9c538f1a6dd35ee5313b34c3947140c6158c96e86f2e4ea2ca3281f2d74fefc ChangeLog 87141 -MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2 -MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566 -RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566 -SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2 metadata.xml 566 +EBUILD apache-2.2.3-r2.ebuild 14395 RMD160 7a70ce6cf5344139f65f7c161514f64204439d1b SHA1 e3724a606502a03ff82ec15283e68b678e0a4d1f SHA256 ba7619e5b775328b3791aceac2044eac8be83919c54ca61b1489240f23c3b879 +MD5 60833b9a007917c3c24977c73845ff92 apache-2.2.3-r2.ebuild 14395 +RMD160 7a70ce6cf5344139f65f7c161514f64204439d1b apache-2.2.3-r2.ebuild 14395 +SHA256 ba7619e5b775328b3791aceac2044eac8be83919c54ca61b1489240f23c3b879 apache-2.2.3-r2.ebuild 14395 +MISC ChangeLog 87370 RMD160 3532d7255fed2bceb7ac64a600f1fe8db526e6ce SHA1 228dd328235b5a0fef3e94aaf4a2a866d3b96fcf SHA256 0d24d3374302185df7e178ed61e0a0ce1d840192db90bbb114b3ae5830098c2c +MD5 6f310decb28857631ed77f02bc317996 ChangeLog 87370 +RMD160 3532d7255fed2bceb7ac64a600f1fe8db526e6ce ChangeLog 87370 +SHA256 0d24d3374302185df7e178ed61e0a0ce1d840192db90bbb114b3ae5830098c2c ChangeLog 87370 +MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb +MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551 +RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551 +SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb metadata.xml 551 MD5 9898e1d5318e43832fc20c4e71e49110 files/digest-apache-1.3.34-r14 1045 RMD160 e3177b6c4899756c982888044d1c321733d121ef files/digest-apache-1.3.34-r14 1045 SHA256 06ec0bcb6e35bc9e1cb81c6d264bb4684bd766fda12aa1d788c1c2d35a9173dc files/digest-apache-1.3.34-r14 1045 @@ -59,16 +51,6 @@ SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/di MD5 fb6513d7e3c17a25d505a7c7a06d43d7 files/digest-apache-2.0.59-r2 542 RMD160 124580b340dddc55cb1c92565a0de043a9b27ab1 files/digest-apache-2.0.59-r2 542 SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/digest-apache-2.0.59-r2 542 -MD5 2b4672f81e282ff8016bdf01018d7250 files/digest-apache-2.2.3 527 -RMD160 cb393c64814165541762b6b6d2c4952c5273aee3 files/digest-apache-2.2.3 527 -SHA256 a3cc6958b1fe0467e885412864c3f753a7cc7f2a0eba1b4f1633cac588463c4e files/digest-apache-2.2.3 527 -MD5 14154dd42c85b73c2e908337c39b152d files/digest-apache-2.2.3-r1 536 -RMD160 e9418e892901efb2d201d15b106da92f3f6f0890 files/digest-apache-2.2.3-r1 536 -SHA256 7a632ba04efc8017554a0f11673c7cca41cfc0e6cea299d8b2596888252854d9 files/digest-apache-2.2.3-r1 536 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFpg+IyuNVb5qfaOYRAnYaAJ9V3ovgpzGEq3BHoZ6KP9QiXgZNnACeK0IW -N4q2tIb8IwnT+uc+HGQ3vGc= -=vsgP ------END PGP SIGNATURE----- +MD5 14154dd42c85b73c2e908337c39b152d files/digest-apache-2.2.3-r2 536 +RMD160 e9418e892901efb2d201d15b106da92f3f6f0890 files/digest-apache-2.2.3-r2 536 +SHA256 7a632ba04efc8017554a0f11673c7cca41cfc0e6cea299d8b2596888252854d9 files/digest-apache-2.2.3-r2 536 diff --git a/net-www/apache/apache-2.2.3-r1.ebuild b/net-www/apache/apache-2.2.3-r1.ebuild deleted file mode 100644 index 51f49e61aac7..000000000000 --- a/net-www/apache/apache-2.2.3-r1.ebuild +++ /dev/null @@ -1,521 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.3-r1.ebuild,v 1.4 2007/01/11 10:22:25 phreak Exp $ - -inherit eutils flag-o-matic gnuconfig multilib autotools - -WANT_AUTOCONF="2.5" - -# latest gentoo apache files -GENTOO_PATCHNAME="gentoo-apache-${PVR}" -GENTOO_PATCHSTAMP="20061126" -GENTOO_DEVSPACE="vericgar" -GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}" - -DESCRIPTION="The Apache Web Server" -HOMEPAGE="http://httpd.apache.org/" -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 - http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" - -# some helper scripts are apache-1.1, thus both are here -LICENSE="Apache-2.0 Apache-1.1" - -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc ldap mpm-event mpm-peruser mpm-prefork mpm-worker no-suexec selinux srvdir ssl static-modules no-suexec threads" - -RDEPEND="dev-lang/perl - >=dev-libs/apr-1.2.7 - >=dev-libs/apr-util-1.2.7 - dev-libs/expat - dev-libs/libpcre - app-misc/mime-types - sys-libs/zlib - ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-apache ) - !mips? ( ldap? ( =net-nds/openldap-2* ) )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.59-r4" - -S="${WORKDIR}/httpd-${PV}" - - - -pkg_setup() { - if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then - eerror "dev-libs/apr-util is missing LDAP support. For apache to have" - eerror "ldap support, apr-util must be built with the ldap USE-flag" - eerror "enabled." - die "ldap USE-flag enabled while not supported in apr-util" - fi - - # select our MPM - MPM_LIST="prefork worker event peruser" - for x in ${MPM_LIST}; do - if useq mpm-${x}; then - if [ "x${mpm}" == "x" ]; then - mpm=${x} - einfo "Selected MPM: ${mpm}" - else - eerror "You have selected more then one mpm USE-flag." - eerror "Only one MPM is supported." - die "more then one mpm was specified" - fi - fi - done - - if [ "x${mpm}" == "x" ]; then - if useq "threads"; then - mpm=worker - einfo "Selected default threaded MPM: ${mpm}"; - else - mpm=prefork - einfo "Selected default MPM: ${mpm}"; - fi - fi - - # setup apache user and group - enewgroup apache 81 - enewuser apache 81 -1 /var/www apache -} - - - -src_unpack() { - unpack ${A} || die - cd ${S} || die - - # Use correct multilib libdir in gentoo patches - sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ - ${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout,scripts/Makefile.suexec,scripts/suexec2-config} \ - || die "libdir sed failed" - - if useq srvdir; then - # Use /srv//www instead of /var/www/ if USE=srvdir - sed -i -e "s:/var/www/localhost:/srv/localhost/www:g" \ - ${GENTOO_PATCHDIR}/{conf/httpd.conf,conf/modules.d/*,conf/vhosts.d/*,patches/config.layout,init/apache2.confd} \ - || die "srvdir sed failed (1)" - sed -i -e "s:/var/www/example.com:/srv/example.com/www:g" \ - ${GENTOO_PATCHDIR}/conf/vhosts.d/*.example \ - || die "srvdir sed failed (2)" - sed -i -e "s:/var/www:/srv:g" \ - ${GENTOO_PATCHDIR}/{conf/httpd.conf,conf/suexec-conf,conf/vhosts.d/*.example,scripts/suexec2-config} \ - || die "srvdir sed failed (3)" - fi - - #### Patch Organization - # 00-19 Gentoo specific (00_all_some-title.patch) - # 20-39 Additional MPMs (20_all_${MPM}_some-title.patch) - # 40-59 USE-flag based (40_all_${USE}_some-title.patch) - # 60-79 Version specific (60_all_${PV}_some-title.patch) - # 80-99 Security patches (80_all_${PV}_cve-####-####.patch) - - EPATCH_SUFFIX="patch" - epatch ${GENTOO_PATCHDIR}/patches/[0-1]* || die "Patching failed" - if $(ls ${GENTOO_PATCHDIR}/patches/[2-3]?_*_${mpm}_* &>/dev/null); then - epatch ${GENTOO_PATCHDIR}/patches/[2-3]?_*_${mpm}_* || \ - die "MPM ${mpm} Patching failed" - fi - for uf in ${IUSE}; do - if useq ${uf} && $(ls ${GENTOO_PATCHDIR}/patches/[4-5]?_*_${uf}_* &>/dev/null) - then - epatch ${GENTOO_PATCHDIR}/patches/[4-5]?_*_${uf}_* || \ - die "USE=\"${uf}\" Patching failed" - fi - done - if $(ls ${GENTOO_PATCHDIR}/patches/[6-9]?_*_${PV}_* &>/dev/null); then - epatch ${GENTOO_PATCHDIR}/patches/[6-9]?_*_${PV}_* || \ - die "Version ${PV} Patching failed" - fi - - - # avoid utf-8 charset problems - export LC_CTYPE=C - - # setup the filesystem layout config - cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout - sed -i -e "s:version:${PF}:g" config.layout - - # patched-in MPMs need the build environment rebuilt - sed -i -e '/sinclude/d' configure.in - AT_GNUCONF_UPDATE=yes AT_M4DIR=build WANT_AUTOCONF=2.5 eautoreconf - -} - - - -src_compile() { - - local modtype - if useq static-modules; then - modtype="static" - else - modtype="shared" - fi - - select_modules_config || die "determining modules failed" - - local myconf - useq ldap && mods="${mods} ldap authnz-ldap" && \ - myconf="${myconf} --enable-authnz-ldap=${modtype}" && \ - myconf="${myconf} --enable-ldap=${modtype}" - useq ssl && mods="${mods} ssl" && \ - myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}" - - # Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003 - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache - - if useq no-suexec; then - myconf="${myconf} --disable-suexec" - else - mods="${mods} suexec" - myconf="${myconf} $(${GENTOO_PATCHDIR}/scripts/suexec2-config --config)" - - myconf="${myconf} - --with-suexec-bin=/usr/sbin/suexec2 \ - --enable-suexec=${modtype}" - fi - - # common confopts - myconf="${myconf} \ - --cache-file=${S}/config.cache \ - --with-perl=/usr/bin/perl \ - --with-expat=/usr \ - --with-z=/usr \ - --with-port=80 \ - --enable-layout=Gentoo \ - --with-program-name=apache2 \ - --host=${CHOST} ${MY_BUILTINS} \ - --with-apr=/usr \ - --with-apr-util=/usr \ - --with-pcre=/usr " - - # debugging support - if useq debug ; then - myconf="${myconf} --enable-maintainer-mode" - fi - - ./configure --with-mpm=${mpm} ${myconf} ${EXTRA_ECONF} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log" - - sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h - - emake || die "problem compiling apache2" - -} - -src_install () { - - #### DEFAULT SETUP & INSTALL - - # general install - einfo "Beginning install phase" - make DESTDIR=${D} install || die - - #### CLEAN-UP - rm -rf ${D}/etc - rm ${D}/usr/sbin/envvars* - rm ${D}/usr/sbin/apachectl - - #### CONFIGURATION - einfo "Setting up configuration" - insinto /etc/apache2 - - # restore the magic file - doins docs/conf/magic - - - # This is a mapping of module names to the -D option in APACHE2_OPTS - # Used for creating optional LoadModule lines - mod_defines="info:INFO status:INFO - ldap:LDAP authnz_ldap:AUTH_LDAP - proxy:PROXY proxy_connect:PROXY proxy_http:PROXY - proxy_ajp:PROXY proxy_balancer:PROXY - ssl:SSL - suexec:SUEXEC - userdir:USERDIR" - - # create our LoadModule lines - if ! useq static-modules; then - load_module='' - moddir="${D}/usr/$(get_libdir)/apache2/modules" - for m in ${mods}; do - endid="no" - - if [ -e "${moddir}/mod_${m}.so" ]; then - for def in ${mod_defines}; do - if [ "${m}" == "${def%:*}" ]; then - load_module="${load_module}\n" - endid="yes" - fi - done - load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so" - if [ "${endid}" == "yes" ]; then - load_module="${load_module}\n" - fi - fi - done - fi - sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \ - ${GENTOO_PATCHDIR}/conf/httpd.conf || die "sed failed" - - # install our configuration - doins -r ${GENTOO_PATCHDIR}/conf/* - - insinto /etc/logrotate.d - newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2 - - # generate a sane default APACHE2_OPTS - APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" - useq doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" - useq ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" - useq no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" - - sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ - ${GENTOO_PATCHDIR}/init/apache2.confd \ - || die "sed failed" - - mv ${D}/etc/apache2/apache2-builtin-mods ${D}/etc/apache2/apache2-builtin-mods-2.2 - - newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2 - newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2 - - # link apache2ctl to the init script - dosym /etc/init.d/apache2 /usr/sbin/apache2ctl - - #### HELPER SCRIPTS - einfo "Installing helper scripts" - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile suexec2-config; do - doexe ${GENTOO_PATCHDIR}/scripts/${i} - done - useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh - - for i in logresolve.pl split-logfile log_server_status; do - doexe support/${i} - done - - # needed for suexec2-config - insinto /usr/$(get_libdir)/apache2/build - doins ${GENTOO_PATCHDIR}/scripts/Makefile.suexec - doins support/suexec.c - - - #### SLOTTING - einfo "Applying SLOT=2" - cd ${D} - - # sbin binaries - slotmv="apxs htpasswd htdigest rotatelogs logresolve log_server_status - ab checkgid dbmmanage split-logfile suexec" - for i in ${slotmv}; do - mv usr/sbin/${i} usr/sbin/${i}2 - done - mv usr/sbin/logresolve.pl usr/sbin/logresolve2.pl - - # man.1 - for i in dbmmanage htdigest htpasswd; do - mv usr/share/man/man1/${i}.1 usr/share/man/man1/${i}2.1 - done - - # man.8 - for i in ab apxs logresolve rotatelogs suexec; do - mv usr/share/man/man8/${i}.8 usr/share/man/man8/${i}2.8 - done - - mv usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8 - - # we don't use apachectl anymore, it's symlinked to the init script - rm usr/share/man/man8/apachectl.8 - - #### DOCS - # basic info - einfo "Installing docs" - cd ${S} - dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING - - # drop in a convenient link to the manual - if useq doc; then - sed -i -e "s:VERSION:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf - else - einfo "USE=-docs :: Removing Manual" - rm ${D}/etc/apache2/modules.d/00_apache_manual.conf - rm -rf ${D}/usr/share/doc/${PF}/manual - fi - - # the default webroot gets stored in /usr/share/doc - einfo "Installing default webroot to /usr/share/doc/${PF}" - useq srvdir || mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot - useq srvdir && mv ${D}/srv/localhost/www ${D}/usr/share/doc/${PF}/webroot - - - #### PERMISSONS - einfo "Applying permissions" - - - # protect the suexec binary - if ! useq no-suexec; then - fowners root:apache /usr/sbin/suexec2 - fperms 4710 /usr/sbin/suexec2 - fi - - keepdir /etc/apache2/vhosts.d - keepdir /etc/apache2/modules.d - - # empty dirs - for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do - keepdir ${i} - fowners apache:apache ${i} - fperms 755 ${i} - done - - # We'll be needing /etc/apache2/ssl if USE=ssl - useq ssl && keepdir /etc/apache2/ssl - - fperms 755 /usr/sbin/apache2logserverstatus - fperms 755 /usr/sbin/apache2splitlogfile - -} - -pkg_postinst() { - # Automatically generate test certificates if ssl USE flag is being set - if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then - cd ${ROOT}/etc/apache2/ssl - einfo - einfo "Generating self-signed test certificate in /etc/apache2/ssl..." - yes "" 2>/dev/null | \ - ${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ - die "gentestcrt.sh failed" - einfo - fi - - # we do this here because the default webroot is a copy of the files - # that exist elsewhere and we don't want them managed/removed by portage - # when apache is upgraded. - useq srvdir || webroot=/var/www/localhost - useq srvdir && webroot=/srv/localhost/www - - if [ -e "${ROOT}${webroot}" ]; then - einfo "The default webroot has not been installed into" - einfo "${ROOT}${webroot} because the directory already exists" - einfo "and we do not want to overwrite any files you have put there." - einfo - einfo "If you would like to install the latest webroot, please run" - einfo "emerge --config =${PF}" - else - einfo "Installing default webroot to ${ROOT}${webroot}" - mkdir -p ${ROOT}${webroot} - cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}${webroot} - chown -R apache: ${ROOT}${webroot} - fi - - # Check for dual/upgrade install - # The hasq is a hack so we don't throw QA warnings for not putting - # apache2 in IUSE - the only use of the flag is this warning - if has_version '=net-www/apache-1*' || ! hasq apache2 ${USE}; then - ewarn - ewarn "Please add the 'apache2' flag to your USE variable and (re)install" - ewarn "any additional DSO modules you may wish to use with Apache-2.x." - ewarn "Addon modules are configured in /etc/apache2/modules.d/" - ewarn - fi - - - if has_version '/dev/null); then - epatch ${GENTOO_PATCHDIR}/patches/[2-3]?_*_${mpm}_* || \ - die "MPM ${mpm} Patching failed" - fi - for uf in ${IUSE}; do - if useq ${uf} && $(ls ${GENTOO_PATCHDIR}/patches/[4-5]?_*_${uf}_* &>/dev/null) - then - epatch ${GENTOO_PATCHDIR}/patches/[4-5]?_*_${uf}_* || \ - die "USE=\"${uf}\" Patching failed" - fi - done - if $(ls ${GENTOO_PATCHDIR}/patches/[6-9]?_*_${PV}_* &>/dev/null); then - epatch ${GENTOO_PATCHDIR}/patches/[6-9]?_*_${PV}_* || \ - die "Version ${PV} Patching failed" - fi - - - # avoid utf-8 charset problems - export LC_CTYPE=C - - # setup the filesystem layout config - cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout - sed -i -e "s:version:${PF}:g" config.layout - - # patched-in MPMs need the build environment rebuilt - sed -i -e '/sinclude/d' configure.in - AT_GNUCONF_UPDATE=yes AT_M4DIR=build WANT_AUTOCONF=2.5 eautoreconf - -} - - - -src_compile() { - - local modtype - if useq static-modules; then - modtype="static" - else - modtype="shared" - fi - - select_modules_config || die "determining modules failed" - - local myconf - useq ldap && mods="${mods} ldap authnz-ldap" && \ - myconf="${myconf} --enable-authnz-ldap=${modtype}" && \ - myconf="${myconf} --enable-ldap=${modtype}" - useq ssl && mods="${mods} ssl" && \ - myconf="${myconf} --with-ssl=/usr --enable-ssl=${modtype}" - - # Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003 - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache - - if useq no-suexec; then - myconf="${myconf} --disable-suexec" - else - mods="${mods} suexec" - myconf="${myconf} $(${GENTOO_PATCHDIR}/scripts/suexec2-config --config)" - - myconf="${myconf} - --with-suexec-bin=/usr/sbin/suexec2 \ - --enable-suexec=${modtype}" - fi - - # common confopts - myconf="${myconf} \ - --cache-file=${S}/config.cache \ - --with-perl=/usr/bin/perl \ - --with-expat=/usr \ - --with-z=/usr \ - --with-port=80 \ - --enable-layout=Gentoo \ - --with-program-name=apache2 \ - --host=${CHOST} ${MY_BUILTINS} \ - --with-apr=/usr \ - --with-apr-util=/usr \ - --with-pcre=/usr " - - # debugging support - if useq debug ; then - myconf="${myconf} --enable-maintainer-mode" - fi - - ./configure --with-mpm=${mpm} ${myconf} ${EXTRA_ECONF} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log" - - sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h - - emake || die "problem compiling apache2" - -} - -src_install () { - - #### DEFAULT SETUP & INSTALL - - # general install - einfo "Beginning install phase" - make DESTDIR=${D} install || die - - #### CLEAN-UP - rm -rf ${D}/etc - rm ${D}/usr/sbin/envvars* - rm ${D}/usr/sbin/apachectl - - #### CONFIGURATION - einfo "Setting up configuration" - insinto /etc/apache2 - - # restore the magic file - doins docs/conf/magic - - - # This is a mapping of module names to the -D option in APACHE2_OPTS - # Used for creating optional LoadModule lines - mod_defines="info:INFO status:INFO - ldap:LDAP authnz-ldap:AUTH_LDAP - proxy:PROXY proxy_connect:PROXY proxy_http:PROXY - ssl:SSL - suexec:SUEXEC - userdir:USERDIR" - - # create our LoadModule lines - if ! useq static-modules; then - load_module='' - moddir="${D}/usr/$(get_libdir)/apache2/modules" - for m in ${mods}; do - endid="no" - - if [ -e "${moddir}/mod_${m}.so" ]; then - for def in ${mod_defines}; do - if [ "${m}" == "${def%:*}" ]; then - load_module="${load_module}\n" - endid="yes" - fi - done - load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so" - if [ "${endid}" == "yes" ]; then - load_module="${load_module}\n" - fi - fi - done - fi - sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \ - ${GENTOO_PATCHDIR}/conf/httpd.conf || die "sed failed" - - # install our configuration - doins -r ${GENTOO_PATCHDIR}/conf/* - - insinto /etc/logrotate.d - newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2 - - # generate a sane default APACHE2_OPTS - APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE" - useq doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" - useq ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" - useq no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" - - sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ - ${GENTOO_PATCHDIR}/init/apache2.confd \ - || die "sed failed" - - mv ${D}/etc/apache2/apache2-builtin-mods ${D}/etc/apache2/apache2-builtin-mods-2.2 - - newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2 - newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2 - - - #### HELPER SCRIPTS - einfo "Installing helper scripts" - exeinto /usr/sbin - for i in apache2logserverstatus apache2splitlogfile suexec2-config; do - doexe ${GENTOO_PATCHDIR}/scripts/${i} - done - useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh - - for i in logresolve.pl split-logfile log_server_status; do - doexe support/${i} - done - - # needed for suexec2-config - insinto /usr/$(get_libdir)/apache2/build - doins ${GENTOO_PATCHDIR}/scripts/Makefile.suexec - doins support/suexec.c - - - #### SLOTTING - einfo "Applying SLOT=2" - cd ${D} - - # sbin binaries - slotmv="apxs htpasswd htdigest rotatelogs logresolve log_server_status - ab checkgid dbmmanage split-logfile suexec" - for i in ${slotmv}; do - mv usr/sbin/${i} usr/sbin/${i}2 - done - mv usr/sbin/logresolve.pl usr/sbin/logresolve2.pl - - # man.1 - for i in dbmmanage htdigest htpasswd; do - mv usr/share/man/man1/${i}.1 usr/share/man/man1/${i}2.1 - done - - # man.8 - for i in ab apxs logresolve rotatelogs suexec; do - mv usr/share/man/man8/${i}.8 usr/share/man/man8/${i}2.8 - done - - mv usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8 - mv usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8 - - - - #### DOCS - # basic info - einfo "Installing docs" - cd ${S} - dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING - - # drop in a convenient link to the manual - if useq doc; then - sed -i -e "s:VERSION:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf - else - einfo "USE=-docs :: Removing Manual" - rm ${D}/etc/apache2/modules.d/00_apache_manual.conf - rm -rf ${D}/usr/share/doc/${PF}/manual - fi - - # the default webroot gets stored in /usr/share/doc - einfo "Installing default webroot to /usr/share/doc/${PF}" - mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot - - - #### PERMISSONS - einfo "Applying permissions" - - - # protect the suexec binary - if ! useq no-suexec; then - fowners root:apache /usr/sbin/suexec2 - fperms 4710 /usr/sbin/suexec2 - fi - - keepdir /etc/apache2/vhosts.d - keepdir /etc/apache2/modules.d - - # empty dirs - for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do - keepdir ${i} - fowners apache:apache ${i} - fperms 755 ${i} - done - - # We'll be needing /etc/apache2/ssl if USE=ssl - useq ssl && keepdir /etc/apache2/ssl - - fperms 755 /usr/sbin/apache2logserverstatus - fperms 755 /usr/sbin/apache2splitlogfile - -} - -pkg_postinst() { - # Automatically generate test ceritificates if ssl USE flag is being set - if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then - cd ${ROOT}/etc/apache2/ssl - einfo - einfo "Generating self-signed test certificate in /etc/apache2/ssl..." - yes "" 2>/dev/null | \ - ${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \ - die "gentestcrt.sh failed" - einfo - fi - - # we do this here because the default webroot is a copy of the files - # that exist elsewhere and we don't want them managed/removed by portage - # when apache is upgraded. - if [ -e "${ROOT}/var/www/localhost" ]; then - einfo "The default webroot has not been installed into" - einfo "${ROOT}/var/www/localhost because the directory already exists" - einfo "and we do not want to overwrite any files you have put there." - einfo - einfo "If you would like to install the latest webroot, please run" - einfo "emerge --config =${PF}" - else - einfo "Installing default webroot to ${ROOT}/var/www/localhost" - mkdir -p ${ROOT}/var/www/localhost - cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost - chown -R apache: ${ROOT}/var/www/localhost - fi - - # Check for dual/upgrade install - # The hasq is a hack so we don't throw QA warnings for not putting - # apache2 in IUSE - the only use of the flag is this warning - if has_version '=net-www/apache-1*' || ! hasq apache2 ${USE}; then - ewarn - ewarn "Please add the 'apache2' flag to your USE variable and (re)install" - ewarn "any additional DSO modules you may wish to use with Apache-2.x." - ewarn "Addon modules are configured in /etc/apache2/modules.d/" - ewarn - fi - - - if has_version '