1 |
commit: 2cced84a4ae58d3f6211ee36ab49ab33243dc809 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 31 06:03:40 2017 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 31 06:03:40 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cced84a |
7 |
|
8 |
app-crypt/heimdal: remove vulnerable |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
app-crypt/heimdal/Manifest | 3 - |
13 |
app-crypt/heimdal/files/heimdal_db6.patch | 41 ----- |
14 |
app-crypt/heimdal/files/heimdal_link_order.patch | 41 ----- |
15 |
.../heimdal/files/heimdal_missing-include.patch | 11 -- |
16 |
.../heimdal/files/heimdal_missing_symbols.patch | 28 --- |
17 |
app-crypt/heimdal/files/heimdal_texinfo-5.patch | 28 --- |
18 |
app-crypt/heimdal/heimdal-1.5.3-r2.ebuild | 193 --------------------- |
19 |
app-crypt/heimdal/heimdal-7.1.0.ebuild | 175 ------------------- |
20 |
app-crypt/heimdal/heimdal-7.3.0.ebuild | 175 ------------------- |
21 |
9 files changed, 695 deletions(-) |
22 |
|
23 |
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest |
24 |
index f182453c8de..c8eef7ab1ca 100644 |
25 |
--- a/app-crypt/heimdal/Manifest |
26 |
+++ b/app-crypt/heimdal/Manifest |
27 |
@@ -1,4 +1 @@ |
28 |
-DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19 |
29 |
-DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8 |
30 |
-DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95 |
31 |
DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001 |
32 |
|
33 |
diff --git a/app-crypt/heimdal/files/heimdal_db6.patch b/app-crypt/heimdal/files/heimdal_db6.patch |
34 |
deleted file mode 100644 |
35 |
index 316cf153379..00000000000 |
36 |
--- a/app-crypt/heimdal/files/heimdal_db6.patch |
37 |
+++ /dev/null |
38 |
@@ -1,41 +0,0 @@ |
39 |
---- a/cf/db.m4 |
40 |
-+++ b/cf/db.m4 |
41 |
-@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5 |
42 |
- #include <stdio.h> |
43 |
- #ifdef HAVE_DBHEADER |
44 |
- #include <$dbheader/db.h> |
45 |
-+ #elif HAVE_DB6_DB_H |
46 |
-+ #include <db6/db.h> |
47 |
- #elif HAVE_DB5_DB_H |
48 |
- #include <db5/db.h> |
49 |
- #elif HAVE_DB4_DB_H |
50 |
---- a/lib/hdb/db3.c |
51 |
-+++ b/lib/hdb/db3.c |
52 |
-@@ -276,7 +276,7 @@ |
53 |
- } |
54 |
- db->hdb_db = d; |
55 |
- |
56 |
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1) |
57 |
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) |
58 |
- ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode); |
59 |
- #else |
60 |
- ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode); |
61 |
-@@ -284,7 +284,7 @@ |
62 |
- |
63 |
- if (ret == ENOENT) { |
64 |
- /* try to open without .db extension */ |
65 |
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1) |
66 |
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) |
67 |
- ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE, |
68 |
- myflags, mode); |
69 |
- #else |
70 |
---- a/cf/db.m4 |
71 |
-+++ b/cf/db.m4 |
72 |
-@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno], |
73 |
- fi |
74 |
- ])], |
75 |
- [AC_CHECK_HEADERS([ \ |
76 |
-+ db6/db.h \ |
77 |
- db5/db.h \ |
78 |
- db4/db.h \ |
79 |
- db3/db.h \ |
80 |
|
81 |
diff --git a/app-crypt/heimdal/files/heimdal_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch |
82 |
deleted file mode 100644 |
83 |
index fdf6a0af9bc..00000000000 |
84 |
--- a/app-crypt/heimdal/files/heimdal_link_order.patch |
85 |
+++ /dev/null |
86 |
@@ -1,41 +0,0 @@ |
87 |
---- kadmin/Makefile.am.orig 2010-11-25 12:39:31.000000000 +0000 |
88 |
-+++ kadmin/Makefile.am 2011-02-14 21:37:29.000000000 +0000 |
89 |
-@@ -64,10 +64,10 @@ |
90 |
- $(top_builddir)/lib/krb5/libkrb5.la \ |
91 |
- $(LIB_hcrypto) \ |
92 |
- $(top_builddir)/lib/asn1/libasn1.la \ |
93 |
-- $(LIB_roken) \ |
94 |
- $(DBLIB) |
95 |
- |
96 |
- kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \ |
97 |
-+ $(LIB_roken) \ |
98 |
- ../lib/gssapi/libgssapi.la \ |
99 |
- $(LDADD_common) \ |
100 |
- $(LIB_pidfile) \ |
101 |
-@@ -78,12 +78,14 @@ |
102 |
- $(top_builddir)/lib/kadm5/libkadm5srv.la \ |
103 |
- $(top_builddir)/lib/sl/libsl.la \ |
104 |
- $(LIB_readline) \ |
105 |
-+ $(LIB_roken) \ |
106 |
- $(LDADD_common) \ |
107 |
- $(LIB_dlopen) |
108 |
- |
109 |
- add_random_users_LDADD = \ |
110 |
- $(top_builddir)/lib/kadm5/libkadm5clnt.la \ |
111 |
- $(top_builddir)/lib/kadm5/libkadm5srv.la \ |
112 |
-+ $(LIB_roken) \ |
113 |
- $(LDADD_common) \ |
114 |
- $(LIB_dlopen) |
115 |
- |
116 |
---- tests/plugin/check-pac.in.orig 2010-11-25 12:39:31.000000000 +0000 |
117 |
-+++ tests/plugin/check-pac.in 2011-02-16 13:24:50.000000000 +0000 |
118 |
-@@ -62,7 +62,8 @@ |
119 |
- test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req" |
120 |
- |
121 |
- KRB5_CONFIG="${objdir}/krb5.conf" |
122 |
--export KRB5_CONFIG |
123 |
-+LD_PRELOAD="../../lib/roken/.libs/libroken.so" |
124 |
-+export KRB5_CONFIG LD_PRELOAD |
125 |
- |
126 |
- rm -f ${keytabfile} |
127 |
- rm -f current-db* |
128 |
|
129 |
diff --git a/app-crypt/heimdal/files/heimdal_missing-include.patch b/app-crypt/heimdal/files/heimdal_missing-include.patch |
130 |
deleted file mode 100644 |
131 |
index e245cf8fff0..00000000000 |
132 |
--- a/app-crypt/heimdal/files/heimdal_missing-include.patch |
133 |
+++ /dev/null |
134 |
@@ -1,11 +0,0 @@ |
135 |
---- base/test_base.c 2011-09-30 15:58:45.000000000 +0300 |
136 |
-+++ base/test_base.c 2011-12-27 23:04:50.482955923 +0200 |
137 |
-@@ -39,6 +39,8 @@ |
138 |
- #include "heimbase.h" |
139 |
- #include "heimbasepriv.h" |
140 |
- |
141 |
-+#include <stdlib.h> |
142 |
-+ |
143 |
- static void |
144 |
- memory_free(heim_object_t obj) |
145 |
- { |
146 |
|
147 |
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch |
148 |
deleted file mode 100644 |
149 |
index aa915fb130d..00000000000 |
150 |
--- a/app-crypt/heimdal/files/heimdal_missing_symbols.patch |
151 |
+++ /dev/null |
152 |
@@ -1,28 +0,0 @@ |
153 |
-Add missing symbols. Cherry picked from upstream master. |
154 |
-Bug #420821. |
155 |
- |
156 |
---- a/lib/krb5/version-script.map 2012-01-10 21:53:51.000000000 +0000 |
157 |
-+++ b/lib/krb5/version-script.map 2012-06-13 16:23:26.000000000 +0000 |
158 |
-@@ -42,6 +42,7 @@ |
159 |
- krb5_auth_con_getrcache; |
160 |
- krb5_auth_con_getremoteseqnumber; |
161 |
- krb5_auth_con_getremotesubkey; |
162 |
-+ krb5_auth_con_getsendsubkey; |
163 |
- krb5_auth_con_init; |
164 |
- krb5_auth_con_removeflags; |
165 |
- krb5_auth_con_setaddrs; |
166 |
-@@ -383,6 +384,14 @@ |
167 |
- krb5_h_errno_to_heim_errno; |
168 |
- krb5_have_error_string; |
169 |
- krb5_hmac; |
170 |
-+ krb5_init_creds_init; |
171 |
-+ krb5_init_creds_set_service; |
172 |
-+ krb5_init_creds_set_keytab; |
173 |
-+ krb5_init_creds_get; |
174 |
-+ krb5_init_creds_set_password; |
175 |
-+ krb5_init_creds_free; |
176 |
-+ krb5_init_creds_get_creds; |
177 |
-+ krb5_init_creds_get_error; |
178 |
- krb5_init_context; |
179 |
- krb5_init_ets; |
180 |
- krb5_initlog; |
181 |
|
182 |
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch |
183 |
deleted file mode 100644 |
184 |
index b16a90cefdb..00000000000 |
185 |
--- a/app-crypt/heimdal/files/heimdal_texinfo-5.patch |
186 |
+++ /dev/null |
187 |
@@ -1,28 +0,0 @@ |
188 |
---- a/doc/whatis.texi |
189 |
-+++ b/doc/whatis.texi |
190 |
-@@ -35,10 +35,11 @@ services can authenticate each other. |
191 |
- @end macro |
192 |
- @end ifinfo |
193 |
- |
194 |
--@tex |
195 |
--@def@xsub#1{$_{#1}$} |
196 |
--@global@let@sub=@xsub |
197 |
--@end tex |
198 |
-+@iftex |
199 |
-+@macro sub{arg} |
200 |
-+@textsubscript{\arg\} |
201 |
-+@end macro |
202 |
-+@end iftex |
203 |
- |
204 |
- @ifhtml |
205 |
- @macro sub{arg} |
206 |
---- a/doc/win2k.texi |
207 |
-+++ b/doc/win2k.texi |
208 |
-@@ -311,4 +311,5 @@ Other useful programs include these: |
209 |
- |
210 |
- @itemize @bullet |
211 |
- @item pwdump2 |
212 |
--@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize |
213 |
-+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm} |
214 |
-+@end itemize |
215 |
- |
216 |
|
217 |
diff --git a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild |
218 |
deleted file mode 100644 |
219 |
index b1ddcdedd4e..00000000000 |
220 |
--- a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild |
221 |
+++ /dev/null |
222 |
@@ -1,193 +0,0 @@ |
223 |
-# Copyright 1999-2016 Gentoo Foundation |
224 |
-# Distributed under the terms of the GNU General Public License v2 |
225 |
- |
226 |
-EAPI=5 |
227 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
228 |
-VIRTUALX_REQUIRED="manual" |
229 |
- |
230 |
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 toolchain-funcs virtualx flag-o-matic |
231 |
- |
232 |
-MY_P="${P}" |
233 |
-DESCRIPTION="Kerberos 5 implementation from KTH" |
234 |
-HOMEPAGE="http://www.h5l.org/" |
235 |
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz" |
236 |
- |
237 |
-LICENSE="BSD" |
238 |
-SLOT="0" |
239 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd" |
240 |
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X" |
241 |
- |
242 |
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
243 |
- berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] ) |
244 |
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) |
245 |
- caps? ( sys-libs/libcap-ng ) |
246 |
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] |
247 |
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] |
248 |
- sys-libs/ncurses:0= |
249 |
- >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] |
250 |
- afs? ( net-fs/openafs ) |
251 |
- hdb-ldap? ( >=net-nds/openldap-2.3.0 ) |
252 |
- X? ( x11-libs/libX11 |
253 |
- x11-libs/libXau |
254 |
- x11-libs/libXt ) |
255 |
- abi_x86_32? ( |
256 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 |
257 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
258 |
- ) |
259 |
- !!app-crypt/mit-krb5 |
260 |
- !!app-crypt/mit-krb5-appl" |
261 |
- |
262 |
-DEPEND="${CDEPEND} |
263 |
- ${PYTHON_DEPS} |
264 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
265 |
- >=sys-devel/autoconf-2.62 |
266 |
- test? ( X? ( ${VIRTUALX_DEPEND} ) )" |
267 |
- |
268 |
-RDEPEND="${CDEPEND} |
269 |
- selinux? ( sec-policy/selinux-kerberos )" |
270 |
- |
271 |
-MULTILIB_WRAPPED_HEADERS=( |
272 |
- /usr/include/krb5-types.h |
273 |
- /usr/include/cms_asn1.h |
274 |
- /usr/include/digest_asn1.h |
275 |
- /usr/include/hdb_asn1.h |
276 |
- /usr/include/krb5_asn1.h |
277 |
- /usr/include/pkcs12_asn1.h |
278 |
- /usr/include/pkinit_asn1.h |
279 |
- /usr/include/rfc2459_asn1.h |
280 |
-) |
281 |
- |
282 |
-MULTILIB_CHOST_TOOLS=( |
283 |
- /usr/bin/krb5-config |
284 |
-) |
285 |
- |
286 |
-src_prepare() { |
287 |
- epatch "${FILESDIR}/heimdal_missing-include.patch" |
288 |
- epatch "${FILESDIR}/heimdal_db6.patch" |
289 |
- epatch "${FILESDIR}/heimdal_disable-check-iprop.patch" |
290 |
- epatch "${FILESDIR}/heimdal_link_order.patch" |
291 |
- epatch "${FILESDIR}/heimdal_missing_symbols.patch" |
292 |
- epatch "${FILESDIR}/heimdal_texinfo-5.patch" |
293 |
- epatch "${FILESDIR}/heimdal_tinfo.patch" |
294 |
- eautoreconf |
295 |
-} |
296 |
- |
297 |
-src_configure() { |
298 |
- # QA |
299 |
- append-flags -fno-strict-aliasing |
300 |
- |
301 |
- multilib-minimal_src_configure |
302 |
-} |
303 |
- |
304 |
-multilib_src_configure() { |
305 |
- local myconf=() |
306 |
- if use berkdb; then |
307 |
- myconf+=( |
308 |
- --with-berkeley-db |
309 |
- --with-berkeley-db-include="$(db_includedir)" |
310 |
- ) |
311 |
- else |
312 |
- myconf+=( |
313 |
- --without-berkeley-db |
314 |
- ) |
315 |
- fi |
316 |
- |
317 |
- ECONF_SOURCE=${S} \ |
318 |
- econf \ |
319 |
- --enable-kcm \ |
320 |
- --disable-osfc2 \ |
321 |
- --enable-shared \ |
322 |
- --with-libintl=/usr \ |
323 |
- --with-readline=/usr \ |
324 |
- --with-sqlite3=/usr \ |
325 |
- --libexecdir=/usr/sbin \ |
326 |
- $(use_enable afs afs-support) \ |
327 |
- $(use_enable otp) \ |
328 |
- $(use_enable pkinit kx509) \ |
329 |
- $(use_enable pkinit pk-init) \ |
330 |
- $(use_enable static-libs static) \ |
331 |
- $(use_enable threads pthread-support) \ |
332 |
- $(multilib_native_use_with caps capng) \ |
333 |
- $(multilib_native_use_with hdb-ldap openldap /usr) \ |
334 |
- $(use_with ipv6) \ |
335 |
- $(use_with ssl openssl /usr) \ |
336 |
- $(multilib_native_use_with X x) \ |
337 |
- "${myconf[@]}" |
338 |
-} |
339 |
- |
340 |
-multilib_src_compile() { |
341 |
- if multilib_is_native_abi; then |
342 |
- emake -j1 |
343 |
- else |
344 |
- emake -C include -j1 |
345 |
- emake -C base -j1 |
346 |
- emake -C lib -j1 |
347 |
- emake -C kdc -j1 |
348 |
- emake -C tools -j1 |
349 |
- emake -C tests/plugin -j1 |
350 |
- fi |
351 |
-} |
352 |
- |
353 |
-multilib_src_test() { |
354 |
- multilib_is_native_abi && emake check |
355 |
-} |
356 |
- |
357 |
-multilib_src_install() { |
358 |
- if multilib_is_native_abi; then |
359 |
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install |
360 |
- else |
361 |
- emake -C include DESTDIR="${D}" install |
362 |
- emake -C base DESTDIR="${D}" install |
363 |
- emake -C lib DESTDIR="${D}" install |
364 |
- emake -C kdc DESTDIR="${D}" install |
365 |
- emake -C tools DESTDIR="${D}" install |
366 |
- emake -C tests/plugin DESTDIR="${D}" install |
367 |
- fi |
368 |
-} |
369 |
- |
370 |
-multilib_src_install_all() { |
371 |
- dodoc ChangeLog README NEWS TODO |
372 |
- |
373 |
- # Begin client rename and install |
374 |
- for i in {telnetd,ftpd,rshd,popper} |
375 |
- do |
376 |
- mv "${D}"/usr/share/man/man8/{,k}${i}.8 |
377 |
- mv "${D}"/usr/sbin/{,k}${i} |
378 |
- done |
379 |
- |
380 |
- for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf} |
381 |
- do |
382 |
- mv "${D}"/usr/share/man/man1/{,k}${i}.1 |
383 |
- mv "${D}"/usr/bin/{,k}${i} |
384 |
- done |
385 |
- |
386 |
- mv "${D}"/usr/share/man/man5/{,k}ftpusers.5 |
387 |
- mv "${D}"/usr/share/man/man5/{,k}login.access.5 |
388 |
- |
389 |
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc |
390 |
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind |
391 |
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd |
392 |
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm |
393 |
- |
394 |
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc |
395 |
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind |
396 |
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd |
397 |
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm |
398 |
- |
399 |
- insinto /etc |
400 |
- newins "${FILESDIR}"/krb5.conf krb5.conf.example |
401 |
- |
402 |
- if use hdb-ldap; then |
403 |
- insinto /etc/openldap/schema |
404 |
- doins "${S}/lib/hdb/hdb.schema" |
405 |
- fi |
406 |
- |
407 |
- prune_libtool_files |
408 |
- |
409 |
- # default database dir |
410 |
- keepdir /var/heimdal |
411 |
- |
412 |
- # Ugly hack for broken symlink - bug #417081 |
413 |
- rm "${D}"/usr/share/man/man5/qop.5 || die |
414 |
- dosym mech.5 /usr/share/man/man5/qop.5 |
415 |
-} |
416 |
|
417 |
diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild |
418 |
deleted file mode 100644 |
419 |
index 5a5572526bb..00000000000 |
420 |
--- a/app-crypt/heimdal/heimdal-7.1.0.ebuild |
421 |
+++ /dev/null |
422 |
@@ -1,175 +0,0 @@ |
423 |
-# Copyright 1999-2017 Gentoo Foundation |
424 |
-# Distributed under the terms of the GNU General Public License v2 |
425 |
- |
426 |
-EAPI=6 |
427 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
428 |
-VIRTUALX_REQUIRED="manual" |
429 |
- |
430 |
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic |
431 |
- |
432 |
-MY_P="${P}" |
433 |
-DESCRIPTION="Kerberos 5 implementation from KTH" |
434 |
-HOMEPAGE="http://www.h5l.org/" |
435 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" |
436 |
- |
437 |
-LICENSE="BSD" |
438 |
-SLOT="0" |
439 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" |
440 |
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X" |
441 |
- |
442 |
-CDEPEND=" |
443 |
- ssl? ( |
444 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
445 |
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
446 |
- ) |
447 |
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) |
448 |
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) |
449 |
- caps? ( sys-libs/libcap-ng ) |
450 |
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] |
451 |
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] |
452 |
- sys-libs/ncurses:0= |
453 |
- >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] |
454 |
- afs? ( net-fs/openafs ) |
455 |
- hdb-ldap? ( >=net-nds/openldap-2.3.0 ) |
456 |
- X? ( x11-libs/libX11 |
457 |
- x11-libs/libXau |
458 |
- x11-libs/libXt ) |
459 |
- abi_x86_32? ( |
460 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 |
461 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
462 |
- ) |
463 |
- !!app-crypt/mit-krb5 |
464 |
- !!app-crypt/mit-krb5-appl" |
465 |
- |
466 |
-DEPEND="${CDEPEND} |
467 |
- ${PYTHON_DEPS} |
468 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
469 |
- >=sys-devel/autoconf-2.62 |
470 |
- test? ( X? ( ${VIRTUALX_DEPEND} ) )" |
471 |
- |
472 |
-RDEPEND="${CDEPEND} |
473 |
- selinux? ( sec-policy/selinux-kerberos )" |
474 |
- |
475 |
-MULTILIB_WRAPPED_HEADERS=( |
476 |
- /usr/include/krb5-types.h |
477 |
- /usr/include/cms_asn1.h |
478 |
- /usr/include/digest_asn1.h |
479 |
- /usr/include/hdb_asn1.h |
480 |
- /usr/include/krb5_asn1.h |
481 |
- /usr/include/pkcs12_asn1.h |
482 |
- /usr/include/pkinit_asn1.h |
483 |
- /usr/include/rfc2459_asn1.h |
484 |
-) |
485 |
- |
486 |
-MULTILIB_CHOST_TOOLS=( |
487 |
- /usr/bin/krb5-config |
488 |
-) |
489 |
- |
490 |
-src_prepare() { |
491 |
- eapply "${FILESDIR}/heimdal_disable-check-iprop.patch" |
492 |
- eapply "${FILESDIR}/heimdal_tinfo.patch" |
493 |
- eautoreconf |
494 |
- eapply_user |
495 |
-} |
496 |
- |
497 |
-src_configure() { |
498 |
- # QA |
499 |
- append-flags -fno-strict-aliasing |
500 |
- |
501 |
- multilib-minimal_src_configure |
502 |
-} |
503 |
- |
504 |
-multilib_src_configure() { |
505 |
- local myconf=() |
506 |
- if use berkdb; then |
507 |
- myconf+=( |
508 |
- --with-berkeley-db |
509 |
- --with-berkeley-db-include="$(db_includedir)" |
510 |
- ) |
511 |
- else |
512 |
- myconf+=( |
513 |
- --without-berkeley-db |
514 |
- ) |
515 |
- fi |
516 |
- |
517 |
- ECONF_SOURCE=${S} \ |
518 |
- econf \ |
519 |
- --enable-kcm \ |
520 |
- --disable-osfc2 \ |
521 |
- --enable-shared \ |
522 |
- --with-libintl=/usr \ |
523 |
- --with-readline=/usr \ |
524 |
- --with-sqlite3=/usr \ |
525 |
- --libexecdir=/usr/sbin \ |
526 |
- --enable-pthread-support \ |
527 |
- $(use_enable afs afs-support) \ |
528 |
- $(use_enable otp) \ |
529 |
- $(use_enable pkinit kx509) \ |
530 |
- $(use_enable pkinit pk-init) \ |
531 |
- $(use_enable static-libs static) \ |
532 |
- $(multilib_native_use_with caps capng) \ |
533 |
- $(multilib_native_use_with hdb-ldap openldap /usr) \ |
534 |
- $(use_with ipv6) \ |
535 |
- $(use_with ssl openssl /usr) \ |
536 |
- $(multilib_native_use_with X x) \ |
537 |
- "${myconf[@]}" |
538 |
-} |
539 |
- |
540 |
-multilib_src_compile() { |
541 |
- if multilib_is_native_abi; then |
542 |
- emake -j1 |
543 |
- else |
544 |
- emake -C include -j1 |
545 |
- emake -C lib -j1 |
546 |
- emake -C kdc -j1 |
547 |
- emake -C tools -j1 |
548 |
- emake -C tests/plugin -j1 |
549 |
- fi |
550 |
-} |
551 |
- |
552 |
-multilib_src_test() { |
553 |
- multilib_is_native_abi && emake -j1 check |
554 |
-} |
555 |
- |
556 |
-multilib_src_install() { |
557 |
- if multilib_is_native_abi; then |
558 |
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install |
559 |
- else |
560 |
- emake -C include DESTDIR="${D}" install |
561 |
- emake -C lib DESTDIR="${D}" install |
562 |
- emake -C kdc DESTDIR="${D}" install |
563 |
- emake -C tools DESTDIR="${D}" install |
564 |
- emake -C tests/plugin DESTDIR="${D}" install |
565 |
- fi |
566 |
-} |
567 |
- |
568 |
-multilib_src_install_all() { |
569 |
- dodoc ChangeLog* README NEWS TODO |
570 |
- |
571 |
- # client rename |
572 |
- mv "${D}"/usr/share/man/man1/{,k}su.1 |
573 |
- mv "${D}"/usr/bin/{,k}su |
574 |
- |
575 |
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc |
576 |
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind |
577 |
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd |
578 |
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm |
579 |
- |
580 |
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc |
581 |
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind |
582 |
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd |
583 |
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm |
584 |
- |
585 |
- insinto /etc |
586 |
- newins "${S}"/krb5.conf krb5.conf.example |
587 |
- |
588 |
- if use hdb-ldap; then |
589 |
- insinto /etc/openldap/schema |
590 |
- doins "${S}/lib/hdb/hdb.schema" |
591 |
- fi |
592 |
- |
593 |
- prune_libtool_files |
594 |
- |
595 |
- # default database dir |
596 |
- keepdir /var/heimdal |
597 |
-} |
598 |
|
599 |
diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild |
600 |
deleted file mode 100644 |
601 |
index 5a5572526bb..00000000000 |
602 |
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild |
603 |
+++ /dev/null |
604 |
@@ -1,175 +0,0 @@ |
605 |
-# Copyright 1999-2017 Gentoo Foundation |
606 |
-# Distributed under the terms of the GNU General Public License v2 |
607 |
- |
608 |
-EAPI=6 |
609 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
610 |
-VIRTUALX_REQUIRED="manual" |
611 |
- |
612 |
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic |
613 |
- |
614 |
-MY_P="${P}" |
615 |
-DESCRIPTION="Kerberos 5 implementation from KTH" |
616 |
-HOMEPAGE="http://www.h5l.org/" |
617 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" |
618 |
- |
619 |
-LICENSE="BSD" |
620 |
-SLOT="0" |
621 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" |
622 |
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X" |
623 |
- |
624 |
-CDEPEND=" |
625 |
- ssl? ( |
626 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
627 |
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
628 |
- ) |
629 |
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) |
630 |
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) |
631 |
- caps? ( sys-libs/libcap-ng ) |
632 |
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] |
633 |
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] |
634 |
- sys-libs/ncurses:0= |
635 |
- >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}] |
636 |
- afs? ( net-fs/openafs ) |
637 |
- hdb-ldap? ( >=net-nds/openldap-2.3.0 ) |
638 |
- X? ( x11-libs/libX11 |
639 |
- x11-libs/libXau |
640 |
- x11-libs/libXt ) |
641 |
- abi_x86_32? ( |
642 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 |
643 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
644 |
- ) |
645 |
- !!app-crypt/mit-krb5 |
646 |
- !!app-crypt/mit-krb5-appl" |
647 |
- |
648 |
-DEPEND="${CDEPEND} |
649 |
- ${PYTHON_DEPS} |
650 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
651 |
- >=sys-devel/autoconf-2.62 |
652 |
- test? ( X? ( ${VIRTUALX_DEPEND} ) )" |
653 |
- |
654 |
-RDEPEND="${CDEPEND} |
655 |
- selinux? ( sec-policy/selinux-kerberos )" |
656 |
- |
657 |
-MULTILIB_WRAPPED_HEADERS=( |
658 |
- /usr/include/krb5-types.h |
659 |
- /usr/include/cms_asn1.h |
660 |
- /usr/include/digest_asn1.h |
661 |
- /usr/include/hdb_asn1.h |
662 |
- /usr/include/krb5_asn1.h |
663 |
- /usr/include/pkcs12_asn1.h |
664 |
- /usr/include/pkinit_asn1.h |
665 |
- /usr/include/rfc2459_asn1.h |
666 |
-) |
667 |
- |
668 |
-MULTILIB_CHOST_TOOLS=( |
669 |
- /usr/bin/krb5-config |
670 |
-) |
671 |
- |
672 |
-src_prepare() { |
673 |
- eapply "${FILESDIR}/heimdal_disable-check-iprop.patch" |
674 |
- eapply "${FILESDIR}/heimdal_tinfo.patch" |
675 |
- eautoreconf |
676 |
- eapply_user |
677 |
-} |
678 |
- |
679 |
-src_configure() { |
680 |
- # QA |
681 |
- append-flags -fno-strict-aliasing |
682 |
- |
683 |
- multilib-minimal_src_configure |
684 |
-} |
685 |
- |
686 |
-multilib_src_configure() { |
687 |
- local myconf=() |
688 |
- if use berkdb; then |
689 |
- myconf+=( |
690 |
- --with-berkeley-db |
691 |
- --with-berkeley-db-include="$(db_includedir)" |
692 |
- ) |
693 |
- else |
694 |
- myconf+=( |
695 |
- --without-berkeley-db |
696 |
- ) |
697 |
- fi |
698 |
- |
699 |
- ECONF_SOURCE=${S} \ |
700 |
- econf \ |
701 |
- --enable-kcm \ |
702 |
- --disable-osfc2 \ |
703 |
- --enable-shared \ |
704 |
- --with-libintl=/usr \ |
705 |
- --with-readline=/usr \ |
706 |
- --with-sqlite3=/usr \ |
707 |
- --libexecdir=/usr/sbin \ |
708 |
- --enable-pthread-support \ |
709 |
- $(use_enable afs afs-support) \ |
710 |
- $(use_enable otp) \ |
711 |
- $(use_enable pkinit kx509) \ |
712 |
- $(use_enable pkinit pk-init) \ |
713 |
- $(use_enable static-libs static) \ |
714 |
- $(multilib_native_use_with caps capng) \ |
715 |
- $(multilib_native_use_with hdb-ldap openldap /usr) \ |
716 |
- $(use_with ipv6) \ |
717 |
- $(use_with ssl openssl /usr) \ |
718 |
- $(multilib_native_use_with X x) \ |
719 |
- "${myconf[@]}" |
720 |
-} |
721 |
- |
722 |
-multilib_src_compile() { |
723 |
- if multilib_is_native_abi; then |
724 |
- emake -j1 |
725 |
- else |
726 |
- emake -C include -j1 |
727 |
- emake -C lib -j1 |
728 |
- emake -C kdc -j1 |
729 |
- emake -C tools -j1 |
730 |
- emake -C tests/plugin -j1 |
731 |
- fi |
732 |
-} |
733 |
- |
734 |
-multilib_src_test() { |
735 |
- multilib_is_native_abi && emake -j1 check |
736 |
-} |
737 |
- |
738 |
-multilib_src_install() { |
739 |
- if multilib_is_native_abi; then |
740 |
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install |
741 |
- else |
742 |
- emake -C include DESTDIR="${D}" install |
743 |
- emake -C lib DESTDIR="${D}" install |
744 |
- emake -C kdc DESTDIR="${D}" install |
745 |
- emake -C tools DESTDIR="${D}" install |
746 |
- emake -C tests/plugin DESTDIR="${D}" install |
747 |
- fi |
748 |
-} |
749 |
- |
750 |
-multilib_src_install_all() { |
751 |
- dodoc ChangeLog* README NEWS TODO |
752 |
- |
753 |
- # client rename |
754 |
- mv "${D}"/usr/share/man/man1/{,k}su.1 |
755 |
- mv "${D}"/usr/bin/{,k}su |
756 |
- |
757 |
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc |
758 |
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind |
759 |
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd |
760 |
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm |
761 |
- |
762 |
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc |
763 |
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind |
764 |
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd |
765 |
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm |
766 |
- |
767 |
- insinto /etc |
768 |
- newins "${S}"/krb5.conf krb5.conf.example |
769 |
- |
770 |
- if use hdb-ldap; then |
771 |
- insinto /etc/openldap/schema |
772 |
- doins "${S}/lib/hdb/hdb.schema" |
773 |
- fi |
774 |
- |
775 |
- prune_libtool_files |
776 |
- |
777 |
- # default database dir |
778 |
- keepdir /var/heimdal |
779 |
-} |