* [gentoo-commits] repo/gentoo:master commit in: eclass/, www-servers/apache/
@ 2021-01-26 10:48 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2021-01-26 10:48 UTC (permalink / raw
To: gentoo-commits
commit: c313d7c192cede3d4efcc6fa6bf636f9a20727ee
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 09:34:56 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 10:48:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c313d7c1
www-servers/apache: Renamed CDEPEND to COMMON_DEPEND
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
eclass/apache-2.eclass | 4 ++--
www-servers/apache/apache-2.4.46-r1.ebuild | 6 +++---
www-servers/apache/apache-2.4.46-r4.ebuild | 6 +++---
www-servers/apache/apache-2.4.46.ebuild | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index ccfe482f528..9e80b914afe 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -25,7 +25,7 @@ esac
case $(ver_cut 1-2) in
2.4)
DEFAULT_MPM_THREADED="event" #509922
- CDEPEND=">=dev-libs/apr-1.5.1:=
+ COMMON_DEPEND=">=dev-libs/apr-1.5.1:=
!www-apache/mod_macro" #492578 #477702
;;
*)
@@ -121,7 +121,7 @@ _apache2_set_mpms() {
_apache2_set_mpms
unset -f _apache2_set_mpms
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-lang/perl
=dev-libs/apr-util-1*:=[gdbm=,ldap?]
dev-libs/libpcre
diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild b/www-servers/apache/apache-2.4.46-r1.ebuild
index ff031a46230..de842ec792e 100644
--- a/www-servers/apache/apache-2.4.46-r1.ebuild
+++ b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -146,7 +146,7 @@ IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
# New suexec options (since 2.4.34)
IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_md? ( >=dev-libs/jansson-2.10 )
@@ -155,9 +155,9 @@ CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
!libressl? ( dev-libs/apr-util[openssl] )
)"
-DEPEND+="${CDEPEND}
+DEPEND+="${COMMON_DEPEND}
suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
REQUIRED_USE="apache2_modules_http2? ( ssl )
apache2_modules_md? ( ssl )"
diff --git a/www-servers/apache/apache-2.4.46-r4.ebuild b/www-servers/apache/apache-2.4.46-r4.ebuild
index 9f40b40102d..8a6aea0662a 100644
--- a/www-servers/apache/apache-2.4.46-r4.ebuild
+++ b/www-servers/apache/apache-2.4.46-r4.ebuild
@@ -146,7 +146,7 @@ IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
# New suexec options (since 2.4.34)
IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_md? ( >=dev-libs/jansson-2.10 )
@@ -155,9 +155,9 @@ CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
!libressl? ( dev-libs/apr-util[openssl] )
)"
-DEPEND+="${CDEPEND}
+DEPEND+="${COMMON_DEPEND}
suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
REQUIRED_USE="apache2_modules_http2? ( ssl )
apache2_modules_md? ( ssl )"
diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index ed6c693f82f..b4a4b7d7fb4 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -144,7 +144,7 @@ IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
# New suexec options (since 2.4.34)
IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
apache2_modules_md? ( >=dev-libs/jansson-2.10 )
@@ -153,9 +153,9 @@ CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
!libressl? ( dev-libs/apr-util[openssl] )
)"
-DEPEND+="${CDEPEND}
+DEPEND+="${COMMON_DEPEND}
suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
REQUIRED_USE="apache2_modules_http2? ( ssl )
apache2_modules_md? ( ssl )"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: eclass/, www-servers/apache/
@ 2023-12-31 17:37 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-12-31 17:37 UTC (permalink / raw
To: gentoo-commits
commit: d696d0acb609eb856c3052c8f9f3aea848d2d6d1
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 31 03:56:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 17:36:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d696d0ac
www-servers/apache: apache-2.eclass: inline USE=split-usr
It is undesirable and should be removed, which requires inlining into
each ebuild and then removing it in a revbump.
Bug: https://bugs.gentoo.org/502384
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/apache-2.eclass | 2 +-
www-servers/apache/apache-2.4.57-r5.ebuild | 3 +++
www-servers/apache/apache-2.4.57.ebuild | 3 +++
www-servers/apache/apache-2.4.58-r1.ebuild | 3 +++
www-servers/apache/apache-2.4.58.ebuild | 3 +++
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 4da2e151fed2..86e5dc2a93ba 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -88,7 +88,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
# built-in modules
IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
-IUSE="${IUSE} debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads"
+IUSE="${IUSE} debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog threads"
for module in ${IUSE_MODULES} ; do
case ${module} in
diff --git a/www-servers/apache/apache-2.4.57-r5.ebuild b/www-servers/apache/apache-2.4.57-r5.ebuild
index 649085501170..02691c5f39d9 100644
--- a/www-servers/apache/apache-2.4.57-r5.ebuild
+++ b/www-servers/apache/apache-2.4.57-r5.ebuild
@@ -8,6 +8,9 @@ GENTOO_PATCHSTAMP="20231011"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.57-r5"
+# ancient hack: bug #502384
+IUSE="split-usr"
+
# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="prefork"
IUSE_MPMS_THREAD="event worker"
diff --git a/www-servers/apache/apache-2.4.57.ebuild b/www-servers/apache/apache-2.4.57.ebuild
index c5ef6767c8fe..cf939d694848 100644
--- a/www-servers/apache/apache-2.4.57.ebuild
+++ b/www-servers/apache/apache-2.4.57.ebuild
@@ -8,6 +8,9 @@ GENTOO_PATCHSTAMP="20210212"
GENTOO_DEVELOPER="polynomial-c"
GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
+# ancient hack: bug #502384
+IUSE="split-usr"
+
# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="prefork"
IUSE_MPMS_THREAD="event worker"
diff --git a/www-servers/apache/apache-2.4.58-r1.ebuild b/www-servers/apache/apache-2.4.58-r1.ebuild
index 9ca9e8c742c0..7a858a9b3cbf 100644
--- a/www-servers/apache/apache-2.4.58-r1.ebuild
+++ b/www-servers/apache/apache-2.4.58-r1.ebuild
@@ -8,6 +8,9 @@ GENTOO_PATCHSTAMP="20231019"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.58"
+# ancient hack: bug #502384
+IUSE="split-usr"
+
# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="prefork"
IUSE_MPMS_THREAD="event worker"
diff --git a/www-servers/apache/apache-2.4.58.ebuild b/www-servers/apache/apache-2.4.58.ebuild
index aa9944f2f03f..af8224e7166b 100644
--- a/www-servers/apache/apache-2.4.58.ebuild
+++ b/www-servers/apache/apache-2.4.58.ebuild
@@ -8,6 +8,9 @@ GENTOO_PATCHSTAMP="20231019"
GENTOO_DEVELOPER="graaff"
GENTOO_PATCHNAME="gentoo-apache-2.4.58"
+# ancient hack: bug #502384
+IUSE="split-usr"
+
# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="prefork"
IUSE_MPMS_THREAD="event worker"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-31 17:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-31 17:37 [gentoo-commits] repo/gentoo:master commit in: eclass/, www-servers/apache/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-01-26 10:48 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox