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 868E71396D0 for ; Wed, 4 Oct 2017 07:55:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9AD3E0C2F; Wed, 4 Oct 2017 07:55:50 +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 AAD94E0C2F for ; Wed, 4 Oct 2017 07:55:50 +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 0D714341801 for ; Wed, 4 Oct 2017 07:55:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E322746E for ; Wed, 4 Oct 2017 07:55:47 +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: <1507103735.e7fe90b7aeeb8c2d1d426a751d5a1e33513c505d.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.28.ebuild X-VCS-Directories: app-admin/apache-tools/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e7fe90b7aeeb8c2d1d426a751d5a1e33513c505d X-VCS-Branch: master Date: Wed, 4 Oct 2017 07:55:47 +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: beb4f7f1-0edc-4cda-b9d7-5ff606a82c7a X-Archives-Hash: e7f7f68488d6f8d80933c7c2355f85ad commit: e7fe90b7aeeb8c2d1d426a751d5a1e33513c505d Author: Lars Wendler gentoo org> AuthorDate: Wed Oct 4 07:37:01 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Oct 4 07:55:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7fe90b7 app-admin/apache-tools: Bump to version 2.4.28 Package-Manager: Portage-2.3.11, Repoman-2.3.3 app-admin/apache-tools/Manifest | 1 + app-admin/apache-tools/apache-tools-2.4.28.ebuild | 106 ++++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 8f4d1f6b5d0..42b698e7ee9 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -3,3 +3,4 @@ DIST httpd-2.2.32.tar.bz2 5777509 SHA256 527bc9d8092d784daf08910dd6c9d2681d6a232 DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd DIST httpd-2.4.25.tar.bz2 6398218 SHA256 f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2 SHA512 6ba4ce1dcef71416cf1c0de2468c002767b5637a75744daf5beb0edd045749a751b3826c4132f594c48e4b33ca8e1b25ebfb63ac4c8b759ca066a89d3261fb22 WHIRLPOOL ccb783875632241e8acf7b43c59163c25b13357b307416abaa3adb0ac868fc547b3cff9585b347e98a8663ec26bea3edad4d42604e6ae86b0db5f769fc11d072 DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba +DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed diff --git a/app-admin/apache-tools/apache-tools-2.4.28.ebuild b/app-admin/apache-tools/apache-tools-2.4.28.ebuild new file mode 100644 index 00000000000..efe38de4891 --- /dev/null +++ b/app-admin/apache-tools/apache-tools-2.4.28.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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 ~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 +}