From a4d27825eb68a75b92d5147800fa2812584b24476eee98ed8af603d1d4e46c73 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 29 Jun 2022 07:23:29 +0000 Subject: [PATCH] Accepting request 985672 from home:1Antoine1:branches:network - Add heimdal-7.7.0-autoconf-2.70.patch: Fix build with autoconf 2.70 (gh#heimdal/heimdal#856). OBS-URL: https://build.opensuse.org/request/show/985672 OBS-URL: https://build.opensuse.org/package/show/network/libheimdal?expand=0&rev=26 --- heimdal-7.7.0-autoconf-2.70.patch | 32 +++++++++++++++++++++++++++++++ libheimdal.changes | 6 ++++++ libheimdal.spec | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 heimdal-7.7.0-autoconf-2.70.patch diff --git a/heimdal-7.7.0-autoconf-2.70.patch b/heimdal-7.7.0-autoconf-2.70.patch new file mode 100644 index 0000000..5217294 --- /dev/null +++ b/heimdal-7.7.0-autoconf-2.70.patch @@ -0,0 +1,32 @@ +From e109c0e6f550c81095d387761eb37f7c2b914475 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Wed, 17 Mar 2021 17:49:18 +0100 +Subject: [PATCH] autoconf-2.70 fix + +autoconf-2.70 and newer are more strict with quoting etc. and thus generate +a broken configure file: + + configure: 20855: Syntax error: ")" unexpected (expecting "fi") + +(cherry picked from commit 22352b90e78e2d162b98b5ef6c84672c397be40a) + +Change-Id: I39730c768e7bfaffa3c7ad2474f16649b04e949f +Gentoo-bug: https://bugs.gentoo.org/776241 +Signed-off-by: Lars Wendler +--- + cf/check-var.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cf/check-var.m4 b/cf/check-var.m4 +index 2fd7bca6f0..71d6f70ca8 100644 +--- a/cf/check-var.m4 ++++ b/cf/check-var.m4 +@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo) + if test "$ac_foo" = yes; then + AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, + [Define if you have the `]$1[' variable.]) +- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2])) ++ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])]) + fi + ]) + diff --git a/libheimdal.changes b/libheimdal.changes index ea1f0b7..30beb1f 100644 --- a/libheimdal.changes +++ b/libheimdal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 28 18:47:19 UTC 2022 - Antoine Belvire + +- Add heimdal-7.7.0-autoconf-2.70.patch: Fix build with autoconf + 2.70 (gh#heimdal/heimdal#856). + ------------------------------------------------------------------- Wed May 25 11:59:29 UTC 2022 - Jan Engelhardt diff --git a/libheimdal.spec b/libheimdal.spec index ea9ce60..4e77a93 100644 --- a/libheimdal.spec +++ b/libheimdal.spec @@ -30,6 +30,8 @@ Source2: heimdal-patch-source.sh Patch0: heimdal-patched.diff # PATCH-FIX-UPSTREAM bmwiedemann -- make build reproducible (boo#1047218) Patch1: reproducible.patch +# PATCH-FIX-UPSTREAM heimdal-7.7.0-autoconf-2.70.patch -- fix build with autoconf 2.70 (gh#heimdal/heimdal#856) +Patch2: heimdal-7.7.0-autoconf-2.70.patch %if 0%{?sles_version} == 11 BuildRequires: libcom_err-devel BuildRequires: sqlite3-devel