1 |
commit: 3ba92259e954426118d8f238ff53e7d632e852a1 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 20 23:57:25 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 20 23:57:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba92259 |
7 |
|
8 |
dev-libs/apr: Security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/635272 |
11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
dev-libs/apr/Manifest | 1 - |
15 |
dev-libs/apr/apr-1.5.2.ebuild | 143 ------------------------------------------ |
16 |
2 files changed, 144 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest |
19 |
index e664da23c52..d237c17a11d 100644 |
20 |
--- a/dev-libs/apr/Manifest |
21 |
+++ b/dev-libs/apr/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d |
24 |
DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996 |
25 |
DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc |
26 |
DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148 |
27 |
|
28 |
diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild |
29 |
deleted file mode 100644 |
30 |
index a3288dfe3f6..00000000000 |
31 |
--- a/dev-libs/apr/apr-1.5.2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,143 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=5 |
38 |
- |
39 |
-inherit autotools eutils libtool multilib toolchain-funcs |
40 |
- |
41 |
-DESCRIPTION="Apache Portable Runtime Library" |
42 |
-HOMEPAGE="http://apr.apache.org/" |
43 |
-SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
44 |
- |
45 |
-LICENSE="Apache-2.0" |
46 |
-SLOT="1" |
47 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
48 |
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" |
49 |
- |
50 |
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
51 |
- elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" |
52 |
-RDEPEND="${CDEPEND} |
53 |
- selinux? ( sec-policy/selinux-apache )" |
54 |
-DEPEND="${CDEPEND} |
55 |
- >=sys-devel/libtool-2.4.2 |
56 |
- doc? ( app-doc/doxygen )" |
57 |
- |
58 |
-DOCS=(CHANGES NOTICE README) |
59 |
- |
60 |
-src_prepare() { |
61 |
- epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch |
62 |
- epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch |
63 |
- epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch |
64 |
- epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 |
65 |
- |
66 |
- epatch_user #449048 |
67 |
- |
68 |
- AT_M4DIR="build" eautoreconf |
69 |
- elibtoolize |
70 |
- |
71 |
- epatch "${FILESDIR}/config.layout.patch" |
72 |
-} |
73 |
- |
74 |
-src_configure() { |
75 |
- local myconf=() |
76 |
- |
77 |
- [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no |
78 |
- |
79 |
- if use older-kernels-compatibility; then |
80 |
- local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec |
81 |
- export apr_cv_accept4="no" |
82 |
- export apr_cv_dup3="no" |
83 |
- export apr_cv_epoll_create1="no" |
84 |
- export apr_cv_sock_cloexec="no" |
85 |
- fi |
86 |
- if tc-is-cross-compiler; then |
87 |
- # The apache project relies heavily on AC_TRY_RUN and doesn't |
88 |
- # have any sane cross-compiling fallback logic. |
89 |
- export \ |
90 |
- ac_cv_file__dev_zero="yes" \ |
91 |
- ac_cv_func_sem_open="yes" \ |
92 |
- ac_cv_negative_eai="yes" \ |
93 |
- ac_cv_o_nonblock_inherited="no" \ |
94 |
- ac_cv_struct_rlimit="yes" \ |
95 |
- ap_cv_atomic_builtins="yes" \ |
96 |
- apr_cv_accept4="yes" \ |
97 |
- apr_cv_dup3="yes" \ |
98 |
- apr_cv_epoll="yes" \ |
99 |
- apr_cv_epoll_create1="yes" \ |
100 |
- apr_cv_gai_addrconfig="yes" \ |
101 |
- apr_cv_mutex_recursive="yes" \ |
102 |
- apr_cv_mutex_robust_shared="yes" \ |
103 |
- apr_cv_process_shared_works="yes" \ |
104 |
- apr_cv_pthreads_lib="-pthread" \ |
105 |
- apr_cv_sock_cloexec="yes" \ |
106 |
- apr_cv_tcp_nodelay_with_cork="yes" |
107 |
- fi |
108 |
- |
109 |
- if use urandom; then |
110 |
- myconf+=( --with-devrandom=/dev/urandom ) |
111 |
- elif (( ${CHOST#*-hpux11.} <= 11 )); then |
112 |
- : # no /dev/*random on hpux11.11 and before, $PN detects this. |
113 |
- else |
114 |
- myconf+=( --with-devrandom=/dev/random ) |
115 |
- fi |
116 |
- |
117 |
- tc-is-static-only && myconf+=( --disable-dso ) |
118 |
- |
119 |
- # shl_load does not search runpath, but hpux11 supports dlopen |
120 |
- [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) |
121 |
- |
122 |
- if [[ ${CHOST} == *-solaris2.10 ]]; then |
123 |
- case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in |
124 |
- *atomic_cas_ptr*) ;; |
125 |
- *) |
126 |
- elog "You do not have Solaris Patch ID "$( |
127 |
- [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 |
128 |
- )" (Problem 4954703) installed on your host ($(hostname))," |
129 |
- elog "using generic atomic operations instead." |
130 |
- myconf+=( --disable-nonportable-atomics ) |
131 |
- ;; |
132 |
- esac |
133 |
- fi |
134 |
- |
135 |
- econf \ |
136 |
- --enable-layout=gentoo \ |
137 |
- --enable-nonportable-atomics \ |
138 |
- --enable-posix-shm \ |
139 |
- --enable-threads \ |
140 |
- $(use_enable static-libs static) \ |
141 |
- "${myconf[@]}" |
142 |
-} |
143 |
- |
144 |
-src_compile() { |
145 |
- if tc-is-cross-compiler; then |
146 |
- # This header is the same across targets, so use the build compiler. |
147 |
- emake tools/gen_test_char |
148 |
- tc-export_build_env BUILD_CC |
149 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
150 |
- tools/gen_test_char.c -o tools/gen_test_char || die |
151 |
- fi |
152 |
- |
153 |
- emake |
154 |
- |
155 |
- if use doc; then |
156 |
- emake dox |
157 |
- fi |
158 |
-} |
159 |
- |
160 |
-src_install() { |
161 |
- default |
162 |
- |
163 |
- # Prallel install breaks since apr-1.5.1 |
164 |
- #make -j1 DESTDIR="${D}" install || die |
165 |
- |
166 |
- prune_libtool_files --all |
167 |
- |
168 |
- if use doc; then |
169 |
- dohtml -r docs/dox/html/* |
170 |
- fi |
171 |
- |
172 |
- # This file is only used on AIX systems, which Gentoo is not, |
173 |
- # and causes collisions between the SLOTs, so remove it. |
174 |
- # Even in Prefix, we don't need this on AIX. |
175 |
- rm -f "${ED}usr/$(get_libdir)/apr.exp" |
176 |
-} |