diff options
Diffstat (limited to 'www-apache')
32 files changed, 345 insertions, 216 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz Binary files differindex faf82607b2ac..56c44f0dab7f 100644 --- a/www-apache/Manifest.gz +++ b/www-apache/Manifest.gz diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest index 761b15bffca5..7a4cddc69fce 100644 --- a/www-apache/libapreq2/Manifest +++ b/www-apache/libapreq2/Manifest @@ -1,5 +1,7 @@ AUX 76_mod_apreq.conf 316 BLAKE2B 368a404fae7bf917eb61090c90b19d090d607f54ffb717f1fa7154af6db0c1b71f6022e4ee38b1588c56b6777adb5eee4402377a33c4d78601bb19d0074a8de3 SHA512 2a4d7c8415162d27ae182f091b8a2219c2865ff7ace0a5b8944e853cd256955888482877ab7cce55342a3d30686f9d7932bbbfdcc8c037e15c92e60de9eab20b AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0b4f51f1b7e3e4e2d0f4d96dde2a687c9c2e5885fbdba2b936efd5947d13c3aacc7ba69d40ce5a956593fce4ca4 SHA512 dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766 +AUX libapreq2-2.08-fix-linkage.patch 1958 BLAKE2B aea75f1fe1922604e71bcd7965f7b9d1af67ec2f37d3b9278db83174a3a9bea7337c9d22a319e878a3536eab3fcbdd65dbc85b66d30389853c42653c50bdbfc8 SHA512 de97c9d1176296f3c71851135bf681f4b05bab065d6ede13e01152388cc6a815976af776ef461638e154db1df6c6cced5c32fbd065f5f3a16fcca19d7ec4e9c7 DIST libapreq2-2.17.tar.gz 849867 BLAKE2B d2fa15693c200925e4926f207f1e023cba59ac0bfe3af3a8ac12880020bb00625c7fa21478c6562f9995d5307151b865efb83b837f45213d73fc523a1a864899 SHA512 89b139b8673145d9e2d8fd77d36f878c519c1deb7f9b853cda2a15d34cbb619d1c5e784ba21553f23c2ef07803f07c75a83d96cd770f80e1b36283a4cbb88999 +EBUILD libapreq2-2.17-r1.ebuild 1700 BLAKE2B 3e8ad44d74e8c8aadf4a818c6183ed34326b12ad3e2de296d13308982dc118e23b88425f7b37f90cee874e50848fecfff9e22c0d4bd95f61bc09b873b5815cb9 SHA512 55f4aa5f90cbde86d06344c572cfcfdda6668d97af008327abea8f8c8e7c3b953c73dcc1f5153853964f2fbb9807d6efc10fbd4b8fd0dd558045290ca1c09e5d EBUILD libapreq2-2.17.ebuild 1647 BLAKE2B fa8ddb52259918f78e514da6fc080f74b1a2f9260699105c97c00f54f818ebab3440f39edb853811cd3f93f5a2e009ec2578607240768c6ee2357bdacf5644e3 SHA512 2c54c42ac25c3717e42065c49c994a26d799c4d48b5591dfc2274cdacd030ec5a6eb19744f8fff3e289f74f69f4fc7f2411c514e6d2c3ae17b0856eb89375130 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/www-apache/libapreq2/files/libapreq2-2.08-fix-linkage.patch b/www-apache/libapreq2/files/libapreq2-2.08-fix-linkage.patch new file mode 100644 index 000000000000..c77fceb0640e --- /dev/null +++ b/www-apache/libapreq2/files/libapreq2-2.08-fix-linkage.patch @@ -0,0 +1,51 @@ +https://bugs.gentoo.org/934379 +https://src.fedoraproject.org/rpms/libapreq2/blob/rawhide/f/libapreq2-2.12-install.patch + +From: Lubomir Rintel <lkundrak@v3.sk> + +APR shared objects were not properly linked when they were installed to a +specific DESTDIR. This was broken in r733406, which attempted to fix +rpaths for the obscure platforms that still use them. + +With this applied, we call apreq2-config we just installed and add a library +path of libraries in DESTDIR to linker. + +$ perl -MAPR::Request +Can't load '/usr/lib/perl5/auto/APR/Request/Request.so' for module APR::Request: /usr/lib/perl5/auto/APR/Request/Request.so: undefined symbol: apreq_hook_disable_uploads at /usr/lib/perl5/DynaLoader.pm line 200. + at - line 0 +Compilation failed in require. +BEGIN failed--compilation aborted. + +--- a/glue/Makefile.am ++++ b/glue/Makefile.am +@@ -15,7 +15,9 @@ perl_test: perl/Makefile + cd perl; $(MAKE) test + + perl_install: +- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@ ++ cd perl; INSTALL=1 PKG_CONFIG_PATH=$(DESTDIR)$(libdir)/pkgconfig \ ++ DESTDIR=$(DESTDIR) LIBDIR=$(libdir) \ ++ @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@ + cd perl; $(MAKE) install + + perl_clean: +--- a/glue/perl/Makefile.PL ++++ b/glue/perl/Makefile.PL +@@ -136,10 +136,15 @@ if (WIN32) { + my $apreq2_config = "$base_dir/apreq2-config"; + my $bindir = qx{$apreq2_config --bindir}; + chomp $bindir; +- $apreq2_config = "$bindir/apreq2-config" if $ENV{INSTALL}; ++ $apreq2_config = "PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} ". ++ $ENV{DESTDIR}."$bindir/apreq2-config" ++ if $ENV{INSTALL}; + $apreq_libs = qx{$apreq2_config --link-ld --ldflags --libs}; ++ die "Failed to run $apreq2_config" if $?; + chomp $apreq_libs; ++ $apreq_libs = " -L".$ENV{DESTDIR}.$ENV{LIBDIR}." ".$apreq_libs ++ if $ENV{INSTALL}; + } + + my $mp2_typemaps = Apache2::Build->new->typemaps; + + diff --git a/www-apache/libapreq2/libapreq2-2.17-r1.ebuild b/www-apache/libapreq2/libapreq2-2.17-r1.ebuild new file mode 100644 index 000000000000..c379b136f230 --- /dev/null +++ b/www-apache/libapreq2/libapreq2-2.17-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit apache-module perl-module + +DESCRIPTION="A library for manipulating client request data via the Apache API" +HOMEPAGE="https://httpd.apache.org/apreq/" +SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="perl test" +RESTRICT="!test? ( test )" + +RDEPEND=" + || ( + dev-libs/apr-util[openssl] + dev-libs/apr-util[nss] + ) + perl? ( + >=dev-perl/ExtUtils-XSBuilder-0.23 + virtual/perl-version + >=www-apache/mod_perl-2 + ) + virtual/libcrypt:=" +DEPEND=" + ${RDEPEND} + test? ( dev-perl/Apache-Test )" +BDEPEND="sys-apps/file" + +PATCHES=( + "${FILESDIR}"/libapreq2-2.08-doc.patch + "${FILESDIR}"/libapreq2-2.08-fix-linkage.patch +) + +APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so" +APACHE2_MOD_CONF="76_mod_apreq" +APACHE2_MOD_DEFINE="APREQ" + +need_apache2 + +pkg_setup() { + perl_set_version +} + +src_prepare() { + default + + sed -i -e "s/PERL \$PERL_OPTS/PERL/" acinclude.m4 aclocal.m4 configure || die +} + +src_configure() { + econf \ + --disable-static \ + --with-apache2-apxs=${APXS} \ + $(use_enable perl perl-glue) +} + +src_install() { + APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules" + apache-module_src_install + + emake DESTDIR="${D}" INSTALLDIRS=vendor install + doman docs/man/man3/*.3 + + perl_delete_localpod + + HTML_DOCS=( docs/html/. ) + einstalldocs + dodoc INSTALL MANIFEST + + local f + while IFS="" read -d $'\0' -r f ; do + if file "${f}" | grep -i " text"; then + sed -i -e "s:${ED}:/:g" "${f}" || die + fi + done < <(find "${ED}" -type f -not -name '*.so' -print0) + + find "${ED}" -name '*.la' -delete || die +} diff --git a/www-apache/mod_authnz_external/Manifest b/www-apache/mod_authnz_external/Manifest index 634d4422565e..126334f07c43 100644 --- a/www-apache/mod_authnz_external/Manifest +++ b/www-apache/mod_authnz_external/Manifest @@ -1,4 +1,4 @@ AUX 10_mod_authnz_external.conf 993 BLAKE2B 36daed95a23c58abb0749cfd4836f57b7913362f7dd98f18a5e0158b30754392756f9f9e0c3a8158d6e93e40f765ec440fa3f24069746a49ec16db9f2c8ca6b1 SHA512 66de4c74f5f72ee1f0483c8f5bcd0ff461ebcf0a7b2790692a3b6f4c2ac1be8e6510ffcaa7502903d1b5b611a1a8375a845ff14c3147df3614e5d73384a22ce4 DIST mod_authnz_external-3.3.3.tar.gz 38266 BLAKE2B 03bdfe7efdcd832b7662be70e0e38cdfb4f025d3bdd3baf3e98b4d77efd538605db8f625006246515f427989aca3242626a4115e4534ecb75c09adc967227ea6 SHA512 65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2 -EBUILD mod_authnz_external-3.3.3.ebuild 805 BLAKE2B fed678608b027aeb9d8694f6b25b1d6df7c4b4e01260dde9abe28e93aa4791ca14ec529598cc96bae88d86e547f9b6162a469360e35cb2e53b5d7b56700ab493 SHA512 5a1fd2b4cbb2359e8b08be3c724f8630f7d885ab9c1828cd7262eb73c3321ba1a2e1694b7d02d50fc6380be8b5eafc5b1580b46fd9a244bdc5bf272fd0d299b3 +EBUILD mod_authnz_external-3.3.3-r2.ebuild 799 BLAKE2B ca30128cffb1c05e9351199d7ac925d7b3f19e03584cfb51ee84fae26b050fe9d37b105edd9efdcc906faba33ac17303f934e3454b26561b78aeffe8847c5393 SHA512 916601231739d79ba28533c786da54b6b411fe8fe466e20cc7d3d21870de0980ea4aacb9fbd7e1da6c39d579a554d1d79fa816e2c82107a491c0bfcebd768ba0 MISC metadata.xml 337 BLAKE2B 98dd71f26a860fea5d25a02ec76292898fcb76adbb3018a377383a99170318b0d3fa48f53248a7bc4b138a0c63d575963ebf1f90d5af5a6020260781fbd1d79d SHA512 63e2117dfdcf645e5d966a36dec31fd92f10a17c9efff9f378803060f91f0344ce76b51fa8eec6eef5dbd7fb7368e33d6a668185cf901bd01d1f99438cad120c diff --git a/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3-r2.ebuild index 705143bd9946..ea4592e2963e 100644 --- a/www-apache/mod_authnz_external/mod_authnz_external-3.3.3.ebuild +++ b/www-apache/mod_authnz_external/mod_authnz_external-3.3.3-r2.ebuild @@ -1,7 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +DESCRIPTION="An Apache2 authentication DSO using external programs" +HOMEPAGE="https://github.com/phokz/mod-auth-external" + inherit apache-module if [[ ${PV} == *9999 ]] ; then @@ -10,16 +14,13 @@ if [[ ${PV} == *9999 ]] ; then S="${WORKDIR}/${P}/mod_authnz_external" else SRC_URI="https://github.com/phokz/mod-auth-external/archive/${P}.tar.gz" - KEYWORDS="amd64 x86" S="${WORKDIR}/mod-auth-external-${P}" + KEYWORDS="amd64 x86" fi -DESCRIPTION="An Apache2 authentication DSO using external programs" -HOMEPAGE="https://github.com/phokz/mod-auth-external" - LICENSE="Apache-1.1" SLOT="2" -IUSE="" + need_apache2_4 DOCFILES="AUTHENTICATORS CHANGES INSTALL INSTALL.HARDCODE README TODO UPGRADE" diff --git a/www-apache/mod_authz_unixgroup/Manifest b/www-apache/mod_authz_unixgroup/Manifest index 82196360f746..0c3015bd0533 100644 --- a/www-apache/mod_authz_unixgroup/Manifest +++ b/www-apache/mod_authz_unixgroup/Manifest @@ -1,4 +1,4 @@ AUX 10_mod_authz_unixgroup.conf 359 BLAKE2B 5dcb3eb6d28c3b2d8aeae65ef109eb56e1781248bec2dbd6a99d5f0f927135dafe249222ae33c89634ca79e74b641677e17a293a7845064ec3ec7ae631639c4f SHA512 172d3ea8e80a77443e16d45c2cc6daf82b88facd145a26b1a196986c000967f861c9ee90cb5c6d3bd1de5c167a74e68039379fb55a9abcb4b32b773d502b8662 DIST mod_authz_unixgroup-1.1.0.tar.gz 10085 BLAKE2B d7948cf046d58bcf27dfd4310a69ea61395d75f67c782fdbeb3f96015b7df8abebb7c59a244efe37a20e42ed72b501cd757346812144cd66a1cae8dabbd62a42 SHA512 83c767b2eb903964e688658bc4ae4384afd14c99f714c9aafb8c5bdddc855511e0b81f3499411b401865e42028b587dbba4ea2eb5123fe32ac91899327d6bbb8 -EBUILD mod_authz_unixgroup-1.1.0.ebuild 734 BLAKE2B c28033779369bc334c5c4d8476461470d1b2910a768773a346e6bce2afe14f72ae6ec9da2031007340fdf6eb392d975f0f10ef483e6dec1d61647cbc98da6dca SHA512 a7a7bef6c17aa59c55d6645309a0af76768fb3268422f46b44cfcd149d0a765d64ac67e9ac3b9e9315eb012a1af113fb36a28940d0fa74bf25f500851efe0637 +EBUILD mod_authz_unixgroup-1.1.0-r2.ebuild 734 BLAKE2B 895c77d58fdc21f7847491d045f62dc77e1f1339a345f1ab3754487e23dc84ae4b4067ac9c5f92e2f2c9ad1267911e291b5e5160266f92e70c61a9b6306673c0 SHA512 1c0af54fab1b822d7a51cbb338fc401a5b3c547b51aebc61d1b39bd28051dfad08cdc7addf9ff5d29c74ffcb8c704ef9746a9d1b4280da6d58e09d67362f0dd7 MISC metadata.xml 337 BLAKE2B 98dd71f26a860fea5d25a02ec76292898fcb76adbb3018a377383a99170318b0d3fa48f53248a7bc4b138a0c63d575963ebf1f90d5af5a6020260781fbd1d79d SHA512 63e2117dfdcf645e5d966a36dec31fd92f10a17c9efff9f378803060f91f0344ce76b51fa8eec6eef5dbd7fb7368e33d6a668185cf901bd01d1f99438cad120c diff --git a/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0.ebuild b/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0-r2.ebuild index 58dd0cc92263..ff0157b722eb 100644 --- a/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0.ebuild +++ b/www-apache/mod_authz_unixgroup/mod_authz_unixgroup-1.1.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 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_gnutls/Manifest b/www-apache/mod_gnutls/Manifest index 6ad9b2413464..5b20b9c348e1 100644 --- a/www-apache/mod_gnutls/Manifest +++ b/www-apache/mod_gnutls/Manifest @@ -1,4 +1,4 @@ AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7 DIST mod_gnutls-0.12.0.tar.bz2 461643 BLAKE2B ffbb4bd50cae7c974c59067908712e104e6d77b121e5e6114a1a45279b9396331f353a53ddae8e3d58259cd7669f047edc4d2b5ebebe94bb40df55f3546b0a02 SHA512 1ec32d0641dc8dc520726a4439edf2e9dbe582651aa4c782047d0499e5e7418b3145eb071d9e97aa4ec803e6818974efea2ed8ed18e5062cd7fdb90ef2e9e0f2 -EBUILD mod_gnutls-0.12.0-r1.ebuild 1998 BLAKE2B 49f4773bd8efda776d30afdc65a03daef23830eb749e14b1eedf16d9410ced93e9072937ef25cf5379879e3ed879e327f3db1287e8ca34b86d5563f0b30c6063 SHA512 ad2f3a92a5ad14d53cd4bd4726986427b436b1208deac41b878def7f1ddac986d0235e287b4f56624defe105cda22a5a7317c2d60c3e36be63b78b86a189a770 +EBUILD mod_gnutls-0.12.0-r1.ebuild 1999 BLAKE2B cd32e8a0f58cc322aefcb6d51c8f7cb258a5162c91537a1be729076093f72b9aa9311484fcb9e64e78b3b1f0656f124c9b01d2826174fdd6091c5b27d129701f SHA512 68a72b6a78478820f3aeb25f7cd05c138cb90d1c7a57bc7f786c66d10e0fe5fae7c8137cfab440341e2581f9e1aad8ad84fa24748d765d2112ae212cf8fccfc4 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild index 2ed94d16531c..f5fe0e246acd 100644 --- a/www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild +++ b/www-apache/mod_gnutls/mod_gnutls-0.12.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools apache-module flag-o-matic python-any-r1 diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest index 9837a707b5ed..27c31907250a 100644 --- a/www-apache/mod_h2/Manifest +++ b/www-apache/mod_h2/Manifest @@ -1,5 +1,5 @@ AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5 -DIST mod_h2-2.0.27.tar.gz 692514 BLAKE2B c089644fada8fa2293a23d4af60ed23fd795b4ed2df170992ff89c898b663e83ad68080d083d58a5beab3a9e0ddbe56e35c99b8ba3551939bf68570652288abf SHA512 37be31f74bd9c54905c9be84bc7e6bd602604c113c2cb0af2eb9229a010763b04ce508a15a474b9193228ba6d075664879f42600253eb7ed92845285f20141f8 -EBUILD mod_h2-2.0.27.ebuild 935 BLAKE2B 6d3a2c3d69210475fd9583247058693c9d031644b661a956ffd83ca018d40b94f31c4d3c134be3464897368ef16e2ef5dbef064b4218bc8c1e067203a85a2438 SHA512 b18345178ed0517c7684b8dbbd8bca1d5afe9fb6c25f2fb6cacc194db60a833f152bf49a1167bb788a48ae182327e53fffa5156a6ae91e480fbb1083c67c4f0c +DIST mod_h2-2.0.29.tar.gz 694725 BLAKE2B b9c7a325ab49feded5ca80881a97aa1b3cbc2ef388a857199027ceec69322890d69fcd2a6859c72e2fd94a77121f9a8fcebb76116375cf699bb8cf8d97804156 SHA512 cd784c5100fcd1b24c05dfce18c8b926d2af3d9e6fe37cecef5f629d1d76105e6c68dba5985007b50cfd8c909ec739126d3e5b2226ac6eef46265806b8aaeaee +EBUILD mod_h2-2.0.29.ebuild 935 BLAKE2B 6d3a2c3d69210475fd9583247058693c9d031644b661a956ffd83ca018d40b94f31c4d3c134be3464897368ef16e2ef5dbef064b4218bc8c1e067203a85a2438 SHA512 b18345178ed0517c7684b8dbbd8bca1d5afe9fb6c25f2fb6cacc194db60a833f152bf49a1167bb788a48ae182327e53fffa5156a6ae91e480fbb1083c67c4f0c EBUILD mod_h2-9999.ebuild 935 BLAKE2B 6523bf0f4b1a12a823a7a1458046151b7ea52e4e68396307c16c095d9f17201fb93e3dfe94cfb1f72b798ea5eb978d3506e89a647da3a071073f8c4458c83ea7 SHA512 fac393c1667d1c161ea2255f08185975f5863165485184835e9aa4da497074c288783fdd66b60dab0bf95364e1e58744614951bff4f59c2c81ef4a70abc7b25b MISC metadata.xml 326 BLAKE2B 200b47b41409bd7167132c55b5e77b5efa2ec18859520ea38d61a625a6e68bbb1cb0095dda3fd7d273e17114e7cc0ff2fe5c1bbb66ea3a90b4796490fc04a2e8 SHA512 6d45faf84382555d53dc9f38f8d7a23454d763025bbb345f51bece78b36287372d86e173c894038839092adce210e444389b8c41644f44bce0c912880d788080 diff --git a/www-apache/mod_h2/mod_h2-2.0.27.ebuild b/www-apache/mod_h2/mod_h2-2.0.29.ebuild index dddc92e83e4f..dddc92e83e4f 100644 --- a/www-apache/mod_h2/mod_h2-2.0.27.ebuild +++ b/www-apache/mod_h2/mod_h2-2.0.29.ebuild diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index 66f82fb274a8..fbd5a5ed27b2 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,6 +1,6 @@ AUX mod_jk-1.2.49-export-symbols-regex.patch 1352 BLAKE2B dd9c7325be14083b3ba81235c7c195ec450052089061efb5cee58c6bfa7df5bf4ffe63a9eb3a7821863e3131ed4faa8786b5b85e9593ea7054b5fcf38b14d3fe SHA512 cdd7eecc9bc3fe5af9d7c85b18800b4ae1e859c667d5db5262df40da1009e4e944fe73b2c88027f570b6082ea47edf05eff24a99025df7cef3cf20913a77fb9c AUX mod_jk-1.2.49-musl.patch 985 BLAKE2B e7cc5412d74f2df9c28ebe7eddf7594214931eecf5ec20c1c6486ea48e1aa79e86f95931568425af73535a3df37a44e8e2620e502b03d85338db2b15219b2ceb SHA512 77635b10c5e14466c57512a3423673aa2b488b73abb2727522b321f71db3d7aed39ab0b6f7e783cc246742c973d5f7dd5d8b9039a6cc6274656f1761b174ca07 -DIST tomcat-connectors-1.2.49-src.tar.gz 1702479 BLAKE2B 5994bbff6b8c11770cfe8287590d3af793d8720b8a54ecb066abe481e158517c25757a575c9db197e39b1ffc957f27237e92818a9da557db78e5d286b58b1d13 SHA512 936eb017ff9d9011996933838d5c306ede9ae1886405f4daed60719ee522cca6075dedb3b647863ef12155cca93f6db8e58209a5d3bbd2da157ffc536a6809f2 -DIST tomcat-connectors-1.2.49-src.tar.gz.asc 873 BLAKE2B 52cd9b6f051a6a76b1823773c4af2742dfdd686afa951975623d2d2a42730cbd40882e0f6f13600a6e473d265418b662ae1a576889e25685d74d8e692ae1a42e SHA512 41edf25b31bbf280814451dcb9fdc28497394213dfd968c37b2c15670aee34e028a7fc1145a374f128d7ab969c43ca9ae6fd296fee6bf5fae4785ea35908b144 -EBUILD mod_jk-1.2.49-r1.ebuild 2041 BLAKE2B 6feb8839f07603dd8d0f68a96ba1af4972086156b826e2e760498970d135e42bcc1e6712e22542f3ca0130946af0a1f2f515aa308b99ea944ab12eac30d2c695 SHA512 26d0bade7d7fb3e6eff8df02fd1be3dd2eae07690cb8d72b625ddc5b47e4cad903fb5689e823563f2428f59f913d9652b0116af6c96559e2a9d2c6a0a730fd1c +DIST tomcat-connectors-1.2.50-src.tar.gz 1738508 BLAKE2B ffa76cde244010169753d903735157fadcc93e91f32cb604247a8db801d6c05cf67817f457f11ba1aaa3b9d5ae480fad4bde2e50f3114e4e64a70117062419b4 SHA512 9b5a1eb1c0fd38627c574102b3551cdc96fc438b00be5d65770c55b43234af445e642fe8bcbdfe47686b0f3aadab3679340fa76b54b693f57f2273e83ac114ab +DIST tomcat-connectors-1.2.50-src.tar.gz.asc 833 BLAKE2B e27ef4f7a194623f6561b30f9a97ba0dd1391404d44577e8bfe8663513bf12801753d859fbd75c63d1ceafa59493d338f5b0a1db2eb3678caf807293dc2acd7e SHA512 359721d9bbf121415b655082db5dc9ca7e98aa952038e89c49a69da0c77a4cd183a3e4c40107aa4803885332439868abfe9473b296e99480d01dd2ccc4c9b98b +EBUILD mod_jk-1.2.50.ebuild 1920 BLAKE2B 46554274869ef2270dcb2d5ec0b7219f3b25688aab6f2aceb77f95ddd32e88c47e5e0414ccdd8c7102c61078dc32ad04b4a73fe55a8c89a984f0a8ae94be5294 SHA512 4bc5b2b4e56d9a10c0f06616be06a0e90bb3c8212462155847b6cd739969724ca505b5c1a485f300287d10c9531228d61571b6afc1af17c10f77a99a9998952f MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7 diff --git a/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.50.ebuild index 4356eed57aec..9f3276c04839 100644 --- a/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.50.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="tomcat-connectors-${PV#-*}-src" @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}/native" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" DEPEND="dev-libs/apr:1=" RDEPEND="${DEPEND}" @@ -24,11 +24,6 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) " -PATCHES=( - "${FILESDIR}/${PN}-1.2.49-export-symbols-regex.patch" #914237 - "${FILESDIR}/${PN}-1.2.49-musl.patch" -) - APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" APACHE2_MOD_DEFINE="JK" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" diff --git a/www-apache/mod_maxminddb/Manifest b/www-apache/mod_maxminddb/Manifest index a69720f6935c..9c81720c7f85 100644 --- a/www-apache/mod_maxminddb/Manifest +++ b/www-apache/mod_maxminddb/Manifest @@ -1,4 +1,4 @@ AUX 70_mod_maxminddb.conf 87 BLAKE2B b50eb32c9cbf88f63bd9b0d5d12d13a83d7a4cb87ff3ad96bbc06825aa2b144d9ae6c09f0abd2c4004ec7a88b9156ba6b5bf5b6fbf2ede947dae2f46a03c5b30 SHA512 e9137211ea71a52a1010cd022cc5bdc3ae967a02eeb5cbe8339239251f3d2fdb14aba03ba66dea1071f513947e26598cd228e455e92df5a41a5016e5112b5ea5 DIST mod_maxminddb-1.2.0.tar.gz 101465 BLAKE2B a0f9673560851726e7e85b3c6a5ef3e9004854e79a72bb14446bd68eec59ed8befb3bc27d7e7f031c69708ab54984c9f7537e5d55616be9f7ef1b92e2de61ccd SHA512 739c3c9b136fd3ce784e0a81c82a26a188e7d07435c1381ba359b2e159a721d072cb04310f2ce2a38953a8918fec686025bac6c140048a1afc035c0b8e449483 -EBUILD mod_maxminddb-1.2.0.ebuild 903 BLAKE2B 48709b6a24cf6fda247bfcdcef912e8cdd03640fc4ecc529ea06f3b09ea989f697496b1f60574f1670685ed77bce9bbb92b25a083b1b25dd47cf30dae359f5d9 SHA512 c9b1ee3f42f7d3ed824d7dedb56c4dd016ad93aa40a03b2480009f4dd50f7ba2a4aad09c8b13c642f591d72ed10f4969b84e77412289e6656cec8801ba0a55d5 +EBUILD mod_maxminddb-1.2.0-r1.ebuild 901 BLAKE2B 5c97adab508da71a4bd92e76ef9848833a25d785fd4b7838a4ecf9e1c4ad279cc14e9879700ab8f44003c1a96396b1a18a199b207e99674808ef1775b59148f3 SHA512 269250625a3b88d24d6b5c3aeab532ae18d22da9f5e8dc1c8195bbdc9a2f38eed6dabc08be92f69135943f70f679aea5a3659ac1e3a8f184857991e38263db4f MISC metadata.xml 484 BLAKE2B 7b1241b11e8b219d9cedd46ff190ec211020ee5ad206d159726181dcaa2b98dbda2985dbe8469a4f3ad76b50fe7ae08bbffbe7f467ee1afac921312cb3d4490b SHA512 dd5c40a767ffcc04e01c1212e704c3f937dc0cef8c019bbb77bcbf2d24d54dd4f7811f1b063b004d7c841aed3c2b3d63e4525b85f840ee79b8d95fb6fb865103 diff --git a/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0-r1.ebuild index d53a3e7151ef..7a0e31e4cfc0 100644 --- a/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild +++ b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 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 autotools diff --git a/www-apache/mod_vdbh/Manifest b/www-apache/mod_vdbh/Manifest deleted file mode 100644 index 8ab181e79749..000000000000 --- a/www-apache/mod_vdbh/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 21_mod_vdbh.conf 489 BLAKE2B f91c0dcbafb1cbd6925bd26e61ec00f463ebe95aef47c221cc72139679259d275bd88983a1a900dd57eb56d2820ca04a2815214b0d189f4227857d03fcc8b036 SHA512 db6fe3fc7e76e5db30529f458ff326681151cd116ff3cb2bda036c6117765103a79cd6b66af46038ee8e22e83ff58524e74bbf1f25723595006159e057064f1b -DIST mod_vdbh-1.0.3.tar.gz 8053 BLAKE2B f0b7b00e180c288cd93fbc4021f2c35809179d980a3bd20d05173f4da057cf923efa13cc0331a075e2cefc44860bf82236a801f17c80625670dbe924bc9fb7eb SHA512 32039fca98bd106571db2f456c60a8420a67846125e3a042ba7e770817d62c224c834aed79d9cdd538116c46bdb9b7bc90be0b6832ecc8712572bc95280805cf -EBUILD mod_vdbh-1.0.3-r2.ebuild 704 BLAKE2B 2011b193d2fd629ab3eb6d6bf026f7ccbd212a281f2f92c620bdf667d5ace0493092f2e8745155282c25b57f3c28082aed1e341eeed1d4940a435223645d6ba3 SHA512 47d4832c9a0eace6b7d564017d4c2f08dff1178a5040ee2f6a22ee8bb2eb2153c48e8b6080c2438a2354423494b3d7585d09fa5112867a28916fdcb6560115a1 -MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/www-apache/mod_vdbh/files/21_mod_vdbh.conf b/www-apache/mod_vdbh/files/21_mod_vdbh.conf deleted file mode 100644 index 337e07bbecdb..000000000000 --- a/www-apache/mod_vdbh/files/21_mod_vdbh.conf +++ /dev/null @@ -1,18 +0,0 @@ -<IfDefine VDBH> -LoadModule vdbh_module modules/mod_vdbh.so - -#NameVirtualHost 206.9.161.29 -#<VirtualHost 206.9.161.29> -# vdbh On -# vdbh_CLIENT_COMPRESS On -# vdbh_MySQL_Database virtual_hosts -# vdbh_MySQL_Table virtual_hosts -# vdbh_MySQL_Host_Field server -# vdbh_MySQL_Path_Field path -# vdbh_MySQL_Environment_Field environment_variable -# vdbh_Default_Host julia.fractal.net -# vdbh_Declines .htpasswd *.txt -#</VirtualHost> -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_vdbh/metadata.xml b/www-apache/mod_vdbh/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/www-apache/mod_vdbh/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild b/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild deleted file mode 100644 index 3b7c60c3f165..000000000000 --- a/www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit apache-module - -KEYWORDS="ppc x86" - -DESCRIPTION="An Apache2 module for mass virtual hosting using a MySQL database" -HOMEPAGE="http://www.synthemesc.com/mod_vdbh/" -SRC_URI="http://www.synthemesc.com/downloads/${PN}/${P}.tar.gz" -LICENSE="Apache-1.1" -SLOT="0" -IUSE="" - -S="${WORKDIR}/${PN}" - -DEPEND="dev-db/mysql-connector-c:= - >=sys-libs/zlib-1.1.4" -RDEPEND="${DEPEND}" - -APXS2_ARGS="-DHAVE_STDDEF_H -I/usr/include/mysql -Wl,-lmysqlclient -c ${PN}.c" - -APACHE2_MOD_CONF="21_mod_vdbh" -APACHE2_MOD_DEFINE="VDBH" - -DOCFILES="AUTHORS README" - -need_apache2 - -pkg_setup() { - _init_apache2_late -} diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest index 5d1e0f2c6cf1..b69a365e5a38 100644 --- a/www-apache/mod_wsgi/Manifest +++ b/www-apache/mod_wsgi/Manifest @@ -1,6 +1,4 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da22d336c1426c4f8f0379e1958b3599811b2efc3cdb16f9543ad3f72d6139da9be01897bf200c06100 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833 -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 -EBUILD mod_wsgi-4.9.0.ebuild 1108 BLAKE2B b85f3abbc1b1da6af973babf3aa2142a1dd5b571ea345d2cbc7cbc418dff5b5389cdff674ec6389f4bdde76f4fcc0ac4602cfaea0ccfe7869c9586690c2b50ca SHA512 d993d3cb33f60839a8b68bffbdf91e50a56e4d84ad6dfac5568a6a1dbbd19be182099c1d7ee8a16a8a3f293be40ca31cce1038677cd3fc5b111ddf8152a54e6b -EBUILD mod_wsgi-4.9.4-r1.ebuild 1093 BLAKE2B bb0d072da7e4e2a9e2dd344075f89be656a4cc36ff3ba9ff053581e9ad82801eab8b3c6b184eafa9410d5fc42f8e5851ec5aed7b9c5fcbeb82e586340ae18924 SHA512 004903697b5d4931ab2b9a26aa59fa70794b87228bd8e70f2aa7c50e097eb6ef03ca94fcdd7529c323c07be0ff6908868566ed826bf10e0855fab125cbf19039 +DIST mod_wsgi-5.0.0.gh.tar.gz 707590 BLAKE2B 14dd43849c0f9d1e67eece9a87acc3573cbb38f8d6338551b22ba33ebd8b6f6e1371e97c7c5d3f1b15cb10e2ae9990eff7f4c6af62fb9236bcc78b35aad4a8db SHA512 3ecc3ad2fd05164929915541be61201db8d35d1e27183ce26c67583b836bb404bd10c88a2ada94714a14140a7f885eb67256cf02bf47aa0dbd81aecd0894a984 +EBUILD mod_wsgi-5.0.0.ebuild 1093 BLAKE2B 1c3c779bad6b352537a4ce5afcbef0e9a6a53eb23ee3df809eeb610110cbc32000e14dd5cd1ff04b0dce965ec7e648ec7a2af75090b10d567c2d0da0bfbb07a9 SHA512 a3c9f49eacd2c213b381bfdf85366a87e5daba151298091da55ee26a95557d19b68f23e0e6829f03b6677cedf3899acb8ec54d3dbdefa5c6c6b64b3470e7e780 MISC metadata.xml 303 BLAKE2B 3b6303fa847f0f5b287faece9a7f0ce422531e0a0a130035cb5a032049daccba08c5460fc58af8a68d2eede0b8f5e76502e9c64109f33f219757ace3b2e82b98 SHA512 d24e5bcec7363bc5bb7f3c5798aa6978aefaee6990f5917ff133362fdcc32927a7b68a939b90cf38ebddbcf04c5b6310a1654a92d0a5eece5ba27245b8df0550 diff --git a/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild deleted file mode 100644 index 52e81200b1b8..000000000000 --- a/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) -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}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="" -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/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild index b6f56dd96b64..b609a01ce5cc 100644 --- a/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild +++ b/www-apache/mod_wsgi/mod_wsgi-5.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="threads(+)" inherit apache-module python-single-r1 diff --git a/www-apache/modsec-flameeyes/Manifest b/www-apache/modsec-flameeyes/Manifest deleted file mode 100644 index f8833d1e4460..000000000000 --- a/www-apache/modsec-flameeyes/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST modsec-flameeyes-20130216.tar.gz 18716 BLAKE2B 1466cd1bd943106609e80fec8251fe85f3ca5fc8e21fcaa3e0e264776b4aff21ef671fa75fed1c19aee76441e02211b88efdcdfc17bea21f3036526272eefe7e SHA512 196a8176da09340c5496a3056deb473c69721fdd6c891b6bec6dd5459063dbd61b00eb9559ba0e88413678633cd90496cb0e1b2828442635d31d68dc949013db -EBUILD modsec-flameeyes-20130216.ebuild 1282 BLAKE2B d32be195af654e59863564c4383cb214c98648a731e255ef00b6902bb17f4e0401fcce232e0caccd6857dd449963bd7718a529beba3d7d4272df3102d8f5a8ec SHA512 caa3e41e0dfb0065fdf9c5f04f9565a9735bfa7d79cb772cb214d9a8e5013c3d4e3f4a317f068edad7dc555ab4e9f81bd882e168ecd77c93874fccf1ce5a34f2 -MISC metadata.xml 262 BLAKE2B d3d94dbb77d97807f87d471a045ae52e5ce3425970e5d202990088f4d36151b6bd25d0618616aecde8db169c27809939feb421b6e23073f7868d453f8d623493 SHA512 c99e15c81d76ddfd4646bc41da74bcb4e4e6e1fae12fc076709d42189af867d9a5ceadc8e29982e6ad65ff148bf5ecf9812176cf0c9037f176c8fe42c135af84 diff --git a/www-apache/modsec-flameeyes/metadata.xml b/www-apache/modsec-flameeyes/metadata.xml deleted file mode 100644 index 87c5dce09990..000000000000 --- a/www-apache/modsec-flameeyes/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <upstream> - <remote-id type="github">Flameeyes/modsec-flameeyes</remote-id> - </upstream> -</pkgmetadata> diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild deleted file mode 100644 index d52b04714b54..000000000000 --- a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.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 7f8827357b05..469290d1df35 100644 --- a/www-apache/modsecurity-crs/Manifest +++ b/www-apache/modsecurity-crs/Manifest @@ -1,8 +1,10 @@ AUX 80_mod_security-crs.conf 289 BLAKE2B 441b2f4d46e62ff24886b94dc933b08de8693ad7198cc855a8b0c322ba045e6409b7d3b7b2e2fdc0bd412ee9fdd3761987d59f405de5a84d5e8c96d2dd14ab76 SHA512 e5b86164a68e15d67a294688c993799fca10928c1265cee04555becfb17fb516314471d8c4eaea1205ac1703890cedb4647d93ce75b0a2a1ab9a401a495465dc 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.2.0.tar.gz 511240 BLAKE2B f33d1a2bfac809e08ce5480af68b2380b19ea33f4d1409dd79d2117e451631df5b73ba2ccbc6eae2757df3b092c9439bfe79b49658d76fda1a1237f204317080 SHA512 041556b2071385c10a4b4a29ad4f926ee86f819f8b9c95f849e76b3d2724d5fc29c21a69f9eba6fd62e7f5709a109a95feca67a19d8c8d1f0410ee2987ac7a6b +DIST modsecurity-crs-4.4.0.tar.gz 510998 BLAKE2B 770a392836fbe29b69d0aa0b487bd7798cc618d1a5923d169a04bcac52b3add6dee8d5777e97e9b3afb3776bc442fb004e02c0c27becb07df62f2fa289d70be9 SHA512 a196a922c5456a2f025f43f8c0b5e3905eed8b3586c54d7b7771c386e5226d8dc6fce2b0bc05d69b389b07d5935bf8abbfb0a524e8ef856a433e9e4aed4b448d +DIST modsecurity-crs-4.5.0.tar.gz 508360 BLAKE2B 88d63ed74e0c10577fd614cd782a247b00fc2e9a18f3f8c8dcb26f848e8b2025aa699a125c682cd2d82d386202205278b570d8adc57c56ad1e8ada1c780841a7 SHA512 057ed442b435efe4f6092bc05e55a7d133e3a62b92744c2a151291e6e21722fa37857729c4434814f0996b3f814118fd64a76c8ceb7b430cbe0b8921295556df EBUILD modsecurity-crs-3.3.5.ebuild 1062 BLAKE2B 3b697a9b74293ef96c1d4d7638abb79a3ed32e393eb788e9e8efb552e6624b904b71ccae381a5db9597bc225e51e4ba665e10b9621342a26ea0f586bede77925 SHA512 e97eb99fbd642956c3b64e6e7cb260bf1c5b83122d9c79822f1d2b8c533337fe9c179b2011782988a31f7073447b2e97c05c308c48abd4c6fce1de0bf9c7a7f8 EBUILD modsecurity-crs-4.0.0.ebuild 1096 BLAKE2B b35e7c1e9dcfb5656ab01ba4110a654e0ef8dbc2ce73ed5da1590ba383883ddd02c5ddad78ac2e63b5e78229d05c63a35cc02a04bce919dc70efdbc6d79f9ad7 SHA512 c81295a5d0a58349e57f708652a4af2a7b4ab9d351c3daecb26d104ef51b3ddfbdd302706e673c4805e6d04b5e36a42744e837eb6f6df60884a81906b01e46ed -EBUILD modsecurity-crs-4.2.0.ebuild 1098 BLAKE2B fb13e454c1ab3e99b724890e027b7c202d300d98c728b567599d7b036e6c4015ad11714f2b8855c4cf1219cd779afe9418a86bd3239ac0a3ba0c3ae717e68295 SHA512 67dcdb18c8b15e670b2e8afd4d48036a442d693d66e486498106f6cbf92ad51bd16d769dac978e991d4106569767ea5581f0f5c7ffacb5d6eff787c63449a91e +EBUILD modsecurity-crs-4.4.0.ebuild 1098 BLAKE2B fb13e454c1ab3e99b724890e027b7c202d300d98c728b567599d7b036e6c4015ad11714f2b8855c4cf1219cd779afe9418a86bd3239ac0a3ba0c3ae717e68295 SHA512 67dcdb18c8b15e670b2e8afd4d48036a442d693d66e486498106f6cbf92ad51bd16d769dac978e991d4106569767ea5581f0f5c7ffacb5d6eff787c63449a91e +EBUILD modsecurity-crs-4.5.0.ebuild 1098 BLAKE2B fb13e454c1ab3e99b724890e027b7c202d300d98c728b567599d7b036e6c4015ad11714f2b8855c4cf1219cd779afe9418a86bd3239ac0a3ba0c3ae717e68295 SHA512 67dcdb18c8b15e670b2e8afd4d48036a442d693d66e486498106f6cbf92ad51bd16d769dac978e991d4106569767ea5581f0f5c7ffacb5d6eff787c63449a91e MISC metadata.xml 254 BLAKE2B 1d5f172b57a97b9a944fc05ce672b09fa81d2468756786518e06e809bffe571e7296fd1dd3988833af4dfbf85d14ad5cfd89fc337562f044422d30cb87740169 SHA512 817d5613af5a0a1e9a2aadcc5319fef2c0c36fa979c2c514e7b938eeebb2a4d83cc2ec478f4f26fef937847b2ffebd5671dbe5aa7b4c43122efd629f57b17d16 diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.2.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.4.0.ebuild index 1a0a134d3046..1a0a134d3046 100644 --- a/www-apache/modsecurity-crs/modsecurity-crs-4.2.0.ebuild +++ b/www-apache/modsecurity-crs/modsecurity-crs-4.4.0.ebuild diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild new file mode 100644 index 000000000000..1a0a134d3046 --- /dev/null +++ b/www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature + +MY_PV=${PV/_/-} + +DESCRIPTION="OWASP ModSecurity Core Rule Set" +HOMEPAGE="https://coreruleset.org/" +SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/coreruleset-${MY_PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+apache2" + +RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )" + +DOCS=( CHANGES.md CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS.md README.md ) + +src_install() { + insinto "/usr/share/${PN}" + doins -r plugins rules + + einstalldocs + + if use apache2; then + # I don't think it's worth pulling in apache-module.eclass just for + # this path... + insinto /etc/apache2/modules.d + doins "${FILESDIR}/80_mod_security-crs.conf" + fi +} + +pkg_postinst() { + if use apache2; then + einfo "The CRS configuration file has been installed to:" + einfo " ${ROOT}/etc/apache2/modules.d/80_mod_security-crs.conf" + fi + + optfeature "apache-less installations, e.g. nginx" dev-libs/modsecurity +} diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 3f9b3f7d62a2..ce9ed0b8df5a 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -2,6 +2,8 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d DIST passenger-6.0.20.tar.gz 8476308 BLAKE2B dc1ac3a1e2be1a9138594d68cf23fc0a73b6b0aca0550c022de56bc156825b3627de741128f163871c89747f178fb26fc41533962ba83ef2659ca71793c0fa62 SHA512 b46864cd7fa83fe39a2a4f42d581660c9a521b96942604b56caa567adff272bb092e82a46a6817a7b68be4830ad1015c9af4429a6d5b26edfe9c3e3884046559 DIST passenger-6.0.22.tar.gz 8296503 BLAKE2B 0e9440134ead3c909570f1fde54e332dd1b017dbc140e1c0b6f1bc73462f01ab4ce36a19a44fc89bbc1d5a93f0faa6cb2e10dc2425722b9b17a4ebe4a5102ded SHA512 85c07386f36677063d32214cce780933d19a3893d15c15efc6c7333dce8046e368218ae9a6aa4d814abdfcfa7da823ae86badfd2c6e6252d4da4f20cd468cdd8 +DIST passenger-6.0.23.tar.gz 8298217 BLAKE2B ec247509656fcce61c4045cf5c08cee4faa1c02e9503c2aaa670ca6c2075e3593d3b82e58b499cb102849a7e8107962c46eaefec6dbce53e95c246bbeaf354a0 SHA512 5e01596bd658dad94b2281ad1efd5cb4624268021d4347cd911c14824e11e15125032b1793c2aa82e879cf07f93473fe78d9fc6a1f2b6f5fc0dcc12a84a5ea45 EBUILD passenger-6.0.20.ebuild 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352 -EBUILD passenger-6.0.22.ebuild 4037 BLAKE2B 011ddae946f9313462c25a7e9b0c044dcfdfb96d6693400da96f11333faf5a276e2e49b1082bec1996c46e607b4e0301772f62f3cfa62578aca76ece901ec25a SHA512 5c341279b8f222d8ab48d89722da467358d81336045069bbb87defd2e02c92b49678fcb79932676e9c7e047a4a64abbbcf8f736f1ef062180d83e20f19fe0fda +EBUILD passenger-6.0.22.ebuild 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352 +EBUILD passenger-6.0.23.ebuild 3845 BLAKE2B 156901cefc349dd04ff1801efacb7a8c6bf31eb23199daf864616b596ec9668dc0e1d8b69f4d6b4a51ed2ed709b6aaeeaf2ea81cbc5044f9565c942ea3cc1bd7 SHA512 493722c14f5510b99649627fb9e271dffdcabfaf60c18b3f34c5aafe57231f42a57f399119bfee0fac2fdafe886d5ca896bf9a80f8a43ba4cbbe3e9e57da1190 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086 diff --git a/www-apache/passenger/passenger-6.0.22.ebuild b/www-apache/passenger/passenger-6.0.22.ebuild index 0c0ad6d0d23f..be4bb51c3197 100644 --- a/www-apache/passenger/passenger-6.0.22.ebuild +++ b/www-apache/passenger/passenger-6.0.22.ebuild @@ -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" diff --git a/www-apache/passenger/passenger-6.0.23.ebuild b/www-apache/passenger/passenger-6.0.23.ebuild new file mode 100644 index 000000000000..9aa739548a85 --- /dev/null +++ b/www-apache/passenger/passenger-6.0.23.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32 ruby33" + +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 + + # Avoid fixed debugging CFLAGs. + sed -e '/debugging_\(c\|cxx\)flags/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 and RANLIB + sed -e "s/ar cru/"$(tc-getAR)" cru/" \ + -e "s/ranlib/"$(tc-getRANLIB)"/" \ + -i 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" +} |