summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild4
-rw-r--r--www-apache/mod_authnz_external/mod_authnz_external-3.3.3-r2.ebuild (renamed from www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild)4
-rw-r--r--www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0-r2.ebuild (renamed from www-apache/mod_authz_unixgroup/mod_authz_unixgroup-9999.ebuild)4
-rw-r--r--www-apache/mod_maxminddb/mod_maxminddb-1.2.0-r1.ebuild40
-rw-r--r--www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild (renamed from www-apache/mod_perl/mod_perl-2.0.13.ebuild)9
-rw-r--r--www-apache/mod_qos/Manifest4
-rw-r--r--www-apache/mod_qos/mod_qos-11.66.ebuild62
-rw-r--r--www-apache/mod_qos/mod_qos-11.72.ebuild62
-rw-r--r--www-apache/mod_qos/mod_qos-11.74.ebuild62
-rw-r--r--www-apache/mod_qos/mod_qos-11.75.ebuild (renamed from www-apache/mod_qos/mod_qos-11.74-r1.ebuild)4
-rw-r--r--www-apache/mod_wsgi/Manifest1
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild46
-rw-r--r--www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild55
-rw-r--r--www-apache/modsecurity-crs/Manifest2
-rw-r--r--www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild2
-rw-r--r--www-apache/modsecurity-crs/modsecurity-crs-4.2.0.ebuild (renamed from www-apache/modsecurity-crs/modsecurity-crs-4.0.0_rc2.ebuild)0
-rw-r--r--www-apache/passenger/Manifest3
-rw-r--r--www-apache/passenger/passenger-6.0.18.ebuild128
-rw-r--r--www-apache/passenger/passenger-6.0.22.ebuild (renamed from www-apache/passenger/passenger-6.0.19.ebuild)4
19 files changed, 106 insertions, 390 deletions
diff --git a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild
index f06674c34353..0c1f5271ba76 100644
--- a/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild
+++ b/www-apache/mod_auth_kerb/mod_auth_kerb-5.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit apache-module depend.apache tmpfiles
DESCRIPTION="An Apache authentication module using Kerberos"
HOMEPAGE="http://modauthkerb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/modauthkerb/${PN}/${P}/${P}.tar.gz
+SRC_URI="https://downloads.sourceforge.net/project/modauthkerb/${PN}/${P}/${P}.tar.gz
https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
LICENSE="BSD openafs-krb5-a HPND"
diff --git a/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3-r2.ebuild
index a118abb601a5..a27c2a023a2d 100644
--- a/www-apache/mod_authnz_external/mod_authnz_external-9999.ebuild
+++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit apache-module
if [[ ${PV} == *9999 ]] ; then
diff --git a/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-9999.ebuild b/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0-r2.ebuild
index 7c9081bf3575..e445b9e407d1 100644
--- a/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-9999.ebuild
+++ b/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit apache-module
if [[ ${PV} == *9999 ]] ; then
diff --git a/www-apache/mod_maxminddb/mod_maxminddb-1.2.0-r1.ebuild b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..5d627f1c3888
--- /dev/null
+++ b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit apache-module autotools
+
+DESCRIPTION="MaxMind DB Apache Module"
+HOMEPAGE="https://maxmind.github.io/mod_maxminddb/"
+SRC_URI="https://github.com/maxmind/mod_maxminddb/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libmaxminddb:="
+RDEPEND="${DEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ # skipping this results in:
+ # Cannot load modules/mod_maxminddb.so into server:
+ # /usr/lib64/apache2/modules/mod_maxminddb.so: undefined symbol: MMDB_aget_value
+ # because mod_maxminddb.so is not linked with libmaxminddb
+ emake
+}
+
+src_install() {
+ APACHE2_MOD_CONF="70_${PN}"
+ APACHE2_MOD_DEFINE="MAXMINDDB"
+ APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+ apache-module_src_install
+}
diff --git a/www-apache/mod_perl/mod_perl-2.0.13.ebuild b/www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
index d2b6cb753c19..a0d8c495793b 100644
--- a/www-apache/mod_perl/mod_perl-2.0.13.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.13-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/perl/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86"
-IUSE="debug ithreads test"
+IUSE="debug perl_features_ithreads test"
RESTRICT="!test? ( test )"
# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
@@ -25,11 +25,12 @@ RESTRICT="!test? ( test )"
# default one, which will likely need threading.
RDEPEND="
- dev-lang/perl[ithreads=]
+ perl_features_ithreads? ( || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) )
+ !perl_features_ithreads? ( || ( >=dev-lang/perl-5.38.2-r3[-perl_features_ithreads] <dev-lang/perl-5.38.2-r3[-ithreads] ) )
>=dev-perl/Apache-Test-1.420.0
>=www-servers/apache-2.0.47
>=dev-libs/apr-util-1.4
- !ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
+ !perl_features_ithreads? ( www-servers/apache[-apache2_mpms_event,-apache2_mpms_worker,apache2_mpms_prefork] )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -75,7 +76,7 @@ src_configure() {
_init_apache2_late
local debug=$(usex debug 1 0)
- local nothreads=$(usex ithreads 0 1)
+ local nothreads=$(usex perl_features_ithreads 0 1)
myconf=(
MP_USE_DSO=1
MP_APXS=${APXS}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index f95388b2d297..d6a2ffc64fc3 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1,3 +1 @@
-DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
-DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d41f54765ee1a055606df139c7e7dad4ad7d6161dbf07003a93d54b966b15d20fc721a6ba05cba221e1cae126d8 SHA512 0e5af2c702bade096101f20fcf12b90a2a538665cfbec4183608acdfdc99552304ad4a42f63ad3111b570bfd42b17ce7acb16f6bc86a0380c79fae84a5124715
-DIST mod_qos-11.74.tar.gz 1288870 BLAKE2B b61622c89c797b567744f557c9cbbf791db3f19d6fa736197d5ac95929aa7a93989c804edd6a8c8f5d567ca7ba43203003654a9d47e18cc228da95fbeafc60f4 SHA512 107eab22336741ab9415d9f6925ff2b38edf9cdfa81dd76f782a5388420c19f554e1280e0fe26788014bc0f24b2906c812fb2fcf04ce4b08d06c5770bf158d48
+DIST mod_qos-11.75.tar.gz 1289194 BLAKE2B b0353ac443fa7067e57ee4c4cd4b4804f58b163280d914509d4e6b68020e6791b6dc264ae3c017670efe62331355c88b95b51b630c1f42a817c780f1d0346d4b SHA512 ebb73196c94c6fa5874c179112b8dcb7283f961a04389e2c2a09191653c5112901ccf8d07cc6b90868c0233b06f49ce1ea608e0c5332351ddb29259bf342fd80
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
deleted file mode 100644
index 58b9e562e955..000000000000
--- a/www-apache/mod_qos/mod_qos-11.66.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools apache-module
-
-DESCRIPTION="A QOS module for the apache webserver"
-HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
- dev-libs/libpcre:3
- dev-libs/openssl:0=
- media-libs/libpng:0=
- sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="QOS"
-DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
-
-need_apache2
-
-pkg_setup() {
- _init_apache2
- _init_apache2_late
-}
-src_prepare() {
- default
-
- pushd "${S}"/tools &>/dev/null || die
- eautoreconf
- popd &>/dev/null || die
-}
-
-src_configure() {
- pushd "${S}"/tools &>/dev/null || die
- econf
- popd &>/dev/null || die
-}
-
-src_compile() {
- apache-module_src_compile
- emake -C "${S}"/tools
-}
-
-src_install() {
- einfo "Installing Apache module ..."
- pushd "${S}"/tools &>/dev/null || die
- apache-module_src_install
- popd &>/dev/null || die
-
- einfo "Installing module utilities ..."
- emake -C "${S}"/tools install DESTDIR="${D}"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.72.ebuild b/www-apache/mod_qos/mod_qos-11.72.ebuild
deleted file mode 100644
index e440a61cc67c..000000000000
--- a/www-apache/mod_qos/mod_qos-11.72.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools apache-module
-
-DESCRIPTION="A QOS module for the apache webserver"
-HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
- dev-libs/libpcre:3
- dev-libs/openssl:0=
- media-libs/libpng:0=
- sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="QOS"
-DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
-
-need_apache2
-
-pkg_setup() {
- _init_apache2
- _init_apache2_late
-}
-src_prepare() {
- default
-
- pushd "${S}"/tools &>/dev/null || die
- eautoreconf
- popd &>/dev/null || die
-}
-
-src_configure() {
- pushd "${S}"/tools &>/dev/null || die
- econf
- popd &>/dev/null || die
-}
-
-src_compile() {
- apache-module_src_compile
- emake -C "${S}"/tools
-}
-
-src_install() {
- einfo "Installing Apache module ..."
- pushd "${S}"/tools &>/dev/null || die
- apache-module_src_install
- popd &>/dev/null || die
-
- einfo "Installing module utilities ..."
- emake -C "${S}"/tools install DESTDIR="${D}"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.74.ebuild b/www-apache/mod_qos/mod_qos-11.74.ebuild
deleted file mode 100644
index 1c3182af2600..000000000000
--- a/www-apache/mod_qos/mod_qos-11.74.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools apache-module
-
-DESCRIPTION="A QOS module for the apache webserver"
-HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-libs/libpcre2
- dev-libs/openssl:0=
- media-libs/libpng:0=
- sys-libs/zlib:0=
-"
-DEPEND="${RDEPEND}"
-
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="QOS"
-DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
-
-need_apache2
-
-pkg_setup() {
- _init_apache2
- _init_apache2_late
-}
-src_prepare() {
- default
-
- pushd "${S}"/tools &>/dev/null || die
- eautoreconf
- popd &>/dev/null || die
-}
-
-src_configure() {
- pushd "${S}"/tools &>/dev/null || die
- econf
- popd &>/dev/null || die
-}
-
-src_compile() {
- apache-module_src_compile
- emake -C "${S}"/tools
-}
-
-src_install() {
- einfo "Installing Apache module ..."
- pushd "${S}"/tools &>/dev/null || die
- apache-module_src_install
- popd &>/dev/null || die
-
- einfo "Installing module utilities ..."
- emake -C "${S}"/tools install DESTDIR="${D}"
-}
diff --git a/www-apache/mod_qos/mod_qos-11.74-r1.ebuild b/www-apache/mod_qos/mod_qos-11.75.ebuild
index e428ba480f54..191594b4fb1e 100644
--- a/www-apache/mod_qos/mod_qos-11.74-r1.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.75.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,7 +7,7 @@ inherit autotools apache-module
DESCRIPTION="A QOS module for the apache webserver"
HOMEPAGE="http://mod-qos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/mod-qos/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index ccb9c85dea5e..b31f959fed6f 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,2 +1,3 @@
DIST mod_wsgi-4.9.0.tar.gz 699891 BLAKE2B 7ee6ffc28e86baf8ee92973479a26964f7c183c2b113b49a48af02c622f8d8f698abffcd4f522a1ecca5b89325f94856cbe89db5a81d2ac2e87438ee90be97b0 SHA512 9dc34d431171321094a9713444895d9754eff4e69ad1e86c8d3cd77bc1ca0a4c10b697e7f8cf14902d6bfaf205c8842e62fa944bb38f66f1c54fd36af95a09d6
DIST mod_wsgi-4.9.4.gh.tar.gz 706904 BLAKE2B 6473ee5be4f21d7d5806028b22d582e9d2b6f2a28bb0ed2b03a3da799858bdb4ebcfc85eb7850e91ff041d0c0a6cf2a898bffbbe884faa891c4f1f115d043517 SHA512 0898221d95f0ce374cbd34a1849a6e6b5bd7850644d5fe36f558dcc58095cd535c854cb06798482d312485b8d89b8641d91fa26af3d208e10a6073b885af3199
+DIST mod_wsgi-5.0.0.gh.tar.gz 707590 BLAKE2B 14dd43849c0f9d1e67eece9a87acc3573cbb38f8d6338551b22ba33ebd8b6f6e1371e97c7c5d3f1b15cb10e2ae9990eff7f4c6af62fb9236bcc78b35aad4a8db SHA512 3ecc3ad2fd05164929915541be61201db8d35d1e27183ce26c67583b836bb404bd10c88a2ada94714a14140a7f885eb67256cf02bf47aa0dbd81aecd0894a984
diff --git a/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild
new file mode 100644
index 000000000000..777e934aadbf
--- /dev/null
+++ b/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit apache-module python-single-r1
+
+DESCRIPTION="An Apache2 module for running Python WSGI applications"
+HOMEPAGE="https://github.com/GrahamDumpleton/mod_wsgi"
+SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+APACHE2_MOD_CONF="70_${PN}"
+APACHE2_MOD_DEFINE="WSGI"
+APACHE2_MOD_FILE="${S}/src/server/.libs/${PN}.so"
+
+DOCFILES="README.rst"
+
+need_apache2
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ # Calling depend.apache_pkg_setup fails because we do not have
+ # "apache2" in IUSE but the function expects this in order to call
+ # _init_apache2_late which sets the APACHE_MODULESDIR variable.
+ _init_apache2
+ _init_apache2_late
+}
+
+src_configure() {
+ econf --with-apxs="${APXS}" --with-python="${PYTHON}"
+}
+
+src_compile() {
+ default
+}
diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
deleted file mode 100644
index d52b04714b54..000000000000
--- a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="Flameeyes's Ruleset for ModSecurity"
-HOMEPAGE="https://github.com/Flameeyes/modsec-flameeyes"
-if [[ ${PV} == "99999999" ]]; then
- EGIT_REPO_URI="https://github.com/Flameeyes/modsec-flameeyes.git"
- inherit git-r3
-else
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/Flameeyes/modsec-flameeyes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-
-RDEPEND=">=www-apache/mod_security-2.5.1"
-DEPEND=""
-
-RULESDIR=/etc/modsecurity/flameeyes
-
-DOC_CONTENTS="To enable the ruleset, define MODSEC_FLAMEEYES in
-/etc/conf.d/apache2.
-
-If you do not use www-apache/modsecurity-crs you want also to uncomment
-the init configuration file in /etc/apache2/modules/81_${PN}.conf."
-
-src_install() {
- insinto "${RULESDIR}"
- doins -r rules optional
-
- dodoc README.md
-
- cat - > "${T}/81_${PN}.conf" <<EOF
-<IfDefine MODSEC_FLAMEEYES>
-
-# Uncomment this if you don't use the CRS
-# Include /etc/modsecurity/flameeyes/optional/flameeyes_init.conf
-
-Include /etc/modsecurity/flameeyes/rules/*.conf
-
-# -*- apache -*-
-# vim: ts=4 filetype=apache
-
-EOF
-
- insinto /etc/apache2/modules.d/
- doins "${T}/81_${PN}.conf"
-
- readme.gentoo_create_doc
-}
diff --git a/www-apache/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest
index 42d6a88cdcda..9235054778d5 100644
--- a/www-apache/modsecurity-crs/Manifest
+++ b/www-apache/modsecurity-crs/Manifest
@@ -1,3 +1,3 @@
DIST modsecurity-crs-3.3.5.tar.gz 299458 BLAKE2B b8617de77cf5168c7b95fab46eae45e2101b4ec7a537d8d471b9b1b27a856b1d370a9de43ee262c07dc9371b3ff79cd86b7328b171fde003da9110897206e91e SHA512 001f9afe25f479dd988aaec1a4a2c0197b2d27e00d2cd10b70892e4889b399259cd0655f42a96965ae655855abdb7f9d8295c225ae17bf1e47361b70232633e5
DIST modsecurity-crs-4.0.0.tar.gz 504720 BLAKE2B e6da0268ae9209179d1f6cefba34e097b614dd4659a4b4df2ef3e6a0b32be7be9d825beaf6d8ca1fbef0dd27217b4707090844e59eaa817111be4a6f8333e205 SHA512 c25bfd6de772815977783e78d7afd388d60bbba151762a38c7050fd5ecde6a48baa0a850028a24d42855ae4a788404ad1ee0f7a4ad2d94d53a46e261a00f7224
-DIST modsecurity-crs-4.0.0_rc2.tar.gz 491479 BLAKE2B 71a016b7e45a991373357ece9cc7a59afe54daf91ffa826b76fd4a986b6e8989efb54ca3b83fac9307cf6ede1e1f7a78f9534cc5682e63ea3d75b9092c295d30 SHA512 302129aa3c476afd84b41bfdf73afaa1561f300ecad6ea3540d977639dc3c2167169298fbbe453ceb108d10dee3835b2e4f30f0c12cc413d3acd530906123021
+DIST modsecurity-crs-4.2.0.tar.gz 511240 BLAKE2B f33d1a2bfac809e08ce5480af68b2380b19ea33f4d1409dd79d2117e451631df5b73ba2ccbc6eae2757df3b092c9439bfe79b49658d76fda1a1237f204317080 SHA512 041556b2071385c10a4b4a29ad4f926ee86f819f8b9c95f849e76b3d2724d5fc29c21a69f9eba6fd62e7f5709a109a95feca67a19d8c8d1f0410ee2987ac7a6b
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild
index 1a0a134d3046..fe3c87163c0e 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-4.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/coreruleset-${MY_PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+apache2"
RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )"
diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.0.0_rc2.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.2.0.ebuild
index 1a0a134d3046..1a0a134d3046 100644
--- a/www-apache/modsecurity-crs/modsecurity-crs-4.0.0_rc2.ebuild
+++ b/www-apache/modsecurity-crs/modsecurity-crs-4.2.0.ebuild
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index c118832730db..210e56efdd93 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,3 +1,2 @@
-DIST passenger-6.0.18.tar.gz 8424409 BLAKE2B 50f3639d0233892c85b97383689599c08457642fbfd1d968b67dddee896eb1377ffc40ce8049a2c3ae4a1a6d3673bdc2fef8de9125efa0386722103f9c4ed1ba SHA512 4c9e43d0907e83f82b2ae1bdc882648f5b3c1b54ffe029590a259c191f57b752dc3196332d0bb68319d50d656192e59df0ed9647f1c7fe3fdc13477a9c0b829b
-DIST passenger-6.0.19.tar.gz 8426094 BLAKE2B d0c6cf8b1b27cb11723f28b019d45710a53db76001f1449fd207b7e552080e1b303378acfbc3194076a4a33d03a8eeed9e716471a24706a5a5049343f2b93ef8 SHA512 3ac9b1d85549c8b69f9895d2b0fe00bee68bedfd2ef36ec148fb5e76a88db6498caf7bf6aa2255298aa51bb6b3d14e05c48de519398a0271402cc81e926b206d
DIST passenger-6.0.20.tar.gz 8476308 BLAKE2B dc1ac3a1e2be1a9138594d68cf23fc0a73b6b0aca0550c022de56bc156825b3627de741128f163871c89747f178fb26fc41533962ba83ef2659ca71793c0fa62 SHA512 b46864cd7fa83fe39a2a4f42d581660c9a521b96942604b56caa567adff272bb092e82a46a6817a7b68be4830ad1015c9af4429a6d5b26edfe9c3e3884046559
+DIST passenger-6.0.22.tar.gz 8296503 BLAKE2B 0e9440134ead3c909570f1fde54e332dd1b017dbc140e1c0b6f1bc73462f01ab4ce36a19a44fc89bbc1d5a93f0faa6cb2e10dc2425722b9b17a4ebe4a5102ded SHA512 85c07386f36677063d32214cce780933d19a3893d15c15efc6c7333dce8046e368218ae9a6aa4d814abdfcfa7da823ae86badfd2c6e6252d4da4f20cd468cdd8
diff --git a/www-apache/passenger/passenger-6.0.18.ebuild b/www-apache/passenger/passenger-6.0.18.ebuild
deleted file mode 100644
index d501f7ead463..000000000000
--- a/www-apache/passenger/passenger-6.0.18.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby30 ruby31 ruby32"
-
-inherit apache-module flag-o-matic ruby-ng toolchain-funcs
-
-DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
-HOMEPAGE="https://www.phusionpassenger.com/"
-SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
-
-# Passenger is licensed MIT, but vendored code licenses should also be taken into account.
-LICENSE="Boost-1.0 MIT BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="apache2 debug"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-ruby_add_rdepend "
- >=dev-ruby/rack-1.0.0:*
- >=dev-ruby/rake-0.8.1"
-
-# libev is bundled but with adapations that do not seem to be accepted
-# upstream, so we must use the bundled version :-(
-CDEPEND="
- >=dev-libs/libuv-1.8.0
- net-misc/curl[ssl]
- apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
-
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}"
-
-APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
-APACHE2_MOD_DEFINE="PASSENGER"
-
-want_apache2
-
-pkg_setup() {
- use debug && append-flags -DPASSENGER_DEBUG
- depend.apache_pkg_setup
-}
-
-all_ruby_prepare() {
- eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-
- # Change these with sed instead of a patch so that we can easily use
- # the toolchain-funcs methods.
- sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
- -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
- -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
-
- # Avoid fixed debugging CFLAGs.
- sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
-
- # Use sed here so that we can dynamically set the documentation directory.
- sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
- -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
- src/ruby_supportlib/phusion_passenger.rb || die
- sed -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
- -i src/cxx_supportlib/ResourceLocator.h || die
-
- # Don't install a tool that won't work in our setup.
- sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
- rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
-
- # Make sure we use the system-provided version where possible
- rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
-
- # Fix hard-coded use of AR
- sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
-
- # Make sure apache support is not attempted with -apache2
- if ! use apache2 ; then
- sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
- fi
-}
-
-all_ruby_compile() {
- if use apache2 ; then
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
- APXS2="${APXS}" \
- HTTPD="${APACHE_BIN}" \
- FS_LIBDIR='/usr/'$(get_libdir) \
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
- RANLIB=$(tc-getRANLIB) \
- ruby -S rake apache2 || die "rake failed"
- fi
-}
-
-each_ruby_compile() {
- append-flags -fno-strict-aliasing
-
- V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
- APXS2="${APXS}" \
- HTTPD="${APACHE_BIN}" \
- FS_LIBDIR='/usr/'$(get_libdir) \
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
- RANLIB=$(tc-getRANLIB) \
- ${RUBY} -S rake native_support || die "rake failed"
-}
-
-all_ruby_install() {
- if use apache2 ; then
- APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
- apache-module_src_install
-
- # Patch in the correct libdir
- sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
- fi
-
- dodoc CHANGELOG README.md doc/*.md
-}
-
-each_ruby_install() {
- DISTDIR="${D}" \
- RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
- RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
- APXS2="${APXS}" \
- HTTPD="${APACHE_BIN}" \
- FS_DOCDIR="/usr/share/doc/${P}" \
- FS_LIBDIR='/usr/'$(get_libdir) \
- EXTRA_LDFLAGS="${LDFLAGS}" \
- USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
- RANLIB=$(tc-getRANLIB) \
- ${RUBY} -S rake fakeroot || die "rake failed"
-}
diff --git a/www-apache/passenger/passenger-6.0.19.ebuild b/www-apache/passenger/passenger-6.0.22.ebuild
index 881b0b4073de..0c0ad6d0d23f 100644
--- a/www-apache/passenger/passenger-6.0.19.ebuild
+++ b/www-apache/passenger/passenger-6.0.22.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
inherit apache-module flag-o-matic ruby-ng toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
# Passenger is licensed MIT, but vendored code licenses should also be taken into account.
LICENSE="Boost-1.0 MIT BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="apache2 debug"
ruby_add_bdepend "dev-ruby/rake"