gentoo resync : 31.05.2021

2 files changed, 105 insertions, 0 deletions

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 992acf7a614a..cf2038118b37 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,6 +1,8 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
 DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
+DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
 EBUILD apache-tools-2.4.46.ebuild 2488 BLAKE2B 8da99d7419766be20d61d727fbc6f95b4ba9b5f3b0c24e322c18e07667644c1f46dfd6c8f649d822dfe1bbb991eaafadaf2810b6483c243db57fc10e6ed3553a SHA512 db9ce51d714565461119bac52422ecb3b3a2e863eddf96de3d3e91ca2445e4e55cc1234c6517a0616a24d25a807011c8ea7bf052f0d7cfa88279d02eb9642ab1
 EBUILD apache-tools-2.4.47.ebuild 2497 BLAKE2B 0a4976317b10820f2395856ffb7a0f7c0e5f6bfa7fc7a11b719802043cbb32e14769c6bdfa7e94b6ca82c35e2b5354f21ac26aa54a98a2b52144535a6fdff2fb SHA512 70728fdc698534aa1629df0353980fca8ff37a1c11567a1adc803e3423a3ca2fb2e55a5f74818e0abb9fa9a75daa63deaea74e390db2e21695f5207e3b90b8c1
+EBUILD apache-tools-2.4.48.ebuild 2497 BLAKE2B 0a4976317b10820f2395856ffb7a0f7c0e5f6bfa7fc7a11b719802043cbb32e14769c6bdfa7e94b6ca82c35e2b5354f21ac26aa54a98a2b52144535a6fdff2fb SHA512 70728fdc698534aa1629df0353980fca8ff37a1c11567a1adc803e3423a3ca2fb2e55a5f74818e0abb9fa9a75daa63deaea74e390db2e21695f5207e3b90b8c1
 MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2
diff --git a/app-admin/apache-tools/apache-tools-2.4.48.ebuild b/app-admin/apache-tools/apache-tools-2.4.48.ebuild
new file mode 100644
index 000000000000..da529f9a8bd5
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.48.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	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.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
+	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
+}