[gentoo-commits] repo/gentoo:master commit in: net-misc/gsasl/files/, net-misc/gsasl/

2020-09-15 Thread Sam James
commit: 204a9b324d6af7771865a7daec61d3507dc4ff91
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 15 21:37:01 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 15 21:46:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204a9b32

net-misc/gsasl: bump to 1.8.1

Bug: https://bugs.gentoo.org/725358
Closes: https://bugs.gentoo.org/625144
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 net-misc/gsasl/Manifest|  1 +
 .../gsasl/files/gsasl-1.8.1-sasl-gss-extra.patch   | 21 +
 net-misc/gsasl/gsasl-1.8.1.ebuild  | 89 ++
 3 files changed, 111 insertions(+)

diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 182bceaaa32..251cd278af3 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1 +1,2 @@
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 
89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8
 SHA512 
711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
+DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 
0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b
 SHA512 
8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb

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 000..6aff3878a05
--- /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.0 +
 b/lib/m4/gss-extra.m4  2011-11-05 21:11:54.0 +
+@@ -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 
++  #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.1.ebuild 
b/net-misc/gsasl/gsasl-1.8.1.ebuild
new file mode 100644
index 000..0317f3443ee
--- /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) \
+  

[gentoo-commits] repo/gentoo:master commit in: net-misc/gsasl/files/, net-misc/gsasl/

2020-09-15 Thread Sam James
commit: 99c4005cc8ecf754da7dca31b2702e3c63f0164b
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 15 21:20:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 15 21:46:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c4005c

net-misc/gsasl: bump to EAPI 7

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 ...xtra.patch => gsasl-1.8.0-sasl-gss-extra.patch} |  4 +--
 net-misc/gsasl/gsasl-1.8.0-r1.ebuild   | 35 --
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/net-misc/gsasl/files/gsasl-gss-extra.patch 
b/net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
similarity index 86%
rename from net-misc/gsasl/files/gsasl-gss-extra.patch
rename to net-misc/gsasl/files/gsasl-1.8.0-sasl-gss-extra.patch
index e08a36ae577..a3eec016e40 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.orig2010-12-14 12:57:08.0 +
-+++ lib/gl/m4/gss-extra.m4 2011-11-05 21:11:54.0 +
+--- a/lib/gl/m4/gss-extra.m4   2010-12-14 12:57:08.0 +
 b/lib/gl/m4/gss-extra.m4   2011-11-05 21:11:54.0 +
 @@ -19,7 +19,16 @@
  AC_CHECK_FUNCS([gss_decapsulate_token])
  AC_CHECK_FUNCS([gss_oid_equal])

diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild 
b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
index 9fb42b26621..a1e9339e1b7 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