diff options
author | 2014-04-16 14:12:01 +0000 | |
---|---|---|
committer | 2014-04-16 14:12:01 +0000 | |
commit | c208f4eb604a6c507be753a70b066b6100491e5e (patch) | |
tree | e6514602aa298c151a90b4165f42bf31413ab3b5 /www-servers | |
parent | Version bump. Removed old (diff) | |
download | historical-c208f4eb604a6c507be753a70b066b6100491e5e.tar.gz historical-c208f4eb604a6c507be753a70b066b6100491e5e.tar.bz2 historical-c208f4eb604a6c507be753a70b066b6100491e5e.zip |
Version bump. Removed old
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/apache/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/apache/Manifest | 32 | ||||
-rw-r--r-- | www-servers/apache/apache-2.2.27.ebuild | 126 | ||||
-rw-r--r-- | www-servers/apache/apache-2.4.7.ebuild | 245 |
4 files changed, 149 insertions, 262 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog index c669eca98127..731e5f9d6283 100644 --- a/www-servers/apache/ChangeLog +++ b/www-servers/apache/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/apache # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.260 2014/03/18 18:50:08 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.261 2014/04/16 14:12:00 polynomial-c Exp $ + +*apache-2.2.27 (16 Apr 2014) + + 16 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> +apache-2.2.27.ebuild, + -apache-2.4.7.ebuild: + Version bump. Removed old. *apache-2.4.9 (18 Mar 2014) diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index aa0b7f7f3223..f9889d8ff7ac 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -13,30 +13,30 @@ DIST gentoo-apache-2.4.4-20130801.tar.bz2 24536 SHA256 bae819de1ded2104a65dabc75 DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6 DIST httpd-2.2.26.tar.bz2 5390190 SHA256 af908e3dd5673f1c6f0ccc615e11d435e77517940af00e518e68ea25284b42b6 SHA512 d66bef511acfc9b0daea699c83c282a88351f6820369a6ed70c71a192a90911c6d28491d845e545a50dd394241e16e41338c054844cddcffc49af99c6208ec41 WHIRLPOOL 9ac6e8f38144b701201d87d9010a79314f331cc696660358c1cd6a27e8a712910d6cf6796156dfa2aef9aeea64d47550afc9b2afa3984afd6c8f4519d6f61744 -DIST httpd-2.4.7.tar.bz2 5004719 SHA256 64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b SHA512 35500788e1a8b5813bbc0ee0f647ec4acb5b13c27bf5d826691487ea23ee27d4a3babea766fa70f960eb347f6e2c243d1315bb2f1aa082509e632560e7eef562 WHIRLPOOL b82065bec3d6b24ec39282f07d05e4e8ee64599679c68c2879841b359e1326ba9773f13d6c5cd5df1a1d23a641e330fcaab8b363b65eddeb1aba1733f82941c5 +DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1 DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648 EBUILD apache-2.2.24.ebuild 3241 SHA256 fb797efa6220ed5ab35d9a3ed6e652e72f97e1fdc99c7f8113768a1799f6abbc SHA512 cf1306c8ee02ee40ad8a6119148cd7ca02fabefeee7529250c230daff73118c9bce24707fdc0db681e6de86c34891c60313ecf3adca8098b89ca9057ab97fab8 WHIRLPOOL e1364ee59ac46ffd523de98cfaa417c86e4b9d0196dce50a0519808798560bd3140c35bd411f66ad3b7c643d312fb49a6c7943b5e7e41ee224f7c3742c27a140 EBUILD apache-2.2.25.ebuild 3431 SHA256 1c22f6a2ad0126cc7be3bce968931b0c204a030af925f843e81129cf89c21fd0 SHA512 3e2c527b1abefda9934bc3c272df412e2878894424b026df367107fddb39502b3d5251d1807edf22ba9b634c24321d0516cd918e1ee9703b2e500f4aab3f9ddd WHIRLPOOL cdeb8411ffcbaa0a86d5d4ab17af2785046750c026e1a431d3b61f0394e95aff92e8b1bb6e3742d4190a3d1ddbe21a8ae314672a37708471594f1716f56d3c58 EBUILD apache-2.2.26.ebuild 3423 SHA256 a14661e5b61eab42351fa4e55e820368b4456927171d89a5c034690a233c8120 SHA512 4122fcaeedb1108bfb3f25a35f52d2eea2f4d6e1ebdef2f552836bffb1d401a316a5b76f961b44658f561e2a2abafc915fd86f13dfa02259947ec14c53d11bc0 WHIRLPOOL 5fbe8114565013c93ab53b337f26f265b08b2d68338408b64e545a415ad70c3f6d1099f5db364b3d493a40d45fceb89ecc15ad363bd05d93dde16e9dea5cb4b2 -EBUILD apache-2.4.7.ebuild 8119 SHA256 a3865e28574993cf912cb0e00542beaf9ebebe855d6783df4c0cd7af3f2e92c5 SHA512 45b80565021343940586ff5b54fbc8804123e522092b3ecf877edde88ea84f4137c8907b9565f2ca37d99aa2639729d09eed2057c7e2445bd008eb0d4c60b2fc WHIRLPOOL f39be6e88e53321548d89038a6033d73df2d94ca97a0be89acc961a66e3b8b7c0f8bece36d6354a89ae232e5202df584de8f9ef65d318bb42ed39d7c762c138e +EBUILD apache-2.2.27.ebuild 3423 SHA256 0bcdf6d20f37bb451961cc6d07542cca45ee13cd9a60ba6f96f3aaea9fea809b SHA512 0d789525cd32d02f103a0add1e9c46cecf5d8df534ab8817eb15d2c75085d7efb3210d801d2def95b57d68eae86c97e7a21bdafd84eeaa8a5c3fd79683b7e6b2 WHIRLPOOL 8f6ba1a2e94fd2ea62d8ebffba7ba2163493536f782ac676ca3c2fe14ef4e7303616029a337d6bcfddd5279cf5c573397fb73482234382d3b40c67993ce00ec2 EBUILD apache-2.4.9.ebuild 8119 SHA256 8758610061af4c2dc87786ede94740d7f19bab7d2c8c6ef34252e8be3be3c657 SHA512 2de1025be341bb8b02525146e800b0bb2cb9043033be263f36e4ff975ab7510c585d47a70288ce73ac06f8b0b62b82e05f58135333910c0ab98a76515a63ab3a WHIRLPOOL f3542b5eb5b025cba032a919eef2dba966b8611291bcb5575202a26d8cfc080f486c54f29efbb9efc4d3b6d203ef7dd261f0092551c99db2e986ad6411852f39 -MISC ChangeLog 24013 SHA256 185ca0b8914d7c5bbbf84f01ac82dc0ca6b4393ab46f0c6f59c2cafd98fd926b SHA512 6704ca3473c71002684ad90a8509422fbfdaae55130c4f01c16a30d478dfd37a45d5c1d92cb035c0cedc8e1eed2bf408510f4945cd676dc7f1df3662d8a3424e WHIRLPOOL 508ed65f92870397aac15b3d131d2a88414ac082ec6b66d3bb9f170ef9befae147c370c5dfea888bb05712a57038147ef43f9fc3037eecc2cb759154d227d90b +MISC ChangeLog 24174 SHA256 a7cc47419c8deb5b2864cd42992bcfe8fc091f1f950ceafc68cb237b3ea5996e SHA512 8fc6a4b24843d316006448babec3bca4ddf98be1d0da49c8f6c40ec3f4b5d25c7d55a62554a2f2a6b6e008d92f093f4a3181a6087c37c4e39d88ac70af640833 WHIRLPOOL ea579af91690ede2eb1e8503791d7869e685442a03c774bcfc2e1c1b7b575cf6e3b20ccc325d4f0df17b2c951194eb323b71e5b010e62514a6478b4e67906329 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8 MISC metadata.xml 2590 SHA256 165207b1cfcf0ce30ad2af5b0dd7e8cf06dbfc9ae4ed42e35bbc5d8e6ce0fdee SHA512 74bd116d0678c035c0e19f82a379c80b7f59b87db649e9c6835a3133569c52d6c0973f9445054bb1b5278d22c95f28f3d85dfda0878ae094172f7e84e15a0113 WHIRLPOOL 8c5ce73c072551040ac44c6ee632fd6144cf2673904401481a01311fe9edf72eb8e1a3d57cee9f94c1c8d9d71d1f80ce2a2f11fb9cb3274b7057489fe7b8578c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTKJViAAoJEPiazRVxLXTF5mgP/R1FIoY7Lu8QGNb6CGNCHsGy -pF2kShP4fQ1o14ztZeGgQ2NiERuwEjyfNoBSXRGoIvmN98jvNyjVIqmEAWI0O7nX -jWADi56xx0g8JY9vCI8A0JUGo8END+L7S1YMzrCUYaE1i6wL2suhi0A381cjTpHc -HVfNpSj84LeMzL4RTGIwX2L2dpcV8zYGC62wD/1wvMt980Z0AjONHAdR/+feghWQ -w1odf8jDzsjld6tPh1QZjnsDZDrIj+LfG2fKneH/b35AHzAnQy2FRFDVICqIDIQ+ -uBkN1vXwqsGgyNiOggMdiR+IhwW5VMXl0/fKNlrKdf8J2DKMisQd2Qy2MyWzXKNt -odViLvwoGt0vV5dQNnbLcMm732Ujbq3nRdRrhoBNYqh0q131NTNLA2bISvzDWnDS -lai1BMJbK6mbPTKW5JDf5LRI2rQhqVYhNc+QbLPD0ZrPeF59K3WQrVh9HQ/+p2lv -u7Tmtj1yxBgXd7w/iqqy5394jRDwtUKJbHHKZlAhTzX2iHp8UurhJcAfD7IGY4TW -6TBp0VBjuAhuDPwFX4FhvHAxg6mv6ImeGJ/4Bsyu9eq1e6y3aNZVglJr1zIFQKtq -Mja332VoviooRq5pAwgAqjRU6FA0J0Xobv5gZaZ8eVIuMmq+00pEZm5hXPP2bvKf -dL+Ao36Kp4i67d+4vsUA -=nWZg +iQIcBAEBCAAGBQJTTo+xAAoJEPiazRVxLXTFDu4QALPpJTjl6g4+Pnv2u191ko/K +iMbVO/36K+MfQ/s44bfud4dD27xlNF+y9w+Th+jFQOS2Un7T14tVKFUtUtJgjSF2 +8bH+fDuW9yXw9HjS44rE3r/bLbiQuvGAzq4c5S2k9orLkRj1KKq0CUodIGAJfDPo +pY8uNV0dfEEs6zTYFomCWcIERKml0rDHd6cD/NyB3wSNu5MsoC+vdW43roxdZKXR +9ILX+Tt1NzaEU2HhNQ7e9aML+XG3v3RKjNxSDle9K5fyqgnRtIILjFhPYTkJ5Oi3 +YFI4zDFqrvnWXhIJ0UBZ0x+TWtEble0j/89XpdC3l1ApT7Cdf2/GV0JeTH6O9t3d +Q5mqqG9oRH+R++/Xoa3hZiGFn1P27TQiy9A75gGs8g2EaLAt3s64oeTgmGFsOX9F +3jLphMR+Va1Z8scaIRAUfA/9lB5pqvlgUWcIXCYYW4k/oXDTCC5j4fYUF3dBSyoO +19C8jhBfOmTiWxpZffA848JU9uojIecsjqssEYIdq9VoLh2kOs6kt6N57/Gevf72 +sC7rIqKp0yfJ7ohnMx2bb0yhTheWveHXNd2bgRjo4Tl2L6yaO7T4N7vKKt0oisrH +9/xPYJ2ANsmlwPLE+rRVuVJKR7c392MfFADAdSsBOS7LAw4xOS0hm9j6nDcTwuy/ +L074wFKAsKPUYyKHSkAg +=ohut -----END PGP SIGNATURE----- diff --git a/www-servers/apache/apache-2.2.27.ebuild b/www-servers/apache/apache-2.2.27.ebuild new file mode 100644 index 000000000000..54bdc1d2c049 --- /dev/null +++ b/www-servers/apache/apache-2.2.27.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27.ebuild,v 1.1 2014/04/16 14:12:00 polynomial-c Exp $ + +EAPI=5 + +# latest gentoo apache files +GENTOO_PATCHSTAMP="20121012" +GENTOO_DEVELOPER="patrick" +GENTOO_PATCHNAME="gentoo-apache-2.2.23" + +# IUSE/USE_EXPAND magic +IUSE_MPMS_FORK="itk peruser prefork" +IUSE_MPMS_THREAD="event worker" + +IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon +authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default +authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta +charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio +env expires ext_filter file_cache filter headers ident imagemap include info +log_config log_forensic logio mem_cache mime mime_magic negotiation proxy +proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite +reqtimeout setenvif speling status substitute unique_id userdir usertrack +version vhost_alias" +# The following are also in the source as of this version, but are not available +# for user selection: +# bucketeer case_filter case_filter_in echo http isapi optional_fn_export +# optional_fn_import optional_hook_export optional_hook_import + +# inter-module dependencies +# TODO: this may still be incomplete +MODULE_DEPENDS=" + dav_fs:dav + dav_lock:dav + deflate:filter + disk_cache:cache + ext_filter:filter + file_cache:cache + log_forensic:log_config + logio:log_config + mem_cache:cache + mime_magic:mime + proxy_ajp:proxy + proxy_balancer:proxy + proxy_connect:proxy + proxy_ftp:proxy + proxy_http:proxy + proxy_scgi:proxy + substitute:filter +" + +# module<->define mappings +MODULE_DEFINES=" + auth_digest:AUTH_DIGEST + authnz_ldap:AUTHNZ_LDAP + cache:CACHE + dav:DAV + dav_fs:DAV + dav_lock:DAV + disk_cache:CACHE + file_cache:CACHE + info:INFO + ldap:LDAP + mem_cache:CACHE + proxy:PROXY + proxy_ajp:PROXY + proxy_balancer:PROXY + proxy_connect:PROXY + proxy_ftp:PROXY + proxy_http:PROXY + ssl:SSL + status:STATUS + suexec:SUEXEC + userdir:USERDIR +" + +# critical modules for the default config +MODULE_CRITICAL=" + authz_host + dir + mime +" + +inherit apache-2 systemd toolchain-funcs + +DESCRIPTION="The Apache Web Server." +HOMEPAGE="http://httpd.apache.org/" + +# some helper scripts are Apache-1.1, thus both are here +LICENSE="Apache-2.0 Apache-1.1" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="" + +DEPEND="${DEPEND} + >=dev-libs/openssl-0.9.8m + apache2_modules_deflate? ( sys-libs/zlib )" + +# dependency on >=dev-libs/apr-1.4.5 for bug #368651 +RDEPEND="${RDEPEND} + >=dev-libs/apr-1.4.5 + >=dev-libs/openssl-0.9.8m + apache2_modules_mime? ( app-misc/mime-types )" + +# init script fixup - should be rolled into next tarball #389965 +src_prepare() { + apache-2_src_prepare + pushd "${GENTOO_PATCHDIR}" &>/dev/null || die + epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch + popd &>/dev/null || die + cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix" +} + +src_configure() { + # Brain dead check. + tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" + + apache-2_src_configure +} + +src_install() { + apache-2_src_install + + systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" + systemd_dotmpfilesd "${FILESDIR}/apache.conf" +} diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild deleted file mode 100644 index 1141ddd0bc9a..000000000000 --- a/www-servers/apache/apache-2.4.7.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.8 2014/02/19 09:20:39 polynomial-c Exp $ - -EAPI=5 - -# latest gentoo apache files -GENTOO_PATCHSTAMP="20130801" -GENTOO_DEVELOPER="kensington" -GENTOO_PATCHNAME="gentoo-apache-2.4.4" - -# IUSE/USE_EXPAND magic -IUSE_MPMS_FORK="itk peruser prefork" -IUSE_MPMS_THREAD="event worker" - -# << obsolete modules: -# authn_default authz_default mem_cache -# mem_cache is replaced by cache_disk -# ?? buggy modules -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found -# >> added modules for reason: -# compat: compatibility with 2.2 access control -# authz_host: new module for access control -# authn_core: functionality provided by authn_alias in previous versions -# authz_core: new module, provides core authorization capabilities -# cache_disk: replacement for mem_cache -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests). -# socache_shmcb: shared object cache provider. Default config with ssl needs it -# unixd: fixes startup error: Invalid command 'User' -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon -authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm -authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta -charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio -env expires ext_filter file_cache filter headers ident imagemap include info -lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat -log_config log_forensic logio mime mime_magic negotiation proxy -proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi -rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute -unique_id userdir usertrack unixd version vhost_alias" -# The following are also in the source as of this version, but are not available -# for user selection: -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export -# optional_fn_import optional_hook_export optional_hook_import - -# inter-module dependencies -# TODO: this may still be incomplete -MODULE_DEPENDS=" - dav_fs:dav - dav_lock:dav - deflate:filter - cache_disk:cache - ext_filter:filter - file_cache:cache - lbmethod_byrequests:proxy_balancer - lbmethod_byrequests:slotmem_shm - lbmethod_bytraffic:proxy_balancer - lbmethod_bybusyness:proxy_balancer - lbmethod_heartbeat:proxy_balancer - log_forensic:log_config - logio:log_config - cache_disk:cache - mime_magic:mime - proxy_ajp:proxy - proxy_balancer:proxy - proxy_balancer:slotmem_shm - proxy_connect:proxy - proxy_ftp:proxy - proxy_http:proxy - proxy_scgi:proxy - proxy_fcgi:proxy - substitute:filter -" - -# module<->define mappings -MODULE_DEFINES=" - auth_digest:AUTH_DIGEST - authnz_ldap:AUTHNZ_LDAP - cache:CACHE - cache_disk:CACHE - dav:DAV - dav_fs:DAV - dav_lock:DAV - file_cache:CACHE - info:INFO - ldap:LDAP - proxy:PROXY - proxy_ajp:PROXY - proxy_balancer:PROXY - proxy_connect:PROXY - proxy_ftp:PROXY - proxy_http:PROXY - proxy_fcgi:PROXY - proxy_scgi:PROXY - socache_shmcb:SSL - ssl:SSL - status:STATUS - suexec:SUEXEC - userdir:USERDIR -" - -# critical modules for the default config -MODULE_CRITICAL=" - authn_core - authz_core - authz_host - dir - mime - unixd -" -inherit eutils apache-2 systemd toolchain-funcs - -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org/" - -# some helper scripts are Apache-1.1, thus both are here -LICENSE="Apache-2.0 Apache-1.1" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="${DEPEND} - >=dev-libs/openssl-0.9.8m - apache2_modules_deflate? ( sys-libs/zlib )" - -# dependency on >=dev-libs/apr-1.5.0 for bug #492578 -RDEPEND="${RDEPEND} - >=dev-libs/apr-1.5.0 - >=dev-libs/openssl-0.9.8m - apache2_modules_mime? ( app-misc/mime-types )" - -pkg_setup() { - # dependend critical modules which are not allowed in global scope due - # to USE flag conditionals (bug #499260) - use ssl && MODULE_CRITICAL+=" socache_shmcb" - use doc && MODULE_CRITICAL+=" alias negotiation setenvif" - apache-2_pkg_setup -} - -# init script fixup - should be rolled into next tarball #389965 -src_prepare() { - # the following patch can be removed once it is included in - # GENTOO_PATCHNAME="gentoo-apache-2.4.1" ... - if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then - cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}" - epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" - cd "${S}" || die "Failed to cd to ${S}" - fi - apache-2_src_prepare - pushd "${GENTOO_PATCHDIR}" &>/dev/null || die - epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch - popd &>/dev/null || die -} - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - apache-2_src_configure -} - -src_compile() { - if tc-is-cross-compiler; then - # This header is the same across targets, so use the build compiler. - pushd server >/dev/null - emake gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die - popd >/dev/null - fi - - default -} - -src_install() { - apache-2_src_install - for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do - rm "${D}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do - rm "${D}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do - rm "${D}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do - rm "${D}/"$i || die "Failed to prune apache-tools bits" - done - - # well, actually installing things makes them more installed, I guess? - cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs" - chmod 0755 "${D}"/usr/sbin/apxs - - # Note: wait for mod_systemd to be included in the next release, - # then apache2.4.service can be used and systemd support controlled - # through --enable-systemd - systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service" - systemd_dotmpfilesd "${FILESDIR}/apache.conf" - #insinto /etc/apache2/modules.d - #doins "${FILESDIR}/00_systemd.conf" -} - -pkg_postinst() -{ - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed" - # warnings that default config might not work out of the box - for mod in $MODULE_CRITICAL; do - if ! use "apache2_modules_${mod}"; then - echo - ewarn "Warning: Critical module not installed!" - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'" - ewarn "are highly recomended but might not be in the base profile yet." - ewarn "Default config for ssl needs module 'socache_shmcb'." - ewarn "Enabling the following flags is highly recommended:" - for cmod in $MODULE_CRITICAL; do - use "apache2_modules_${cmod}" || \ - ewarn "+ apache2_modules_${cmod}" - done - echo - break - fi - done - # warning for proxy_balancer and missing load balancing scheduler - if use apache2_modules_proxy_balancer; then - local lbset= - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do - if use "apache2_modules_${mod}"; then - lbset=1 && break - fi - done - if [ ! $lbset ]; then - echo - ewarn "Info: Missing load balancing scheduler algorithm module" - ewarn "(They were split off from proxy_balancer in 2.3)" - ewarn "In order to get the ability of load balancing, at least" - ewarn "one of these modules has to be present:" - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat" - echo - fi - fi -} |