From c9c310b1ac9aa206e694078318aa045020bebad6 Mon Sep 17 00:00:00 2001 From: Peter Hanecak Date: Apr 17 2021 15:01:39 +0000 Subject: Added autoconf-2.70 fix from upstream --- diff --git a/lksctp-tools-1.0.18-autoconf_2_70.patch b/lksctp-tools-1.0.18-autoconf_2_70.patch new file mode 100644 index 0000000..fa7b419 --- /dev/null +++ b/lksctp-tools-1.0.18-autoconf_2_70.patch @@ -0,0 +1,82 @@ +From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 8 Jan 2021 22:22:52 +0000 +Subject: [PATCH] m4/sctp.m4: make conpatible to autoconf-2.70 + +On recently released `autoconf-2.70` generated `./configure` +fails as: + +``` +$ ./configure +... +checking for struct sctp_event_subscribe.sctp_stream_reset_event... yes +checking for gcc options needed to detect all undeclared functions... none needed +./configure: line 16464: syntax error: unexpected end of file +``` + +This happens becuase new autoconf generates less whitespace: + +``` +{ +if ... +... +fi} +``` + +It requires at least whitespace between `fi` and `}`. + +As input already has newlines the change just drops extra `{}`. + +Tested on `autoconf-2.69` and `autoconf-2.70`. + +Signed-off-by: Sergei Trofimovich +Signed-off-by: Marcelo Ricardo Leitner +--- + m4/sctp.m4 | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/m4/sctp.m4 b/m4/sctp.m4 +index 6593517..94527a6 100644 +--- a/m4/sctp.m4 ++++ b/m4/sctp.m4 +@@ -6,7 +6,7 @@ + + # Macros to assist on probing kernel features + # Probes if a type is defined +-AC_DEFUN([LKSCTP_CHECK_TYPE], [{ ++AC_DEFUN([LKSCTP_CHECK_TYPE], [ + AC_CHECK_TYPE([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -22,10 +22,10 @@ AC_CHECK_TYPE([$1], + #ifdef HAVE_LINUX_SCTP_H + # include + #endif +-])}]) ++])]) + + # Probes if a struct has a given member +-AC_DEFUN([LKSCTP_CHECK_MEMBER], [{ ++AC_DEFUN([LKSCTP_CHECK_MEMBER], [ + AC_CHECK_MEMBER([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -41,10 +41,10 @@ AC_CHECK_MEMBER([$1], + #ifdef HAVE_LINUX_SCTP_H + # include + #endif +-])}]) ++])]) + + # Probes if a declaration is present +-AC_DEFUN([LKSCTP_CHECK_DECL], [{ ++AC_DEFUN([LKSCTP_CHECK_DECL], [ + AC_CHECK_DECL([$1], + AC_DEFINE([$2], 1, + [Define if $1 is present.]) +@@ -60,4 +60,4 @@ AC_CHECK_DECL([$1], + #ifdef HAVE_LINUX_SCTP_H + # include + #endif +-])}]) ++])]) diff --git a/lksctp-tools.spec b/lksctp-tools.spec index cd8ed85..6233d56 100644 --- a/lksctp-tools.spec +++ b/lksctp-tools.spec @@ -1,7 +1,7 @@ Name: lksctp-tools Summary: User-space access to Linux Kernel SCTP Version: 1.0.18 -Release: 9%{?dist} +Release: 10%{?dist} # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification License: GPLv2 and GPLv2+ and LGPLv2 and MIT Group: System Environment/Libraries @@ -16,6 +16,7 @@ Patch4: lksctp-tools-1.0.18-build-remove-v4.12-secondary-defines-in-favor-of-HAV Patch5: lksctp-tools-1.0.18-build-fix-probing-for-HAVE_SCTP_SENDV.patch Patch6: lksctp-tools-1.0.18-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch Patch7: lksctp-tools-symver.patch +Patch8: lksctp-tools-1.0.18-autoconf_2_70.patch BuildRequires: libtool, automake, autoconf, make %description @@ -58,6 +59,7 @@ Drafts). %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build [ ! -x ./configure ] && sh bootstrap @@ -94,6 +96,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete %doc doc/*.txt %changelog +* Sat Apr 17 2021 Peter Hanecak - 1.0.18-10 +- Added autoconf-2.70 fix from upstream + * Tue Jan 26 2021 Fedora Release Engineering - 1.0.18-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild