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 8018C139085 for ; Sun, 15 Jan 2017 01:38:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCF2DE0D1B; Sun, 15 Jan 2017 01:38:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8604FE0D1B for ; Sun, 15 Jan 2017 01:38:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A37C341134 for ; Sun, 15 Jan 2017 01:38:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89D1A2764 for ; Sun, 15 Jan 2017 01:38:29 +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: <1484444305.4f45ecb82321ba88f26ea9c82cb5952b0ae3874d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/apache-tools/Manifest app-admin/apache-tools/apache-tools-2.4.23.ebuild X-VCS-Directories: app-admin/apache-tools/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4f45ecb82321ba88f26ea9c82cb5952b0ae3874d X-VCS-Branch: master Date: Sun, 15 Jan 2017 01:38:29 +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-Archives-Salt: 820f820e-0702-4455-a4ec-c9e7edf56fe9 X-Archives-Hash: 9c49c85154046137f3747bf60a356a47 commit: 4f45ecb82321ba88f26ea9c82cb5952b0ae3874d Author: Lars Wendler gentoo org> AuthorDate: Sun Jan 15 01:38:10 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jan 15 01:38:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f45ecb8 app-admin/apache-tools: Security cleanup (bug #603130). Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-admin/apache-tools/Manifest | 1 - app-admin/apache-tools/apache-tools-2.4.23.ebuild | 107 ---------------------- 2 files changed, 108 deletions(-) diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 4a4fb90..7188895 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,4 +1,3 @@ DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c DIST httpd-2.2.32.tar.bz2 5777509 SHA256 527bc9d8092d784daf08910dd6c9d2681d6a2325055b2cc69806a0a7df7ed650 SHA512 b1802579f4fc950705ddcf0a24f502ffadbd91d5693fdd3b290ac7ca40122f8fa48132ad1055afae9b841dd55e8bb343239be07ca431b0f60ea081f5c2fad2c3 WHIRLPOOL ee2f1cb74b77f4b3eae7d58bb9bf2728d95a6e215a460d85abf60e220b816cb0e22080169167e3610872e3165951f1cc9ac753f02e46dc75e047a98a1b7384a5 -DIST httpd-2.4.23.tar.bz2 6351875 SHA256 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58 SHA512 c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1 WHIRLPOOL f3defbd06a878c66236adfcac2b59b6f47115ac815708bb45f2152bd1754b14a01458c9331eb7a65cba52e0bc53e2e66b32a384d44a029b07ffdd068c7c08a19 DIST httpd-2.4.25.tar.bz2 6398218 SHA256 f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2 SHA512 6ba4ce1dcef71416cf1c0de2468c002767b5637a75744daf5beb0edd045749a751b3826c4132f594c48e4b33ca8e1b25ebfb63ac4c8b759ca066a89d3261fb22 WHIRLPOOL ccb783875632241e8acf7b43c59163c25b13357b307416abaa3adb0ac868fc547b3cff9585b347e98a8663ec26bea3edad4d42604e6ae86b0db5f769fc11d072 diff --git a/app-admin/apache-tools/apache-tools-2.4.23.ebuild b/app-admin/apache-tools/apache-tools-2.4.23.ebuild deleted file mode 100644 index e52b5cf..00000000 --- a/app-admin/apache-tools/apache-tools-2.4.23.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit flag-o-matic eutils 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 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" -IUSE="libressl 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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" - -DEPEND="${RDEPEND} - sys-devel/libtool" - -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 -} - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - tc-export PKG_CONFIG - - # Instead of filtering --as-needed (bug #128505), append --no-as-needed - append-ldflags $(no-as-needed) - - # econf overwrites the stuff from config.layout. - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ - econf \ - --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' '') - 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 -}