gentoo auto-resync : 19:07:2022 - 02:37:54

3 files changed, 95 insertions, 2 deletions

diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 7d46ff96c961..02ce12616857 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -2,6 +2,7 @@ DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c
 DIST gsasl-2.0.0.tar.gz 3274625 BLAKE2B fb9ce9b3be0cbd0902128a3e8b57ad1f78c9259da646d3da56777b05922152c5e7f019a4c037a9e42a161153e87b140146eab2f2a55e33de9b52d6814a250fd3 SHA512 b7c4e3dfdaa50eaba38f3c0914dedb4bc689d1226fcf162e5bfb3942fa6ce1e96405715a747adca78150709f34830f699e9f995f04ce586cd3d0c14b275910e6
 DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4dc6b73d2f4b08fecbf1ca5f423ffdcfd39e0d2bf71f724ed8302ffd8acda4fda3ef10ceadece60509ac73500 SHA512 01c6f6bd9f986c942a25b89fee0052aef8c10bf914ead29983abdf0cc8fcaa7223fd9d9eeafb4be07e4bc318f087f6f6258facaaeb7f83bca8de512406812be5
 EBUILD gsasl-1.10.0.ebuild 1904 BLAKE2B 3bc572a83c0dfa8837a6e8223bbbc2480a9a76746192884c4e85d6146ee0fa11b01fb38ba62a634f1f02be23a48fa86c68da085772cd3211fb30bf7b1c12b3bf SHA512 8daca23e2fbc2e6bb5fa0a4c671fcbb8f714043bead8e772d5735ff2f1879f0525dd20692281b90feaac735064a4732671617cfacc18b024d178d854acc0655d
-EBUILD gsasl-2.0.0.ebuild 1934 BLAKE2B bf4973bb647e30a85cc40d2e214bf8ccbbe80dbaaa5aa97ee912d85fdca441e7075333b7777f09d2b1324b4f56aa187761cac2f0a1f9e5d0fcf5676dcf3686c8 SHA512 7221cce4fe0cef7a5745acf957c00e768ed180a6d6dcb94484a183a0178b8fae3f6c739fd5d30af94c0517d8022d2bf7ad1e5aa7dcab8eacbda7854c5f2d6fba
+EBUILD gsasl-2.0.0.ebuild 1932 BLAKE2B dceeb9e0ba6793cb70ad1db1ac198ea2aa7880540e45359e7a0de35f52c4a16b730c16bee98f596c70c0347f3f077900801156fe7f80c351df10445e1c624e1b SHA512 a6c182d9d06c849a3bd9b66d24bb7336f7aa4b7225625f9737d4124003645e9c69da9f030cd64fbda907994b8a6e0cb46032a13c833490b27e00b4977c4812c1
+EBUILD gsasl-2.0.1-r2.ebuild 2185 BLAKE2B 8ead62589512588de24ae7619f1a39c7e31f0b5245a48d7a166e014f899f79db05389fc5d939e9d6c0af807ae813d79358a165e1a7bc50c6ed6364973159451e SHA512 ef7af4d634781a493f019ad8424eee1b1d5637662993d0739dfd21d481fe895841cd2ab011cffbd458397242232fb96dc805ff561ce09a1af0150fa2445ccf18
 EBUILD gsasl-2.0.1.ebuild 2001 BLAKE2B d0303d507ac3fa800451c2d8d94c18f3b14687188348f85183145cc163aa1ab6eb759e6572cd9db74704cc5f8ca54f0c34b83253277eb27aed92f16461d6c36b SHA512 8ac5ae96872b28ba8983f69a18f634e46df9956a509529146489e477f8a301edfcc1cfa168f3c5d0f9073ac9c57f9805d819581cf8d765d9baf5fcc391c741d6
 MISC metadata.xml 579 BLAKE2B 87f59c4a4c3ba2b3741aac713b47ec1357889afce3d06919705a5e31fba874ba5e0ba53c1a43cfb465d4c3ed138d465060f883afedd882547a39cefd58e20c01 SHA512 ccf34d49ff3453e97e1e4c2c9c769ea7ae201243d3756bd7154cf98581e704ae980a6e82ba8020993e42956a512111972ba2cc39e0f3fe789b1080ebe9e5f351
diff --git a/net-misc/gsasl/gsasl-2.0.0.ebuild b/net-misc/gsasl/gsasl-2.0.0.ebuild
index 7c713703a870..1c47d7944f81 100644
--- a/net-misc/gsasl/gsasl-2.0.0.ebuild
+++ b/net-misc/gsasl/gsasl-2.0.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/net-misc/gsasl/gsasl-2.0.1-r2.ebuild b/net-misc/gsasl/gsasl-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..79cabd639fd3
--- /dev/null
+++ b/net-misc/gsasl/gsasl-2.0.1-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+# Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
+# if it's a stable release or not!
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="
+	!net-libs/libgsasl
+	sys-libs/readline:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gnutls? ( net-libs/gnutls:= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( >=net-libs/libgssglue-0.5-r1 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( >=net-libs/libntlm-0.3.5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/gl_WARN_ADD(\[-Werror/d' \
+		-e 's/ -Werror//' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl="--with-gssapi-impl=no"
+
+	# See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl=gssglue"
+	fi
+
+	local myeconfargs=(
+		--disable-valgrind-tests
+		--disable-rpath
+
+		--with-packager="Gentoo Linux"
+		--with-packager-bug-reports="https://bugs.gentoo.org"
+		--with-packager-version="r${PR}"
+
+		$(use_enable client)
+		$(use_enable server)
+
+		$(use_enable kerberos gssapi)
+		${krb5_impl}
+		$(use_enable kerberos gs2)
+
+		$(use_with gcrypt libgcrypt)
+		$(use_with gnutls)
+		$(use_enable nls)
+		$(use_with idn stringprep)
+		$(use_enable ntlm)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/lib*/lib*.la || die
+	fi
+
+	doman doc/gsasl.1 doc/man/*.3
+}
+
+pkg_postinst() {
+	ewarn "For USE=kerberos, ${PN} now uses libgssglue to allow choosing"
+	ewarn "the Kerberos implementation at runtime."
+	elog "See https://blog.josefsson.org/2022/07/14/towards-pluggable-gss-api-modules/"
+	elog "for more details."
+}