| 1 |
commit: 04d8c60e97d7fcbd225b060c244a4709cd2f73ab |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 17 07:08:50 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 17 07:10:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d8c60e |
| 7 |
|
| 8 |
www-servers/apache: Revbump to add new suexec related USE flags. |
| 9 |
|
| 10 |
Also fixed a parallel install issue with suexec binary. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/661358 |
| 13 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 14 |
|
| 15 |
.../{apache-2.4.34.ebuild => apache-2.4.34-r1.ebuild} | 12 ++++++++++-- |
| 16 |
.../files/apache-2.4.34-suexec_parallel_install.patch | 19 +++++++++++++++++++ |
| 17 |
www-servers/apache/metadata.xml | 2 ++ |
| 18 |
3 files changed, 31 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/www-servers/apache/apache-2.4.34.ebuild b/www-servers/apache/apache-2.4.34-r1.ebuild |
| 21 |
similarity index 96% |
| 22 |
rename from www-servers/apache/apache-2.4.34.ebuild |
| 23 |
rename to www-servers/apache/apache-2.4.34-r1.ebuild |
| 24 |
index eee96296f45..cf545f229ee 100644 |
| 25 |
--- a/www-servers/apache/apache-2.4.34.ebuild |
| 26 |
+++ b/www-servers/apache/apache-2.4.34-r1.ebuild |
| 27 |
@@ -130,21 +130,29 @@ HOMEPAGE="https://httpd.apache.org/" |
| 28 |
# some helper scripts are Apache-1.1, thus both are here |
| 29 |
LICENSE="Apache-2.0 Apache-1.1" |
| 30 |
SLOT="2" |
| 31 |
-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" |
| 32 |
+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" |
| 33 |
+ |
| 34 |
# Enable http2 by default (bug #563452) |
| 35 |
# FIXME: Move to apache-2.eclass once this has reached stable. |
| 36 |
IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}" |
| 37 |
+# New suexec options (since 2.4.34) |
| 38 |
+IUSE="${IUSE} +suexec-caps suexec-syslog" |
| 39 |
|
| 40 |
CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) |
| 41 |
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) |
| 42 |
apache2_modules_md? ( >=dev-libs/jansson-2.10 )" |
| 43 |
|
| 44 |
-DEPEND+="${CDEPEND}" |
| 45 |
+DEPEND+="${CDEPEND} |
| 46 |
+ suexec? ( suexec-caps? ( sys-libs/libcap ) )" |
| 47 |
RDEPEND+="${CDEPEND}" |
| 48 |
|
| 49 |
REQUIRED_USE="apache2_modules_http2? ( ssl ) |
| 50 |
apache2_modules_md? ( ssl )" |
| 51 |
|
| 52 |
+PATCHES=( |
| 53 |
+ "${FILESDIR}/${PN}-2.4.34-suexec_parallel_install.patch" #661358 |
| 54 |
+) |
| 55 |
+ |
| 56 |
pkg_setup() { |
| 57 |
# dependend critical modules which are not allowed in global scope due |
| 58 |
# to USE flag conditionals (bug #499260) |
| 59 |
|
| 60 |
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 |
| 61 |
new file mode 100644 |
| 62 |
index 00000000000..d5543f7004b |
| 63 |
--- /dev/null |
| 64 |
+++ b/www-servers/apache/files/apache-2.4.34-suexec_parallel_install.patch |
| 65 |
@@ -0,0 +1,19 @@ |
| 66 |
+https://bugs.gentoo.org/661358 |
| 67 |
+ |
| 68 |
+--- httpd-2.4.34/Makefile.in |
| 69 |
++++ httpd-2.4.34/Makefile.in |
| 70 |
+@@ -277,12 +277,12 @@ |
| 71 |
+ $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \ |
| 72 |
+ fi |
| 73 |
+ |
| 74 |
+-install-suexec-setuid: |
| 75 |
++install-suexec-setuid: install-suexec-binary |
| 76 |
+ @if test -f $(builddir)/support/suexec; then \ |
| 77 |
+ chmod 4755 $(DESTDIR)$(sbindir)/suexec; \ |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
+-install-suexec-caps: |
| 81 |
++install-suexec-caps: install-suexec-binary |
| 82 |
+ @if test -f $(builddir)/support/suexec; then \ |
| 83 |
+ setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \ |
| 84 |
+ fi |
| 85 |
|
| 86 |
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml |
| 87 |
index 293e43d3f29..af77bdc266c 100644 |
| 88 |
--- a/www-servers/apache/metadata.xml |
| 89 |
+++ b/www-servers/apache/metadata.xml |
| 90 |
@@ -13,6 +13,8 @@ |
| 91 |
</longdescription> |
| 92 |
<use> |
| 93 |
<flag name="suexec">Install suexec with apache</flag> |
| 94 |
+ <flag name="suexec-caps">Install suexec with capabilities instead of SUID</flag> |
| 95 |
+ <flag name="suexec-syslog">Log suexec to syslog instead of to a separate file</flag> |
| 96 |
<flag name="static">Link in apache2 modules statically rather then plugins</flag> |
| 97 |
<flag name="apache2_modules_access_compat">Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag> |
| 98 |
<flag name="apache2_modules_authn_core">Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag> |
Archives