PR#6: Added autoconf-2.70 fix from upstream - rpms/lksctp-tools

rpms / lksctp-tools

#6 Added autoconf-2.70 fix from upstream

Merged 3 years ago by plautrba. Opened 3 years ago by hanecak.

rpms/ hanecak/lksctp-tools rawhide into rawhide

Added autoconf-2.70 fix from upstream

Peter Hanecak • 3 years ago

c9c310b

lksctp-tools-1.0.18-autoconf_2_70.patch

file added

+82

		`@@ -0,0 +1,82 @@`
		`+ From d6d7130f0a2e3b81880fca29966e42c1b2be40a7 Mon Sep 17 00:00:00 2001`
		`+ From: Sergei Trofimovich <slyfox@gentoo.org>`
		`+ 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 <slyfox@gentoo.org>`
		`+ Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>`
		`+ ---`
		`+ 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 <linux/sctp.h>`
		`+ #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 <linux/sctp.h>`
		`+ #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 <linux/sctp.h>`
		`+ #endif`
		`+ -])}])`
		`+ +])])`

lksctp-tools.spec

file modified

+6 -1

		`@@ -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 @@`
		`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 @@`
		`%patch5 -p1`
		`%patch6 -p1`
		`%patch7 -p1`
		`+ %patch8 -p1`

		`%build`
		`[ ! -x ./configure ] && sh bootstrap`
		`@@ -94,6 +96,9 @@`
		`%doc doc/*.txt`

		`%changelog`
		`+ * Sat Apr 17 2021 Peter Hanecak <hany@hany.sk> - 1.0.18-10`
		`+ - Added autoconf-2.70 fix from upstream`
		`+`
		`* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.18-9`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`