Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/
Date: Tue, 03 Sep 2019 07:56:37
Message-Id: 1567497371.d769033e151e12e3ef46c1785e0437cf94803213.polynomial-c@gentoo
1 commit: d769033e151e12e3ef46c1785e0437cf94803213
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 3 07:56:11 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 3 07:56:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d769033e
7
8 app-admin/apache-tools: Security cleanup
9
10 Bug: https://bugs.gentoo.org/692172
11 Package-Manager: Portage-2.3.75, Repoman-2.3.17
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 app-admin/apache-tools/Manifest | 1 -
15 app-admin/apache-tools/apache-tools-2.4.39.ebuild | 105 ----------------------
16 2 files changed, 106 deletions(-)
17
18 diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
19 index 06cb59c139f..bf65ba13076 100644
20 --- a/app-admin/apache-tools/Manifest
21 +++ b/app-admin/apache-tools/Manifest
22 @@ -1,3 +1,2 @@
23 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
24 -DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
25 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
26
27 diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
28 deleted file mode 100644
29 index 03b9e8d46a7..00000000000
30 --- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
31 +++ /dev/null
32 @@ -1,105 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -inherit flag-o-matic eutils multilib toolchain-funcs
38 -
39 -DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
40 -HOMEPAGE="https://httpd.apache.org/"
41 -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
42 -
43 -LICENSE="Apache-2.0"
44 -SLOT="0"
45 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
46 -IUSE="libressl ssl"
47 -RESTRICT="test"
48 -
49 -RDEPEND=">=dev-libs/apr-1.5.0:1=
50 - dev-libs/apr-util:1=
51 - dev-libs/expat
52 - dev-libs/libpcre
53 - kernel_linux? ( sys-apps/util-linux )
54 - ssl? (
55 - !libressl? ( dev-libs/openssl:0= )
56 - libressl? ( dev-libs/libressl:0= )
57 - )"
58 -
59 -DEPEND="${RDEPEND}
60 - sys-devel/libtool"
61 -
62 -S="${WORKDIR}/httpd-${PV}"
63 -
64 -PATCHES=(
65 - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
66 -)
67 -
68 -src_prepare() {
69 - default
70 -
71 - # This package really should upgrade to using pcre's .pc file.
72 - cat <<-\EOF >"${T}"/pcre-config
73 - #!/bin/bash
74 - flags=()
75 - for flag; do
76 - if [[ ${flag} == "--version" ]]; then
77 - flags+=( --modversion )
78 - else
79 - flags+=( "${flag}" )
80 - fi
81 - done
82 - exec ${PKG_CONFIG} libpcre "${flags[@]}"
83 - EOF
84 - chmod a+x "${T}"/pcre-config || die
85 -}
86 -
87 -src_configure() {
88 - # Brain dead check.
89 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
90 -
91 - tc-export PKG_CONFIG
92 -
93 - local myeconfargs=(
94 - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
95 - --sbindir="${EPREFIX}"/usr/sbin
96 - --with-perl="${EPREFIX}"/usr/bin/perl
97 - --with-expat="${EPREFIX}"/usr
98 - --with-z="${EPREFIX}"/usr
99 - --with-apr="${SYSROOT}${EPREFIX}"/usr
100 - --with-apr-util="${SYSROOT}${EPREFIX}"/usr
101 - --with-pcre="${T}"/pcre-config
102 - $(use_enable ssl)
103 - $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
104 - )
105 - # econf overwrites the stuff from config.layout.
106 - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
107 - econf "${myeconfargs[@]}"
108 - sed -i \
109 - -e '/^LTFLAGS/s:--silent::' \
110 - build/rules.mk build/config_vars.mk || die
111 -}
112 -
113 -src_compile() {
114 - emake -C support
115 -}
116 -
117 -src_install() {
118 - emake -C support DESTDIR="${D}" install
119 - dodoc CHANGES
120 - doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
121 - docs/man/{htcacheclean,rotatelogs}.8
122 -
123 - # Providing compatiblity symlinks for #177697 (which we'll stop to install
124 - # at some point).
125 - pushd "${ED}"/usr/sbin >/dev/null || die
126 - local i
127 - for i in *; do
128 - dosym ${i} /usr/sbin/${i}2
129 - done
130 - popd >/dev/null || die
131 -
132 - # Provide a symlink for ab-ssl
133 - if use ssl ; then
134 - dosym ab /usr/bin/ab-ssl
135 - dosym ab /usr/bin/ab2-ssl
136 - fi
137 -}