CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cyrus-sasl: Fix autoconf patch to work with new autoconf 2.72

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-03-30 17:20:53 -07:00
parent 1807ecfe4b
commit babd1cbf85
2 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-Fix-time.h-check.patch
View File

@ -28,11 +28,9 @@ Signed-off-by: Sam James <sam@gentoo.org>
plugins/cram.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index e1bf53b6..ad781830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
@@ -1231,7 +1231,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
AC_HEADER_DIRENT
AC_HEADER_SYS_WAIT
@ -41,8 +39,6 @@ index e1bf53b6..ad781830 100644
IPv6_CHECK_SS_FAMILY()
IPv6_CHECK_SA_LEN()
diff --git a/plugins/cram.c b/plugins/cram.c
index d02e9baa..695aaa91 100644
--- a/plugins/cram.c
+++ b/plugins/cram.c
@@ -53,6 +53,10 @@
@ -56,6 +52,3 @@ index d02e9baa..695aaa91 100644
#include <sasl.h>
#include <saslplug.h>
#include <saslutil.h>
--
2.37.3

73
meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch
View File

@ -1,50 +1,39 @@
From 288430d3c2d3f36a4c9d40c4fffa85288f44549a Mon Sep 17 00:00:00 2001
From: "Roy.Li" <rongqing.li@windriver.com>
Date: Tue, 25 Jun 2013 09:22:59 +0800
Subject: [PATCH] Avoid to call AC_TRY_RUN
Remove AC_TRY_RUN
Upstream-Status: Inappropriate [configuration]
It can not be run during cross compile
Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO
on cross-compile environment by definition AC_ARG_ENABLE enable-spnego
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
m4/sasl2.m4 | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
index 80371ef..ff70083 100644
Upstream-Status: Inappropriate [Cross-compile specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/m4/sasl2.m4
+++ b/m4/sasl2.m4
@@ -316,6 +316,18 @@ if test "$gssapi" != no; then
@@ -316,28 +316,8 @@ if test "$gssapi" != no; then
AC_CACHE_CHECK([for SPNEGO support in GSSAPI libraries],[ac_cv_gssapi_supports_spnego],[
cmu_save_LIBS="$LIBS"
LIBS="$LIBS $GSSAPIBASE_LIBS"
+ AC_ARG_ENABLE([spnego],
+ [AC_HELP_STRING([--enable-spnego=<DIR>],
+ [enable SPNEGO support in GSSAPI libraries [no]])],
+ [spnego=$enableval],
+ [spnego=no])
+
+ if test "$spnego" = no; then
+ echo "no"
+ elif test "$spnego" = yes; then
+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
+ else
+ AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])
AC_TRY_RUN([
#ifdef HAVE_GSSAPI_H
#include <gssapi.h>
@@ -343,7 +355,7 @@ int main(void)
AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[
AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
])
- AC_TRY_RUN([
-#ifdef HAVE_GSSAPI_H
-#include <gssapi.h>
-#else
-#include <gssapi/gssapi.h>
-#endif
-
+ fi
else
AC_MSG_RESULT([disabled])
fi
--
2.25.1
-int main(void)
-{
- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
- gss_OID_set mech_set;
- OM_uint32 min_stat;
- int have_spnego = 0;
-
- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
- gss_release_oid_set(&min_stat, &mech_set);
- }
-
- return (!have_spnego); // 0 = success, 1 = failure
-}
-],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no])
+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
+ AC_MSG_RESULT(yes)
LIBS="$cmu_save_LIBS"
])
AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[