cyrus-sasl: fix clang compiler error (#27911)

* Patch cyrus sasl

* fixes

* fix

* fixes

---------

Co-authored-by: Luis Caro Campos <[email protected]>

Author: as51340

recipes/cyrus-sasl/all/conandata.yml

@@ -8,14 +8,6 @@ sources:
 patches:
   "2.1.28":
     - patch_file: "patches/0001-Fix-time.h.patch"
-      patch_description: "patch"
-      patch_type: "portability"
     - patch_file: "patches/0001-use-attr-on-gnu.patch"
-      patch_source: https://github.com/cyrusimap/cyrus-sasl/commit/06f41c41e5c0f62ed5c1d703a9e2da42dfdb71f6
-      patch_description: "Fix https://github.com/cyrusimap/cyrus-sasl/issues/831"
-      patch_type: "official"
   "2.1.27":
     - patch_file: "patches/0001-use-attr-on-gnu.patch"
-      patch_source: https://github.com/cyrusimap/cyrus-sasl/commit/06f41c41e5c0f62ed5c1d703a9e2da42dfdb71f6
-      patch_description: "Fix https://github.com/cyrusimap/cyrus-sasl/issues/831"
-      patch_type: "official"

recipes/cyrus-sasl/all/patches/0001-Fix-time.h.patch

@@ -1,47 +1,45 @@
-From 266f0acf7f5e029afbb3e263437039e50cd6c262 Mon Sep 17 00:00:00 2001
-From: Sam James <>
-Date: Wed, 23 Feb 2022 00:45:15 +0000
-Subject: [PATCH] Fix <time.h> check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Backport https://github.com/cyrusimap/cyrus-sasl/pull/709
 
-We're conditionally including based on HAVE_TIME_H in a bunch of places,
-but we're not actually checking for time.h, so that's never going to be defined.
-
-While at it, add in a missing include in the cram plugin.
-
-This fixes a bunch of implicit declaration warnings:
-```
- * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
-```
-
-https://github.com/cyrusimap/cyrus-sasl/commit/266f0acf7f5e029afbb3e263437039e50cd6c262
-
---- a/lib/saslutil.c
-+++ b/lib/saslutil.c
-@@ -59,9 +59,7 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
--#ifdef HAVE_TIME_H
- #include <time.h>
--#endif
- #include "saslint.h"
- #include <saslutil.h>
+diff --git a/configure b/configure
+index 71dff1b..96e41c5 100755
+--- a/configure
++++ b/configure
+@@ -20765,7 +20765,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+ 
+ fi
+ 
+-for ac_header in crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h
++for ac_header in crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 
+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,7 @@
+@@ -53,6 +53,10 @@
  #endif
  #include <fcntl.h>
 
++#ifdef HAVE_TIME_H
 +#include <time.h>
++#endif
++
  #include <sasl.h>
  #include <saslplug.h>
  #include <saslutil.h>
+
+index 8f2f1be..28f9c95 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -304,6 +304,9 @@
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+ 
++/* Define to 1 if you have the <time.h> header file. */
++#undef HAVE_TIME_H
++
+ /* Define to 1 if you have the `strlcat' function. */
+ #undef HAVE_STRLCAT
+ 

recipes/cyrus-sasl/all/patches/0001-use-attr-on-gnu.patch

@@ -1,13 +1,16 @@
+https://github.com/cyrusimap/cyrus-sasl/commit/06f41c41e5c0f62ed5c1d703a9e2da42dfdb71f6
+https://github.com/cyrusimap/cyrus-sasl/issues/831
+
 From 06f41c41e5c0f62ed5c1d703a9e2da42dfdb71f6 Mon Sep 17 00:00:00 2001
-From: Howard Chu <[email protected]>
+From: Howard Chu
 Date: Wed, 24 Jul 2024 19:27:04 +0100
 Subject: [PATCH] include: only use __attribute__ on Gnu C
 
 It's a compiler-specific feature and we can't depend on other
 compilers supporting it identically or at all.
 Fix #831.
 
-Signed-off-by: Howard Chu <[email protected]>
+Signed-off-by: Howard Chu
 ---
  include/prop.h | 6 ++++++
  1 file changed, 6 insertions(+)