9 files changed, 252 insertions, 50 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 60674baa7dc2..1e68f79bc95a 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 9c9e7306aee1..a6153e61fcf5 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -2,6 +2,7 @@ AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d428
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
 AUX mit-krb5-1.14.2-redeclared-ttyname.patch 660 BLAKE2B 8fb59ad5ed7b0896272f4bf10e8e15a1c848047dbe6a7735930657422888530691f681949d72b4b0924a8983ec392282736eae57dd72c8548ee960fc85909c53 SHA512 90a2adedcdca4e2079daaa613e2d4f08e948ccfaf56aba19a08b4cbe2257a6a60dcfd5bbc4b19ca64f584759b1a374d1894729a423e636bfec1969a675a1628e
 AUX mit-krb5-1.14.4-disable-nls.patch 1247 BLAKE2B a24c425a21bed40c7b563658207f324d1dccade9b8aec4d4124e2a2d0007d81e314765d23fe3e4be2bf857fa67bf3da06aead99ffb21afe635bbb1d7bb2c89cf SHA512 5fecc719c5c8a1f5c971443d42561615b8fb8c6b99b735a633c7479f109cfb6852eee5179e267a1e2576e52faf2311395ddabdb47f749b573ead3ddd86714e2e
+AUX mit-krb5-1.15.2-fix-pkinit.patch 3196 BLAKE2B 6fdf17bb1ad096bc2745c3c908fbc913de3d4d7176c060cb51d911b256e82f67a73d9204044f5227c7d3d1cb1f76dbc31b2845738c4f97dd0a199990a9e09f0f SHA512 d7b3f33f25e610b24f2854892d75016dfa5b5e34fac24600df80b91194f5fe2e6dbc35ea3a9a772e0dcdf7659263a56230e767fe393d32796c61b3bd5bb2de69
 AUX mit-krb5-config_LDFLAGS.patch 466 BLAKE2B 2dd4f1cfc20bea229d08201d66e3de71472dccfa45dee9b260c51578187e706b864c0b4ff81c0c5a09fd29401c2abdbe334441ca075208299b02d5e1d49aff94 SHA512 9a1ca9b33e7708346eda78d199fdc51f0d7bd08d3d65ea15a19955a6155ab71b8ee0c8989859d6dff293a141f197ea19394a91b3b641181140a289b743e0f0e7
 AUX mit-krb5kadmind.confd 76 BLAKE2B ca69357a77ddaf67e2f9c104b17d49af5da9891b13bd855f8b04d54bfb6ccf07ae8c5cb694f65a47646675c844c8f8c7224e8487081df678c73c554498259516 SHA512 dbf968800959f0463899031e823f003e9ece90132f452ebf03df08caf0e6a6e6ca2cfdee91491d269cfa24bef19e72dd33c7d818a4bb13ef85edfb6f0e8299f3
 AUX mit-krb5kadmind.initd-r2 612 BLAKE2B ba2a70a7c123d63b9c58f4ec31c3c2366949e6971ff4f203cb38e1efb5a69991533291e118066e680d880c5221168c8eb5b047ec70dac857888330978d1e5a9b SHA512 3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98
@@ -10,5 +11,6 @@ AUX mit-krb5kdc.initd-r2 572 BLAKE2B f9115cc452891e1267268df6d4beb7eeb69ec27edc9
 AUX mit-krb5kpropd.confd 84 BLAKE2B e3f47a3c520af14794c2fe11368651ba56e8aa059babb91b3112af9682403a6409b3fb39ed6313f9cd87169c3754e4c4fc17bc24b0b773cfdf01e7df3eb03490 SHA512 afd1cf21a6afd3bc73b1ef3cb0a26ec3420b26ed31196f8c092ae880b235043273c95e2ecb3b88e65ea008cd8ea6a10553d1966f45646cf5993d5752dfc945ac
 AUX mit-krb5kpropd.initd-r2 608 BLAKE2B 9737f5ff711b8e30444c14ca871e01f2c45e9aecdab99d3dcfd8c16bae65ed05fc732f2007c65f0abfab10cf766035c03c557d217f750ab06f804b639722b27e SHA512 28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7
 DIST krb5-1.15.2.tar.gz 9380755 BLAKE2B 3f5d00a70bf44ef077872bde282e4753e82acb70632e136b8f9f8d3a192e3e7b692840803e5a3f67ddb202d53631767ea9eb8b7615d45a3479389a01a6390ac4 SHA512 e5814bb66384b13637c37918df694c6b9933c29c2d952da0ed0dcd2e623b269060b4c16b6c02162039dadebdab99ff1085e37e7621ae4748dafb036424e612c2
