From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A10D8158086 for ; Mon, 22 Nov 2021 09:52:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA2CCE08CD; Mon, 22 Nov 2021 09:52:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE945E08CD for ; Mon, 22 Nov 2021 09:52:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E8C5342EB2 for ; Mon, 22 Nov 2021 09:52:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE6FB8E for ; Mon, 22 Nov 2021 09:52:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637574701.6d0711ff5c0e069faa6aed313e975b8800e48a65.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cyrus-sasl/, dev-libs/cyrus-sasl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r5.ebuild dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch X-VCS-Directories: dev-libs/cyrus-sasl/files/ dev-libs/cyrus-sasl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6d0711ff5c0e069faa6aed313e975b8800e48a65 X-VCS-Branch: master Date: Mon, 22 Nov 2021 09:52:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 25dca0cc-35d5-41c0-9c7e-038da914ad42 X-Archives-Hash: 9a12765cfdc24995783c0dff9e539cae commit: 6d0711ff5c0e069faa6aed313e975b8800e48a65 Author: Sam James gentoo org> AuthorDate: Mon Nov 22 09:51:41 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 22 09:51:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0711ff dev-libs/cyrus-sasl: fix autoconf 2.71 compatibility (breaks gssapi detection) Closes: https://bugs.gentoo.org/825342 Signed-off-by: Sam James gentoo.org> ....1.27-r5.ebuild => cyrus-sasl-2.1.27-r6.ebuild} | 1 + .../files/cyrus-sasl-2.1.27-autoconf-2.71.patch | 45 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild similarity index 99% rename from dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r5.ebuild rename to dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild index 1a07aa6eace3..3f20ae795401 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r5.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild @@ -58,6 +58,7 @@ PATCHES=( "${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch" "${FILESDIR}/${PN}-2.1.27-slibtool.patch" "${FILESDIR}/${PN}-2.1.27-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch" + "${FILESDIR}/${PN}-2.1.27-autoconf-2.71.patch" ) pkg_setup() { diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch new file mode 100644 index 000000000000..b346cd7e5002 --- /dev/null +++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/825342 + +commit 5664c3f535289ce9efb513a2897991b5c436bb44 +Author: Pavel Raiskup +Date: Thu Apr 1 17:26:28 2021 +0200 + + 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 + +--- 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,9 +222,9 @@ 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?]), +- AC_MSG_WARN(cross-compiler, we'll do our best))) ++], [sasl_cv_dlsym_adds_uscore=yes], [sasl_cv_dlsym_adds_uscore=no ++ AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?])], ++ [AC_MSG_WARN(cross-compiler, we'll do our best)])]) + LIBS="$cmu_save_LIBS" + AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore) +