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