dev-libs/apr: Security cleanup

Bug: https://bugs.gentoo.org/635272
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index e664da23c52b066c7c87fda0e3f77cfb8267b18b..d237c17a11d52514bf910a4638a827ab8da4fd77 100644 (file)
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,4 +1,3 @@
-DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148

diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
deleted file mode 100644 (file)
index a3288df..0000000
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-       elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-apache )"
-DEPEND="${CDEPEND}
-       >=sys-devel/libtool-2.4.2
-       doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch
-       epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-       epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-       epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-
-       epatch_user #449048
-
-       AT_M4DIR="build" eautoreconf
-       elibtoolize
-
-       epatch "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-       local myconf=()
-
-       [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-       if use older-kernels-compatibility; then
-               local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-               export apr_cv_accept4="no"
-               export apr_cv_dup3="no"
-               export apr_cv_epoll_create1="no"
-               export apr_cv_sock_cloexec="no"
-       fi
-       if tc-is-cross-compiler; then
-               # The apache project relies heavily on AC_TRY_RUN and doesn't
-               # have any sane cross-compiling fallback logic.
-               export \
-                       ac_cv_file__dev_zero="yes" \
-                       ac_cv_func_sem_open="yes" \
-                       ac_cv_negative_eai="yes" \
-                       ac_cv_o_nonblock_inherited="no" \
-                       ac_cv_struct_rlimit="yes" \
-                       ap_cv_atomic_builtins="yes" \
-                       apr_cv_accept4="yes" \
-                       apr_cv_dup3="yes" \
-                       apr_cv_epoll="yes" \
-                       apr_cv_epoll_create1="yes" \
-                       apr_cv_gai_addrconfig="yes" \
-                       apr_cv_mutex_recursive="yes" \
-                       apr_cv_mutex_robust_shared="yes" \
-                       apr_cv_process_shared_works="yes" \
-                       apr_cv_pthreads_lib="-pthread" \
-                       apr_cv_sock_cloexec="yes" \
-                       apr_cv_tcp_nodelay_with_cork="yes"
-       fi
-
-       if use urandom; then
-               myconf+=( --with-devrandom=/dev/urandom )
-       elif (( ${CHOST#*-hpux11.} <= 11 )); then
-               : # no /dev/*random on hpux11.11 and before, $PN detects this.
-       else
-               myconf+=( --with-devrandom=/dev/random )
-       fi
-
-       tc-is-static-only && myconf+=( --disable-dso )
-
-       # shl_load does not search runpath, but hpux11 supports dlopen
-       [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-       if [[ ${CHOST} == *-solaris2.10 ]]; then
-               case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-               *atomic_cas_ptr*) ;;
-               *)
-                       elog "You do not have Solaris Patch ID "$(
-                               [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-                       )" (Problem 4954703) installed on your host ($(hostname)),"
-                       elog "using generic atomic operations instead."
-                       myconf+=( --disable-nonportable-atomics )
-                       ;;
-               esac
-       fi
-
-       econf \
-               --enable-layout=gentoo \
-               --enable-nonportable-atomics \
-               --enable-posix-shm \
-               --enable-threads \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-}
-
-src_compile() {
-       if tc-is-cross-compiler; then
-               # This header is the same across targets, so use the build compiler.
-               emake tools/gen_test_char
-               tc-export_build_env BUILD_CC
-               ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-                       tools/gen_test_char.c -o tools/gen_test_char || die
-       fi
-
-       emake
-
-       if use doc; then
-               emake dox
-       fi
-}
-
-src_install() {
-       default
-
-       # Prallel install breaks since apr-1.5.1
-       #make -j1 DESTDIR="${D}" install || die
-
-       prune_libtool_files --all
-
-       if use doc; then
-               dohtml -r docs/dox/html/*
-       fi
-
-       # This file is only used on AIX systems, which Gentoo is not,
-       # and causes collisions between the SLOTs, so remove it.
-       # Even in Prefix, we don't need this on AIX.
-       rm -f "${ED}usr/$(get_libdir)/apr.exp"
-}