1 |
commit: 99d643188c041d67ca7c53f05f8b11e55a125766 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 24 11:24:33 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 24 11:27:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d64318 |
7 |
|
8 |
app-admin/apache-tools: Bump to version 2.4.35 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/666936 |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
12 |
|
13 |
app-admin/apache-tools/Manifest | 1 + |
14 |
app-admin/apache-tools/apache-tools-2.4.35.ebuild | 105 ++++++++++++++++++++++ |
15 |
2 files changed, 106 insertions(+) |
16 |
|
17 |
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest |
18 |
index 7d83b9d428f..e6a16ec25d3 100644 |
19 |
--- a/app-admin/apache-tools/Manifest |
20 |
+++ b/app-admin/apache-tools/Manifest |
21 |
@@ -2,3 +2,4 @@ DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b93 |
22 |
DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c |
23 |
DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269 |
24 |
DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8 |
25 |
+DIST httpd-2.4.35.tar.bz2 7044336 BLAKE2B b0ec5de56bfdaf7c6cf7f6cd2fedbd8748c16a76bddbde8e3442d2102aa33bc2642cf1dacce7b5e38023ddfceee393cd0059b881cd25dc57c029900385a41f59 SHA512 f5d6a849850ebdf4e38b586c84cc1063d68ac4c6737895c9ac1c8796c22655681c55b4de77ed9f1f807338fdb9f7824faf911361aa31cc46f3c3a2cbabe20543 |
26 |
|
27 |
diff --git a/app-admin/apache-tools/apache-tools-2.4.35.ebuild b/app-admin/apache-tools/apache-tools-2.4.35.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..68c866fd77a |
30 |
--- /dev/null |
31 |
+++ b/app-admin/apache-tools/apache-tools-2.4.35.ebuild |
32 |
@@ -0,0 +1,105 @@ |
33 |
+# Copyright 1999-2018 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 |
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 |
+} |