app-crypt/mit-krb5: Sync with Gentoo's latest stable

This commit is contained in:
Kai Lüke 2020-08-05 16:48:40 +00:00
parent d731c2b6d7
commit 2e60c26cd3
18 changed files with 260 additions and 2433 deletions

View File

@ -1,280 +0,0 @@
# ChangeLog for app-crypt/mit-krb5
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*mit-krb5-1.13.2 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +files/kpropd.xinetd,
+files/mit-krb5-1.12_warn_cflags.patch,
+files/mit-krb5-config_LDFLAGS.patch, +files/mit-krb5kadmind.initd-r1,
+files/mit-krb5kdc.initd-r1, +files/mit-krb5kpropd.initd-r1, +metadata.xml,
+mit-krb5-1.13.2.ebuild:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
*mit-krb5-1.13.2-r1 (04 Oct 2015)
04 Oct 2015; Julian Ospald <hasufell@gentoo.org> +mit-krb5-1.13.2-r1.ebuild:
add libressl support
*mit-krb5-1.13.2-r2 (29 Oct 2015)
29 Oct 2015; Eray Aslan <eras@gentoo.org> +files/mit-krb5kadmind.confd,
+files/mit-krb5kadmind.initd-r2, +files/mit-krb5kdc.confd,
+files/mit-krb5kdc.initd-r2, +files/mit-krb5kpropd.confd,
+files/mit-krb5kpropd.initd-r2, +mit-krb5-1.13.2-r2.ebuild:
add confd files to kdc, kadmind and kpropd daemons
Gentoo-Bug: 539010
Thanks to Paul B. Henson
Package-Manager: portage-2.2.23
29 Oct 2015; Eray Aslan <eras@gentoo.org> +files/CVE-2015-2695.patch,
+files/CVE-2015-2696.patch, +files/CVE-2015-2697.patch,
mit-krb5-1.13.2-r2.ebuild:
security bump
Gentoo-Bug: 564304
Package-Manager: portage-2.2.23
29 Oct 2015; Jeroen Roovers <jer@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
Stable for PPC64 (bug #564304).
Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches
29 Oct 2015; Jeroen Roovers <jer@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
Stable for HPPA (bug #564304).
Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches
29 Oct 2015; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
amd64 stable wrt bug #564304
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
29 Oct 2015; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
x86 stable wrt bug #564304
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
01 Nov 2015; Tobias Klausmann <klausman@gentoo.org>
mit-krb5-1.13.2-r2.ebuild:
add alpha keyword
Gentoo-Bug: 564304
Package-Manager: portage-2.2.23
03 Nov 2015; Markus Meier <maekke@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
arm stable, bug #564304
Package-Manager: portage-2.2.23
RepoMan-Options: --include-arches="arm"
04 Nov 2015; Eray Aslan <eras@gentoo.org> files/mit-krb5kadmind.initd-r2,
files/mit-krb5kdc.initd-r2, files/mit-krb5kpropd.initd-r2:
fix quotes in init script
Gentoo-Bug: 564574
Package-Manager: portage-2.2.23
*mit-krb5-1.13.2-r3 (04 Nov 2015)
04 Nov 2015; Eray Aslan <eras@gentoo.org> +mit-krb5-1.13.2-r3.ebuild:
bump for the new init scripts
Package-Manager: portage-2.2.23
04 Nov 2015; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
ppc stable wrt bug #564304
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"
05 Nov 2015; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
sparc stable wrt bug #564304
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="sparc"
07 Nov 2015; Mikle Kolyada <zlogene@gentoo.org> mit-krb5-1.13.2-r2.ebuild:
ia64 stable wrt bug #564304
Package-Manager: portage-2.2.20.1
23 Nov 2015; Eray Aslan <eras@gentoo.org> -mit-krb5-1.13.2.ebuild,
-mit-krb5-1.13.2-r1.ebuild:
remove vulnerable versions
Package-Manager: portage-2.2.25
*mit-krb5-1.14 (23 Nov 2015)
23 Nov 2015; Eray Aslan <eras@gentoo.org> +mit-krb5-1.14.ebuild:
version bump to mit-krb5-1.14
Package-Manager: portage-2.2.25
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)
*mit-krb5-1.14.1 (02 Mar 2016)
02 Mar 2016; Eray Aslan <eras@gentoo.org> +mit-krb5-1.14.1.ebuild:
version bump to 1.14.1
Package-Manager: portage-2.2.27
02 Mar 2016; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.14.1.ebuild:
amd64 stable wrt bug #574604
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
06 Mar 2016; Jeroen Roovers <jer@gentoo.org> mit-krb5-1.14.1.ebuild:
Stable for PPC64 (bug #574604).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
06 Mar 2016; Jeroen Roovers <jer@gentoo.org> mit-krb5-1.14.1.ebuild:
Stable for HPPA (bug #574604).
Package-Manager: portage-2.2.27
RepoMan-Options: --ignore-arches
12 Mar 2016; Markus Meier <maekke@gentoo.org> mit-krb5-1.14.1.ebuild:
arm stable, bug #574604
Package-Manager: portage-2.2.27
RepoMan-Options: --include-arches="arm"
15 Mar 2016; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.14.1.ebuild:
x86 stable wrt bug #574604
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
15 Mar 2016; Tobias Klausmann <klausman@gentoo.org> mit-krb5-1.14.1.ebuild:
1.14.1-r0: add alpha keyword
Gentoo-Bug: 574604
Package-Manager: portage-2.2.28
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.14.1.ebuild:
ppc stable wrt bug #574604
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
19 Mar 2016; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.14.1.ebuild:
sparc stable wrt bug #574604
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
20 Mar 2016; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.14.1.ebuild:
ia64 stable wrt bug #574604
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
*mit-krb5-1.14.2 (21 Apr 2016)
21 Apr 2016; Eray Aslan <eras@gentoo.org> +mit-krb5-1.14.2.ebuild:
Security bump - bug 577930
Package-Manager: portage-2.2.28
21 Apr 2016; Eray Aslan <eras@gentoo.org> -files/CVE-2015-2695.patch,
-files/CVE-2015-2696.patch, -files/CVE-2015-2697.patch,
-files/mit-krb5kadmind.initd-r1, -files/mit-krb5kdc.initd-r1,
-files/mit-krb5kpropd.initd-r1, -mit-krb5-1.13.2-r2.ebuild,
-mit-krb5-1.13.2-r3.ebuild, -mit-krb5-1.14.ebuild:
Remove vulnerable versions
Package-Manager: portage-2.2.28
23 Apr 2016; Jeroen Roovers <jer@gentoo.org> mit-krb5-1.14.2.ebuild:
Stable for HPPA PPC64 (bug #577930).
Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches
26 Apr 2016; Agostino Sarubbo <ago@gentoo.org> mit-krb5-1.14.2.ebuild:
amd64 stable wrt bug #577930
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
26 Apr 2016; Markus Meier <maekke@gentoo.org> mit-krb5-1.14.2.ebuild:
arm stable, bug #577930
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

View File

@ -1,16 +1 @@
AUX kpropd.xinetd 194 SHA256 eaa3838a6ca8db901db359cac3435d4f703a9a10534f02eeb37f494dd21a1736 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f WHIRLPOOL d77ae7b0094c4f42a7ea9cee5d36d0dba844a9ed5d59c621e47c7fa4b75c84fec3414e079c570513711b378d1b0fef61156f675a0df79ee61540d9492416fe42 DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
AUX mit-krb5-1.12_warn_cflags.patch 448 SHA256 67d3c91061933bd5393b9a6ee8fe2e3f5cd287c4eee7b92798cc2e201712c681 SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b WHIRLPOOL 9fa704dde00b0201d765199893bf787c5c104070596b05bc12e7f41ae21c4c60c8d25b21fe8573ecd3e63ab769238a78c5cf70f4d086a23f71423b1cad283eaa
AUX mit-krb5-config_LDFLAGS.patch 466 SHA256 fbb4d9be71ef536a344d415b9c56ea42c5c2a2ef02ec3a866d9da47b3acd93d3 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7 WHIRLPOOL f6c58e652c4c365c4f28894d404413a075cc6c5323f83b18d711dc831bb574623db371ccbc1a5aae0ddf030a1b85e1ad50c06f5904ae5554bb4026e464a2c75f
AUX mit-krb5kadmind.confd 76 SHA256 f1b6c29defb5a37c83e6e3fd52c57f4a538a64a1cfe6e114663150fdf1042796 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3 WHIRLPOOL d3b92cf015b58724124edf0bc107cb0b5bcae347cfc6690689b4beb4a82ff8e445225eb44cd6be43ccd10082d0905e64bc28bcf88e32048205d5ec07abdb8295
AUX mit-krb5kadmind.initd-r2 611 SHA256 30babdd907aee27183ea904e84d2a6fdd3d1fb1bc814a67297cb6ded96fa577f SHA512 58a3c01fb142ad47991ca3e8405334f51813f21d2dbe4f997ac5a571eaa926a0a5218fc308858c75767aaeaa32223d0dc90b9cb110207ff5d7bff20b4c783e58 WHIRLPOOL e78661986a3c8161599011547380fd92b56d57569624061777482145801378c32d58d8b3b24380397f73b2eabf805430702c84d7734cbcabb956312a9721ba2e
AUX mit-krb5kdc.confd 54 SHA256 351b9d541a4d8cc423f277585f5330772c5aec6f43170df7bbf17078990a04c8 SHA512 bd51139b644350f464fe4d254cc5036e96a7f5b0156033e1fdeed1acee6867052bddfe3495893295e83f56dfdff1c30a606bd64faeba58cc9a5bcd6cde5c6b9c WHIRLPOOL 595361668318589819b11eaee3bce4d5f7bbe46c6930a99ce744639381e649d176f74e01da1ab98e1efdb091601537cc2b46c7e38de44d0c830686e4fcc53703
AUX mit-krb5kdc.initd-r2 571 SHA256 3627e48af13173b46f391bb67d038035e2ed371a45e2c9d3439a942261610a33 SHA512 1e9b0325a29962f0727860665e9b8d6ef7be5a690e85c548a82bcf3f4c183b5b8f5815a4155fd30ff97c0469f9d56a7f7cd4ab76d3851254513b0651085f4933 WHIRLPOOL a98ec253a59d20eee3721e4aee769f999f70a550eae26db54fb2141004daff764fb7cf1c0325819e5a5e589a9685a349567c0a86680eee7bf0ca55fcdefe90ad
AUX mit-krb5kpropd.confd 84 SHA256 9e93615c951ef5f598f09bf6b679fefb3d7943fef1373c24b9fdfbded9cb8cef SHA512 afd1cf21a6afd3bc73b1ef3cb0a26ec3420b26ed31196f8c092ae880b235043273c95e2ecb3b88e65ea008cd8ea6a10553d1966f45646cf5993d5752dfc945ac WHIRLPOOL cbb4ab8f7fb1f605d2fbce09d259993ba908f5880f54b4d6cc5e81a6ffd2c4a26b80b0e122bc4b0af0b4bd6383732a0ed5ddef9f654b2f70482855d165757065
AUX mit-krb5kpropd.initd-r2 607 SHA256 26649023e2dea5fd98c71f7573b4511d78cc9a2a37858e9cd6d0896f327812b1 SHA512 ce3d5f2818273653868315b0648a6a2bbfbc37793f2a4876c36167612da5013c625a416254fc44981bb83edca5ca66957a06e94d1a2f468db63786682b0d67c6 WHIRLPOOL 68be109cd29e7592579170f7573093d8415df8f88dad65601308a515529ae99fcf54d7c6d6e62f3a6a3528b4d039e5a07b3d537d000bd6d87ed38b1677582b8c
DIST krb5-1.14.1.tar.gz 12259025 SHA256 c8faa44574246f5bd0ce5a3dedc48c32db48a74cc4323949bf70f0ac2d6f1a99 SHA512 5d64bb30ecb9e267e2494cea4995d8cc314916d8f6a9318fb80067ae6389ad7468656400d996698b6dc0bdb4c1355c13701b570521a7c40008cf1f83df24847d WHIRLPOOL 2d4ab7e8e65d27ce207bd1d254586f95c8b219c01d2deb2fe60f8d5f84e13cd52881bbc2b51c1ee2d40a81570afa15d46c8446e5c6ec052e7621b76d34b72a7d
DIST krb5-1.14.2.tar.gz 12264762 SHA256 6bcad7e6778d1965e4ce4af21d2efdc15b274c5ce5c69031c58e4c954cda8b27 SHA512 8e0d8203740aac78b65a62c0f79998b56dae23725763f645ae13a92dc4263d193e7334f84e278ca873d2b72d425f47cd4b68b58690d029dccce41e8a157b16f0 WHIRLPOOL 18a3729f5bfb928318f5cc28c919cbc49ee9179199ee82445922a5f2e8afbf4ed5a31f7e710877f8c12ef75f326723e7410608ce538983ce1b811e16091d72a1
EBUILD mit-krb5-1.14.1.ebuild 3943 SHA256 a74e42829d945b2709bdd97155e50cb0b5bb6e949f9117bed1a5f8656cdf5d64 SHA512 faa544cb5fb5f95bcdeac760b0f75daaccb38aa77dcf959d482ded5f8269ecd71d60eccd764decb8788f2d8e3e2f6e568731016704af6ce95c3689ad7c782f31 WHIRLPOOL 5729573cd4736c5b390c7a0bae04885f3116248c969e0dcf87135feae5397de4a77d29f4a066dc51f012f5ffa5e57f56045a387da566fb2ef4733b046edf378a
EBUILD mit-krb5-1.14.2.ebuild 3948 SHA256 844962ebcc02bb13d2f8edf133c41d9bdebca5c081b6c7c620b4dd45fb9a5232 SHA512 ca28796b5207c638a2b4b7a7bc1ef37fcf85b450f72d5057568f3810885b4b556808d7dbd048defa6714998788852487ca02684ae3309e1456f5913808bfa24c WHIRLPOOL 84dff3e0a1ac3ef80a9337fc9018f892bd384a6285d99217246a45a2fef0a663731a3f8b2ef71abf55f3a215941d7a6565815872b0caf96a7528e9795c13e7e7
MISC ChangeLog 8904 SHA256 2e80447f6d03280e780e1703f810dd131907821bf2782d009695dd42ed60ea3d SHA512 8ca6fbb3d5cf56c610eace4a9018765cf373f694d773269ca45e1f7a6cb1e6c98c7ae8af2a192d7154b175920fd197124f2cd47b98a029be828d9cc17189eb67 WHIRLPOOL f85e7a814549f0c39628a4ed1f776b91bd8033d85464fc0672a7f7c8c6501a1f62b5ebe6a35478809e7bdc48d13372e020f3c0818b4a0b5036087d7894c7f9c7
MISC ChangeLog-2015 69731 SHA256 b36a2d9ca5172503de725c371c312d47f4eea26af2d43011d1c2c23f6f637a6f SHA512 9d54838fda9eade825266ff2480848c0d1cdd89dba306fd2598f75399eca04440517ed78844d742c17da48cbb6f3c80c6212eed2fba715a0f8dd58f8635badfa WHIRLPOOL 47435d373fa97d0eaa99f92870f7e759b8a1defc0f41b668ea05b3c72b93d0b4d0516639f326417744cc30008a871b20365301c5bf0b6676b22e61d092c7cd4b
MISC metadata.xml 749 SHA256 02314581ba8ee6bc25734eee519fe637f109ee569d553f8544d55bdad6cd45a0 SHA512 6079fc2cbf35af74bade1f9dce37f86c615eae4926a77432980616255d73bb26497f32e35cf25f76ec47d1c6b046b4a260ad71b5636f76d1635422f1b2df5464 WHIRLPOOL 849b836222ab61a417d6bab3004a0faf9c10bda452c3bc24aaf0497c1ee23d49b4b0833a6ce9c746201aaa57fac05b7bf6484094442439f5b8f4b63ecde2a01d

View File

@ -0,0 +1,101 @@
From 58263cbf3106f4c9c9a2252794093014a2f9c01f Mon Sep 17 00:00:00 2001
From: Stefan Strogin <stefan.strogin@gmail.com>
Date: Thu, 25 Apr 2019 03:48:10 +0300
Subject: [PATCH] Fix build for LibreSSL 2.9.x
asn1_mac.h is removed from LibreSSL 2.9.0, but static_ASN1_*() methods
are not defined. Define them.
Upstream-Status: Pending
[Needs to be amended if
https://github.com/libressl-portable/openbsd/pull/109 is accepted]
Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
---
.../preauth/pkinit/pkinit_crypto_openssl.c | 13 ++++++++----
.../preauth/pkinit/pkinit_crypto_openssl.h | 20 ++++++++++++++++++-
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
index 2064eb7bd..81d5d3cf2 100644
--- a/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+++ b/plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -188,14 +188,16 @@ pkinit_pkcs11_code_to_text(int err);
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-/* 1.1 standardizes constructor and destructor names, renaming
- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
+/* 1.1 (and LibreSSL 2.7) standardizes constructor and destructor names,
+ * renaming EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
#define EVP_MD_CTX_new EVP_MD_CTX_create
#define EVP_MD_CTX_free EVP_MD_CTX_destroy
#define ASN1_STRING_get0_data ASN1_STRING_data
+#endif
/* 1.1 makes many handle types opaque and adds accessors. Add compatibility
* versions of the new accessors we use for pre-1.1. */
@@ -203,6 +205,7 @@ pkinit_pkcs11_code_to_text(int err);
#define OBJ_get0_data(o) ((o)->data)
#define OBJ_length(o) ((o)->length)
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
#define DH_set0_pqg compat_dh_set0_pqg
static int compat_dh_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
{
@@ -235,6 +238,7 @@ static void compat_dh_get0_key(const DH *dh, const BIGNUM **pub,
if (priv != NULL)
*priv = dh->priv_key;
}
+#endif /* LIBRESSL_VERSION_NUMBER */
/* Return true if the cert c includes a key usage which doesn't include u.
* Define using direct member access for pre-1.1. */
@@ -3040,7 +3044,8 @@ cleanup:
return retval;
}
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
+ LIBRESSL_VERSION_NUMBER >= 0x2090000fL
/*
* We need to decode DomainParameters from RFC 3279 section 2.3.3. We would
diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
index 7411348fa..ac91408c4 100644
--- a/plugins/preauth/pkinit/pkinit_crypto_openssl.h
+++ b/plugins/preauth/pkinit/pkinit_crypto_openssl.h
@@ -46,7 +46,25 @@
#include <openssl/asn1.h>
#include <openssl/pem.h>
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
+ LIBRESSL_VERSION_NUMBER >= 0x2090000fL
+
+#ifndef static_ASN1_SEQUENCE_END_name
+#define static_ASN1_ITEM_start(itname) \
+ static const ASN1_ITEM itname##_it = {
+#define static_ASN1_SEQUENCE_END_name(stname, tname) \
+ ;\
+ static_ASN1_ITEM_start(tname) \
+ ASN1_ITYPE_SEQUENCE,\
+ V_ASN1_SEQUENCE,\
+ tname##_seq_tt,\
+ sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
+ NULL,\
+ sizeof(stname),\
+ #stname \
+ ASN1_ITEM_end(tname)
+#endif /* !defined(static_ASN1_SEQUENCE_END_name) */
+
#include <openssl/asn1t.h>
#else
#include <openssl/asn1_mac.h>
--
2.21.0

View File

@ -0,0 +1,42 @@
From e3e3bc2a20795becda6e130d511fe59f04635624 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <steils@gentoo.org>
Date: Sat, 15 Feb 2020 10:27:20 +0200
Subject: [PATCH] Fix compilation for LibreSSL 3.0.2
RSA_PKCS1_OpenSSL() is provided in LibreSSL the master branch,
expected to be in the next release.
See: https://github.com/libressl-portable/openbsd/commit/3a8c41f3a84868337fde01ec1122198ec60bdc8e
Bug: https://bugs.gentoo.org/709640
Signed-off-by: Stefan Strogin <steils@gentoo.org>
---
tests/softpkcs11/main.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/softpkcs11/main.c b/tests/softpkcs11/main.c
index 1cccdfb43..a5099fbe4 100644
--- a/tests/softpkcs11/main.c
+++ b/tests/softpkcs11/main.c
@@ -47,7 +47,6 @@
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define EVP_PKEY_get0_RSA(key) ((key)->pkey.rsa)
-#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
#define RSA_get0_key compat_rsa_get0_key
static void
compat_rsa_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e,
@@ -62,6 +61,11 @@ compat_rsa_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e,
}
#endif
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x3000200fL)
+#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
+#endif
+
#define OPENSSL_ASN1_MALLOC_ENCODE(T, B, BL, S, R) \
{ \
unsigned char *p; \
--
2.25.0

View File

@ -1,6 +1,6 @@
Bug #448778 Bug #448778
--- a/src/build-tools/krb5-config.in 2012-12-18 02:47:04.000000000 +0000 --- a/build-tools/krb5-config.in 2012-12-18 02:47:04.000000000 +0000
+++ b/src/build-tools/krb5-config.in 2012-12-28 07:13:16.582693363 +0000 +++ b/build-tools/krb5-config.in 2012-12-28 07:13:16.582693363 +0000
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
-e 's#\$(PROG_RPATH)#'$libdir'#' \ -e 's#\$(PROG_RPATH)#'$libdir'#' \
-e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \

View File

@ -0,0 +1,10 @@
--- src/Makefile.in 2019-12-12 10:15:51.674552983 +0300
+++ src/Makefile.in 2019-12-12 10:16:33.205543490 +0300
@@ -71,7 +71,6 @@
$(KRB5_AD_MODULE_DIR) \
$(KRB5_LIBKRB5_MODULE_DIR) $(KRB5_TLS_MODULE_DIR) \
@localstatedir@ @localstatedir@/krb5kdc \
- @runstatedir@ @runstatedir@/krb5kdc \
$(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR) \
$(PKGCONFIG_DIR)

View File

@ -1,4 +1,4 @@
#!/sbin/runscript #!/sbin/openrc-run
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# This script starts/stops the MIT Kerberos 5 Admin daemon # This script starts/stops the MIT Kerberos 5 Admin daemon

View File

@ -0,0 +1,8 @@
[Unit]
Description=Kerberos 5 administration server
[Service]
ExecStart=/usr/sbin/kadmind -nofork
[Install]
WantedBy=multi-user.target

View File

@ -1,4 +1,4 @@
#!/sbin/runscript #!/sbin/openrc-run
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# This script starts/stops the MIT Kerberos 5 KDC # This script starts/stops the MIT Kerberos 5 KDC

View File

@ -0,0 +1,9 @@
[Unit]
Description=Kerberos 5 KDC
[Service]
ExecStart=/usr/sbin/krb5kdc -n
Restart=always
[Install]
WantedBy=multi-user.target

View File

@ -1,4 +1,4 @@
#!/sbin/runscript #!/sbin/openrc-run
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# This script starts/stops the MIT Kerberos 5 kpropd # This script starts/stops the MIT Kerberos 5 kpropd

View File

@ -0,0 +1,8 @@
[Unit]
Description=Kerberos 5 propagation server
[Service]
ExecStart=/usr/sbin/kpropd -S
[Install]
WantedBy=multi-user.target

View File

@ -0,0 +1,9 @@
[Unit]
Description=Kerberos 5 propagation server
[Socket]
ListenStream=754
Accept=yes
[Install]
WantedBy=sockets.target

View File

@ -0,0 +1,8 @@
[Unit]
Description=Kerberos 5 propagation server
Conflicts=mit-krb5kpropd.service
[Service]
ExecStart=/usr/sbin/kpropd
StandardInput=socket
StandardError=syslog

View File

@ -10,10 +10,14 @@
<flag name="doc"> <flag name="doc">
Creates and installs the API and implementation Creates and installs the API and implementation
documentation. This is only useful if you want to develop software documentation. This is only useful if you want to develop software
which depends on kerberos. which depends on kerberos
</flag> </flag>
<flag name="keyutils">Enable for the keyring ccache using keyutils.</flag> <flag name="keyutils">Enable for the keyring ccache using keyutils</flag>
<flag name="pkinit">Enable pkinit support for the initial ticket.</flag> <flag name="lmdb">Add support for using dev-db/lmdb for lookup tables</flag>
<flag name="openldap">Enable support for ldap as a database backend.</flag> <flag name="pkinit">Enable pkinit support for the initial ticket</flag>
<flag name="openldap">Enable support for ldap as a database backend</flag>
</use> </use>
<upstream>
<remote-id type="cpe">cpe:/a:mit:kerberos</remote-id>
</upstream>
</pkgmetadata> </pkgmetadata>

View File

@ -1,151 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator
MY_P="${P/mit-}"
P_DIR=$(get_version_component_range 1-2)
DESCRIPTION="MIT Kerberos V"
HOMEPAGE="http://web.mit.edu/kerberos/www/"
SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
CDEPEND="
!!app-crypt/heimdal
>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
|| (
>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
)
keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] )
openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
pkinit? (
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
)
xinetd? ( sys-apps/xinetd )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
DEPEND="${CDEPEND}
${PYTHON_DEPS}
virtual/yacc
doc? ( virtual/latex-base )
test? (
${PYTHON_DEPS}
dev-lang/tcl:0
dev-util/dejagnu
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-kerberos )"
S=${WORKDIR}/${MY_P}/src
MULTILIB_CHOST_TOOLS=(
/usr/bin/krb5-config
)
src_prepare() {
epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
eautoreconf
}
src_configure() {
append-cppflags "-I${EPREFIX}/usr/include/et"
# QA
append-flags -fno-strict-aliasing
append-flags -fno-strict-overflow
multilib-minimal_src_configure
}
multilib_src_configure() {
use keyutils || export ac_cv_header_keyutils_h=no
ECONF_SOURCE=${S} \
WARN_CFLAGS="set" \
econf \
$(use_with openldap ldap) \
"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
$(use_enable pkinit) \
$(use_enable threads thread-support) \
--without-hesiod \
--enable-shared \
--with-system-et \
--with-system-ss \
--enable-dns-for-realm \
--enable-kdc-lookaside-cache \
--with-system-verto \
--disable-rpath
}
multilib_src_compile() {
emake -j1
}
multilib_src_test() {
multilib_is_native_abi && emake -j1 check
}
multilib_src_install() {
emake \
DESTDIR="${D}" \
EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
install
}
multilib_src_install_all() {
# default database dir
keepdir /var/lib/krb5kdc
cd ..
dodoc README
if use doc; then
dohtml -r doc/html/*
docinto pdf
dodoc doc/pdf/*.pdf
fi
newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
insinto /etc
newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
insinto /var/lib/krb5kdc
newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
if use openldap ; then
insinto /etc/openldap/schema
doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
fi
if use xinetd ; then
insinto /etc/xinetd.d
newins "${FILESDIR}/kpropd.xinetd" kpropd
fi
}
pkg_preinst() {
if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
elog "MIT split the Kerberos applications from the base Kerberos"
elog "distribution. Kerberized versions of telnet, rlogin, rsh, rcp,"
elog "ftp clients and telnet, ftp deamons now live in"
elog "\"app-crypt/mit-krb5-appl\" package."
fi
}

View File

@ -1,24 +1,26 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5 EAPI=7
PYTHON_COMPAT=( python2_7 ) PYTHON_COMPAT=( python3_{7,8} )
inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
MY_P="${P/mit-}" MY_P="${P/mit-}"
P_DIR=$(get_version_component_range 1-2) P_DIR=$(ver_cut 1-2)
DESCRIPTION="MIT Kerberos V" DESCRIPTION="MIT Kerberos V"
HOMEPAGE="http://web.mit.edu/kerberos/www/" HOMEPAGE="https://web.mit.edu/kerberos/www/"
SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz" SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )" LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd" IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
CDEPEND=" # Test suite requires network access
RESTRICT="test"
DEPEND="
!!app-crypt/heimdal !!app-crypt/heimdal
>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
|| ( || (
@ -26,44 +28,57 @@ CDEPEND="
>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}] >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}] >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
) )
keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
lmdb? ( dev-db/lmdb )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
pkinit? ( pkinit? (
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
) )
xinetd? ( sys-apps/xinetd ) xinetd? ( sys-apps/xinetd )
abi_x86_32? ( "
!<=app-emulation/emul-linux-x86-baselibs-20140508-r1 BDEPEND="
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
DEPEND="${CDEPEND}
${PYTHON_DEPS} ${PYTHON_DEPS}
virtual/yacc virtual/yacc
cpu_flags_x86_aes? (
amd64? ( dev-lang/yasm )
x86? ( dev-lang/yasm )
)
doc? ( virtual/latex-base ) doc? ( virtual/latex-base )
test? ( test? (
${PYTHON_DEPS} ${PYTHON_DEPS}
dev-lang/tcl:0 dev-lang/tcl:0
dev-util/dejagnu dev-util/dejagnu
dev-util/cmocka
)" )"
RDEPEND="${CDEPEND} RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-kerberos )" selinux? ( sec-policy/selinux-kerberos )"
S=${WORKDIR}/${MY_P}/src S=${WORKDIR}/${MY_P}/src
PATCHES=(
"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
"${FILESDIR}/${PN}_dont_create_run.patch"
"${FILESDIR}/${PN}-1.18-libressl.patch"
)
MULTILIB_CHOST_TOOLS=( MULTILIB_CHOST_TOOLS=(
/usr/bin/krb5-config /usr/bin/krb5-config
) )
src_prepare() { src_prepare() {
epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch" default
epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch" # Make sure we always use the system copies.
rm -rf util/{et,ss,verto}
sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
eautoreconf eautoreconf
} }
src_configure() { src_configure() {
append-cppflags "-I${EPREFIX}/usr/include/et"
# QA # QA
append-flags -fno-strict-aliasing append-flags -fno-strict-aliasing
append-flags -fno-strict-overflow append-flags -fno-strict-overflow
@ -72,14 +87,16 @@ src_configure() {
} }
multilib_src_configure() { multilib_src_configure() {
use keyutils || export ac_cv_header_keyutils_h=no
ECONF_SOURCE=${S} \ ECONF_SOURCE=${S} \
WARN_CFLAGS="set" \ WARN_CFLAGS="set" \
econf \ econf \
$(use_with openldap ldap) \ $(use_with openldap ldap) \
"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \ "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
$(use_enable nls) \
$(use_enable pkinit) \ $(use_enable pkinit) \
$(use_enable threads thread-support) \ $(use_enable threads thread-support) \
$(use_with lmdb) \
$(use_with keyutils) \
--without-hesiod \ --without-hesiod \
--enable-shared \ --enable-shared \
--with-system-et \ --with-system-et \
@ -87,7 +104,9 @@ multilib_src_configure() {
--enable-dns-for-realm \ --enable-dns-for-realm \
--enable-kdc-lookaside-cache \ --enable-kdc-lookaside-cache \
--with-system-verto \ --with-system-verto \
--disable-rpath --disable-rpath \
\
AR="$(tc-getAR)"
} }
multilib_src_compile() { multilib_src_compile() {
@ -113,7 +132,7 @@ multilib_src_install_all() {
dodoc README dodoc README
if use doc; then if use doc; then
dohtml -r doc/html/* dodoc -r doc/html
docinto pdf docinto pdf
dodoc doc/pdf/*.pdf dodoc doc/pdf/*.pdf
fi fi
@ -125,6 +144,12 @@ multilib_src_install_all() {
newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
insinto /etc insinto /etc
newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
insinto /var/lib/krb5kdc insinto /var/lib/krb5kdc
@ -140,12 +165,3 @@ multilib_src_install_all() {
newins "${FILESDIR}/kpropd.xinetd" kpropd newins "${FILESDIR}/kpropd.xinetd" kpropd
fi fi
} }
pkg_preinst() {
if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
elog "MIT split the Kerberos applications from the base Kerberos"
elog "distribution. Kerberized versions of telnet, rlogin, rsh, rcp,"
elog "ftp clients and telnet, ftp deamons now live in"
elog "\"app-crypt/mit-krb5-appl\" package."
fi
}