diff options
Diffstat (limited to 'www-servers/apache')
| -rw-r--r-- | www-servers/apache/Manifest | 9 | ||||
| -rw-r--r-- | www-servers/apache/apache-2.4.34-r1.ebuild (renamed from www-servers/apache/apache-2.4.29-r1.ebuild) | 65 | ||||
| -rw-r--r-- | www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch | 19 | ||||
| -rw-r--r-- | www-servers/apache/metadata.xml | 2 |
4 files changed, 66 insertions, 29 deletions
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index d42eb1794729..c071e92b6048 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,18 +1,19 @@ AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6 AUX apache-2.4.33-libressl-compatibility.patch 4026 BLAKE2B 6220ac8de57df3146b51d1fc23cbeae1f5e9a2db5e2dd0e5ac16c40939b1396b658de97e6ec4fa12b1932deb3e13147f57446ae8e89f2da10e4e233833bf1152 SHA512 582a3f8b9839e4f4d9d368634b8d499f73d9f06ce171061435aa82331d93d32819f69d887115d07b88b216628bcdcee583df8cf6d27cde815711adc355b330a7 +AUX apache-2.4.34-suexec_parallel_install.patch 578 BLAKE2B f0d89b8f2d29017d653db1cf562a476db6e841d132588b895c48db35fedc1a3a5c21bd4f0d3fc877138d05001802353411cb608fa4daa4c8cc2d8cd1fe14f6ca SHA512 8e07c444eb0e1130bdd73540da7bd2ea4e9d261f4d3700e8183cd49ec309f667a93aeea9afb70a83e8f1e4d92e982b45ad29ac2c00c2760271129a4dfdc0381b AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48 AUX apache2.2.service 716 BLAKE2B 0006b5f5eee85bf4bae7b1b49944cedb057df974b7ed6e74cee21eed109846d91537c997241554ee4ff7b8d0534dcc54fc435f6a1e9d1f07817091f93f986500 SHA512 5f736c803772077598248bbb41f76dff396dfd2f11a60d1ba929a619275efb8c1b4c0dab78cbcdf83b9ec94db67b958b3333b01f67d71eb3b2e07dba4bca2a7c DIST gentoo-apache-2.2.34-20170918.tar.bz2 64390 BLAKE2B d3f6d85192706d7c49a38cc36e816b3ae531f8c0d42111c33ec32ed39900d36d8a2a85a5d1b5afca22331137f04fb24fb424a42a21caa7eb4f6906fa39cb8224 SHA512 10b42e50dcc196f60bcaefe90c382d62a61339dd8a56e899d6afb6998be4acdd376e2c3509791f22a0acf99d06add497e32703b6d523f640306a6db5e05f358a -DIST gentoo-apache-2.4.18-r1-20160303.tar.bz2 24505 BLAKE2B 504deabe5ee9e2b32f44e8ea6cde6f01e7f26643ca05eb0aaf860ab6440d821566f83b5c9aacb2201382f9326974c7dddea4f4289d9da5857762611f424f0395 SHA512 68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d DIST gentoo-apache-2.4.27-20170918.tar.bz2 24850 BLAKE2B a832c2c7a575e167b72214f325cb85922c49969ea8cc4b5821ce97b1d4028ab56852bf416cb32c99f2b2b356545b6fea0af0fa4f6e13bf001393b468357cbcfb SHA512 c58a9a0b171188ff163f6b45c47f243797d4050cf461ba1a642115350285879005be6496cee2031bffaccc0d8beda4c27de87afa2ded17cbe559f792eb7c00e8 DIST gentoo-apache-2.4.33-r1-20180529.tar.bz2 24856 BLAKE2B 4754336f4302d1e7133481516f2000b91a73cd4c60222a7460dde93aa76b71e503b869f9720760b91c6fc4b4fa87d8feb60d33203669d9d19726b71f953b9eda SHA512 a555da6e9b4fa4bfb761ad42b010abc68ef84f312dbf302385ed8ac52ba0b48c5a33020d5c1300bec303ac22a740108b4abd71fe3887c8486bb25cc7dd79c142 +DIST gentoo-apache-2.4.34-20180716.tar.bz2 24773 BLAKE2B 6ff3b711e16a0156f8c5da4c5ee830a6e3d55b1f29c44a81be26decf6611e2680c84ec7779372bc0de775f3aff90fdaec48f5bc7253c8c9317c1308b60bf10e3 SHA512 4b96c2c7cad0aeef070584b64396360acb2ec24139a5af4755fc36b1f3cd2b82b213ebbfc45035f61c49b59ba40870930227b42e0b60042fd1147f34ba5df574 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c -DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 +DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8 EBUILD apache-2.2.34.ebuild 2976 BLAKE2B 8816d1f547ba7e8de670ef0f45cde40748fc5d611e1060f0c76a8b35ce9771a493f89f2277afcd90ac36fc6f4f684be1e19913d2d3a2ecd78e63e9f4f0d97470 SHA512 32b49f813a80f28b50a2170878d3b204c51db243bbd117b60b8aff63627b42d2cb76e87282ad9053ac1513f0faf8489a60edc7dec0c8087f12650a74d3a533b7 EBUILD apache-2.4.27-r1.ebuild 7737 BLAKE2B 6e459c6d091a5d91d1179cde68fa1b34bb4faf04d3c66b8b0a759311e6b03102485fc4758a65437c5c9bd12f63e3afdd50730c196f3e5785c3c6aa25fb2cf2c5 SHA512 bd2df8d64f22fd28af9e2225492de2d3dc2d8172220f14f495841fec587aeb39c02d4d7021d4f96430f9821922baa84a78a7b8470f56d5c5305bd124d763afd2 -EBUILD apache-2.4.29-r1.ebuild 7878 BLAKE2B 3798d1ac5cc708adef4561d647cfb14cccdf83485c4701e42f4498c556dd6004d8176acb1d46c4b0088fa0b44e421577119dd88f982a71489260465c86423743 SHA512 abc125622dd7b362819639893b463db80a960390b2ab16fc859506f22026094a540ddc646df50d99a636708c944db982a0594bc6c1d8806bc2e983a29ca8fa84 EBUILD apache-2.4.33-r1.ebuild 8285 BLAKE2B 380d88d720559b28dc0d3b999e1ac233fb8da49f07bb2bd91f8f4214b1012da6428b44d9324b42c1ee0c52280bd2171e0a04b9eda3b57ad1f913a3a1f016811f SHA512 9ede39ce930d909ed942dfa22462f3c50e4b83eb1a23646a2f702dc4081233ac6944ad135f813d0a94563267e29730ba73ca6a29a834a8f269379f559f49683d -MISC metadata.xml 3682 BLAKE2B aa3bc5eae781b31eb423f51fcb7d56dbcd228bb0b0514863e11271a5256e916705907bf4c60fdb64e98f3fede628c2f49f83c10f64bbc778b4ab350944f00812 SHA512 4b4b07871cce8b85654659627d420456527289c3d5d6b64a6551d7bc9332d362004ad97009b0144e1d9bd63f0909a6de0100d553f51934d6695c048914b25c8e +EBUILD apache-2.4.34-r1.ebuild 8162 BLAKE2B 1cd1ca3041c0babb4cebf4f7dbdcadae27be95b4eb94c7d08795ba40d39fa4e37cf41c84cc7c9105439d6dfcdd8d841ac1370c560bef554df3f9d20f07fecf9b SHA512 71f8cd66955b8f2305144647cf2ddd4f2722adf3805a3b394082e95fd3ebd13c8eec4aa388b4d4a7f385598e0a0aac52f0fe11e4cc4c453d8749f26c6e617833 +MISC metadata.xml 3852 BLAKE2B 66dc78cb1191b40322dde247b302d5987c10348a0d3b639b3479563b7584df67806e3774d46bf967b5115209b05bdd6e29c1a199b5ff250fd3e140d299e36a8c SHA512 7c3f98caa25850b8321ce7809da866a712f0b7c787b5cfad29ed9a3129bf0c685e57f16b239566bd4c377fde724f20bf49d83881fa805168efde28484d1ddf7f diff --git a/www-servers/apache/apache-2.4.29-r1.ebuild b/www-servers/apache/apache-2.4.34-r1.ebuild index 1d97a24d6da8..cf545f229ee8 100644 --- a/www-servers/apache/apache-2.4.29-r1.ebuild +++ b/www-servers/apache/apache-2.4.34-r1.ebuild @@ -4,9 +4,9 @@ EAPI=6 # latest gentoo apache files -GENTOO_PATCHSTAMP="20160303" +GENTOO_PATCHSTAMP="20180716" GENTOO_DEVELOPER="polynomial-c" -GENTOO_PATCHNAME="gentoo-apache-2.4.18-r1" +GENTOO_PATCHNAME="gentoo-apache-2.4.34" # IUSE/USE_EXPAND magic IUSE_MPMS_FORK="prefork" @@ -36,7 +36,7 @@ authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2 ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness -lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation +lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack @@ -65,6 +65,7 @@ MODULE_DEPENDS=" logio:log_config cache_disk:cache cache_socache:cache + md:watchdog mime_magic:mime proxy_ajp:proxy proxy_balancer:proxy @@ -94,6 +95,7 @@ MODULE_DEFINES=" http2:HTTP2 info:INFO ldap:LDAP + md:SSL proxy:PROXY proxy_ajp:PROXY proxy_balancer:PROXY @@ -120,7 +122,7 @@ MODULE_CRITICAL=" mime unixd " -inherit eutils apache-2 systemd toolchain-funcs +inherit apache-2 systemd toolchain-funcs DESCRIPTION="The Apache Web Server" HOMEPAGE="https://httpd.apache.org/" @@ -128,15 +130,28 @@ HOMEPAGE="https://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 ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" + +# Enable http2 by default (bug #563452) +# FIXME: Move to apache-2.eclass once this has reached stable. +IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}" +# New suexec options (since 2.4.34) +IUSE="${IUSE} +suexec-caps suexec-syslog" CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) - apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )" + apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) + apache2_modules_md? ( >=dev-libs/jansson-2.10 )" -DEPEND+="${CDEPEND}" +DEPEND+="${CDEPEND} + suexec? ( suexec-caps? ( sys-libs/libcap ) )" RDEPEND+="${CDEPEND}" -REQUIRED_USE="apache2_modules_http2? ( ssl )" +REQUIRED_USE="apache2_modules_http2? ( ssl ) + apache2_modules_md? ( ssl )" + +PATCHES=( + "${FILESDIR}/${PN}-2.4.34-suexec_parallel_install.patch" #661358 +) pkg_setup() { # dependend critical modules which are not allowed in global scope due @@ -169,26 +184,22 @@ src_compile() { src_install() { apache-2_src_install - for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do - rm "${ED}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do - rm "${ED}"/$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 "${ED}"/$i || die "Failed to prune apache-tools bits" - done - for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do - rm "${ED}/"$i || die "Failed to prune apache-tools bits" + local i + local apache_tools_prune_list=( + /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm} + /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs} + /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1} + /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} + ) + for i in ${apache_tools_prune_list[@]} ; do + rm "${ED%/}"/$i || die "Failed to prune apache-tools bits" done # install apxs in /usr/bin (bug #502384) and put a symlink into the # old location until all ebuilds and eclasses have been modified to # use the new location. - local apxs="/usr/bin/apxs" - cp "${S}"/support/apxs "${ED%/}/${apxs}" || die "Failed to install apxs" - ln -s ../bin/apxs "${ED%/}/usr/sbin/apxs" || die - chmod 0755 "${ED%/}${apxs}" || die + dobin support/apxs + dosym ../bin/apxs /usr/sbin/apxs # Note: wait for mod_systemd to be included in some forthcoming release, # Then apache2.4.service can be used and systemd support controlled @@ -201,12 +212,16 @@ src_install() { # Install http2 module config insinto /etc/apache2/modules.d doins "${FILESDIR}"/41_mod_http2.conf + + # Fix path to apache libdir + sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die } 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 + local mod cmod + for mod in ${MODULE_CRITICAL} ; do if ! use "apache2_modules_${mod}"; then echo ewarn "Warning: Critical module not installed!" @@ -214,7 +229,7 @@ pkg_postinst() { 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 + for cmod in ${MODULE_CRITICAL} ; do use "apache2_modules_${cmod}" || \ ewarn "+ apache2_modules_${cmod}" done diff --git a/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch b/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch new file mode 100644 index 000000000000..d5543f7004be --- /dev/null +++ b/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/661358 + +--- httpd-2.4.34/Makefile.in ++++ httpd-2.4.34/Makefile.in +@@ -277,12 +277,12 @@ + $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \ + fi + +-install-suexec-setuid: ++install-suexec-setuid: install-suexec-binary + @if test -f $(builddir)/support/suexec; then \ + chmod 4755 $(DESTDIR)$(sbindir)/suexec; \ + fi + +-install-suexec-caps: ++install-suexec-caps: install-suexec-binary + @if test -f $(builddir)/support/suexec; then \ + setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ + fi diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml index 293e43d3f29a..af77bdc266ca 100644 --- a/www-servers/apache/metadata.xml +++ b/www-servers/apache/metadata.xml @@ -13,6 +13,8 @@ </longdescription> <use> <flag name="suexec">Install suexec with apache</flag> + <flag name="suexec-caps">Install suexec with capabilities instead of SUID</flag> + <flag name="suexec-syslog">Log suexec to syslog instead of to a separate file</flag> <flag name="static">Link in apache2 modules statically rather then plugins</flag> <flag name="apache2_modules_access_compat">Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag> <flag name="apache2_modules_authn_core">Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag> |