gentoo resync : 16.09.2020

5 files changed, 143 insertions, 13 deletions

diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 3fb0edf20129..428b83a4e1aa 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,4 +1,7 @@
-AUX gsasl-gss-extra.patch 951 BLAKE2B 4cd0a962e8aec77e0cf84ac5b5e6106f1b9e73532b8fa4931ecdbdf9e751c837a552dcf203e89210a8b86ded35a0bba2129e419f3ca3dacb47a935a8974f0930 SHA512 4225049a547b0ca6fbd0b5268e7a1de0454850fd6a29f31eb8b7356472fe400eb3a8076f537101be8cd9e09b7f092f5d784a8d660c8e66e475d4a7a4caff83df
+AUX gsasl-1.8.0-sasl-gss-extra.patch 950 BLAKE2B 958805e574a26f13a199eb5f53df9830586d8d3e81c32bad9a4c711c57ee097139c2653426eed3045f16bd76e4ce1c2bb6ed70fbd378266fedc8247da2a815ab SHA512 0f8ad16b96265221bb045b19724b7a247350e9503b7e5abc92905cc07c11bdafb9a92e91d1959d33075ec96631e6f033b20192993c9ee732d71d86ba5ac3fa22
+AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a5f1bd34c40527edf65a2aaec81a85004106a229f18c0d9d623d81e6e98f1786b213b2e6481814b1ee0e11c44eac9ff33d SHA512 ea406d5de99ebbff454ea453cc3c857c79d0120405d772cd893a03840d720e97000bd1edac1ec52f44208146287531a268bd582a0e146b6097b48671b92b9c88
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
-EBUILD gsasl-1.8.0-r1.ebuild 1684 BLAKE2B 9a40d349aa6d902247de63882a528c3ea344093edace9806250d7f61e5369ff395c75063160041612d6328d300091342f85aac0ab47291237a25ed483a742ddc SHA512 013323933b59ab3c9dd55e9b20498fe35226c3b25f485babe1ba7e3b22465c5ee8a63a3fb812cafd4326637026959c994784d2bef1b6be8dbef0be9960701b31
+DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
+EBUILD gsasl-1.8.0-r1.ebuild 1797 BLAKE2B 5919ec09d3f0c47dd7cb447639d91de50a0bb774e3a74fd30b965d7c6a68c87e46b5cbe4bb249d0acf99e2e5c0afacbfb5a060170933a7681893be6241f77039 SHA512 a445f4165baf5fe2e1f0cdb66e58c0d93173b654a85a4acb72863cdf7c25d96c62710a77db3642de9af7010ec28b946c2f687d92898e4919151c54570a87d217
+EBUILD gsasl-1.8.1.ebuild 1800 BLAKE2B a34868d9504d585cdf1c06370072a3c830e2ada88049376fbf1b82664b840d5a56fe330b50b8b5c02e0f24e9d4d414c52427c17bea15022d46e37ce6b767a995 SHA512 e48ae7ec875fb5fdd9803e8611c150a1adbd7a55403d06ea0e523086dede6ba93a394d24e4ad352bccba02a94f4df8f2a1fc4747379e8b19f9c1414bd8423fad
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/files/gsasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
index e08a36ae5779..a3eec016e40c 100644
--- a/net-misc/gsasl/files/gsasl-gss-extra.patch
+++ b/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
@@ -1,6 +1,6 @@
 Based on gentoo bug #359005
---- lib/gl/m4/gss-extra.m4.orig	2010-12-14 12:57:08.000000000 +0000
-+++ lib/gl/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
+--- a/lib/gl/m4/gss-extra.m4	2010-12-14 12:57:08.000000000 +0000
++++ b/lib/gl/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
 @@ -19,7 +19,16 @@
      AC_CHECK_FUNCS([gss_decapsulate_token])
      AC_CHECK_FUNCS([gss_oid_equal])
diff --git a/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch b/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch
new file mode 100644
index 000000000000..6aff3878a05a
--- /dev/null
+++ b/net-misc/gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch
@@ -0,0 +1,21 @@
+Based on gentoo bug #359005
+--- a/lib/m4/gss-extra.m4	2010-12-14 12:57:08.000000000 +0000
++++ b/lib/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
+@@ -19,7 +19,16 @@
+     AC_CHECK_FUNCS([gss_decapsulate_token])
+     AC_CHECK_FUNCS([gss_oid_equal])
+     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
+-    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
++    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++    	[#include <gssapi.h>
++	#ifdef GSS_C_NT_HOSTBASED_SERVICE
++	   hostbased_service_gss_nt_yes
++	#endif],
++	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
++	    AC_MSG_RESULT([yes])],
++	    AC_MSG_RESULT([no]))
+     if test "$gssapi_impl" != "gss"; then
+       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
+       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
index 9fb42b266213..a1e9339e1b73 100644
--- a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="The GNU SASL client, server, and library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/"
@@ -14,28 +14,42 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	idn? ( net-dns/libidn )
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	nls? ( >=sys-devel/gettext-0.18.1 )
 	ntlm? ( net-libs/libntlm )
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-sasl-gss-extra.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-gss-extra.patch"
+	default
+
 	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
 		-e 's/ -Werror//' configure.ac || die
 	sed -i -e 's/ -Werror//' lib/configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
 	local krb5_impl
+
 	if use kerberos; then
 		krb5_impl="--with-gssapi-impl="
-		krb5_impl+=$(has_version app-crypt/mit-krb5 && echo "mit" || echo "heimdal")
+
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
 	fi
+
 	econf \
 		--enable-client \
 		--enable-server \
@@ -58,14 +72,17 @@ src_configure() {
 
 src_install() {
 	default
+
 	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/lib*.la
+		rm -f "${ED}"/usr/lib*/lib*.la || die
 	fi
+
 	doman doc/gsasl.1 doc/man/*.3
 
 	if use doc; then
 		dodoc doc/*.{eps,ps,pdf}
-		dohtml doc/*.html
+		docinto html
+		dodoc doc/*.html
 		docinto examples
 		dodoc examples/*.c
 	fi
diff --git a/net-misc/gsasl/gsasl-1.8.1.ebuild b/net-misc/gsasl/gsasl-1.8.1.ebuild
new file mode 100644
index 000000000000..0317f3443ee2
--- /dev/null
+++ b/net-misc/gsasl/gsasl-1.8.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
+
+DEPEND="
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( net-libs/libntlm )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.1-sasl-gss-extra.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
+		-e 's/ -Werror//' configure.ac || die
+	sed -i -e 's/ -Werror//' lib/configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl
+
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl="
+
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
+	fi
+
+	econf \
+		--enable-client \
+		--enable-server \
+		--disable-valgrind-tests \
+		--disable-rpath \
+		--without-libshishi \
+		--without-libgss \
+		--disable-kerberos_v5 \
+		$(use_enable kerberos gssapi) \
+		${krb5_impl} \
+		$(use_enable kerberos gs2) \
+		$(use_with gcrypt libgcrypt) \
+		$(use_enable nls) \
+		$(use_with idn stringprep) \
+		$(use_enable ntlm) \
+		$(use_with ntlm libntlm) \
+		$(use_enable static-libs static) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/lib*/lib*.la || die
+	fi
+
+	doman doc/gsasl.1 doc/man/*.3
+
+	if use doc; then
+		dodoc doc/*.{eps,ps,pdf}
+		docinto html
+		dodoc doc/*.html
+		docinto examples
+		dodoc examples/*.c
+	fi
+}