diff --git a/backport-configure-fix-check-for-dlsym-underscore.patch b/backport-configure-fix-check-for-dlsym-underscore.patch new file mode 100644 index 0000000000000000000000000000000000000000..23f15b54ebfda14c2f1d1edbb03030d7e440e7dd --- /dev/null +++ b/backport-configure-fix-check-for-dlsym-underscore.patch @@ -0,0 +1,28 @@ +From 999255e05719f61bdbce8125be2ee774493aa64a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro +Date: Wed, 3 Mar 2021 09:18:09 +0100 +Subject: [PATCH] configure: fix check for dlsym underscore + +The exit function requires to include stdlib otherwise +this will fail on new versions of MacOS + +Signed-off-by: Ignacio Casal Quinteiro +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index a106d35..f3e5ddc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -216,6 +216,7 @@ if test $sasl_cv_uscore = yes; then + AC_CACHE_VAL(sasl_cv_dlsym_adds_uscore,AC_TRY_RUN( [ + #include + #include ++#include + void foo() { int i=0;} + int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY); + if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo"); +-- +1.8.3.1 + diff --git a/backport-configure.ac-avoid-side-effects-in-AC_CACHE_VAL.patch b/backport-configure.ac-avoid-side-effects-in-AC_CACHE_VAL.patch new file mode 100644 index 0000000000000000000000000000000000000000..afc2cafec9136339a8a368c525a6d173926a6082 --- /dev/null +++ b/backport-configure.ac-avoid-side-effects-in-AC_CACHE_VAL.patch @@ -0,0 +1,37 @@ +From 15cbc14aeb4b754b1b3db65f7c892c7deabaab41 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Thu, 1 Apr 2021 17:17:52 +0200 +Subject: [PATCH] configure.ac: avoid side-effects in AC_CACHE_VAL + +In the COMMANDS-TO-SET-IT argument, per Autoconf docs: +https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Caching-Results.html + +Signed-off-by: Pavel Raiskup +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f3e5ddc..79c93c8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -221,11 +221,14 @@ void foo() { int i=0;} + int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY); + if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo"); + if(ptr1 && !ptr2) exit(0); } exit(1); } +-], [sasl_cv_dlsym_adds_uscore=yes], sasl_cv_dlsym_adds_uscore=no +- AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?]), ++], [sasl_cv_dlsym_adds_uscore=yes], sasl_cv_dlsym_adds_uscore=no, + AC_MSG_WARN(cross-compiler, we'll do our best))) + LIBS="$cmu_save_LIBS" + AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore) ++ ++ if test "$sasl_cv_dlsym_adds_uscore" = no; then ++ AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?]) ++ fi + fi + fi + +-- +1.8.3.1 + diff --git a/backport-configure.ac-properly-quote-macro-arguments.patch b/backport-configure.ac-properly-quote-macro-arguments.patch new file mode 100644 index 0000000000000000000000000000000000000000..91643485e56fc82a8792358d39325e695f7a089f --- /dev/null +++ b/backport-configure.ac-properly-quote-macro-arguments.patch @@ -0,0 +1,48 @@ +From 5664c3f535289ce9efb513a2897991b5c436bb44 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Thu, 1 Apr 2021 17:26:28 +0200 +Subject: [PATCH] configure.ac: properly quote macro arguments + +Autoconf 2.70+ is more picky about the quotation (even though with +previous versions the arguments should have been quoted, too). When we +don't quote macros inside the AC_CACHE_VAL macro - some of the Autoconf +initialization is wrongly ordered in ./configure script and we keep +seeing bugs like: + + ./configure: line 2165: ac_fn_c_try_run: command not found + +Original report: https://bugzilla.redhat.com/1943013 + +Signed-off-by: Pavel Raiskup +--- + configure.ac | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79c93c8..aa0dc38 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -213,7 +213,8 @@ if test $sasl_cv_uscore = yes; then + AC_MSG_CHECKING(whether dlsym adds the underscore for us) + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $SASL_DL_LIB" +- AC_CACHE_VAL(sasl_cv_dlsym_adds_uscore,AC_TRY_RUN( [ ++ AC_CACHE_VAL([sasl_cv_dlsym_adds_uscore], ++ [AC_TRY_RUN([ + #include + #include + #include +@@ -221,8 +222,8 @@ void foo() { int i=0;} + int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY); + if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo"); + if(ptr1 && !ptr2) exit(0); } exit(1); } +-], [sasl_cv_dlsym_adds_uscore=yes], sasl_cv_dlsym_adds_uscore=no, +- AC_MSG_WARN(cross-compiler, we'll do our best))) ++], [sasl_cv_dlsym_adds_uscore=yes], [sasl_cv_dlsym_adds_uscore=no], ++ [AC_MSG_WARN(cross-compiler, we'll do our best)])]) + LIBS="$cmu_save_LIBS" + AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore) + +-- +1.8.3.1 + diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index a28ade905fc3d108c0fbb1188755a7f25e588251..f0f6f0c42b7fe6f8f2943ecc419afbbe3a40c45c 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -6,7 +6,7 @@ Name: cyrus-sasl Version: 2.1.27 -Release: 13 +Release: 14 Summary: The Cyrus SASL API Implementation License: BSD with advertising @@ -19,6 +19,9 @@ Patch0: 0003-Prevent-double-free-of-RC4-context.patch Patch1: fix-CVE-2019-19906.patch Patch2: backport-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch Patch3: backport-CVE-2022-24407-Escape-password-for-SQL-insert-update.patch +Patch4: backport-configure-fix-check-for-dlsym-underscore.patch +Patch5: backport-configure.ac-avoid-side-effects-in-AC_CACHE_VAL.patch +Patch6: backport-configure.ac-properly-quote-macro-arguments.patch BuildRequires: autoconf, automake, libtool, gdbm-devel, groff BuildRequires: krb5-devel >= 1.2.2, openssl-devel, pam-devel, pkgconfig @@ -261,6 +264,9 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %changelog +* Fri May 20 2022 yixiangzhike - 2.1.27-14 +- compatible with autoconf-2.71 + * Thu Feb 24 2022 yixiangzhike - 2.1.27-13 - fix CVE-2022-24407