[gentoo-commits] repo/gentoo:master commit in: net-misc/lksctp-tools/files/, net-misc/lksctp-tools/

[gentoo-commits] repo/gentoo:master commit in: net-misc/lksctp-tools/files/, net-misc/lksctp-tools/

[Thomas Deutschmann]

commit:     ab36c5dacec3cd210440834fe2de5766ee32e8cf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 13:13:48 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 13:13:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab36c5da

net-misc/lksctp-tools: fix installation of /usr/include/netinet/sctp.h

Closes: https://bugs.gentoo.org/667512
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/lksctp-tools-1.0.18-install-sctp.h.patch            | 11 +++++++++++
 ...sctp-tools-1.0.18.ebuild => lksctp-tools-1.0.18-r1.ebuild} |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-install-sctp.h.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-install-sctp.h.patch
new file mode 100644
index 00000000000..f831e6c30b3
--- /dev/null
+++ b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-install-sctp.h.patch
@@ -0,0 +1,11 @@
+https://github.com/sctp/lksctp-tools/commit/378560050a8f93786c590cc99a55461666205b61
+
+--- a/src/include/netinet/Makefile.am
++++ b/src/include/netinet/Makefile.am
+@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet
+ # API.
+ include_HEADERS =
+ 
+-libcnetinet_HEADERS = sctp.h.in
+-BUILT_SOURCES = sctp.h
++libcnetinet_HEADERS = sctp.h

diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
similarity index 96%
rename from net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild
rename to net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 3f6e4887461..8dff226ebe2 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -25,6 +25,8 @@ WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
 
+PATCHES=( "${FILESDIR}"/${P}-install-sctp.h.patch )
+
 src_prepare() {
 	default
 

[gentoo-commits] repo/gentoo:master commit in: net-misc/lksctp-tools/files/, net-misc/lksctp-tools/

[Sam James]

commit:     10c30113ffd7419f21c8fc99ac5aeee80951b05f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 12:00:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 12:00:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c30113

net-misc/lksctp-tools: add upstream autoconf-2.70 patch

Thanks-to: Sergei Trofimovich <slyfox <AT> gentoo.org>
Closes: https://bugs.gentoo.org/775419
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/lksctp-tools-1.0.18-autoconf-2.70.patch  | 82 ++++++++++++++++++++++
 .../lksctp-tools/lksctp-tools-1.0.18-r1.ebuild     |  7 +-
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-autoconf-2.70.patch b/net-misc/lksctp-tools/files/lksctp-tools-1.0.18-autoconf-2.70.patch
new file mode 100644
index 00000000000..fa7b4195d93
--- /dev/null
+++ b/net-misc/lksctp-tools/files/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 <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
+-])}])
++])])

diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 3f696ca7327..bf3050d07ac 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -25,7 +25,10 @@ WARNING_IP_SCTP="CONFIG_IP_SCTP:\tis not set when it should be."
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README ROADMAP )
 
-PATCHES=( "${FILESDIR}"/${P}-install-sctp.h.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-install-sctp.h.patch
+	"${FILESDIR}"/${P}-autoconf-2.70.patch
+)
 
 src_prepare() {
 	default