+EBUILD mit-krb5-1.15.2-r1.ebuild 3920 BLAKE2B 4874c8516130a6ff27fc03aef15e0cb2a5fce3b8580d0797846da422a54615234097e6d25e4272ade5624136c84489d32416718d59595317c5522e68eee51389 SHA512 f44f5e7a2fc57156b23d4e91541d8fcf7b644eb0f4b293292a97bf690b93e2f379e070b1b9d31db72bb2af799afeea8b0ccc5e5f53c4d29f449ff76e0f9a22bb
 EBUILD mit-krb5-1.15.2.ebuild 3855 BLAKE2B fa45466eeb8cc35048b654d10a997fb85d35a004e51de910a6ce2b0c239c88b9048837ce81abf8a00b867d6278cb7f6f082fc9c63ffe9e74522668e79c664c64 SHA512 e80bd080eea92ccdc0c475bdc02fc5eed67af1168c98095782233a55524404e0e210c598bf19f999777a334682b717b76e767c11954d7710c405434d5154a927
 MISC metadata.xml 828 BLAKE2B f317440eac9d164e0640cb059dee0c3bdcfeaeb2d0e346d962f09b7152224efc10084611768663b84c67fdf73c9d89481370fe0b70ffe14aa10a360f60bd00f6 SHA512 c0f45699280d49b91eab24de6cbb28900170c3c4526b8c6ef0f6a996d3e53abd49911ce4f6ce7b28c69d37e86cc9e5b830977b9640809734e7fccf078886685c
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
new file mode 100644
index 000000000000..4f721d4d9616
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.15.2-fix-pkinit.patch
@@ -0,0 +1,98 @@
+diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+index 74fffbf321..4b86a6f302 100644
+--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+@@ -5145,33 +5145,29 @@ crypto_retieve_X509_key_usage(krb5_context context,
+     return retval;
+ }
+ 
+-/*
+- * Return a string format of an X509_NAME in buf where
+- * size is an in/out parameter.  On input it is the size
+- * of the buffer, and on output it is the actual length
+- * of the name.
+- * If buf is NULL, returns the length req'd to hold name
+- */
+-static char *
+-X509_NAME_oneline_ex(X509_NAME * a,
+-                     char *buf,
+-                     unsigned int *size,
+-                     unsigned long flag)
++static krb5_error_code
++rfc2253_name(X509_NAME *name, char **str_out)
+ {
+-    BIO *out = NULL;
++    BIO *b = NULL;
++    char *str;
+ 
+-    out = BIO_new(BIO_s_mem ());
+-    if (X509_NAME_print_ex(out, a, 0, flag) > 0) {
+-        if (buf != NULL && (*size) >  (unsigned int) BIO_number_written(out)) {
+-            memset(buf, 0, *size);
+-            BIO_read(out, buf, (int) BIO_number_written(out));
+-        }
+-        else {
+-            *size = BIO_number_written(out);
+-        }
+-    }
+-    BIO_free(out);
+-    return (buf);
++    *str_out = NULL;
++    b = BIO_new(BIO_s_mem());
++    if (b == NULL)
++        return ENOMEM;
++    if (X509_NAME_print_ex(b, name, 0, XN_FLAG_SEP_COMMA_PLUS) < 0)
++        goto error;
++    str = calloc(BIO_number_written(b) + 1, 1);
++    if (str == NULL)
++        goto error;
++    BIO_read(b, str, BIO_number_written(b));
++    BIO_free(b);
++    *str_out = str;
++    return 0;
++
++error:
++    BIO_free(b);
++    return ENOMEM;
+ }
+ 
+ /*
+@@ -5187,8 +5183,6 @@ crypto_cert_get_matching_data(krb5_context context,
+     krb5_principal *pkinit_sans =NULL, *upn_sans = NULL;
+     struct _pkinit_cert_data *cd = (struct _pkinit_cert_data *)ch;
+     unsigned int i, j;
+-    char buf[DN_BUF_LEN];
+-    unsigned int bufsize = sizeof(buf);
+ 
+     if (cd == NULL || cd->magic != CERT_MAGIC)
+         return EINVAL;
+@@ -5201,23 +5195,14 @@ crypto_cert_get_matching_data(krb5_context context,
+ 
+     md->ch = ch;
+ 
+-    /* get the subject name (in rfc2253 format) */
+-    X509_NAME_oneline_ex(X509_get_subject_name(cd->cred->cert),
+-                         buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
+-    md->subject_dn = strdup(buf);
+-    if (md->subject_dn == NULL) {
+-        retval = ENOMEM;
++    retval = rfc2253_name(X509_get_subject_name(cd->cred->cert),
++                          &md->subject_dn);
++    if (retval)
+         goto cleanup;
+-    }
+-
+-    /* get the issuer name (in rfc2253 format) */
+-    X509_NAME_oneline_ex(X509_get_issuer_name(cd->cred->cert),
+-                         buf, &bufsize, XN_FLAG_SEP_COMMA_PLUS);
+-    md->issuer_dn = strdup(buf);
+-    if (md->issuer_dn == NULL) {
+-        retval = ENOMEM;
++    retval = rfc2253_name(X509_get_issuer_name(cd->cred->cert),
++                          &md->issuer_dn);
++    if (retval)
+         goto cleanup;
+-    }
+ 
+     /* get the san data */
+     retval = crypto_retrieve_X509_sans(context, cd->plgctx, cd->reqctx,
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
new file mode 100644
index 000000000000..1f9cfda94660
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools 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 nls 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() {
+	eapply "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	eapply -p2 "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+	eapply -p0 "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
+	eapply "${FILESDIR}/${PN}-1.14.4-disable-nls.patch"
+	eapply -p2 "${FILESDIR}/${PN}-1.15.2-fix-pkinit.patch"
+
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	# 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 nls) \
+		$(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
+		dodoc -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
+}
diff --git a/app-crypt/monkeysign/Manifest b/app-crypt/monkeysign/Manifest
index 1a820b107962..b1f2f7ea64d6 100644
--- a/app-crypt/monkeysign/Manifest
+++ b/app-crypt/monkeysign/Manifest
@@ -1,6 +1,4 @@
 AUX monkeysign-1.1-basename.patch 393 BLAKE2B 87224cefb77a8c1cc090a1b2c5036eea0f4567fc8f654540171f7d2e9235f606fc9d1c0e2ab39577a9e94d45031b1d4a7d5984ee9b1a87cabf5c9f11a68bbcdc SHA512 ae9e01a6aff91231c700f1e46ef7f4dabed8ba6d3d3a275bb6405b767bcb6f40c96ff7563fe693a17d76e26b63b2ccb0e66e834e910cef5bb94d2a9f9cd366d3
-AUX monkeysign-2.0.0-rst2s5.patch 963 BLAKE2B 8545d78a2ebe9092d13612118de79e2384c1407afdb32eab4c1eeb8b7885ea1a3207f14e68416b9672e1d976a5fcf99bc43c994334a08e917fb5cc832df30d63 SHA512 c738d3a29dd272fe7bbc1108371b302d3b551bb61c8a2725c39ae57804f67539fd9fc2222fe9a53d2b2a213280b6c1707dc9f8fdc541264216f92799d7930d58
-AUX monkeysign-2.0.2-smtplib.patch 1187 BLAKE2B 0e1bfde5d8a6e08b84d44ab58c0716ca8694fb7dd07a8bca3fc358a3846ff5e785dae4771d936652e51a374318e15ee2a6f58ad3f1010c83f06a4afdf2ea7936 SHA512 b62c7b087f4c44b6078be9a49d21790888b5c6313d5780e4b9dcfeb86d879552fe0b3f9c410eaf53327ba0dd8ee056643f7c9b629fcf48251e1b8ebf598a34c6
 AUX monkeysign.desktop 181 BLAKE2B 6e678bdc96a9bc0f9eea80588e8129b5d978debe680d0f5f8e88a3ae9947270ae775a830c372e5008dd8762041a6efe0b6f76df71e6b01c579f069c79faa0c16 SHA512 ec4442e2467700e355a3ed58cb3512119e70d76e5bf75acba4ee8109bd0fea9066cbb23ad7f93551c40a6f8f345f255e7ab73cbcfd974a878275004d8c7cfb98
 DIST monkeysign_2.2.3.tar.xz 1145852 SHA256 b33a2154c55cdb2b215d230b0e998c325fc0f9782c13f35e368629478b1b76e5 SHA512 accbe2b2350ad0ba8ab05ec0da759c95d705b69c149045875cbcdcc35d4c776f13339fd8fa97203fc3ebf23e4f1c70a9776767c39e92196545b1b3905cd25caf WHIRLPOOL 5a79db13d79d6a89e9e2f9b5253044c0d759c22af6640a808db9607b21da5aec99c188163d9687918e6eaff054a4c139e0c367c81e955a4d0d74f53e14f8b152
 EBUILD monkeysign-2.2.3.ebuild 1270 BLAKE2B a8290eaab35c953964dcfc31fa3beec3053939f90e6e8e38efcab9f228da2101b8e35f849dfe6cdcaa3c396e91d5594f4f8f78597e59e38e292122e9c61583f1 SHA512 879fc03171e33e48a91459f85385bd73c86207288410f0c8ea265ca24c85cf869737d81569b9f1e3dbec52be472d16c9401d9c685a0a308a6a2bd2403d4d2180
diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch
deleted file mode 100644
index 2c3c66c884ed..000000000000
--- a/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r 9cf95971dd10 monkeysign/documentation.py
---- a/monkeysign/documentation.py	Sun Oct 19 12:34:21 2014 -0400
-+++ b/monkeysign/documentation.py	Sun Oct 19 12:35:30 2014 -0400
-@@ -161,11 +161,11 @@
-     def run(self):
-         html = os.path.join(os.path.dirname(self.file), os.path.splitext(os.path.basename(self.file))[0] + '.html')
-         self.announce('processing slides from %s to %s' % (self.file, html), 2)
--        os.system('rst2s5 --theme default "%s" "%s"' % (self.file, html))
-+        os.system('rst2s5.py --theme default "%s" "%s"' % (self.file, html))
- 
- def has_rst2s5(build):
-     """predicate for this class: do not fail if rst2s5 is missing"""
--    return (os.system('rst2s5 < /dev/null > /dev/null') == 0)
-+    return (os.system('rst2s5.py < /dev/null > /dev/null') == 0)
- 
- # (function, predicate), see http://docs.python.org/2/distutils/apiref.html#distutils.cmd.Command.sub_commands
- build.sub_commands.append(('build_manpage', None))
diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch b/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch
deleted file mode 100644
index e920acfa3797..000000000000
--- a/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9e6699ec432b23d56a0728bb25fc2ed1a47a85e6 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 2 Feb 2015 20:38:07 +0100
-Subject: [PATCH] ui.py: Make sure to use smtplib namespace
-
-Make sure to properly use the smtplib namespace for SMTPException
-in order to avoid a NameError for undefined exception in global
-scope.
----
- monkeysign/ui.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/monkeysign/ui.py b/monkeysign/ui.py
-index c9b6a30..c2308c8 100644
---- a/monkeysign/ui.py
-+++ b/monkeysign/ui.py
-@@ -359,7 +359,7 @@ expects an EmailFactory email, but will not mail if nomail is set"""
-                     self.abort(_('Unexpected SMTP server error while talking to %s, code: %s (%s)') % (self.options.smtpserver, code, srvmsg))
-                 try:
-                     server.starttls()
--                except SMTPException:
-+                except smtplib.SMTPException:
-                     self.warn(_('SMTP server does not support STARTTLS'))
-                     if self.options.smtpuser: self.warn(_('authentication credentials will be sent in clear text'))
-                 if self.options.smtpuser:
--- 
-2.2.2
-
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 21322188a93b..7836db9a0a37 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,3 +1,3 @@
-DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229
-EBUILD rhash-1.3.5.ebuild 2613 BLAKE2B 765f0aebcaa119fe15151c3b74426d5009eeea28e7a518ce78e67509ed927d17e5d8b225a11cbb2261c07ab7ae89730d95fc0befc4a0196414f23808e1f9b000 SHA512 6c18e8c0813dced4b245f9ef998d4af58246cbc2c922baa947be886342554dd24b44fd6b1e73be1bd0a6e9ab8b8d12b3668daaa0a562b048870f427a0e95bbf3
+DIST rhash-1.3.5-src.tar.gz 316867 BLAKE2B 3ffbf2ec5aef24ef63455e21c3efcae043a321a78be522a26bd25086111430071a496ab3775ff9b4956da7304df8d8e552a061f3306a7a683be5fc65ea3fd1c4 SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c
+EBUILD rhash-1.3.5.ebuild 2612 BLAKE2B 661592c5c8671c1f90f18b20991f0da9eea62f97d95fdaa8803c1de149be999b5ff180c9423f8b53d93993cc68b8c1a9cb17f8bd9f6387841bbc32cb0cfa7b08 SHA512 cc835cb20c7e49154fffcca705a49aa3d21d2ae2c080286f991e1e97ec494f3339158e296318db7ee1a423b7a2b75415f5f2211b0797f9d71997b2ed1a74cfa1
 MISC metadata.xml 843 BLAKE2B 9380d16da7ed26bc2cb455ad4e01806d54233df9ec229e67a8ed1a3944e91569cc4a478c375e75a87ea758eab6a886b89fae27dea32434e8c7f4a068d0371369 SHA512 360de1b8627471599f06a5bbd34a4359be7bd5bc39fe97d7db3da57794e2ace132539e56a2cc971b53911887b314a8ff1c689063c86d70473ac771062f1f3b4f
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild
index 652f90180707..20e99bca4138 100644
--- a/app-crypt/rhash/rhash-1.3.5.ebuild
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls openssl static-libs"
 
 RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"