1 |
polynomial-c 15/02/04 18:17:34 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: apache-tools-2.4.12.ebuild |
5 |
Removed: apache-tools-2.4.9-r1.ebuild |
6 |
Log: |
7 |
Security bump (bug #538182). Removed old |
8 |
|
9 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
10 |
|
11 |
Revision Changes Path |
12 |
1.194 app-admin/apache-tools/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.194&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.194&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?r1=1.193&r2=1.194 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v |
21 |
retrieving revision 1.193 |
22 |
retrieving revision 1.194 |
23 |
diff -u -r1.193 -r1.194 |
24 |
--- ChangeLog 22 Sep 2014 07:46:40 -0000 1.193 |
25 |
+++ ChangeLog 4 Feb 2015 18:17:34 -0000 1.194 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for app-admin/apache-tools |
28 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.193 2014/09/22 07:46:40 polynomial-c Exp $ |
30 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
31 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.194 2015/02/04 18:17:34 polynomial-c Exp $ |
32 |
+ |
33 |
+*apache-tools-2.4.12 (04 Feb 2015) |
34 |
+ |
35 |
+ 04 Feb 2015; Lars Wendler <polynomial-c@g.o> |
36 |
+ -apache-tools-2.4.9-r1.ebuild, +apache-tools-2.4.12.ebuild: |
37 |
+ Security bump (bug #538182). Removed old. |
38 |
|
39 |
*apache-tools-2.2.29 (22 Sep 2014) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 app-admin/apache-tools/apache-tools-2.4.12.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.12.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.12.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: apache-tools-2.4.12.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2015 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.12.ebuild,v 1.1 2015/02/04 18:17:34 polynomial-c Exp $ |
54 |
|
55 |
EAPI=5 |
56 |
inherit flag-o-matic eutils multilib toolchain-funcs |
57 |
|
58 |
DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" |
59 |
HOMEPAGE="http://httpd.apache.org/" |
60 |
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" |
61 |
|
62 |
LICENSE="Apache-2.0" |
63 |
SLOT="0" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" |
65 |
IUSE="ssl" |
66 |
RESTRICT="test" |
67 |
|
68 |
RDEPEND=">=dev-libs/apr-1.5.0:1 |
69 |
dev-libs/apr-util:1 |
70 |
dev-libs/libpcre |
71 |
ssl? ( dev-libs/openssl )" |
72 |
|
73 |
DEPEND="${RDEPEND} |
74 |
sys-devel/libtool" |
75 |
|
76 |
S="${WORKDIR}/httpd-${PV}" |
77 |
|
78 |
src_prepare() { |
79 |
epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446 |
80 |
|
81 |
# This package really should upgrade to using pcre's .pc file. |
82 |
cat <<-\EOF >"${T}"/pcre-config |
83 |
#!/bin/sh |
84 |
[ "${flag}" = "--version" ] && set -- --modversion |
85 |
exec ${PKG_CONFIG} libpcre "$@" |
86 |
EOF |
87 |
chmod a+x "${T}"/pcre-config |
88 |
} |
89 |
|
90 |
src_configure() { |
91 |
# Brain dead check. |
92 |
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
93 |
|
94 |
tc-export PKG_CONFIG |
95 |
|
96 |
# Instead of filtering --as-needed (bug #128505), append --no-as-needed |
97 |
append-ldflags $(no-as-needed) |
98 |
|
99 |
# econf overwrites the stuff from config.layout. |
100 |
ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ |
101 |
econf \ |
102 |
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \ |
103 |
--sbindir="${EPREFIX}"/usr/sbin \ |
104 |
--with-perl="${EPREFIX}"/usr/bin/perl \ |
105 |
--with-expat="${EPREFIX}"/usr \ |
106 |
--with-z="${EPREFIX}"/usr \ |
107 |
--with-apr="${SYSROOT}${EPREFIX}"/usr \ |
108 |
--with-apr-util="${SYSROOT}${EPREFIX}"/usr \ |
109 |
--with-pcre="${T}"/pcre-config \ |
110 |
$(use_enable ssl) \ |
111 |
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '') |
112 |
sed -i \ |
113 |
-e '/^LTFLAGS/s:--silent::' \ |
114 |
build/rules.mk build/config_vars.mk || die |
115 |
} |
116 |
|
117 |
src_compile() { |
118 |
emake -C support |
119 |
} |
120 |
|
121 |
src_install() { |
122 |
emake -C support DESTDIR="${D}" install |
123 |
dodoc CHANGES |
124 |
doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ |
125 |
docs/man/{htcacheclean,rotatelogs}.8 |
126 |
|
127 |
# Providing compatiblity symlinks for #177697 (which we'll stop to install |
128 |
# at some point). |
129 |
pushd "${ED}"/usr/sbin >/dev/null || die |
130 |
local i |
131 |
for i in *; do |
132 |
dosym ${i} /usr/sbin/${i}2 |
133 |
done |
134 |
popd >/dev/null || die |
135 |
|
136 |
# Provide a symlink for ab-ssl |
137 |
if use ssl; then |
138 |
dosym ab /usr/bin/ab-ssl |
139 |
dosym ab /usr/bin/ab2-ssl |
140 |
fi |
141 |
} |