81 lines
3.4 KiB
Diff
81 lines
3.4 KiB
Diff
From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001
|
|
From: Xin Long <lucien.xin@gmail.com>
|
|
Date: Fri, 24 Aug 2018 01:13:32 +0800
|
|
Subject: [PATCH] build: fix netinet/sctp.h not to be installed
|
|
|
|
From db6d15bf12a0123e4320e5fd7cb688331dea1bdc Mon Sep 17 00:00:00 2001
|
|
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
|
|
Date: Fri, 24 Aug 2018 09:52:58 -0300
|
|
Subject: [PATCH] build: remove v4.12 secondary defines in favor of
|
|
HAVE_SCTP_STREAM_RECONFIG
|
|
|
|
From 596efd6631b83069d41782fb0ee2d6cf76a50dfa Mon Sep 17 00:00:00 2001
|
|
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
|
|
Date: Fri, 24 Aug 2018 09:52:59 -0300
|
|
Subject: [PATCH] build: fix probing for HAVE_SCTP_SENDV
|
|
|
|
From e5952a0cdfa8b1b56a5823574835f1f771f14ae0 Mon Sep 17 00:00:00 2001
|
|
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
|
|
Date: Fri, 24 Aug 2018 09:53:00 -0300
|
|
Subject: [PATCH] build: 0b0dce7a36fb actually belongs to v4.19
|
|
|
|
diff -Naur a/configure.ac b/configure.ac
|
|
--- a/configure.ac 2020-07-01 10:56:38.411772329 +0800
|
|
+++ b/configure.ac 2020-07-01 14:28:33.355511122 +0800
|
|
@@ -75,14 +75,6 @@
|
|
LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_reset_event],
|
|
[HAVE_SCTP_STREAM_RESET_EVENT])
|
|
|
|
-# Support for assoc reset event, added on v4.12, c95129d127c6
|
|
-#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_assoc_reset_event], \
|
|
-# [HAVE_SCTP_ASSOC_RESET_EVENT])
|
|
-
|
|
-# Support for stream change event, added on v4.12, b444153fb5a6
|
|
-#LKSCTP_CHECK_MEMBER([struct sctp_event_subscribe.sctp_stream_change_event], \
|
|
-# [HAVE_SCTP_STREAM_CHANGE_EVENT])
|
|
-
|
|
# RFC 6525 (Stream Reconf), finished on v4.12, c0d8bab6ae51
|
|
LKSCTP_CHECK_DECL([SCTP_RECONFIG_SUPPORTED], [HAVE_SCTP_STREAM_RECONFIG])
|
|
|
|
@@ -95,15 +87,14 @@
|
|
LKSCTP_CHECK_MEMBER([struct sctp_pdapi_event.pdapi_seq],
|
|
[HAVE_SCTP_PDAPI_EVENT_PDAPI_SEQ])
|
|
|
|
-# PR-SCTP field used to probe for sendv/recvv support, added on v4.17
|
|
-LKSCTP_CHECK_MEMBER([struct sendv_prinfo.sctp_prinfo],
|
|
- [HAVE_SCTP_SENDV])
|
|
+# PR-SCTP struct used to probe for sendv/recvv support, added on v4.17
|
|
+LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV])
|
|
|
|
# This event indicates that the peer does not support SCTP authentication,
|
|
# added on v4.16, 30f6ebf65bc4
|
|
LKSCTP_CHECK_DECL([SCTP_AUTH_NO_AUTH], [HAVE_SCTP_AUTH_NO_AUTH])
|
|
|
|
-# New members to sctp_paddrparams, added on v4.18, 0b0dce7a36fb
|
|
+# New members to sctp_paddrparams, added on v4.19, 0b0dce7a36fb
|
|
LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_ipv6_flowlabel],
|
|
[HAVE_SCTP_SPP_IPV6_FLOWLABEL])
|
|
LKSCTP_CHECK_MEMBER([struct sctp_paddrparams.spp_dscp],
|
|
diff -Naur a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am
|
|
--- a/src/include/netinet/Makefile.am 2020-07-01 10:56:38.421772349 +0800
|
|
+++ b/src/include/netinet/Makefile.am 2020-07-01 14:20:14.894642374 +0800
|
|
@@ -11,5 +11,4 @@
|
|
# API.
|
|
include_HEADERS =
|
|
|
|
-libcnetinet_HEADERS = sctp.h.in
|
|
-BUILT_SOURCES = sctp.h
|
|
+libcnetinet_HEADERS = sctp.h
|
|
diff -Naur a/src/include/netinet/sctp.h.in b/src/include/netinet/sctp.h.in
|
|
--- a/src/include/netinet/sctp.h.in 2020-07-01 10:56:38.421772349 +0800
|
|
+++ b/src/include/netinet/sctp.h.in 2020-07-01 14:25:06.035149487 +0800
|
|
@@ -61,8 +61,6 @@
|
|
#define HAVE_SCTP_CANSET_PRIMARY
|
|
|
|
#undef HAVE_SCTP_STREAM_RESET_EVENT
|
|
-#undef HAVE_SCTP_ASSOC_RESET_EVENT
|
|
-#undef HAVE_SCTP_STREAM_CHANGE_EVENT
|
|
#undef HAVE_SCTP_STREAM_RECONFIG
|
|
#undef HAVE_SCTP_PEELOFF_FLAGS
|
|
#undef HAVE_SCTP_PDAPI_EVENT_PDAPI_STREAM
|