From d7c31112db0c2fa84c7c6fdc2da074335d80d413 Mon Sep 17 00:00:00 2001 From: Yunfei Li Date: Tue, 23 May 2023 15:46:53 +0800 Subject: [PATCH] fix va_arg_pack conflict with clang compile --- ...-fix-va_arg_pack-conflict-with-clang.patch | 47 +++++++++++++++++++ cyrus-sasl.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0001-fix-va_arg_pack-conflict-with-clang.patch diff --git a/0001-fix-va_arg_pack-conflict-with-clang.patch b/0001-fix-va_arg_pack-conflict-with-clang.patch new file mode 100644 index 0000000..d77eef2 --- /dev/null +++ b/0001-fix-va_arg_pack-conflict-with-clang.patch @@ -0,0 +1,47 @@ +From 0ad1ba5931b5b3d7eaa138bb9235ff0205974c49 Mon Sep 17 00:00:00 2001 +From: liyunfei +Date: Tue, 23 May 2023 15:15:08 +0800 +Subject: [PATCH] fix va_arg_pack conflict with clang + +--- + sample/common.c | 2 ++ + sample/common.h | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/sample/common.c b/sample/common.c +index 712549f..a6cc716 100644 +--- a/sample/common.c ++++ b/sample/common.c +@@ -127,6 +127,7 @@ int recv_string(FILE *f, char *buf, int buflen) + + int debuglevel = 0; + ++#ifdef __va_arg_pack + int dprintf(int lvl, const char *fmt, ...) + { + va_list ap; +@@ -140,6 +141,7 @@ int dprintf(int lvl, const char *fmt, ...) + + return ret; + } ++#endif + + void saslerr(int why, const char *what) + { +diff --git a/sample/common.h b/sample/common.h +index 819d010..a59f849 100644 +--- a/sample/common.h ++++ b/sample/common.h +@@ -43,7 +43,9 @@ extern int send_string(FILE *f, const char *s, int l); + extern int recv_string(FILE *f, char *buf, int buflen); + + extern int debuglevel; ++#ifdef __va_arg_pack + extern int dprintf(int lvl, const char *fmt, ...); ++#endif + + extern void saslerr(int why, const char *what); + extern void saslfail(int why, const char *what); +-- +2.28.0.windows.1 + diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 55e80da..d0cde1f 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -6,7 +6,7 @@ Name: cyrus-sasl Version: 2.1.28 -Release: 1 +Release: 2 Summary: The Cyrus SASL API Implementation License: BSD with advertising @@ -16,6 +16,7 @@ Source1: saslauthd.service Source2: saslauthd.sysconfig Patch1: backport-Fix-earlier-554-commit-to-use-fetch_errno-instead-of.patch +Patch2: 0001-fix-va_arg_pack-conflict-with-clang.patch BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig @@ -258,6 +259,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %changelog +* Tue May 23 2023 liyunfei - 2.1.28-2 +- fix va_arg_pack conflict with clang compile + * Tue Oct 25 2022 yixiangzhike - 2.1.28-1 - update to 2.1.28 -- Gitee