gentoo auto-resync : 19:10:2023 - 15:53:17

3 files changed, 115 insertions, 0 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ac2aede6ba15..0b1559e38fbd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index f9ee92e28ea8..b395ee5ca3cc 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,5 +2,7 @@ AUX apache-tools-2.4.54-Makefile.patch 1263 BLAKE2B f54fa67584b3dda69cf5030e8003
 AUX apache-tools-2.4.54-libtool.patch 594 BLAKE2B c1b11ad580369a42fde6cbaec8d4191c7c8f26760a596e4a1a2f095727942625e0573c7846b680bcef8d08a63632be3393478992853c6d1a97951dd5eec395ce SHA512 dd18b43fcc71c2e3ddf0fe9e6731dc76dfea8078eb709bdf092ac5bf829810f25bc11b16d52d2f443e22359aafaf3e75a8066b6320174e4cf462190449cd53c7
 AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
+DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
 EBUILD apache-tools-2.4.57.ebuild 2660 BLAKE2B 8bf80b78241207e068e1960b2e1bdd84ff7a41dde35ca1065d398652c71686f950fdd335e013b0297b9d62a85f161bb1406941902a2bd18f069216bca7b0f403 SHA512 cf807f4de552193cd826b74b6f33f3a9431b261814f63c5c0a7ad4cf6e1b046e559183e20bed337374cf91b5bb04aee9d56bbaa3d2909a1731f0b4b5922c8a61
+EBUILD apache-tools-2.4.58.ebuild 2667 BLAKE2B 9dbff91c1ddebfef9df63ba9c3820378a6a469700d61796808810c5388cf17b191898620620e1a8c8d906e53faeb1b29dba8e408b4d856d1147554aa2269260a SHA512 19ef52f7e11fc66cc89baa138f47be339cc97fca53703e81c41c159eb1ae3089c63181de03dde7060c0edafa8e8840ad1d5a9a55cfec06556043387828e09367
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
new file mode 100644
index 000000000000..b4f5b385c813
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre2
+	virtual/libcrypt:=
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
+	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF > "${T}"/pcre2-config
+	#!/usr/bin/env bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre2-config || die
+
+	# Only here for libtool and which patches
+	eautoreconf
+}
+
+src_configure() {
+	# Silly check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${ESYSROOT}"/usr
+		--with-apr-util="${ESYSROOT}"/usr
+		--without-pcre
+		--with-pcre2="${T}"/pcre2-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+
+	# econf overwrites the stuff from config.layout.
+	econf "${myeconfargs[@]}"
+
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}