1 |
commit: e552b498c45cdc084643a4ead21571fa1e7733a2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 21 11:01:40 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 21 11:02:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e552b498 |
7 |
|
8 |
app-admin/apache-tools: Security bump to version 2.4.52 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/829722 |
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.52.ebuild | 101 ++++++++++++++++++++++ |
15 |
2 files changed, 102 insertions(+) |
16 |
|
17 |
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest |
18 |
index ff7308ed88f3..47a7da201bc1 100644 |
19 |
--- a/app-admin/apache-tools/Manifest |
20 |
+++ b/app-admin/apache-tools/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df SHA512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 |
23 |
+DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713 SHA512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 |
24 |
|
25 |
diff --git a/app-admin/apache-tools/apache-tools-2.4.52.ebuild b/app-admin/apache-tools/apache-tools-2.4.52.ebuild |
26 |
new file mode 100644 |
27 |
index 000000000000..1f89503c59ee |
28 |
--- /dev/null |
29 |
+++ b/app-admin/apache-tools/apache-tools-2.4.52.ebuild |
30 |
@@ -0,0 +1,101 @@ |
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-z="${EPREFIX}"/usr |
93 |
+ --with-apr="${SYSROOT}${EPREFIX}"/usr |
94 |
+ --with-apr-util="${SYSROOT}${EPREFIX}"/usr |
95 |
+ --with-pcre="${T}"/pcre-config |
96 |
+ $(use_enable ssl) |
97 |
+ $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') |
98 |
+ ) |
99 |
+ # econf overwrites the stuff from config.layout. |
100 |
+ ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \ |
101 |
+ econf "${myeconfargs[@]}" |
102 |
+ sed -i \ |
103 |
+ -e '/^LTFLAGS/s:--silent::' \ |
104 |
+ build/rules.mk build/config_vars.mk || die |
105 |
+} |
106 |
+ |
107 |
+src_compile() { |
108 |
+ emake -C support |
109 |
+} |
110 |
+ |
111 |
+src_install() { |
112 |
+ emake -C support DESTDIR="${D}" install |
113 |
+ dodoc CHANGES |
114 |
+ doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ |
115 |
+ docs/man/{htcacheclean,rotatelogs}.8 |
116 |
+ |
117 |
+ # Providing compatiblity symlinks for #177697 (which we'll stop to install |
118 |
+ # at some point). |
119 |
+ pushd "${ED}"/usr/sbin >/dev/null || die |
120 |
+ local i |
121 |
+ for i in *; do |
122 |
+ dosym ${i} /usr/sbin/${i}2 |
123 |
+ done |
124 |
+ popd >/dev/null || die |
125 |
+ |
126 |
+ # Provide a symlink for ab-ssl |
127 |
+ if use ssl ; then |
128 |
+ dosym ab /usr/bin/ab-ssl |
129 |
+ dosym ab /usr/bin/ab2-ssl |
130 |
+ fi |
131 |
+} |