Gentoo Archives: gentoo-commits

From: Eray Aslan <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/mit-krb5/files/, app-crypt/mit-krb5/
Date: Thu, 10 May 2018 06:42:02
Message-Id: 1525934513.f7248912b982989fc1aa142bdbbab3a375725fa5.eras@gentoo
1 commit: f7248912b982989fc1aa142bdbbab3a375725fa5
2 Author: Eray Aslan <eras <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 10 06:41:26 2018 +0000
4 Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
5 CommitDate: Thu May 10 06:41:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7248912
7
8 app-crypt/mit-krb5: remove old
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12 app-crypt/mit-krb5/Manifest | 1 -
13 .../files/mit-krb5-1.14.2-redeclared-ttyname.patch | 26 ----
14 .../files/mit-krb5-1.14.4-disable-nls.patch | 45 ------
15 .../files/mit-krb5-1.15.2-fix-pkinit.patch | 98 -------------
16 app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild | 145 --------------------
17 app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild | 144 -------------------
18 app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild | 152 ---------------------
19 7 files changed, 611 deletions(-)
20
21 diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
22 index 2e79cf89fa3..80fe45536f5 100644
23 --- a/app-crypt/mit-krb5/Manifest
24 +++ b/app-crypt/mit-krb5/Manifest
25 @@ -1,3 +1,2 @@
26 -DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70632e136b8f9f8d3a192e3e7b692840803e5a3f67ddb202d53631767ea9eb8b7615d45a3479389a01a6390ac4 SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2
27 DIST krb5-1.16.1.tar.gz 9477480 BLAKE2B 16bdd7d6d03ddbd4b070663c3a7a3d2331d54e8590b24f1dc162be2531bfbbbd65878d426a160c65ffc1ba4751f16bbbd177a8a91c01002fde0e886cc1bd91b9 SHA512 fa4ec14a4ffe690861e2dd7ea39d7698af2058ce181bb733ea891f80279f4dde4bb891adec5ccb0eaddf737306e6ceb1fe3744a2946e6189a7d7d2dd3bc5ba84
28 DIST krb5-1.16.tar.gz 9474479 BLAKE2B 0c5caa0a0d2308a447d47ab94d7b8dc92a67ad78b3bac1678c3f3ece3905f27feda5a23d28b3c13ebd64d1760726888c759fb19da82ad960c6f84a433b753873 SHA512 7e162467b95dad2b6aaa11686d08a00f1cc4eb08247fca8f0e5a8bcaa5f9f7b42cdf00db69c5c6111bdf9eb8063d53cef3bb207ce5d6a287615ca10b710153f9
29
30 diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
31 deleted file mode 100644
32 index a76cd3a7f84..00000000000
33 --- a/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
34 +++ /dev/null
35 @@ -1,26 +0,0 @@
36 -Fixes the redeclaration of ttyname which was preventing
37 -enabling clang fortify.
38 -
39 -The error was;
40 -
41 -main.c:858:15: error: redeclaration of 'ttyname' must have the 'overloadable' attribute
42 - char *p, *ttyname();
43 - ^
44 -/build/samus/usr/include/unistd.h:784:14: note: previous overload of function is here
45 -extern char *ttyname (int __fd) __THROW __CLANG_NO_MANGLE (ttyname);
46 -
47 -https://github.com/krb5/krb5/pull/568
48 -
49 -Patch by Zentaro Kavanagh <zentaro@××××××.com>
50 -
51 ---- clients/ksu/main.c
52 -+++ clients/ksu/main.c
53 -@@ -855,7 +855,7 @@
54 -
55 - static char * ontty()
56 - {
57 -- char *p, *ttyname();
58 -+ char *p;
59 - static char buf[MAXPATHLEN + 5];
60 - int result;
61 -
62
63 diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch
64 deleted file mode 100644
65 index 63cb0fc0c55..00000000000
66 --- a/app-crypt/mit-krb5/files/mit-krb5-1.14.4-disable-nls.patch
67 +++ /dev/null
68 @@ -1,45 +0,0 @@
69 -Adds support for --(enable|disable)-nls configure option.
70 -
71 -This enables\disables the generation of language files and
72 -sets the ENABLE_NLS define appropriately.
73 -
74 -Default value is enabled to preserve current behavior.
75 -
76 -Patch by Zentaro Kavanagh <zentaro@××××××.com>
77 -https://crbug.com/654842
78 -
79 -https://github.com/krb5/krb5/pull/584
80 -
81 ---- src/configure.in
82 -+++ src/configure.in
83 -@@ -118,15 +118,22 @@
84 - ])
85 - AC_SUBST(LIBUTIL)
86 -
87 --AC_CHECK_HEADER(libintl.h, [
88 -- AC_SEARCH_LIBS(dgettext, intl, [
89 -- AC_DEFINE(ENABLE_NLS, 1,
90 -- [Define if translation functions should be used.])])])
91 --
92 --AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
93 -+# Determine if NLS is desired and supported.
94 - po=
95 --if test x"$MSGFMT" != x; then
96 -- po=po
97 -+AC_ARG_ENABLE([nls],
98 -+AC_HELP_STRING([--disable-nls],
99 -+ [Disable Native Language Support(NLS).]), ,
100 -+ enableval=yes)
101 -+if test "$enableval" = yes ; then
102 -+ AC_CHECK_HEADER(libintl.h, [
103 -+ AC_SEARCH_LIBS(dgettext, intl, [
104 -+ AC_DEFINE(ENABLE_NLS, 1,
105 -+ [Define if translation functions should be used.])])])
106 -+
107 -+ AC_CHECK_PROG(MSGFMT,msgfmt,msgfmt)
108 -+ if test x"$MSGFMT" != x; then
109 -+ po=po
110 -+ fi
111 - fi
112 - AC_SUBST(po)
113 -
114
115 diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch b/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
116 deleted file mode 100644
117 index 4f721d4d961..00000000000
118 --- a/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
119 +++ /dev/null
120 @@ -1,98 +0,0 @@
121 -diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
122 -index 74fffbf321..4b86a6f302 100644
123 ---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
124 -+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
125 -@@ -5145,33 +5145,29 @@ crypto_retieve_X509_key_usage(krb5_context context,
126 - return retval;
127 - }
128 -
129 --/*
130 -- * Return a string format of an X509_NAME in buf where
131 -- * size is an in/out parameter. On input it is the size
132 -- * of the buffer, and on output it is the actual length
133 -- * of the name.
134 -- * If buf is NULL, returns the length req'd to hold name
135 -- */
136 --static char *
137 --X509_NAME_oneline_ex(X509_NAME * a,
138 -- char *buf,
139 -- unsigned int *size,
140 -- unsigned long flag)
141 -+static krb5_error_code
142 -+rfc2253_name(X509_NAME *name, char **str_out)
143 - {
144 -- BIO *out = NULL;
145 -+ BIO *b = NULL;
146 -+ char *str;
147 -
148 -- out = BIO_new(BIO_s_mem ());
149 -- if (X509_NAME_print_ex(out, a, 0, flag) > 0) {
150 -- if (buf != NULL && (*size) > (unsigned int) BIO_number_written(out)) {
151 -- memset(buf, 0, *size);
152 -- BIO_read(out, buf, (int) BIO_number_written(out));
153 -- }
154 -- else {
155 -- *size = BIO_number_written(out);
156 -- }
157 -- }
158 -- BIO_free(out);
159 -- return (buf);
160 -+ *str_out = NULL;
161 -+ b = BIO_new(BIO_s_mem());
162 -+ if (b == NULL)
163 -+ return ENOMEM;
164 -+ if (X509_NAME_print_ex(b, name, 0, XN_FLAG_SEP_COMMA_PLUS) < 0)
165 -+ goto error;
166 -+ str = calloc(BIO_number_written(b) + 1, 1);
167 -+ if (str == NULL)
168 -+ goto error;
169 -+ BIO_read(b, str, BIO_number_written(b));
170 -+ BIO_free(b);
171 -+ *str_out = str;
172 -+ return 0;
173 -+
174 -+error:
175 -+ BIO_free(b);
176 -+ return ENOMEM;
177 - }
178 -
179 - /*
180 -@@ -5187,8 +5183,6 @@ crypto_cert_get_matching_data(krb5_context context,
181 - krb5_principal *pkinit_sans =NULL, *upn_sans = NULL;
182 - struct _pkinit_cert_data *cd = (struct _pkinit_cert_data *)ch;
183 - unsigned int i, j;
184 -- char buf[DN_BUF_LEN];
185 -- unsigned int bufsize = sizeof(buf);
186 -
187 - if (cd == NULL || cd->magic != CERT_MAGIC)
188 - return EINVAL;
189 -@@ -5201,23 +5195,14 @@ crypto_cert_get_matching_data(krb5_context context,
190 -
191 - md->ch = ch;
192 -
193 -- /* get the subject name (in rfc2253 format) */
194 -- X509_NAME_oneline_ex(X509_get_subject_name(cd->cred->cert),
195 -- buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
196 -- md->subject_dn = strdup(buf);
197 -- if (md->subject_dn == NULL) {
198 -- retval = ENOMEM;
199 -+ retval = rfc2253_name(X509_get_subject_name(cd->cred->cert),
200 -+ &md->subject_dn);
201 -+ if (retval)
202 - goto cleanup;
203 -- }
204 --
205 -- /* get the issuer name (in rfc2253 format) */
206 -- X509_NAME_oneline_ex(X509_get_issuer_name(cd->cred->cert),
207 -- buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
208 -- md->issuer_dn = strdup(buf);
209 -- if (md->issuer_dn == NULL) {
210 -- retval = ENOMEM;
211 -+ retval = rfc2253_name(X509_get_issuer_name(cd->cred->cert),
212 -+ &md->issuer_dn);
213 -+ if (retval)
214 - goto cleanup;
215 -- }
216 -
217 - /* get the san data */
218 - retval = crypto_retrieve_X509_sans(context, cd->plgctx, cd->reqctx,
219
220 diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
221 deleted file mode 100644
222 index 3f1ef7523d9..00000000000
223 --- a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
224 +++ /dev/null
225 @@ -1,145 +0,0 @@
226 -# Copyright 1999-2018 Gentoo Foundation
227 -# Distributed under the terms of the GNU General Public License v2
228 -
229 -EAPI=6
230 -
231 -PYTHON_COMPAT=( python2_7 )
232 -inherit autotools flag-o-matic multilib-minimal python-any-r1 versionator
233 -
234 -MY_P="${P/mit-}"
235 -P_DIR=$(get_version_component_range 1-2)
236 -DESCRIPTION="MIT Kerberos V"
237 -HOMEPAGE="http://web.mit.edu/kerberos/www/"
238 -SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
239 -
240 -LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
241 -SLOT="0"
242 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
243 -IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
244 -
245 -CDEPEND="
246 - !!app-crypt/heimdal
247 - >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
248 - || (
249 - >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
250 - >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
251 - >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
252 - )
253 - keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
254 - openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
255 - pkinit? (
256 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
257 - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
258 - )
259 - xinetd? ( sys-apps/xinetd )"
260 -DEPEND="${CDEPEND}
261 - ${PYTHON_DEPS}
262 - virtual/yacc
263 - doc? ( virtual/latex-base )
264 - test? (
265 - ${PYTHON_DEPS}
266 - dev-lang/tcl:0
267 - dev-util/dejagnu
268 - )"
269 -RDEPEND="${CDEPEND}
270 - selinux? ( sec-policy/selinux-kerberos )"
271 -
272 -S=${WORKDIR}/${MY_P}/src
273 -
274 -MULTILIB_CHOST_TOOLS=(
275 - /usr/bin/krb5-config
276 -)
277 -
278 -src_prepare() {
279 - eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
280 - eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
281 - eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
282 - eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
283 - eapply -p2 "${FILESDIR}/${PN}-1.15.2-fix-pkinit.patch"
284 -
285 - # Make sure we always use the system copies.
286 - rm -rf util/{et,ss,verto}
287 - sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
288 -
289 - eapply_user
290 - eautoreconf
291 -}
292 -
293 -src_configure() {
294 - # QA
295 - append-flags -fno-strict-aliasing
296 - append-flags -fno-strict-overflow
297 -
298 - multilib-minimal_src_configure
299 -}
300 -
301 -multilib_src_configure() {
302 - use keyutils || export ac_cv_header_keyutils_h=no
303 - ECONF_SOURCE=${S} \
304 - WARN_CFLAGS="set" \
305 - econf \
306 - $(use_with openldap ldap) \
307 - "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
308 - $(use_enable nls) \
309 - $(use_enable pkinit) \
310 - $(use_enable threads thread-support) \
311 - --without-hesiod \
312 - --enable-shared \
313 - --with-system-et \
314 - --with-system-ss \
315 - --enable-dns-for-realm \
316 - --enable-kdc-lookaside-cache \
317 - --with-system-verto \
318 - --disable-rpath
319 -}
320 -
321 -multilib_src_compile() {
322 - emake -j1
323 -}
324 -
325 -multilib_src_test() {
326 - multilib_is_native_abi && emake -j1 check
327 -}
328 -
329 -multilib_src_install() {
330 - emake \
331 - DESTDIR="${D}" \
332 - EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
333 - install
334 -}
335 -
336 -multilib_src_install_all() {
337 - # default database dir
338 - keepdir /var/lib/krb5kdc
339 -
340 - cd ..
341 - dodoc README
342 -
343 - if use doc; then
344 - dodoc -r doc/html
345 - docinto pdf
346 - dodoc doc/pdf/*.pdf
347 - fi
348 -
349 - newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
350 - newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
351 - newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
352 - newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
353 - newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
354 - newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
355 -
356 - insinto /etc
357 - newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
358 - insinto /var/lib/krb5kdc
359 - newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
360 -
361 - if use openldap ; then
362 - insinto /etc/openldap/schema
363 - doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
364 - fi
365 -
366 - if use xinetd ; then
367 - insinto /etc/xinetd.d
368 - newins "${FILESDIR}/kpropd.xinetd" kpropd
369 - fi
370 -}
371
372 diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
373 deleted file mode 100644
374 index 9b63538a0b3..00000000000
375 --- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
376 +++ /dev/null
377 @@ -1,144 +0,0 @@
378 -# Copyright 1999-2018 Gentoo Foundation
379 -# Distributed under the terms of the GNU General Public License v2
380 -
381 -EAPI=6
382 -
383 -PYTHON_COMPAT=( python2_7 )
384 -inherit autotools flag-o-matic multilib-minimal python-any-r1 versionator
385 -
386 -MY_P="${P/mit-}"
387 -P_DIR=$(get_version_component_range 1-2)
388 -DESCRIPTION="MIT Kerberos V"
389 -HOMEPAGE="http://web.mit.edu/kerberos/www/"
390 -SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
391 -
392 -LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
393 -SLOT="0"
394 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
395 -IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
396 -
397 -CDEPEND="
398 - !!app-crypt/heimdal
399 - >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
400 - || (
401 - >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
402 - >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
403 - >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
404 - )
405 - keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
406 - openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
407 - pkinit? (
408 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
409 - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
410 - )
411 - xinetd? ( sys-apps/xinetd )"
412 -DEPEND="${CDEPEND}
413 - ${PYTHON_DEPS}
414 - virtual/yacc
415 - doc? ( virtual/latex-base )
416 - test? (
417 - ${PYTHON_DEPS}
418 - dev-lang/tcl:0
419 - dev-util/dejagnu
420 - )"
421 -RDEPEND="${CDEPEND}
422 - selinux? ( sec-policy/selinux-kerberos )"
423 -
424 -S=${WORKDIR}/${MY_P}/src
425 -
426 -MULTILIB_CHOST_TOOLS=(
427 - /usr/bin/krb5-config
428 -)
429 -
430 -src_prepare() {
431 - eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
432 - eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
433 - eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
434 - eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
435 -
436 - # Make sure we always use the system copies.
437 - rm -rf util/{et,ss,verto}
438 - sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
439 -
440 - eapply_user
441 - eautoreconf
442 -}
443 -
444 -src_configure() {
445 - # QA
446 - append-flags -fno-strict-aliasing
447 - append-flags -fno-strict-overflow
448 -
449 - multilib-minimal_src_configure
450 -}
451 -
452 -multilib_src_configure() {
453 - use keyutils || export ac_cv_header_keyutils_h=no
454 - ECONF_SOURCE=${S} \
455 - WARN_CFLAGS="set" \
456 - econf \
457 - $(use_with openldap ldap) \
458 - "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
459 - $(use_enable nls) \
460 - $(use_enable pkinit) \
461 - $(use_enable threads thread-support) \
462 - --without-hesiod \
463 - --enable-shared \
464 - --with-system-et \
465 - --with-system-ss \
466 - --enable-dns-for-realm \
467 - --enable-kdc-lookaside-cache \
468 - --with-system-verto \
469 - --disable-rpath
470 -}
471 -
472 -multilib_src_compile() {
473 - emake -j1
474 -}
475 -
476 -multilib_src_test() {
477 - multilib_is_native_abi && emake -j1 check
478 -}
479 -
480 -multilib_src_install() {
481 - emake \
482 - DESTDIR="${D}" \
483 - EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
484 - install
485 -}
486 -
487 -multilib_src_install_all() {
488 - # default database dir
489 - keepdir /var/lib/krb5kdc
490 -
491 - cd ..
492 - dodoc README
493 -
494 - if use doc; then
495 - dodoc -r doc/html
496 - docinto pdf
497 - dodoc doc/pdf/*.pdf
498 - fi
499 -
500 - newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
501 - newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
502 - newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
503 - newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
504 - newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
505 - newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
506 -
507 - insinto /etc
508 - newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
509 - insinto /var/lib/krb5kdc
510 - newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
511 -
512 - if use openldap ; then
513 - insinto /etc/openldap/schema
514 - doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
515 - fi
516 -
517 - if use xinetd ; then
518 - insinto /etc/xinetd.d
519 - newins "${FILESDIR}/kpropd.xinetd" kpropd
520 - fi
521 -}
522
523 diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
524 deleted file mode 100644
525 index 94966e19df3..00000000000
526 --- a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
527 +++ /dev/null
528 @@ -1,152 +0,0 @@
529 -# Copyright 1999-2018 Gentoo Foundation
530 -# Distributed under the terms of the GNU General Public License v2
531 -
532 -EAPI=6
533 -
534 -PYTHON_COMPAT=( python2_7 )
535 -inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd versionator
536 -
537 -MY_P="${P/mit-}"
538 -P_DIR=$(get_version_component_range 1-2)
539 -DESCRIPTION="MIT Kerberos V"
540 -HOMEPAGE="https://web.mit.edu/kerberos/www/"
541 -SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
542 -
543 -LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
544 -SLOT="0"
545 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
546 -IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
547 -
548 -# Test suite require network access
549 -RESTRICT="test"
550 -
551 -CDEPEND="
552 - !!app-crypt/heimdal
553 - >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
554 - || (
555 - >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
556 - >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
557 - >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
558 - )
559 - keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
560 - openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
561 - pkinit? (
562 - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
563 - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
564 - )
565 - xinetd? ( sys-apps/xinetd )"
566 -DEPEND="${CDEPEND}
567 - ${PYTHON_DEPS}
568 - virtual/yacc
569 - doc? ( virtual/latex-base )
570 - test? (
571 - ${PYTHON_DEPS}
572 - dev-lang/tcl:0
573 - dev-util/dejagnu
574 - )"
575 -RDEPEND="${CDEPEND}
576 - selinux? ( sec-policy/selinux-kerberos )"
577 -
578 -S=${WORKDIR}/${MY_P}/src
579 -
580 -MULTILIB_CHOST_TOOLS=(
581 - /usr/bin/krb5-config
582 -)
583 -
584 -src_prepare() {
585 - eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
586 - eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
587 - eapply "${FILESDIR}/${PN}-libressl-version-check.patch"
588 -
589 - # Make sure we always use the system copies.
590 - rm -rf util/{et,ss,verto}
591 - sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
592 -
593 - eapply_user
594 - eautoreconf
595 -}
596 -
597 -src_configure() {
598 - # QA
599 - append-flags -fno-strict-aliasing
600 - append-flags -fno-strict-overflow
601 -
602 - multilib-minimal_src_configure
603 -}
604 -
605 -multilib_src_configure() {
606 - use keyutils || export ac_cv_header_keyutils_h=no
607 - ECONF_SOURCE=${S} \
608 - WARN_CFLAGS="set" \
609 - econf \
610 - $(use_with openldap ldap) \
611 - "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
612 - $(use_enable nls) \
613 - $(use_enable pkinit) \
614 - $(use_enable threads thread-support) \
615 - --without-hesiod \
616 - --enable-shared \
617 - --with-system-et \
618 - --with-system-ss \
619 - --enable-dns-for-realm \
620 - --enable-kdc-lookaside-cache \
621 - --with-system-verto \
622 - --disable-rpath
623 -}
624 -
625 -multilib_src_compile() {
626 - emake -j1
627 -}
628 -
629 -multilib_src_test() {
630 - multilib_is_native_abi && emake -j1 check
631 -}
632 -
633 -multilib_src_install() {
634 - emake \
635 - DESTDIR="${D}" \
636 - EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
637 - install
638 -}
639 -
640 -multilib_src_install_all() {
641 - # default database dir
642 - keepdir /var/lib/krb5kdc
643 -
644 - cd ..
645 - dodoc README
646 -
647 - if use doc; then
648 - dodoc -r doc/html
649 - docinto pdf
650 - dodoc doc/pdf/*.pdf
651 - fi
652 -
653 - newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
654 - newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
655 - newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
656 - newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
657 - newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
658 - newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
659 -
660 - systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
661 - systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
662 - systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
663 - systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
664 - systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
665 -
666 - insinto /etc
667 - newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
668 - insinto /var/lib/krb5kdc
669 - newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
670 -
671 - if use openldap ; then
672 - insinto /etc/openldap/schema
673 - doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
674 - fi
675 -
676 - if use xinetd ; then
677 - insinto /etc/xinetd.d
678 - newins "${FILESDIR}/kpropd.xinetd" kpropd
679 - fi
680 -}