1 |
commit: 0c3695da57db9834225238f55ea4fe7927ac898a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 23 14:33:27 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 23 15:30:54 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c3695da |
7 |
|
8 |
app-admin/apache-tools: Bump to version 2.4.29 |
9 |
|
10 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
11 |
|
12 |
app-admin/apache-tools/Manifest | 1 + |
13 |
app-admin/apache-tools/apache-tools-2.4.29.ebuild | 106 ++++++++++++++++++++++ |
14 |
2 files changed, 107 insertions(+) |
15 |
|
16 |
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest |
17 |
index 79f1c36022b..8c364055f1a 100644 |
18 |
--- a/app-admin/apache-tools/Manifest |
19 |
+++ b/app-admin/apache-tools/Manifest |
20 |
@@ -2,3 +2,4 @@ DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd281 |
21 |
DIST httpd-2.2.34.tar.bz2 5779739 SHA256 e53183d5dfac5740d768b4c9bea193b1099f4b06b57e5f28d7caaf9ea7498160 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 WHIRLPOOL 0bd86b3644fae79c74928c0cd8bc3e4b7d821544a760dbe6459df43210f690d3c4dc74168e029b0b5bbaba6fcd0433aeb4312794455d91b00b7c36c537dfdefd |
22 |
DIST httpd-2.4.27.tar.bz2 6527394 SHA256 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c WHIRLPOOL 35aeaa01b2bf5772ad21d1011e619befd75fdaade5aa0ca7c61367e7b7a66af28dccf8729a53418f2598199721b68aac7d8c575797ed218150d00af4e8dd4dba |
23 |
DIST httpd-2.4.28.tar.bz2 6553163 SHA256 c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666 SHA512 8de8e32b87e6de220e492e74db9df0882fae11c3b9732f3d3316da048c04767ac4429c0433c36f87d8705263e3376f97a7e1f66a9d7a518632a67b6fe617590a WHIRLPOOL a4c8be522d5e900e01cefc0fc6d196e3e49e45e2daffa9ec22b2dc44deace506da5a4cf68afd04b0062b87ffcd27b6e59d0b8ae71cc2304d5080d066174e95ed |
24 |
+DIST httpd-2.4.29.tar.bz2 6567926 SHA256 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a WHIRLPOOL bd91e3baa3c2b25cb6a4e48062c38a97f9c941884be2e44805a3a08e1fdfb13bf18b37b6c7ab9e7656934f2d3b8c2893e79480ee119f073bfbb376b6c3e32a74 |
25 |
|
26 |
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..efe38de4891 |
29 |
--- /dev/null |
30 |
+++ b/app-admin/apache-tools/apache-tools-2.4.29.ebuild |
31 |
@@ -0,0 +1,106 @@ |
32 |
+# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=6 |
36 |
+inherit flag-o-matic eutils multilib toolchain-funcs |
37 |
+ |
38 |
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" |
39 |
+HOMEPAGE="https://httpd.apache.org/" |
40 |
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" |
41 |
+ |
42 |
+LICENSE="Apache-2.0" |
43 |
+SLOT="0" |
44 |
+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" |
45 |
+IUSE="libressl ssl" |
46 |
+RESTRICT="test" |
47 |
+ |
48 |
+RDEPEND=">=dev-libs/apr-1.5.0:1 |
49 |
+ dev-libs/apr-util:1 |
50 |
+ dev-libs/expat |
51 |
+ dev-libs/libpcre |
52 |
+ kernel_linux? ( sys-apps/util-linux ) |
53 |
+ ssl? ( |
54 |
+ !libressl? ( dev-libs/openssl:0= ) |
55 |
+ libressl? ( dev-libs/libressl:0= ) |
56 |
+ )" |
57 |
+ |
58 |
+DEPEND="${RDEPEND} |
59 |
+ sys-devel/libtool" |
60 |
+ |
61 |
+S="${WORKDIR}/httpd-${PV}" |
62 |
+ |
63 |
+PATCHES=( |
64 |
+ "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 |
65 |
+) |
66 |
+ |
67 |
+src_prepare() { |
68 |
+ default |
69 |
+ |
70 |
+ # This package really should upgrade to using pcre's .pc file. |
71 |
+ cat <<-\EOF >"${T}"/pcre-config |
72 |
+ #!/bin/bash |
73 |
+ flags=() |
74 |
+ for flag; do |
75 |
+ if [[ ${flag} == "--version" ]]; then |
76 |
+ flags+=( --modversion ) |
77 |
+ else |
78 |
+ flags+=( "${flag}" ) |
79 |
+ fi |
80 |
+ done |
81 |
+ exec ${PKG_CONFIG} libpcre "${flags[@]}" |
82 |
+ EOF |
83 |
+ chmod a+x "${T}"/pcre-config |
84 |
+} |
85 |
+ |
86 |
+src_configure() { |
87 |
+ # Brain dead check. |
88 |
+ tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
89 |
+ |
90 |
+ tc-export PKG_CONFIG |
91 |
+ |
92 |
+ # Instead of filtering --as-needed (bug #128505), append --no-as-needed |
93 |
+ #append-ldflags $(no-as-needed) |
94 |
+ |
95 |
+ # econf overwrites the stuff from config.layout. |
96 |
+ ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ |
97 |
+ econf \ |
98 |
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \ |
99 |
+ --sbindir="${EPREFIX}"/usr/sbin \ |
100 |
+ --with-perl="${EPREFIX}"/usr/bin/perl \ |
101 |
+ --with-expat="${EPREFIX}"/usr \ |
102 |
+ --with-z="${EPREFIX}"/usr \ |
103 |
+ --with-apr="${SYSROOT}${EPREFIX}"/usr \ |
104 |
+ --with-apr-util="${SYSROOT}${EPREFIX}"/usr \ |
105 |
+ --with-pcre="${T}"/pcre-config \ |
106 |
+ $(use_enable ssl) \ |
107 |
+ $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') |
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 |
+} |