gentoo auto-resync : 16:02:2025 - 00:13:18

5 files changed, 136 insertions, 12 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 936605019558..d1e765c7f084 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_auth_radius/Manifest b/www-apache/mod_auth_radius/Manifest
index e749921b61dd..743489dbbd58 100644
--- a/www-apache/mod_auth_radius/Manifest
+++ b/www-apache/mod_auth_radius/Manifest
@@ -1,3 +1,3 @@
 DIST mod_auth_radius-1.6.0.tar.gz 20176 BLAKE2B b004b133a3b8e84533f1e97883436aaec389870c6ca6eb2017bd7f4fac12913c438b9838ff1fce01e5ed26bfeec65f6ac349816ee681f39deea0616c22e2530c SHA512 e128855ab198b35030b798c16538fa33c1698f0f179fccb0d160c2d2cce08f1a7b2ecfaefdc19ae7f21802d38705b7a08414444ac52041b7365a5633e5e66159
-EBUILD mod_auth_radius-1.6.0.ebuild 896 BLAKE2B a53e510c70f452d6fb62b8810dd595724f661caa93c5b64c747105cff9c3116a2254457e084e01536183458c56e8912a4959559202abeb3e777397ac3b935191 SHA512 7a52be61ab97e29012df45a47d3ad64ac9c8416587f43eb094da32f0218edf25902c9a86c04ce1ff9a78fdb0284af98c548282152fb1f097000ffdec9c2c6a60
+EBUILD mod_auth_radius-1.6.0.ebuild 803 BLAKE2B f9360584c28f4d46e09e706fd43ebcc94dfde06e134c538744aab442c8169c1c6b00a1e5c1ee110be28c4b946cf2808e5fabcc57bacb930f0019f5494e328d4b SHA512 b93b34afdcf5026f2e6016dfbd3d43696cdf48eb8df77da1443717c81acc8fae7eb0ea93c18bf565a271b076d0621ec2ef67a07754893dbf1d095098a9ac89b7
 MISC metadata.xml 259 BLAKE2B 6704df19e3d95bccaa31c53df8815234bab8e4e84c37469ba36802fe148f431de61a00bba9c1d4e2a77c6d1b4ef055151c8ed92b58d76af5ea63053dba55aa3b SHA512 a0e68dcd7a05f7974935d97d0783ba28f8748b7f966e64b4b0e2b7ac30bc421a22d8f1315798eca8d01708f8c2a9a0d09cb0786d705661cd81ca440ed4eeec3b
diff --git a/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild b/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
index c53926ebd7cd..5b9ee1709fc0 100644
--- a/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
+++ b/www-apache/mod_auth_radius/mod_auth_radius-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit apache-module depend.apache
+inherit apache-module depend.apache eapi9-ver
 
 DESCRIPTION="Radius authentication for Apache"
 HOMEPAGE="https://freeradius.org/sub_projects/ https://github.com/FreeRADIUS/mod_auth_radius/"
@@ -26,14 +26,10 @@ pkg_setup() {
 }
 
 pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 1.6.0; then
-				ewarn "Please note that upstream has changed the name of this module from"
-				ewarn "    ${PN}-2.0.so"
-				ewarn "to simply"
-				ewarn "    ${PN}.so"
-			fi
-		done
+	if ver_replacing -lt 1.6.0; then
+		ewarn "Please note that upstream has changed the name of this module from"
+		ewarn "    ${PN}-2.0.so"
+		ewarn "to simply"
+		ewarn "    ${PN}.so"
 	fi
 }
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 8d2485c1f7e3..f055d9ced035 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.23.tar.gz 8298217 BLAKE2B ec247509656fcce61c4045cf5c08cee4faa1c02e9503c2aaa670ca6c2075e3593d3b82e58b499cb102849a7e8107962c46eaefec6dbce53e95c246bbeaf354a0 SHA512 5e01596bd658dad94b2281ad1efd5cb4624268021d4347cd911c14824e11e15125032b1793c2aa82e879cf07f93473fe78d9fc6a1f2b6f5fc0dcc12a84a5ea45
 DIST passenger-6.0.24.tar.gz 8322829 BLAKE2B 08d845b01505e5426773702f6a647aaa17ddae3bdb176f31ddb75c8f30051fd8c28b8916c2622d6f882df48bb4738299ab0c03efd78b643affbdd975e31b58c4 SHA512 cccb347fa2efbaf75e31aa90c4c1a6f72510081814cf3a7b41a7f53638a2c863bb7f4dcc55a894cc02614259752c3d128e2169d3d8ba0bdf111fdb6aa0437a11
+DIST passenger-6.0.25.tar.gz 8323095 BLAKE2B d8d945188daeb831eb2a2fbc1b124578dcd03cdd5f3ca276a2a3baf7cd05b4446b56f16fb3e914b3c441411524906bf7848a37a5f99d2e7a56616630983ac9d8 SHA512 5920dc75ed9aa4f72de63633de8e17d9bd82a38edefb5873a99f80fce5b88490589feb5cfa7e6fc98cc81bffb26e36bb70e56cae359ae0eba4d56b3fb4cd1bec
 EBUILD passenger-6.0.23.ebuild 3845 BLAKE2B 156901cefc349dd04ff1801efacb7a8c6bf31eb23199daf864616b596ec9668dc0e1d8b69f4d6b4a51ed2ed709b6aaeeaf2ea81cbc5044f9565c942ea3cc1bd7 SHA512 493722c14f5510b99649627fb9e271dffdcabfaf60c18b3f34c5aafe57231f42a57f399119bfee0fac2fdafe886d5ca896bf9a80f8a43ba4cbbe3e9e57da1190
 EBUILD passenger-6.0.24.ebuild 3866 BLAKE2B e67c61e5a246a4b3733da1b30f141bffa38137d515a166a289fad2ad888598253852f613360f64a8655dc39c83f6cc86e579f4b37746300f8bc4856a38cfb4c7 SHA512 e098ee3fce907271c2af83f36f6cea5e2c5545600ae0f5f3d3deff58049daf4e8508bd6db7f56467855add58b9a10f08639498db4e47a1b558325e1ef9c05694
+EBUILD passenger-6.0.25.ebuild 3868 BLAKE2B 6327a9cb93b31019fac6a50622c71509082846eebd3bbb6f280f9c45ade6979ba819065a98a82f7aa6427fd915abffca86685dabf93edffcfc2118f96aba3f02 SHA512 5839d398322d2fc1b953c635a4cd8a258c1f347dc9e1d1bb0eeb6dcfcff7004dc02a07477d0b72a215f43dd9d8f910cc06bd8128d24eadd68b758670bf55e326
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.25.ebuild b/www-apache/passenger/passenger-6.0.25.ebuild
new file mode 100644
index 000000000000..dce67c97c0a0
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.25.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2025 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.6.13:*
+	dev-ruby/rackup:2
+	>=dev-ruby/rake-12.3.3"
+
+# 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"
+}