summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/libapreq2/Manifest1
-rw-r--r--www-apache/libapreq2/libapreq2-2.13-r1.ebuild63
-rw-r--r--www-apache/libapreq2/libapreq2-2.15-r1.ebuild3
-rw-r--r--www-apache/libapreq2/libapreq2-2.16.ebuild3
-rw-r--r--www-apache/mod_h2/Manifest2
-rw-r--r--www-apache/mod_h2/mod_h2-1.15.18.ebuild49
-rw-r--r--www-apache/mod_h2/mod_h2-1.15.19.ebuild49
-rw-r--r--www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch17
-rw-r--r--www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch11
-rw-r--r--www-apache/mod_perl/mod_perl-2.0.11.ebuild4
-rw-r--r--www-apache/mod_qos/mod_qos-11.66.ebuild4
-rw-r--r--www-apache/mod_security/mod_security-2.9.3-r100.ebuild2
-rw-r--r--www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild2
-rw-r--r--www-apache/passenger/Manifest2
-rw-r--r--www-apache/passenger/passenger-6.0.8.ebuild2
-rw-r--r--www-apache/passenger/passenger-6.0.9.ebuild (renamed from www-apache/passenger/passenger-6.0.7.ebuild)5
16 files changed, 140 insertions, 79 deletions
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index ae1f862ad76..1b7d380564a 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -1,3 +1,2 @@
-DIST libapreq2-2.13.tar.gz 891320 BLAKE2B 6e896b95a17d7e4eede651bd74f21280d77b38c1c96be790c34993307a0435ea6d4626825dc215680e1fa2cd6a3ec635fcbeb9fda3b34e687ed8f7641b4fee7e SHA512 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
DIST libapreq2-2.15.tar.gz 839618 BLAKE2B 875aa8091512cf6b43c8654579b3d4779ea50835784380dcf69ca048f9b8d4ef6e573fef5ee03c0e47a929dcd8c4643d5dc861d875122095024bca6e8fbbf38c SHA512 abdc34f4867ba891966e7296c8110cffaa723f9b966522a1de352bc459e89e5cfc60de25dcd20cf0fa9b7cdf9282719b0276b621af8aa7bb770c89a7fbae4701
DIST libapreq2-2.16.tar.gz 839264 BLAKE2B 6a79e0281bb24962775f6c2fcc906d07a2f7643f608871018a647a225329c45516f1afe12e27c432449765463b2a4e823a728051fa73938e97ddc828b94c4732 SHA512 aa9e751a3f0d6a9cb587aa1c5408e8d9a073560860d7f653776196fe3739516df16abe943c9cb0460cfb9b68a2d79ad651cfd5e4a30a2ca34d6dc3ced73f628c
diff --git a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild b/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
deleted file mode 100644
index 8a4890686cf..00000000000
--- a/www-apache/libapreq2/libapreq2-2.13-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit apache-module epatch perl-module multilib
-
-DESCRIPTION="A library for manipulating client request data via the Apache API"
-SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
-HOMEPAGE="https://httpd.apache.org/apreq/"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="perl"
-
-DEPEND="${DEPEND}
- perl? (
- >=dev-perl/ExtUtils-XSBuilder-0.23
- virtual/perl-version
- >=www-apache/mod_perl-2
- )"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so"
-APACHE2_MOD_CONF="76_mod_apreq"
-APACHE2_MOD_DEFINE="APREQ"
-DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST"
-
-need_apache2
-
-pkg_setup() {
- perl_set_version
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/libapreq2-2.08-doc.patch
-
- sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die
- sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die
- sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure || die
-}
-
-src_configure() {
- econf \
- --with-apache2-apxs=${APXS} \
- $(use_enable perl perl-glue)
-}
-
-src_install() {
- apache-module_src_install
-
- make DESTDIR="${D}" INSTALLDIRS=vendor install || die "make install failed"
- doman docs/man/man3/*.3
-
- perl_delete_localpod
-
- for i in $(find "${D}" -type f -not -name '*.so'); do
- if file ${i} | grep -i " text"; then
- sed -i -e "s:${D}:/:g" ${i}
- fi
- done
-}
diff --git a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
index fa4bb408b23..35a9342e6d4 100644
--- a/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.15-r1.ebuild
@@ -11,14 +11,13 @@ HOMEPAGE="https://httpd.apache.org/apreq/"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="perl test"
RESTRICT="!test? ( test )"
RDEPEND="
|| (
dev-libs/apr-util[openssl]
- dev-libs/apr-util[libressl]
dev-libs/apr-util[nss]
)
perl? (
diff --git a/www-apache/libapreq2/libapreq2-2.16.ebuild b/www-apache/libapreq2/libapreq2-2.16.ebuild
index cf4d3ef38e4..1b153b06644 100644
--- a/www-apache/libapreq2/libapreq2-2.16.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.16.ebuild
@@ -11,14 +11,13 @@ HOMEPAGE="https://httpd.apache.org/apreq/"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="perl test"
RESTRICT="!test? ( test )"
RDEPEND="
|| (
dev-libs/apr-util[openssl]
- dev-libs/apr-util[libressl]
dev-libs/apr-util[nss]
)
perl? (
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index e2990fb5cfa..0fa225a8e51 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,2 +1,4 @@
DIST mod_h2-1.15.16.tar.gz 702081 BLAKE2B 1f1ce9911c4dba5001d548b99fe08c5a13882a1f44b067a19c3edc178566895522e30d5b949c89754c322eb80a09fd5c07cba740783377b46e2d075e207ca04b SHA512 48e734bafc68acda75a2b9b72b503396bb8c4e58842e5b1ff395389835681a26485cd3795ca3c7fe7be5ad9614b89f305993d2753f1486856eff7599d2892c49
DIST mod_h2-1.15.17.tar.gz 708333 BLAKE2B 7f7f4625d20dd85e88768cbc1b6347498d2d913b4e778fcac6e01ef2e6676ff4c180385610e5db990d7e9d3ceceafac7e1a08b421c7d99814f9c212b17ac8d76 SHA512 7d6af4123091171273093b4333699bda2469b3e2bd7412e226394f0dc79a5a7d684035538549e13d119c5134016c8b7a3e7aaf8559eec56ed15d849655f11521
+DIST mod_h2-1.15.18.tar.gz 708704 BLAKE2B 1ad8bd317c42f517baf015cbdeb89040a743753f19a0fd6ae20a3d2f1c48ae4a76dcb926ad71060f25e64e8e89c07e7e95f938b2a346b92c7c961808816fd19f SHA512 4582e815f582c66e0d119925a1b19ecd74afedc4e7db4410a8552384ad6d2e113dc4e428fa88214ef23f0d7b0b3a64c2fa6f9a42b9e0a8b1239d891826b56cdc
+DIST mod_h2-1.15.19.tar.gz 708753 BLAKE2B 9193e9b307ead341e90dffe4547de444a3f47340f23e3a7171f8a0fdbd0c5749eddfd7f9e6b3e4a3afccda521437183a8e7039a79e554a4c6e18415678dfec57 SHA512 52717d173df26faaa82e1335366de448bd0b125032066e436546027580707ba872ae07e1e4e9b8b4fc5dbd02e212441d44b96092aac8732627117e109b95671a
diff --git a/www-apache/mod_h2/mod_h2-1.15.18.ebuild b/www-apache/mod_h2/mod_h2-1.15.18.ebuild
new file mode 100644
index 00000000000..e59d601d9dd
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+ inherit git-r3
+else
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ default
+
+ APACHE2_MOD_DEFINE="HTTP2"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_h2/mod_h2-1.15.19.ebuild b/www-apache/mod_h2/mod_h2-1.15.19.ebuild
new file mode 100644
index 00000000000..e59d601d9dd
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.19.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+ inherit git-r3
+else
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/icing/mod_h2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+ >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ default
+
+ APACHE2_MOD_DEFINE="HTTP2"
+ insinto "${APACHE_MODULES_CONFDIR}"
+ newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
new file mode 100644
index 00000000000..c6c5bed4ed0
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch
@@ -0,0 +1,17 @@
+
+Fix build for perl >= 5.33.7
+
+Patch by Leon Timmermans <fawaka@gmail.com> from https://github.com/Perl/perl5/issues/18617
+
+
+--- perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:48:02 1889013
++++ perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:55:29 1889014
+@@ -268,7 +268,7 @@
+ #ifdef MP_NEED_HASH_SEED_FIXUP
+ if (MP_init_hash_seed_set) {
+ #if MP_PERL_VERSION_AT_LEAST(5, 17, 6)
+- memcpy(&PL_hash_seed, &MP_init_hash_seed,
++ memcpy(PL_hash_seed, &MP_init_hash_seed,
+ sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ?
+ sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed));
+ PL_hash_seed_set = MP_init_hash_seed_set;
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch b/www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch
new file mode 100644
index 00000000000..a8e9e303693
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-ranlib.patch
@@ -0,0 +1,11 @@
+--- ./lib/Apache2/Build.pm~ 2019-10-05 12:04:39.000000000 +0100
++++ ./lib/Apache2/Build.pm 2020-10-28 19:20:40.809279091 +0000
+@@ -1664,7 +1664,7 @@
+
+ my $ranlib = "\t" . '$(MODPERL_RANLIB) $@' . "\n";
+
+- $link .= "\n" . $ranlib unless (DARWIN or OPENBSD);
++ #$link .= "\n" . $ranlib unless (DARWIN or OPENBSD);
+
+ $link;
+ }
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
index 014692d57e0..77fb5135e3a 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -61,6 +61,8 @@ PATCHES=(
"${FILESDIR}/${PN}"-2.0.4-inline.patch # 550244
"${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
"${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+ "${FILESDIR}/${PN}"-2.0.11-ranlib.patch # 728554
+ "${FILESDIR}/${PN}"-2.0.11-perl534.patch # 791403
)
src_prepare() {
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
index 32b1e831b2e..412c8e3c8eb 100644
--- a/www-apache/mod_qos/mod_qos-11.66.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -12,12 +12,10 @@ SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
RDEPEND="
dev-libs/libpcre:3
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
media-libs/libpng:0=
sys-libs/zlib:0=
"
diff --git a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
index b367e95e44b..ad8579ac88e 100644
--- a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
@@ -55,7 +55,7 @@ need_apache2
pkg_setup() {
_init_apache2
_init_apache2_late
- lua-single_pkg_setup
+ use lua && lua-single_pkg_setup
}
src_prepare() {
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
index 0bf447b96d6..e5ae886e528 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 1a1cd910c9b..5f9086aee16 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,3 +1,3 @@
DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
-DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca
DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
+DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4
diff --git a/www-apache/passenger/passenger-6.0.8.ebuild b/www-apache/passenger/passenger-6.0.8.ebuild
index 17074fb367b..4d290110e58 100644
--- a/www-apache/passenger/passenger-6.0.8.ebuild
+++ b/www-apache/passenger/passenger-6.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="apache2 debug"
ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apache/passenger/passenger-6.0.7.ebuild b/www-apache/passenger/passenger-6.0.9.ebuild
index 70b99758160..0a7a0aa829f 100644
--- a/www-apache/passenger/passenger-6.0.7.ebuild
+++ b/www-apache/passenger/passenger-6.0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
@@ -43,7 +43,6 @@ pkg_setup() {
all_ruby_prepare() {
eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
- eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
# Change these with sed instead of a patch so that we can easily use
# the toolchain-funcs methods.