From 996a2bda06cb164877d5d952774a6db1b271c2f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Jun 2024 00:12:20 +0100 Subject: gentoo auto-resync : 25:06:2024 - 00:12:20 --- www-apache/Manifest.gz | Bin 5925 -> 5919 bytes www-apache/libapreq2/Manifest | 2 + .../files/libapreq2-2.08-fix-linkage.patch | 51 +++++++++++++ www-apache/libapreq2/libapreq2-2.17-r1.ebuild | 83 +++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 www-apache/libapreq2/files/libapreq2-2.08-fix-linkage.patch create mode 100644 www-apache/libapreq2/libapreq2-2.17-r1.ebuild (limited to 'www-apache') diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz index dba7b6177be4..72e62ef58b15 100644 Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ 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 + +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 +} -- cgit v1.2.3