diff options
Diffstat (limited to 'www-apache')
35 files changed, 393 insertions, 598 deletions
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest index 1c2e18c9b0ae..aa8a6a30aeb8 100644 --- a/www-apache/libapreq2/Manifest +++ b/www-apache/libapreq2/Manifest @@ -1,2 +1 @@ -DIST libapreq2-2.16.tar.gz 839264 BLAKE2B 6a79e0281bb24962775f6c2fcc906d07a2f7643f608871018a647a225329c45516f1afe12e27c432449765463b2a4e823a728051fa73938e97ddc828b94c4732 SHA512 aa9e751a3f0d6a9cb587aa1c5408e8d9a073560860d7f653776196fe3739516df16abe943c9cb0460cfb9b68a2d79ad651cfd5e4a30a2ca34d6dc3ced73f628c DIST libapreq2-2.17.tar.gz 849867 BLAKE2B d2fa15693c200925e4926f207f1e023cba59ac0bfe3af3a8ac12880020bb00625c7fa21478c6562f9995d5307151b865efb83b837f45213d73fc523a1a864899 SHA512 89b139b8673145d9e2d8fd77d36f878c519c1deb7f9b853cda2a15d34cbb619d1c5e784ba21553f23c2ef07803f07c75a83d96cd770f80e1b36283a4cbb88999 diff --git a/www-apache/libapreq2/libapreq2-2.16-r1.ebuild b/www-apache/libapreq2/libapreq2-2.16-r1.ebuild deleted file mode 100644 index 4d50482c8c95..000000000000 --- a/www-apache/libapreq2/libapreq2-2.16-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 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 ) - -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_dnssd/mod_dnssd-0.6-r2.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild index 600600a890b2..b28c1fac2d4b 100644 --- a/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild +++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86" DEPEND="net-dns/avahi[dbus]" RDEPEND="${DEPEND}" diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest index 0ca847e49535..e792fff6c638 100644 --- a/www-apache/mod_h2/Manifest +++ b/www-apache/mod_h2/Manifest @@ -1 +1 @@ -DIST mod_h2-2.0.13.tar.gz 791279 BLAKE2B fe1b13e60ea064f3c190ecb30d28fc34e594a35f71d86280e573009aa49638ee12ea2fcafbc25b2fe53a25ada4d98a586ede4c89cd296844a763c80284a3239d SHA512 69ffc4910c89be393406161fa75dce27e17e7bd7d8e1658b7eaae68eb877324f2e30d47a268d41995bb4837c6b4aea4bb8e840191e3291b1fafee3d4f1d55baa +DIST mod_h2-2.0.24.tar.gz 689555 BLAKE2B 8fa963a96fb29ba257e4fce072bd7d4bf4e46cfe64f066d9d3a9c692d4bc61552fce3340dd89a0547a6e3dd7180051ce5b0334eae763809e99755441f6203e90 SHA512 1f80c2738f84a58eb691d6a51ed63be4a3567d10501e0fd69aca8519ede8e084b85fb2aad678701b65c6422b6216c005ec8a50199f55e35a1c1197f87dfd5862 diff --git a/www-apache/mod_h2/mod_h2-2.0.13.ebuild b/www-apache/mod_h2/mod_h2-2.0.24.ebuild index 5ba43634b8e0..5ba43634b8e0 100644 --- a/www-apache/mod_h2/mod_h2-2.0.13.ebuild +++ b/www-apache/mod_h2/mod_h2-2.0.24.ebuild diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index 55838aac9901..ada527e80f79 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1 +1,3 @@ DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47 +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 diff --git a/www-apache/mod_jk/mod_jk-1.2.49.ebuild b/www-apache/mod_jk/mod_jk-1.2.49.ebuild new file mode 100644 index 000000000000..8b6a43685192 --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="tomcat-connectors-${PV#-*}-src" + +inherit apache-module autotools verify-sig + +DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine" +HOMEPAGE="https://tomcat.apache.org/connectors-doc/" +SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz + verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/jk/tomcat-connectors-${PV}-src.tar.gz.asc )" +S="${WORKDIR}/${MY_P}/native" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DEPEND="dev-libs/apr:1=" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-lang/perl + verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" + +APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" +APACHE2_MOD_DEFINE="JK" + +need_apache2 + +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_prepare() { + default + + # Don't add '-Wl,' as prefix for CFLAGS, as linker will fail + sed -e '/JK_PREFIX_IF_MISSING/d' -i configure.ac || die + eautoreconf + + # Adjust confpath and logpath for Gentoo + local logs_path="/var/log/apache2" + sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die +} + +src_configure() { + local myeconfargs=( + --disable-static + --with-apxs="${APXS}" + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + LIBTOOL="/bin/sh $(pwd)/libtool --silent" + default +} + +src_install() { + apache-module_src_install + + insinto "${APACHE_CONFDIR}" + doins "${S}"/../conf/*.properties + + insinto "${APACHE_MODULES_CONFDIR}" + newins ../conf/httpd-jk.conf 88_mod_jk.conf + + einstalldocs +} diff --git a/www-apache/mod_log_sql/Manifest b/www-apache/mod_log_sql/Manifest deleted file mode 100644 index 89ae093e5fea..000000000000 --- a/www-apache/mod_log_sql/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mod_log_sql-1.101.tar.bz2 127500 BLAKE2B b82677ba590f900a69506b0a9f5ada92076faa303815655d0d9e24c1f50704c96878ab39b7285836bbb59ecac15db6bfba674c10dfc78bdb0907ff37cf680cf5 SHA512 30ea586443cf042e52149012613d80ca0c6631847618366905e90f99bfab235ca6e050fa1dbdb98ef54be6d68b34564781c6efb36ba89f7b51e4f3e00892d91f diff --git a/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf deleted file mode 100644 index 57bd78d34ae4..000000000000 --- a/www-apache/mod_log_sql/files/1.101/42_mod_log_sql.conf +++ /dev/null @@ -1,33 +0,0 @@ -<IfDefine LOG_SQL> -LoadModule log_sql_module modules/mod_log_sql.so -LoadModule log_sql_logio_module modules/mod_log_sql_logio.so - -<IfDefine DBI> -LoadModule log_sql_dbi_module modules/mod_log_sql_dbi.so -</IfDefine> - -<IfDefine !DBI> -LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so -</IfDefine> - -<IfDefine SSL> -LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so -</IfDefine> - -LogSQLLoginInfo mysql://user:passwd@host/database -LogSQLDBParam socketfile /var/run/mysqld/mysqld.sock - -# LogSQLMassVirtualHosting automatically sets LogSQLCreateTables to 'on' -#LogSQLCreateTables on -LogSQLMassVirtualHosting on - -LogSQLMachineID machine_id -LogSQLPreserveFile logs/mod_log_sql_preserve.sql - -# See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/ -# for details about LogSQLTransferLogFormat -# be compatible with the Combined Log Format (CLF) -LogSQLTransferLogFormat AbHhmRSsTUuv -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_log_sql/files/42_mod_log_sql.conf b/www-apache/mod_log_sql/files/42_mod_log_sql.conf deleted file mode 100644 index d5ae3813fc56..000000000000 --- a/www-apache/mod_log_sql/files/42_mod_log_sql.conf +++ /dev/null @@ -1,28 +0,0 @@ -<IfDefine LOG_SQL> -LoadModule log_sql_module modules/mod_log_sql.so -LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so - -<IfDefine SSL> -LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so -</IfDefine> - -LogSQLLoginInfo mysql://user:passwd@host/database -LogSQLDBParam socketfile /var/run/mysqld/mysqld.sock - -# LogSQLMassVirtualHosting automatically sets LogSQLCreateTables to 'on' -#LogSQLCreateTables on -LogSQLMassVirtualHosting on - -LogSQLMachineID machine_id -LogSQLPreserveFile logs/mod_log_sql_preserve.sql - -# See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/ -# for details about LogSQLTransferLogFormat -# be compatible with the Combined Log Format (CLF) -LogSQLTransferLogFormat AbHhmRSsTUuv -<IfDefine SSL> -LogSQLTransferLogFormat AbHhmRSsTUuv -</IfDefine> -</IfDefine> - -# vim: ts=4 filetype=apache diff --git a/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch b/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch deleted file mode 100644 index afbaf3927b7d..000000000000 --- a/www-apache/mod_log_sql/files/mod_log_sql-1.101-apache-2.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fixes compatibility with Apache 2.4 API -Author: Thomas Goirand <zigo@debian.org> -Bug-Debian: http://bugs.debian.org/666797 -Forwarded: http://lists.outoforder.cc/pipermail/mod_log_sql/2012-April/000358.html -Last-Update: 2013-07-10 - ---- libapache-mod-log-sql-1.100.orig/functions.h -+++ libapache-mod-log-sql-1.100/functions.h -@@ -14,7 +14,7 @@ static const char *extract_remote_addres - - static const char *extract_remote_address(request_rec *r, char *a) - { -- return r->connection->remote_ip; -+ return r->useragent_ip; - } - - static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused)); diff --git a/www-apache/mod_log_sql/metadata.xml b/www-apache/mod_log_sql/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/www-apache/mod_log_sql/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_log_sql/mod_log_sql-1.101-r3.ebuild b/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild deleted file mode 100644 index 250033863d3d..000000000000 --- a/www-apache/mod_log_sql/mod_log_sql-1.101-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit apache-module - -DESCRIPTION="An Apache module for logging to an SQL (MySQL) database" -HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_log_sql/" -SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2" - -LICENSE="Artistic" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="dbi ssl" - -DEPEND="dev-db/mysql-connector-c:0= - dbi? ( dev-db/libdbi ) - ssl? ( dev-libs/openssl:0= )" -RDEPEND="${DEPEND}" - -APACHE2_MOD_CONF="1.101/42_${PN}" -APACHE2_MOD_DEFINE="LOG_SQL" - -APACHE2_EXECFILES=" - .libs/${PN}_logio.so - .libs/${PN}_mysql.so - .libs/${PN}_ssl.so" - -DOCS=( AUTHORS CHANGELOG docs/README contrib/create_tables.sql - contrib/make_combined_log.pl contrib/mysql_import_combined_log.pl ) -HTML_DOCS=( docs/manual.html ) - -PATCHES=( "${FILESDIR}"/${P}-apache-2.4.patch ) - -need_apache2_4 - -pkg_setup() { - _init_apache2 - _init_apache2_late -} - -src_configure() { - local myconf="--with-apxs=${APXS}" - myconf="${myconf} $(usex ssl --with-ssl-inc=/usr --without-ssl-inc)" - myconf="${myconf} $(usex dbi --with-dbi=/usr --without-dbi)" - econf ${myconf} -} - -src_compile() { - emake -} - -src_install() { - use dbi && APACHE2_EXECFILES="${APACHE2_EXECFILES} .libs/${PN}_dbi.so" - apache-module_src_install - einstalldocs -} - -pkg_postinst() { - use dbi && APACHE2_MOD_DEFINE="${APACHE2_MOD_DEFINE} DBI" - apache-module_pkg_postinst - einfo "Refer to /usr/share/doc/${PF}/ for scripts" - einfo "on how to create logging tables." -} diff --git a/www-apache/mod_musicindex/files/mod_musicindex-1.4.1-slibtool.patch b/www-apache/mod_musicindex/files/mod_musicindex-1.4.1-slibtool.patch new file mode 100644 index 000000000000..37b829334a29 --- /dev/null +++ b/www-apache/mod_musicindex/files/mod_musicindex-1.4.1-slibtool.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/778566 + +commit 7455f156499c1980193f0c7a4e25b1040ba99104 +Author: orbea <orbea@riseup.net> +Date: Sat Apr 8 12:31:47 2023 -0700 + + build: Don't overwrite the default install target + + Autotools is capable of creating a working install target without any + help from apache's apxs which results in calling apache's libtool + implementation instead of GNU libtool or slibtool. + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4815507..7a63571 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -69,11 +69,3 @@ noinst_HEADERS = \ + playlist-mp4.h \ + playlist-vorbis.h \ + sort.h +- +-install: $(lib_LTLIBRARIES) +- $(mkinstalldirs) "$(DESTDIR)$(libdir)" +-if BUILD_FOR_APACHE2 +- $(APXS) -S LIBEXECDIR="$(DESTDIR)$(libdir)" -i -n musicindex mod_musicindex.la +-else +- $(APXS) -S LIBEXECDIR="$(DESTDIR)$(libdir)" -i -n musicindex .libs/mod_musicindex.so +-endif diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r4.ebuild index fa92548ef157..1ef181d29e3c 100644 --- a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild +++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit apache-module +inherit apache-module autotools DESCRIPTION="mod_musicindex allows nice displaying of directories containing music files" HOMEPAGE="http://hacks.slashdirt.org/sw/musicindex/" @@ -30,12 +30,21 @@ APACHE2_MOD_CONF="50_${PN}" APACHE2_MOD_DEFINE="MUSICINDEX" DOCS=( AUTHORS BUGS ChangeLog README UPGRADING ) +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch #778566 +) + need_apache2 pkg_setup() { _init_apache2_late } +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ --with-vorbis-libraries="${ESYSROOT}/usr/$(get_libdir)" \ @@ -62,4 +71,6 @@ src_install() { newins "${DISTDIR}/${P}_valid-rss.png" valid-rss.png newins "${DISTDIR}/${P}_valid-xhtml11" valid-xhtml11 newins "${DISTDIR}/${P}_vcss" vcss + + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest index 238175ecb66c..5e94a56ae488 100644 --- a/www-apache/mod_perl/Manifest +++ b/www-apache/mod_perl/Manifest @@ -1 +1,2 @@ DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B 8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272 SHA512 f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf +DIST mod_perl-2.0.12.tar.gz 3848030 BLAKE2B fe4e57d76f7e7a79f171a96d2bab65743eeae45528c0bc3a8bc8ef6d91bb875d3857799f7d65cbf590994c30699a8646dbc905d76551fb97151d0827222a9ba2 SHA512 890dca0950847e32180485cabbeffbf236af2c92c7df957a233c210022b5172957eddb1db3e9281b87cd438d2fa404a05ae99c7eda098267c68d5e9262b400b0 diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch new file mode 100644 index 000000000000..989d472831f7 --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.12-avoid-pch.patch @@ -0,0 +1,22 @@ +Avoid sandbox denial while attempting to generate PCH: +``` +F: fopen_wr +S: deny +P: /usr/include/apr-1/apr.h.gch +A: /usr/include/apr-1/apr.h.gch +R: /usr/include/apr-1/apr.h.gch +C: /usr/libexec/gcc/x86_64-pc-linux-gnu/13/cc1 -quiet /usr/include/apr-1/apr.h -quiet -dM -dumpdir a- -dumpbase apr.h -dumpbase-ext .h -mtune=generic -march=x86-64 -o /tmp/ccfl5N0L.s --output-pch /usr/include/apr-1/apr.h.gch +``` + +Sent upstream by email on 2023-07-05. +--- a/lib/Apache2/Build.pm ++++ b/lib/Apache2/Build.pm +@@ -1502,7 +1502,7 @@ sub get_apr_config { + }; + } + else { +- my @command = ($self->perl_config('cpp'), '-dM', $header); ++ my @command = ($self->perl_config('cpp'), '-E', '-dM', $header); + open $fh, '-|', @command or do { + error "Unable to preprocess $header with @command: $!"; + return undef; diff --git a/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch new file mode 100644 index 000000000000..3932dffe4a68 --- /dev/null +++ b/www-apache/mod_perl/files/mod_perl-2.0.12-perl538.patch @@ -0,0 +1,25 @@ +https://github.com/apache/mod_perl/commit/991cfeca9bac185f191510e0064f174d45718e6a + +From 991cfeca9bac185f191510e0064f174d45718e6a Mon Sep 17 00:00:00 2001 +From: Steve Hay <stevehay@apache.org> +Date: Tue, 27 Jun 2023 08:38:15 +0000 +Subject: [PATCH] Stop using do_open9() - this deprecated function was removed + in 5.37.1 + +Patch by Jitka Plesnikova <jplesnik@redhat.com> from https://rt.cpan.org/Ticket/Display.html?id=148451 + +git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1910623 13f79535-47bb-0310-9956-ffa450edef68 +--- a/src/modules/perl/modperl_io.c ++++ b/src/modules/perl/modperl_io.c +@@ -116,8 +116,8 @@ modperl_io_perlio_override_stdhandle(pTHX_ request_rec *r, int mode) + save_gp(handle, 1); + + sv_setref_pv(sv, "Apache2::RequestRec", (void*)r); +- status = do_open9(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", +- 9, FALSE, mode, 0, (PerlIO *)NULL, sv, 1); ++ status = do_openn(handle, mode == O_RDONLY ? "<:Apache2" : ">:Apache2", ++ 9, FALSE, mode, 0, (PerlIO *)NULL, &sv, 1); + if (status == 0) { + Perl_croak(aTHX_ "Failed to open STD%s: %" SVf, + mode == O_RDONLY ? "IN" : "OUT", get_sv("!", TRUE)); + diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml index 743975e53191..78a62be94e65 100644 --- a/www-apache/mod_perl/metadata.xml +++ b/www-apache/mod_perl/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="ithreads">Build for use with thread-capable perl, needs same setting as in <pkg>dev-lang/perl</pkg></flag> </use> + <upstream> + <remote-id type="github">apache/mod_perl</remote-id> + </upstream> </pkgmetadata> diff --git a/www-apache/mod_perl/mod_perl-2.0.12.ebuild b/www-apache/mod_perl/mod_perl-2.0.12.ebuild new file mode 100644 index 000000000000..1ebaf1e19813 --- /dev/null +++ b/www-apache/mod_perl/mod_perl-2.0.12.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DIST_TEST=do +inherit depend.apache apache-module perl-module + +DESCRIPTION="An embedded Perl interpreter for Apache2" +HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl" +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" +RESTRICT="!test? ( test )" + +# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled. +# The minimum versions requested here are the bundled versions. + +# The test dependencies are from CPAN (Bundle::Apache2). + +# When all MPMs are disabled via useflags, the apache ebuild selects a +# default one, which will likely need threading. + +RDEPEND=" + dev-lang/perl[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] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-perl/Module-Build + test? ( + >=dev-perl/CGI-3.110.0 + dev-perl/Chatbot-Eliza + dev-perl/Devel-Symdump + dev-perl/HTML-Parser + dev-perl/IPC-Run3 + dev-perl/libwww-perl + www-servers/apache[apache2_modules_version,-apache2_modules_unique_id] + !www-apache/mpm_itk + ) +" +PDEPEND=" + >=dev-perl/Apache-Reload-0.130.0 + >=dev-perl/Apache-SizeLimit-0.970.0 +" + +APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so" +APACHE2_MOD_CONF="2.0.3/75_${PN}" +APACHE2_MOD_DEFINE="PERL" + +need_apache2 + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-sneak-tmpdir.patch # seems to fix the make test problem + "${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.12-perl538.patch + "${FILESDIR}"/${PN}-2.0.12-avoid-pch.patch +) + +src_prepare() { + perl-module_src_prepare + + # chainsaw unbundling + rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/ || die +} + +src_configure() { + _init_apache2_late + + local debug=$(usex debug 1 0) + local nothreads=$(usex ithreads 0 1) + myconf=( + MP_USE_DSO=1 + MP_APXS=${APXS} + MP_APR_CONFIG=/usr/bin/apr-1-config + MP_TRACE=${debug} + MP_DEBUG=${debug} + MP_NO_THREADS=${nothreads} + ) + + perl-module_src_configure +} + +src_test() { + # make test notes whether it is running as root, and drops + # privileges all the way to "nobody" if so, so we must adjust + # write permissions accordingly in this case. + + # IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail! + if [[ "$(id -u)" == "0" ]]; then + chown nobody:nobody "${WORKDIR}" "${T}" || die + fi + + # We force verbose tests for now to get meaningful bug reports. + MAKEOPTS+=" -j1" + TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 LC_TIME=C perl-module_src_test +} + +src_install() { + apache-module_src_install + + default + + perl_delete_localpod + perl_fix_packlist + perl_delete_emptybsdir + + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl + + # this is an attempt to get @INC in line with /usr/bin/perl. + # there is blib garbage in the mainstream one that can only be + # useful during internal testing, so we wait until here and then + # just go with a clean slate. should be much easier to see what's + # happening and revert if problematic. + + perl_set_version + sed -i \ + -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ + -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \ + -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \ + "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die + + local fname + for fname in $(find "${D}" -type f -not -name '*.so'); do + grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}" + sed -i -e "s:\(${D}\|${S}\):/:g" ${fname} || die + done + + perl_remove_temppath +} + +pkg_postinst() { + apache-module_pkg_postinst +} diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest index 1efb04766656..f95388b2d297 100644 --- a/www-apache/mod_qos/Manifest +++ b/www-apache/mod_qos/Manifest @@ -1,5 +1,3 @@ DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6 -DIST mod_qos-11.70.tar.gz 1283241 BLAKE2B 516dc8ec0228956c374845e10ed2533291544c496a1eda693da28d551b81f83ab898384a627b87c940782925c5bc84f1140e4e241c964b451acb63fd947a274d SHA512 004898d7993cda82f261d28e4c91b1ff1665465d3ad1da005fae94471824a31f0d30ca4edf700ddb45bfde133218c55d49a396ba03b3ed0ac00b1743c4aaa5be -DIST mod_qos-11.71.tar.gz 1282858 BLAKE2B 92061497a6f31c009c5dbd7d0bf9042272b679e7b2f1bf5fdf9a52dc3b9cf9ea13fae6a6bd422d652466a5d1ac4355b7cc33f2d183900a64eddce3de97e96e82 SHA512 2550d868a03b7add5a48a4cd43a5287317142c879777e6d38c15270a8bbef1e2a639f938d996645bb2cace40dc6806094fc4a80e2a9b5b4e5ccc60bd35244cc8 DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d41f54765ee1a055606df139c7e7dad4ad7d6161dbf07003a93d54b966b15d20fc721a6ba05cba221e1cae126d8 SHA512 0e5af2c702bade096101f20fcf12b90a2a538665cfbec4183608acdfdc99552304ad4a42f63ad3111b570bfd42b17ce7acb16f6bc86a0380c79fae84a5124715 -DIST mod_qos-11.73.tar.gz 1288540 BLAKE2B 74953216f8dd1e5cacda09dfbeb8901a09f2c1d7929db2846f8576a4ae00123a7120385e6d77438c2d4fb33c5602e84a4737033281b7c647ba249629da0b26ce SHA512 67099a7efe2cb99191e4af1eb2f23ce9ba609425520c95360ae064dd9b88cd7ce6b3a3af21ee5805d3e26721637433a0436c1b1633d109e98613593544767ebd +DIST mod_qos-11.74.tar.gz 1288870 BLAKE2B b61622c89c797b567744f557c9cbbf791db3f19d6fa736197d5ac95929aa7a93989c804edd6a8c8f5d567ca7ba43203003654a9d47e18cc228da95fbeafc60f4 SHA512 107eab22336741ab9415d9f6925ff2b38edf9cdfa81dd76f782a5388420c19f554e1280e0fe26788014bc0f24b2906c812fb2fcf04ce4b08d06c5770bf158d48 diff --git a/www-apache/mod_qos/files/mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff b/www-apache/mod_qos/files/mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff new file mode 100644 index 000000000000..51971667ee59 --- /dev/null +++ b/www-apache/mod_qos/files/mod_qos-11.74-fix-incompatible-pointer-to-integer-conversion.diff @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/898860 +--- a/tools/src/qsfilter2.c ++++ b/tools/src/qsfilter2.c +@@ -1800,7 +1800,7 @@ int main(int argc, const char * const argv[]) { + printf("# --------------------------------------------------------\n"); + + { +- STACK_OF(qs_rule_t) *st = sk_new(STACK_qs_cmp); ++ STACK_OF(qs_rule_t) *st = sk_new((qs_rule_t *)STACK_qs_cmp); + qs_rule_t *r; + int j = 1; + entry = (apr_table_entry_t *)apr_table_elts(rules)->elts; diff --git a/www-apache/mod_qos/mod_qos-11.71.ebuild b/www-apache/mod_qos/mod_qos-11.71.ebuild deleted file mode 100644 index a6cc2a461250..000000000000 --- a/www-apache/mod_qos/mod_qos-11.71.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.70.ebuild b/www-apache/mod_qos/mod_qos-11.74-r1.ebuild index 412c8e3c8eb5..e428ba480f54 100644 --- a/www-apache/mod_qos/mod_qos-11.70.ebuild +++ b/www-apache/mod_qos/mod_qos-11.74-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" - dev-libs/libpcre:3 + dev-libs/libpcre2 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= @@ -28,6 +28,10 @@ DOCFILES="${S}/doc/*.txt ${S}/README.TXT" need_apache2 +PATCHES=( + "${FILESDIR}"/${PN}-11.74-fix-incompatible-pointer-to-integer-conversion.diff +) + pkg_setup() { _init_apache2 _init_apache2_late diff --git a/www-apache/mod_qos/mod_qos-11.73.ebuild b/www-apache/mod_qos/mod_qos-11.74.ebuild index 1c3182af2600..1c3182af2600 100644 --- a/www-apache/mod_qos/mod_qos-11.73.ebuild +++ b/www-apache/mod_qos/mod_qos-11.74.ebuild diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest index e326936af388..ccb9c85dea5e 100644 --- a/www-apache/mod_wsgi/Manifest +++ b/www-apache/mod_wsgi/Manifest @@ -1 +1,2 @@ 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 diff --git a/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild new file mode 100644 index 000000000000..b6f56dd96b64 --- /dev/null +++ b/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +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/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild deleted file mode 100644 index 6006d8ed7ab3..000000000000 --- a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit apache-module - -MY_PV="1.0b1" -DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the output handler" -HOMEPAGE="https://tn123.org/mod_xsendfile/" -SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz" -S="${WORKDIR}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 sparc x86 ~amd64-linux" - -need_apache2 - -src_install() { - APACHE2_MOD_CONF="50_${PN}" - APACHE2_MOD_DEFINE="XSENDFILE" - # Triggers unfortunate QA warning in the eclass - # See bug #515414, seems to be an apache-module.eclasss issue - DOCFILES="docs/Readme.html" - - APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules" - - apache-module_src_install -} diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild index c80385f181c5..a1cc08aec3b4 100644 --- a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild +++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ S="${WORKDIR}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 sparc x86 ~amd64-linux" need_apache2 diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild index 6428a8a1346d..d52b04714b54 100644 --- a/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild +++ b/www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit readme.gentoo-r1 DESCRIPTION="Flameeyes's Ruleset for ModSecurity" -HOMEPAGE="http://www.flameeyes.eu/projects/modsec" +HOMEPAGE="https://github.com/Flameeyes/modsec-flameeyes" if [[ ${PV} == "99999999" ]]; then EGIT_REPO_URI="https://github.com/Flameeyes/modsec-flameeyes.git" inherit git-r3 diff --git a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild index 6428a8a1346d..d52b04714b54 100644 --- a/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild +++ b/www-apache/modsec-flameeyes/modsec-flameeyes-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit readme.gentoo-r1 DESCRIPTION="Flameeyes's Ruleset for ModSecurity" -HOMEPAGE="http://www.flameeyes.eu/projects/modsec" +HOMEPAGE="https://github.com/Flameeyes/modsec-flameeyes" if [[ ${PV} == "99999999" ]]; then EGIT_REPO_URI="https://github.com/Flameeyes/modsec-flameeyes.git" inherit git-r3 diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index cf674f0711f7..b6d8b3a1827f 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -1,3 +1 @@ -DIST passenger-6.0.15.tar.gz 8379463 BLAKE2B 0bf2a319072671660aae8651fb0253dd0221bce55e3bdfc832ba2f1972e7dbdeee6e9ef9b13bf9a90de20a1c1a4dbeaabf138ed71a0009b0d336e672aeb1573d SHA512 b5af050bc16624542b36433b1d23bba243892cf82b10fdee19c92174b916ea2fffff7f98a5cfcf26bc358b9f29c2c9612c29134c290531c5ce13103e52045fdc -DIST passenger-6.0.16.tar.gz 8378384 BLAKE2B ae435df097b4692f62bc83c006a2abe8103e984bae50a27d3d1faf2114c8aef5b918882b4d8999d565335046ade3c06a177d26efa0bace8d961d84376fa79da1 SHA512 6fa071c32e5ddc615e40975d1b859a9426a10ebd1d4b14adc8a759da76fca58f473bce0a7ed77e23a4ac220f74a50089bc92ebc2cb7190751c54bc5dbf845217 -DIST passenger-6.0.17.tar.gz 8422867 BLAKE2B 3ffc7dff50289efa4fdee5cb05254661f57ab5478138822d61f7821cfc6319d881827eb982b30c336bd0294c23e5a57ea81a609d4df6fbb0da0fd844f8148973 SHA512 00c972de84bf0aa6623cf805bdd9c41c8341e984f2a4e1675c9c5e981b369cf69c083bbc421f5d3a2dcecd3b47ba5402ba6d9c7c8ee51dd1b0310395c01888fa +DIST passenger-6.0.18.tar.gz 8424409 BLAKE2B 50f3639d0233892c85b97383689599c08457642fbfd1d968b67dddee896eb1377ffc40ce8049a2c3ae4a1a6d3673bdc2fef8de9125efa0386722103f9c4ed1ba SHA512 4c9e43d0907e83f82b2ae1bdc882648f5b3c1b54ffe029590a259c191f57b752dc3196332d0bb68319d50d656192e59df0ed9647f1c7fe3fdc13477a9c0b829b diff --git a/www-apache/passenger/passenger-6.0.15.ebuild b/www-apache/passenger/passenger-6.0.15.ebuild deleted file mode 100644 index c3abda835c9d..000000000000 --- a/www-apache/passenger/passenger-6.0.15.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby27 ruby30 ruby31" - -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 ~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 -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" 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.16.ebuild b/www-apache/passenger/passenger-6.0.16.ebuild deleted file mode 100644 index 81b1706a8140..000000000000 --- a/www-apache/passenger/passenger-6.0.16.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby27 ruby30 ruby31" - -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 ~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.17.ebuild b/www-apache/passenger/passenger-6.0.18.ebuild index 3914640a214b..d501f7ead463 100644 --- a/www-apache/passenger/passenger-6.0.17.ebuild +++ b/www-apache/passenger/passenger-6.0.18.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby27 ruby30 ruby31" +USE_RUBY="ruby30 ruby31 ruby32" 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 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="apache2 debug" ruby_add_bdepend "dev-ruby/rake" |