From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6756138334 for ; Sat, 20 Apr 2019 23:58:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C146AE0C79; Sat, 20 Apr 2019 23:58:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 983FBE0C79 for ; Sat, 20 Apr 2019 23:58:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28902341CEB for ; Sat, 20 Apr 2019 23:58:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8246D5B7 for ; Sat, 20 Apr 2019 23:58:13 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1555804645.3ba92259e954426118d8f238ff53e7d632e852a1.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr/Manifest dev-libs/apr/apr-1.5.2.ebuild X-VCS-Directories: dev-libs/apr/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3ba92259e954426118d8f238ff53e7d632e852a1 X-VCS-Branch: master Date: Sat, 20 Apr 2019 23:58:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 948218df-4665-4ed2-83f5-395c1ec7b90e X-Archives-Hash: 455b8fb2b8d7ecd337d850b43a24d3e5 commit: 3ba92259e954426118d8f238ff53e7d632e852a1 Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 20 23:57:25 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Apr 20 23:57:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba92259 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 gentoo.org> dev-libs/apr/Manifest | 1 - dev-libs/apr/apr-1.5.2.ebuild | 143 ------------------------------------------ 2 files changed, 144 deletions(-) diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index e664da23c52..d237c17a11d 100644 --- 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 index a3288dfe3f6..00000000000 --- 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" -}