From eccb70a7f91b2d22582587f26d1a28bb31408b45 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 May 2019 00:10:51 +0100 Subject: gentoo resync : 18.05.2019 --- app-crypt/heimdal/Manifest | 7 +- .../files/heimdal_build-headers-before-use.patch | 29 ++++ app-crypt/heimdal/files/heimdal_fix-db60.patch | 11 ++ app-crypt/heimdal/files/heimdal_hcrypto.patch | 45 +++++ app-crypt/heimdal/heimdal-7.6.0.ebuild | 185 +++++++++++++++++++++ app-crypt/heimdal/metadata.xml | 3 + 6 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 app-crypt/heimdal/files/heimdal_build-headers-before-use.patch create mode 100644 app-crypt/heimdal/files/heimdal_fix-db60.patch create mode 100644 app-crypt/heimdal/files/heimdal_hcrypto.patch create mode 100644 app-crypt/heimdal/heimdal-7.6.0.ebuild (limited to 'app-crypt/heimdal') diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest index 373fcd65c83d..28ab34288fa4 100644 --- a/app-crypt/heimdal/Manifest +++ b/app-crypt/heimdal/Manifest @@ -6,9 +6,14 @@ AUX heimdal-kdc.confd 130 BLAKE2B d0cd1667fd48f4fa4fe3ea995e810919225c0976e76818 AUX heimdal-kdc.initd-r2 434 BLAKE2B 2790f2d0732c8ff6d3c0dd0917322f33a1215d523db386465af4eea64b973674abd85ab27e83858d38726711f81ed9f72414de34d4a578f47cf3e34b6afe74ac SHA512 1698a29ff23aef6bcc83153076036297639f38e5b42f12a3f59324ecce3fe7483f99f84e2bc88d27f010d07ebec4f2758d0249a9cb5bd62be40c3e6cc79353c1 AUX heimdal-kpasswdd.confd 148 BLAKE2B 74c70bf236789e8c87bfd928d9108f181ad31c254b02e4cf9b45ba925a2169d8ccb7bd59999f5e98f265020f0a5cffd03ac88ad39aedf0c305346821d9688afb SHA512 198d8f219abdd349213d26119e7cc343956981a5cb7d031186c81cb1a0b3f017097f4a429481089787b1cde6f8f013a8ee3909f6807f44b51531ac19a7a3a17e AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b868e5b3ec16bc6ba0bf80c04f303fb8405cb6a728be79052729076de4df4b85e08277198e75d3c0d3093c464680e SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176 +AUX heimdal_build-headers-before-use.patch 1128 BLAKE2B fa8f4a481304b619797a20dce8a8ac9f912d7f3f3402980da35259839fa9ecea0a84b1fb04dfee93af64699beefcdd9b0cedaa27c0323a568861307fa53ef3cf SHA512 df3257627300456afe4bd4a3a18bff5641cf1f0a9d1f0e74716b46a45ad0e58194ee284930cc1f856e7b74eecd6a590d1a6ef93d40a4b275d899856b46e14128 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e +AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad753189addf11359a01236a03280eb605ff136b290dcc379d182741d924e2392fc05642520278af8ecc310f7 SHA512 b6e80678801eaeee8c1aa2ec317a80b58cad3ca181aad14136cf352c55246ae36a43344b48a01bc9fc19c9ecfa383d9ab10892534ea60d25e36255fa049523a7 +AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131 +DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200 EBUILD heimdal-7.5.0.ebuild 4334 BLAKE2B 33303601d32d3b2c6f54a3681012f854b6addc55b09c65e6d0cea74e8ac91c12de09624e37f3d4f9933c54dbe8de3cf7f258bb99d33d26a25a0c280288777b44 SHA512 6d40e8a30e74b95c918e7ee5bf10b3d017178bd4775bba707ff2dfc02d208c121426b66ebdbb50df09a96f4caa5c55b35f2e8d53cad9eac4f8ebf46b0f6de266 -MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f +EBUILD heimdal-7.6.0.ebuild 4584 BLAKE2B ff8eae26b4d710214f4f57a2c519b1f86d37d9ca9ea479458cee91480c09ea5bb4b4ed5ef5e73cffd53de039d80fd9af106a321e86e98cabbeef114ddd93fb64 SHA512 9bcb272d136ec85950cb3e8589ca95be0caa23a432c719460b146e1487ae4384f984f9f584e47af6261b1d3e30f5ff022cbcb54f492a1ff92cb6b6e71f147c28 +MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28 diff --git a/app-crypt/heimdal/files/heimdal_build-headers-before-use.patch b/app-crypt/heimdal/files/heimdal_build-headers-before-use.patch new file mode 100644 index 000000000000..9460e3dcc245 --- /dev/null +++ b/app-crypt/heimdal/files/heimdal_build-headers-before-use.patch @@ -0,0 +1,29 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906623 + +--- a/lib/hx509/Makefile.am 2019-05-16 08:59:34.326758842 +0300 ++++ b/lib/hx509/Makefile.am 2019-05-16 08:58:43.140804423 +0300 +@@ -147,8 +147,8 @@ + + $(ALL_OBJECTS): $(HX509_PROTOS) + +-$(libhx509_la_OBJECTS): $(srcdir)/hx_locl.h +-$(libhx509_la_OBJECTS): ocsp_asn1.h pkcs10_asn1.h ++$(ALL_OBJECTS): $(srcdir)/hx_locl.h ++$(ALL_OBJECTS): ocsp_asn1.h pkcs10_asn1.h $(dist_include_HEADERS) + + $(srcdir)/hx509-protos.h: $(dist_libhx509_la_SOURCES) + $(heim_verbose)cd $(srcdir) && perl ../../cf/make-proto.pl -R '^(_|^C)' -E HX509_LIB -q -P comment -o hx509-protos.h $(dist_libhx509_la_SOURCES) || rm -f hx509-protos.h +--- a/lib/hcrypto/Makefile.am 2019-05-16 09:02:28.154602045 +0300 ++++ b/lib/hcrypto/Makefile.am 2019-05-16 09:02:10.600617878 +0300 +@@ -102,6 +102,11 @@ + + TESTS = $(PROGRAM_TESTS) $(SCRIPT_TESTS) + ++ALL_OBJECTS = $(libhcrypto_la_OBJECTS) ++ALL_OBJECTS += $(test_rand_OBJECTS) ++ALL_OBJECTS += $(libhctest_la_OBJECTS) ++$(ALL_OBJECTS): | install-build-headers ++ + LDADD = $(lib_LTLIBRARIES) $(LIB_roken) $(LIB_openssl_crypto) + test_rand_LDADD = $(LDADD) -lm + diff --git a/app-crypt/heimdal/files/heimdal_fix-db60.patch b/app-crypt/heimdal/files/heimdal_fix-db60.patch new file mode 100644 index 000000000000..7f012007e1ed --- /dev/null +++ b/app-crypt/heimdal/files/heimdal_fix-db60.patch @@ -0,0 +1,11 @@ +--- a/lib/roken/ndbm_wrap.c 2016-12-20 17:23:06.000000000 +0300 ++++ b/lib/roken/ndbm_wrap.c 2019-05-17 10:00:00.107905769 +0300 +@@ -175,7 +175,7 @@ + return NULL; + } + +-#if (DB_VERSION_MAJOR > 3) && (DB_VERSION_MINOR > 0) ++#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR > 3 && DB_VERSION_MINOR > 0) + if(db->open(db, NULL, fn, NULL, DB_BTREE, myflags, mode) != 0) { + #else + if(db->open(db, fn, NULL, DB_BTREE, myflags, mode) != 0) { diff --git a/app-crypt/heimdal/files/heimdal_hcrypto.patch b/app-crypt/heimdal/files/heimdal_hcrypto.patch new file mode 100644 index 000000000000..ff3228d4973a --- /dev/null +++ b/app-crypt/heimdal/files/heimdal_hcrypto.patch @@ -0,0 +1,45 @@ +From 329918bd671c89de6e1c2874baba48d658a89a10 Mon Sep 17 00:00:00 2001 +From: Damir Franusic +Date: Sun, 9 Dec 2018 19:53:58 +0100 +Subject: [PATCH] hcrypto: fix include path + +--- + lib/hcrypto/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am +index 469176b6c6..195117d174 100644 +--- a/lib/hcrypto/Makefile.am ++++ b/lib/hcrypto/Makefile.am +@@ -9,7 +9,8 @@ AM_CPPFLAGS += $(INCLUDE_openssl_crypto) + endif + + AM_CPPFLAGS += -I$(top_srcdir)/lib/hx509 \ +- -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1 ++ -I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1 \ ++ -I$(srcdir)/.. + + lib_LTLIBRARIES = libhcrypto.la + check_LTLIBRARIES = libhctest.la +From 572a6fd7ac41e9210ef3eb765fe7da4ec8a94bb2 Mon Sep 17 00:00:00 2001 +From: Luke Howard +Date: Mon, 24 Dec 2018 02:21:32 +0000 +Subject: [PATCH] hx509: fix dependency, hxtool requires ASN.1 headers + +--- + lib/hx509/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am +index b58deb3e37..09643c43a0 100644 +--- a/lib/hx509/Makefile.am ++++ b/lib/hx509/Makefile.am +@@ -164,7 +164,7 @@ hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC) + dist_hxtool_SOURCES = hxtool.c + nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h + +-$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h ++$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS) + + hxtool_LDADD = \ + libhx509.la \ diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild new file mode 100644 index 000000000000..8f46bd07e4e4 --- /dev/null +++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +VIRTUALX_REQUIRED="manual" + +inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic + +MY_P="${P}" +DESCRIPTION="Kerberos 5 implementation from KTH" +HOMEPAGE="http://www.h5l.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" +IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X" + +CDEPEND=" + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) + ) + berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) + gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) + lmdb? ( dev-db/lmdb ) + caps? ( sys-libs/libcap-ng ) + >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] + >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] + sys-libs/ncurses:0= + >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] + afs? ( net-fs/openafs ) + hdb-ldap? ( >=net-nds/openldap-2.3.0 ) + X? ( + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXt + ) + !!app-crypt/mit-krb5 + !!app-crypt/mit-krb5-appl" + +DEPEND="${CDEPEND} + ${PYTHON_DEPS} + dev-perl/JSON + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=sys-devel/autoconf-2.62 + test? ( X? ( ${VIRTUALX_DEPEND} ) )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-kerberos )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/krb5-types.h + /usr/include/cms_asn1.h + /usr/include/digest_asn1.h + /usr/include/hdb_asn1.h + /usr/include/krb5_asn1.h + /usr/include/pkcs12_asn1.h + /usr/include/pkinit_asn1.h + /usr/include/rfc2459_asn1.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/krb5-config +) + +PATCHES=( + "${FILESDIR}/heimdal_disable-check-iprop.patch" + "${FILESDIR}/heimdal_tinfo.patch" + "${FILESDIR}/heimdal_hcrypto.patch" + "${FILESDIR}/heimdal_build-headers-before-use.patch" + "${FILESDIR}/heimdal_fix-db60.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # QA + append-flags -fno-strict-aliasing + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --enable-kcm + --disable-osfc2 + --enable-shared + --with-libintl="${EPREFIX}"/usr + --with-readline="${EPREFIX}"/usr + --with-sqlite3="${EPREFIX}"/usr + --libexecdir="${EPREFIX}"/usr/sbin + --enable-pthread-support + $(use_enable afs afs-support) + $(use_enable gdbm ndbm-db) + $(use_enable lmdb mdb-db) + $(use_enable otp) + $(use_enable pkinit kx509) + $(use_enable pkinit pk-init) + $(use_enable static-libs static) + $(multilib_native_use_with caps capng) + $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr) + $(use_with ipv6) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(multilib_native_use_with X x) + ) + if use berkdb; then + myeconfargs+=( + --with-berkeley-db + --with-berkeley-db-include="$(db_includedir)" + ) + else + myeconfargs+=( + --without-berkeley-db + ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + emake -C include + emake -C lib + emake -C kdc + emake -C tools + emake -C tests/plugin + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake -j1 check +} + +multilib_src_install() { + if multilib_is_native_abi; then + INSTALL_CATPAGES="no" emake DESTDIR="${D}" install + else + emake -C include DESTDIR="${D}" install + emake -C lib DESTDIR="${D}" install + emake -C kdc DESTDIR="${D}" install + emake -C tools DESTDIR="${D}" install + emake -C tests/plugin DESTDIR="${D}" install + fi +} + +multilib_src_install_all() { + dodoc ChangeLog* README NEWS TODO + + # client rename + mv "${ED%/}"/usr/share/man/man1/{,k}su.1 + mv "${ED%/}"/usr/bin/{,k}su + + newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc + newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind + newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd + newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm + + newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc + newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind + newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd + newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm + + insinto /etc + newins "${S}"/krb5.conf krb5.conf.example + + if use hdb-ldap; then + insinto /etc/openldap/schema + doins "${S}/lib/hdb/hdb.schema" + fi + + if ! use static-libs ; then + find "${ED}" -name "*.la" -delete || die + fi + + # default database dir + keepdir /var/heimdal +} diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml index 0862feb8ed96..c31b6673e508 100644 --- a/app-crypt/heimdal/metadata.xml +++ b/app-crypt/heimdal/metadata.xml @@ -15,6 +15,9 @@ Adds support for LDAP as a database backend + + + Add support for using dev-db/lmdb for lookup tables -- cgit v1.2.3