diff options
Diffstat (limited to 'www-apache')
16 files changed, 16 insertions, 269 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz Binary files differindex de79d11c10d3..d42f53f6c38e 100644 --- a/www-apache/Manifest.gz +++ b/www-apache/Manifest.gz diff --git a/www-apache/mod_auth_openidc/Manifest b/www-apache/mod_auth_openidc/Manifest index 2b583d1a2280..0dffbac2bcfc 100644 --- a/www-apache/mod_auth_openidc/Manifest +++ b/www-apache/mod_auth_openidc/Manifest @@ -1,4 +1,4 @@ AUX 10_mod_auth_openidc.conf 180 BLAKE2B f9d4dd4554b208cfc649a7051bfd4bc984dc36333aa86ef1388c8dd57959b448aca8a83806ee54d2025889527917c42e49cd40d04fc63d591f8ee6fb4535ba96 SHA512 37161c4a699a4b687a65a5d3927c47e6890c96b9469cbd71aab31ecf549b181382298f096d5c5603a433cb64330174a45d05500f01742712b81f4cfd51cc2b7f DIST mod_auth_openidc-2.4.14.4.tar.gz 632757 BLAKE2B e01df9c431df848c1773f8152d87b5efc183b016516718bbf5eff3de66d12c87396b649a06548b5f0e42a52d08baef9ced8cd4b79acfc1657b7427dab0c9c14d SHA512 b7d61f15d48292f2a567653632f7d9df8b6cb54303d4de0c333c8122a32df8749e508a0abd5259ac7ca15da5b244eec1e1d21f62140720ddb1705ec289551984 EBUILD mod_auth_openidc-2.4.14.4-r1.ebuild 1363 BLAKE2B 0365ec264bd6adcdb49aebfc2be2274e482a8e270f8454cc77e161811c60b131145629aaefa2528a17d37e0da438e3174fa7de8c024ca57b33761b94e79128cd SHA512 1e163303dcb263de109a067e35184317b87672ae2b52cca06779967cc4c30b74023bfe98256b2c373061263277ee497441f291f0e6abf471dcb1c9cae300d14f -MISC metadata.xml 637 BLAKE2B 5a45bd9e72b30869c63e54d919e5d46db8565041a2b5e81bd65f3a98d2cf99e7c247fc8f080a85f367a520518526c44f01ca1c0d406097f41b71ae7489f2e793 SHA512 7bb65fc49e704d87d00defd68223ec438d8b6cc32119b73dd8976657cedaa5312e902ae62a1a30ce8876fb5818e65be98cff3ec5ef767c02df16d973e7752c69 +MISC metadata.xml 638 BLAKE2B 7e572d359decb8413b2d09d71c92fec3ffd77ceab4f1f3fbaf3a0fcf09abc05870e6278c08d20282520584d195581c811b3800426cd102eb184fa3c019783af8 SHA512 afede2334d11f42f72399c97791255e359fc6b1e38781fa076951ebde1822343343b397fe3235bbace14b419a33c72de406ac29ff6e50679992248611b289c76 diff --git a/www-apache/mod_auth_openidc/metadata.xml b/www-apache/mod_auth_openidc/metadata.xml index 13dbd324eab0..758faa049b7b 100644 --- a/www-apache/mod_auth_openidc/metadata.xml +++ b/www-apache/mod_auth_openidc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index b8f509f8c90f..77837a967bd0 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,9 +1,4 @@ -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 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.49-r1.ebuild 2041 BLAKE2B 6feb8839f07603dd8d0f68a96ba1af4972086156b826e2e760498970d135e42bcc1e6712e22542f3ca0130946af0a1f2f515aa308b99ea944ab12eac30d2c695 SHA512 26d0bade7d7fb3e6eff8df02fd1be3dd2eae07690cb8d72b625ddc5b47e4cad903fb5689e823563f2428f59f913d9652b0116af6c96559e2a9d2c6a0a730fd1c -EBUILD mod_jk-1.2.50.ebuild 1928 BLAKE2B cb39112add1d322f046af88ef8bba8d71039c6223f29fd097b12db981b959e34ec8ccef8cae8157b640d3e77b6b0dba2ac52088ba6d2534b62c3e4a593c9c01b SHA512 af736d03118d070a937cab442fc398778fd9aa622ef00a26aaffc8049eedc86c8e7a0926cdd7c8be67b50ba28b07266080e97e68b961c813329e2b61f0a6d5f6 +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/files/mod_jk-1.2.49-export-symbols-regex.patch b/www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch deleted file mode 100644 index 1dd05d9c70ed..000000000000 --- a/www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/914237 -https://github.com/apache/tomcat-connectors/commit/ecd005d0792441c4510dc4c2d9348979ab71ddcc - -From ecd005d0792441c4510dc4c2d9348979ab71ddcc Mon Sep 17 00:00:00 2001 -From: Rainer Jung <rainer.jung@kippdata.de> -Date: Fri, 10 Nov 2023 11:38:04 +0100 -Subject: [PATCH] BZ 68117: Fix typo and escaping in libtool flag introduced in - 1.2.49. - ---- - apache-2.0/Makefile.apxs.in | 2 +- - apache-2.0/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/apache-2.0/Makefile.apxs.in b/apache-2.0/Makefile.apxs.in -index 36aeada1c..161616502 100644 ---- a/apache-2.0/Makefile.apxs.in -+++ b/apache-2.0/Makefile.apxs.in -@@ -21,7 +21,7 @@ top_builddir=@top_builddir@ - APXS=@APXS@ - APXSCFLAGS=@APXSCFLAGS@ - APXSLDFLAGS=@APXSLDFLAGS@ --JKLDFLAGS=-export-symbols-regex ^jk_module$ -+JKLDFLAGS=-export-symbols-regex ^jk_module\$$ - - COMMON=common - JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON} -diff --git a/apache-2.0/Makefile.in b/apache-2.0/Makefile.in -index e63f5c921..a9327743b 100644 ---- a/apache-2.0/Makefile.in -+++ b/apache-2.0/Makefile.in -@@ -23,7 +23,7 @@ MKDIR=@MKDIR@ - APXSCFLAGS=@APXSCFLAGS@ - APXSCPPFLAGS=@APXSCPPFLAGS@ - APXSLDFLAGS=@APXSLDFLAGS@ --JKLDFLAGS=-export-symbols-regexp ^jk_module$ -+JKLDFLAGS=-export-symbols-regex ^jk_module\$$ - - CC=@CC@ - SHELL=@SHELL@ diff --git a/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch b/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch deleted file mode 100644 index 65327fcc8bc3..000000000000 --- a/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 479102b941ac4c8c86ce102ec6e5bc9ad59b0d89 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conikost@gentoo.org> -Date: Tue, 23 Jan 2024 22:10:38 +0100 -Subject: [PATCH] native/common/jk_global.h: fix compilation on musl - -On musl, sys/socketvar.h does not exist, so we need to make sure, -not to use it. - -Signed-off-by: Conrad Kostecki <conikost@gentoo.org> ---- - common/jk_global.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/jk_global.h b/common/jk_global.h -index adcbd95f1..f4680ef8b 100644 ---- a/common/jk_global.h -+++ b/common/jk_global.h -@@ -148,7 +148,7 @@ extern char *strdup(const char *str); - #include <netinet/tcp.h> - #include <arpa/inet.h> - #include <sys/un.h> --#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) -+#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) && !defined(PLATFORM_LINUX) - #include <sys/socketvar.h> - #endif - #if !defined(HPUX11) && !defined(AS400) diff --git a/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild deleted file mode 100644 index 4356eed57aec..000000000000 --- a/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 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 ) -" - -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" - -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_jk/mod_jk-1.2.50.ebuild b/www-apache/mod_jk/mod_jk-1.2.50.ebuild index 189e7d517342..9f3276c04839 100644 --- a/www-apache/mod_jk/mod_jk-1.2.50.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.50.ebuild @@ -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}" diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest index b4b09233f3b9..b69a365e5a38 100644 --- a/www-apache/mod_wsgi/Manifest +++ b/www-apache/mod_wsgi/Manifest @@ -1,8 +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 DIST mod_wsgi-5.0.0.gh.tar.gz 707590 BLAKE2B 14dd43849c0f9d1e67eece9a87acc3573cbb38f8d6338551b22ba33ebd8b6f6e1371e97c7c5d3f1b15cb10e2ae9990eff7f4c6af62fb9236bcc78b35aad4a8db SHA512 3ecc3ad2fd05164929915541be61201db8d35d1e27183ce26c67583b836bb404bd10c88a2ada94714a14140a7f885eb67256cf02bf47aa0dbd81aecd0894a984 -EBUILD mod_wsgi-4.9.0.ebuild 1101 BLAKE2B c142395b3866bc6a9469345ef074583fe714caa392872aa98c8b027be107f64a38be1fbbf0e37219f4e6300987d9f8da68f1236403b9fe689992ca20d46046de SHA512 f0bce840f1c5bac3a18bd7a434cc06ecfe251be70e8d554c68d23d814af1f9a0a2a9bcee217b7a1d2ca503142ede90ffdb93fcd6ce98de48a63b69b2ee012242 -EBUILD mod_wsgi-4.9.4-r1.ebuild 1093 BLAKE2B bb0d072da7e4e2a9e2dd344075f89be656a4cc36ff3ba9ff053581e9ad82801eab8b3c6b184eafa9410d5fc42f8e5851ec5aed7b9c5fcbeb82e586340ae18924 SHA512 004903697b5d4931ab2b9a26aa59fa70794b87228bd8e70f2aa7c50e097eb6ef03ca94fcdd7529c323c07be0ff6908868566ed826bf10e0855fab125cbf19039 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 8f92a32cf465..000000000000 --- a/www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 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" - -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-4.9.4-r1.ebuild deleted file mode 100644 index b6f56dd96b64..000000000000 --- a/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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/modsecurity-crs/Manifest b/www-apache/modsecurity-crs/Manifest index 469290d1df35..2c424f5e1b83 100644 --- a/www-apache/modsecurity-crs/Manifest +++ b/www-apache/modsecurity-crs/Manifest @@ -1,10 +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-3.3.6.tar.gz 301489 BLAKE2B 8e7b5b3aacd37731b8d83bb6d761454ad48b625e40c8a951a7d6a4ddc9c62efd41cc9c66d74b334d9339f48aa0fe7399e61316edfea6b34b42708084512222ca SHA512 6e5a7b3ceb7d4a8500044425f7439f1967248ff8ab54c4e8d6b4592460afa75d8a7ac973766b58e54cb02cc08559e61fe8689488fc1261b54a8d49933e65bde2 DIST modsecurity-crs-4.0.0.tar.gz 504720 BLAKE2B e6da0268ae9209179d1f6cefba34e097b614dd4659a4b4df2ef3e6a0b32be7be9d825beaf6d8ca1fbef0dd27217b4707090844e59eaa817111be4a6f8333e205 SHA512 c25bfd6de772815977783e78d7afd388d60bbba151762a38c7050fd5ecde6a48baa0a850028a24d42855ae4a788404ad1ee0f7a4ad2d94d53a46e261a00f7224 -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 +DIST modsecurity-crs-4.7.0.tar.gz 513616 BLAKE2B c3c25baf0ee5b0508d9c5b55702060023c94f4b794bf00f3be47b0541ca90a9fabda9d3d28a95d4b589e5ac971dfb5b9fba731711db389d2d4dcdab9944d8109 SHA512 13b652768a0ea3c3f5e1cae6bc25d520ef22943faf87564340751374e5df238b17526466cafd452846edfc436f6ad98cdd5ed5496531981c1ebebd2c179d22d7 EBUILD modsecurity-crs-3.3.5.ebuild 1062 BLAKE2B 3b697a9b74293ef96c1d4d7638abb79a3ed32e393eb788e9e8efb552e6624b904b71ccae381a5db9597bc225e51e4ba665e10b9621342a26ea0f586bede77925 SHA512 e97eb99fbd642956c3b64e6e7cb260bf1c5b83122d9c79822f1d2b8c533337fe9c179b2011782988a31f7073447b2e97c05c308c48abd4c6fce1de0bf9c7a7f8 +EBUILD modsecurity-crs-3.3.6.ebuild 1062 BLAKE2B 8b42905e858273c7d552e498b240e82e090d8bad8d1dc7bdec54ed7ecb4f5a9a8857c3aa9d292acff0030cb1a0b404c413834eb3ccbe1a2573975ee1b95cbcf6 SHA512 b755c357790635777e3950fe146e5328cdf80832ee681b242ad5f810fec9eb0a9c89bba4e4099935a75fe0939256072d0fb49ccca86fc37bce313f11b2c03617 EBUILD modsecurity-crs-4.0.0.ebuild 1096 BLAKE2B b35e7c1e9dcfb5656ab01ba4110a654e0ef8dbc2ce73ed5da1590ba383883ddd02c5ddad78ac2e63b5e78229d05c63a35cc02a04bce919dc70efdbc6d79f9ad7 SHA512 c81295a5d0a58349e57f708652a4af2a7b4ab9d351c3daecb26d104ef51b3ddfbdd302706e673c4805e6d04b5e36a42744e837eb6f6df60884a81906b01e46ed -EBUILD modsecurity-crs-4.4.0.ebuild 1098 BLAKE2B fb13e454c1ab3e99b724890e027b7c202d300d98c728b567599d7b036e6c4015ad11714f2b8855c4cf1219cd779afe9418a86bd3239ac0a3ba0c3ae717e68295 SHA512 67dcdb18c8b15e670b2e8afd4d48036a442d693d66e486498106f6cbf92ad51bd16d769dac978e991d4106569767ea5581f0f5c7ffacb5d6eff787c63449a91e -EBUILD modsecurity-crs-4.5.0.ebuild 1098 BLAKE2B fb13e454c1ab3e99b724890e027b7c202d300d98c728b567599d7b036e6c4015ad11714f2b8855c4cf1219cd779afe9418a86bd3239ac0a3ba0c3ae717e68295 SHA512 67dcdb18c8b15e670b2e8afd4d48036a442d693d66e486498106f6cbf92ad51bd16d769dac978e991d4106569767ea5581f0f5c7ffacb5d6eff787c63449a91e +EBUILD modsecurity-crs-4.7.0.ebuild 1096 BLAKE2B b35e7c1e9dcfb5656ab01ba4110a654e0ef8dbc2ce73ed5da1590ba383883ddd02c5ddad78ac2e63b5e78229d05c63a35cc02a04bce919dc70efdbc6d79f9ad7 SHA512 c81295a5d0a58349e57f708652a4af2a7b4ab9d351c3daecb26d104ef51b3ddfbdd302706e673c4805e6d04b5e36a42744e837eb6f6df60884a81906b01e46ed MISC metadata.xml 254 BLAKE2B 1d5f172b57a97b9a944fc05ce672b09fa81d2468756786518e06e809bffe571e7296fd1dd3988833af4dfbf85d14ad5cfd89fc337562f044422d30cb87740169 SHA512 817d5613af5a0a1e9a2aadcc5319fef2c0c36fa979c2c514e7b938eeebb2a4d83cc2ec478f4f26fef937847b2ffebd5671dbe5aa7b4c43122efd629f57b17d16 diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-3.3.6.ebuild index 1a0a134d3046..578ba55a9e21 100644 --- a/www-apache/modsecurity-crs/modsecurity-crs-4.5.0.ebuild +++ b/www-apache/modsecurity-crs/modsecurity-crs-3.3.6.ebuild @@ -5,25 +5,23 @@ 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}" +SRC_URI="https://github.com/coreruleset/coreruleset/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/coreruleset-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +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 ) +DOCS=( CHANGES.md CONTRIBUTORS.md crs-setup.conf.example KNOWN_BUGS README.md ) src_install() { insinto "/usr/share/${PN}" - doins -r plugins rules + doins -r rules einstalldocs diff --git a/www-apache/modsecurity-crs/modsecurity-crs-4.4.0.ebuild b/www-apache/modsecurity-crs/modsecurity-crs-4.7.0.ebuild index 1a0a134d3046..fe3c87163c0e 100644 --- a/www-apache/modsecurity-crs/modsecurity-crs-4.4.0.ebuild +++ b/www-apache/modsecurity-crs/modsecurity-crs-4.7.0.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/coreruleset-${MY_PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+apache2" RDEPEND="apache2? ( >=www-apache/mod_security-2.9.6 )" diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest index 5a891a882ad2..ce9ed0b8df5a 100644 --- a/www-apache/passenger/Manifest +++ b/www-apache/passenger/Manifest @@ -5,5 +5,5 @@ DIST passenger-6.0.22.tar.gz 8296503 BLAKE2B 0e9440134ead3c909570f1fde54e332dd1b 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 4035 BLAKE2B 4b006ea98dcb69baae7aa757ce3c10a4ef89b5836e0f6a1d57c22c074435f5bc0f136872c453013faf8fb9c71726546c45cc26fbb9c001e63b846d8bf16906c1 SHA512 4be03e3bec258405cfbbbf8a8fa2006ca13694afcac6e31512d4fd344ccf3ae5c2cad3b93a7119733e814654606f6a5dcb090f3901615046c57d1b8da0a9f352 -EBUILD passenger-6.0.23.ebuild 3847 BLAKE2B 86524a76df90169236620057abc80055f59c45c3c8c95e53d2e5fdc7493db37ddcb0b1ceb93bb6b6c8628305b68cd9a4d0e7568781884551b490cb4c3eddd581 SHA512 fcfeaf97d8ff36f8c4f18672a30eb7ffec3313f405e457da2c1943c663f881345b056f11b9f8183fadaad1aa8148e9bcf8a17c7a20f4e31c57800ef1ead55c8d +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.23.ebuild b/www-apache/passenger/passenger-6.0.23.ebuild index 8bbe3af9b847..9aa739548a85 100644 --- a/www-apache/passenger/passenger-6.0.23.ebuild +++ b/www-apache/passenger/passenger-6.0.23.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" |