commit: 232b26749202346408c3757cc4c79af08208007a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 25 12:50:15 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 25 13:02:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232b2674
app-crypt/mit-krb5: fix build with autoconf 2.70 Thanks-to: Sergei Trofimovich <slyfox <AT> gentoo.org> Closes: https://bugs.gentoo.org/778167 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/mit-krb5-1.18.2-autoconf-2.70.patch | 35 ++++++++++++++++++++++ app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild | 1 + 2 files changed, 36 insertions(+) diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch new file mode 100644 index 00000000000..6741c47e0d1 --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/778167 + +From f78edbe30816f049e1360cb6e203fabfdf7b98df Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <[email protected]> +Date: Fri, 6 Nov 2020 08:14:57 +0000 +Subject: [PATCH] Fix compatibility with upcoming autoconf 2.70 + +Mainline autoconf generates no shell code for AC_CONFIG_AUX_DIR(). +Call it unconditionally to avoid a syntax error. + +[[email protected]: rewrote commit message] + +ticket: 8960 (new) +tags: pullup +target_version: 1.18-next +target_version: 1.17-next +--- + src/aclocal.m4 | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- src/aclocal.m4 ++++ src/aclocal.m4 +@@ -13,11 +13,7 @@ fi + ac_topdir=$srcdir/$ac_reltopdir + ac_config_fragdir=$ac_reltopdir/config + # echo "Looking for $srcdir/$ac_config_fragdir" +-if test -d "$srcdir/$ac_config_fragdir"; then +- AC_CONFIG_AUX_DIR(K5_TOPDIR/config) +-else +- AC_MSG_ERROR([can not find config/ directory in $ac_reltopdir]) +-fi ++AC_CONFIG_AUX_DIR(K5_TOPDIR/config) + ])dnl + dnl + dnl Version info. diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild index 15bd4e8cb41..8482b1acd95 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.18-libressl.patch" "${FILESDIR}/CVE-2020-28196.patch" "${FILESDIR}/${PN}-1.18.2-krb5-config.patch" + "${FILESDIR}/${PN}-1.18.2-autoconf-2.70.patch" ) MULTILIB_CHOST_TOOLS=(
