* [gentoo-commits] repo/gentoo:master commit in: net-libs/libgsasl/files/, net-libs/libgsasl/
@ 2020-09-15 21:46 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-09-15 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 6d9fc682eff90b90fcbe5363d71b16d7564e661f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 21:27:07 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 21:46:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9fc682
net-libs/libgsasl: bump to EAPI 7
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 0
net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild | 24 +++++++++++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
similarity index 100%
rename from net-libs/libgsasl/files/libgsasl-gss-extra.patch
rename to net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 5b146866adc..7550115ea3f 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -1,20 +1,22 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils
+inherit autotools
DESCRIPTION="The GNU SASL library"
HOMEPAGE="https://www.gnu.org/software/gsasl/"
SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+
LICENSE="GPL-3 LGPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="idn gcrypt kerberos nls ntlm static-libs"
+
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 )
@@ -23,11 +25,12 @@ RDEPEND="${DEPEND}
!net-misc/gsasl"
PATCHES=(
- "${FILESDIR}/${PN}-gss-extra.patch"
+ "${FILESDIR}/${PN}-1.8.0-gss-extra.patch"
)
src_prepare() {
default
+
sed -i -e 's/ -Werror//' configure.ac || die
eautoreconf
}
@@ -36,8 +39,14 @@ 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
+
local myeconfargs=(
$(use_with gcrypt libgcrypt)
$(use_with idn stringprep)
@@ -47,6 +56,7 @@ src_configure() {
$(use_enable ntlm)
$(use_enable static-libs static)
)
+
econf "${myeconfargs[@]}"
}
@@ -54,6 +64,6 @@ src_install() {
default
if ! use static-libs; then
- rm -f "${D}"/usr/lib*/lib*.la
+ rm -f "${ED}"/usr/lib*/lib*.la || die
fi
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libgsasl/files/, net-libs/libgsasl/
@ 2020-09-15 21:46 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-09-15 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 219255769e2cf40e8b7427fe0073d3a2827ed50f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 21:41:02 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 21:46:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21925576
net-libs/libgsasl: bump to 1.8.1
Closes: https://bugs.gentoo.org/725358
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/libgsasl/Manifest | 1 +
| 21 +++++++
net-libs/libgsasl/libgsasl-1.8.1.ebuild | 69 ++++++++++++++++++++++
3 files changed, 91 insertions(+)
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index a971e9afd73..8398d6f5395 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1 +1,2 @@
DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
+DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
--git a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
new file mode 100644
index 00000000000..15350a87d51
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
@@ -0,0 +1,21 @@
+Gentoo bug #359005
+--- a/m4/gss-extra.m4
++++ b/m4/gss-extra.m4
+@@ -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-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
new file mode 100644
index 00000000000..c23abb24fb4
--- /dev/null
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="idn gcrypt kerberos nls ntlm static-libs"
+
+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}
+ !net-misc/gsasl"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.8.1-gss-extra.patch"
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's/ -Werror//' 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
+
+ local myeconfargs=(
+ $(use_with gcrypt libgcrypt)
+ $(use_with idn stringprep)
+ $(use_enable kerberos gssapi)
+ ${krb5_impl}
+ $(use_enable nls)
+ $(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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libgsasl/files/, net-libs/libgsasl/
@ 2020-12-18 8:38 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2020-12-18 8:38 UTC (permalink / raw
To: gentoo-commits
commit: b172ace6040dec5927f8a4a4a423d9e3e06b9c2e
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 08:38:01 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 08:38:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b172ace6
net-libs/libgsasl: tweak for autoconf-2.70
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../libgsasl/files/libgsasl-1.8.1-ac-270.patch | 36 ++++++++++++++++++++++
net-libs/libgsasl/libgsasl-1.8.1.ebuild | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
new file mode 100644
index 00000000000..a2a558db5a6
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
@@ -0,0 +1,36 @@
+--- a/m4/std-gnu11.m4
++++ b/m4/std-gnu11.m4
+@@ -6,6 +6,8 @@
+ # This implementation will be obsolete once we can assume Autoconf 2.70
+ # or later is installed everywhere a Gnulib program might be developed.
+
++m4_version_prereq([2.70], [], [
++
+
+ # Copyright (C) 2001-2020 Free Software Foundation, Inc.
+
+@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion -version; do
+- m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++ _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
+ set X $ac_compile
+ ac_compiler=$[2]
+ for ac_option in --version -v -V -qversion; do
+- m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
++ _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
+ done
+
+ m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
+@@ -822,3 +824,6 @@ dnl Tru64 N/A (no support)
+ dnl with extended modes being tried first.
+ [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
+ ])# _AC_PROG_CXX_CXX11
++
++
++])# m4_version_prereq
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
index 6c8b8e05366..331707bb268 100644
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -25,7 +25,8 @@ RDEPEND="${DEPEND}
!net-misc/gsasl"
PATCHES=(
- "${FILESDIR}/${PN}-1.8.1-gss-extra.patch"
+ "${FILESDIR}"/${PN}-1.8.1-gss-extra.patch
+ "${FILESDIR}"/${PN}-1.8.1-ac-270.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-18 8:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-18 8:38 [gentoo-commits] repo/gentoo:master commit in: net-libs/libgsasl/files/, net-libs/libgsasl/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-09-15 21:46 Sam James
2020-09-15 21:46 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox