Skip to contentSkip to conversation

lksctp-tools: Update to latest master

PATCH New Khem Raj 1 participant 1 message Nov 9, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 lksctp-tools: Update to latest master

Drop the patches which are upstream now

---
 ...0dce7a36fb-actually-belongs-to-v4.19.patch | 31 --------
 ...x-netinet-sctp.h-not-to-be-installed.patch | 35 ---------
 ...uild-fix-probing-for-HAVE_SCTP_SENDV.patch | 35 ---------
 ...12-secondary-defines-in-favor-of-HAV.patch | 52 --------------
 ...-CURRENT-REVISION-and-AGE-for-libsct.patch | 71 -------------------
 ...1_events.c-initialize-event-properly.patch | 44 ------------
 ...tp-use-PACKAGE_VERSION-in-withsctp.h.patch | 43 -----------
 .../lksctp-tools/lksctp-tools_1.0.18.bb       |  9 +--
 8 files changed, 1 insertion(+), 319 deletions(-)
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch
 delete mode 100644 meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch
meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch deleted +0 -31
deleted file mode 100644
index 7599b1bcfb..0000000000
@@ -1,31 +0,0 @@
-From e5952a0cdfa8b1b56a5823574835f1f771f14ae0 Mon Sep 17 00:00:00 2001
-From: Marcelo Ricardo Leitner <[email protected]>
-Date: Fri, 24 Aug 2018 09:53:00 -0300
-Subject: [PATCH] build: 0b0dce7a36fb actually belongs to v4.19
-
-Typo or not, this commit actually belongs to v4.19 and made me wonder why
-on v4.18 it didn't find this feature.
-
-Fixes: 817f0bfa248f ("build: add two defines for Peer Address Parameters extensions on sctp_paddrparams")
-Signed-off-by: Marcelo Ricardo Leitner <[email protected]>
-Reviewed-by: Xin Long <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f55775a..5de5c76 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,7 +101,7 @@ LKSCTP_CHECK_TYPE([struct sctp_prinfo], [HAVE_SCTP_SENDV])
- # 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],
--- 
-2.7.4
-
meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-netinet-sctp.h-not-to-be-installed.patch deleted +0 -35
deleted file mode 100644
index 03c6c4f737..0000000000
@@ -1,35 +0,0 @@
-From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001
-From: Xin Long <[email protected]>
-Date: Fri, 24 Aug 2018 01:13:32 +0800
-Subject: [PATCH] build: fix netinet/sctp.h not to be installed
-
-After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can
-no longer be installed into ${includedir}.
-
-Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already
-added into configure.ac, there's no need to generate sctp.h by
-automake.
-
-So we simply set libcnetinet_HEADERS back to sctp.h.
-
-Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup")
-Signed-off-by: Xin Long <[email protected]>
-Signed-off-by: Marcelo Ricardo Leitner <[email protected]>
----
- src/include/netinet/Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am
-index ca0aac2..965db8c 100644
---- 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
--- 
-2.7.4
-
meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch deleted +0 -35
deleted file mode 100644
index 89c89835da..0000000000
@@ -1,35 +0,0 @@
-From 596efd6631b83069d41782fb0ee2d6cf76a50dfa Mon Sep 17 00:00:00 2001
-From: Marcelo Ricardo Leitner <[email protected]>
-Date: Fri, 24 Aug 2018 09:52:59 -0300
-Subject: [PATCH] build: fix probing for HAVE_SCTP_SENDV
-
-Somehow it was using a type that is non-existent. The right one is
-sctp_prinfo, introduced on ed63afb8a318 ("sctp: add support for PR-SCTP
-Information for sendmsg"), present on v4.17.
-
-Fixes: 1b798f1ca3b5 ("build: add define HAVE_SCTP_AUTH_NO_AUTH")
-Signed-off-by: Marcelo Ricardo Leitner <[email protected]>
-Reviewed-by: Xin Long <[email protected]>
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dad658c..f55775a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,9 +94,8 @@ LKSCTP_CHECK_MEMBER([struct sctp_pdapi_event.pdapi_stream],
- 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
--- 
-2.7.4
-
meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch deleted +0 -52

52 lines not on this page · raw message

meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch deleted +0 -71

71 lines not on this page · raw message

meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-test_1_to_1_events.c-initialize-event-properly.patch deleted +0 -44

44 lines not on this page · raw message

meta-networking/recipes-support/lksctp-tools/lksctp-tools/0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch deleted +0 -43

43 lines not on this page · raw message

meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.18.bb +1 -8
index 3cabc4ff8d..1e2c644b41 100644
@@ -8,20 +8,13 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \
 "
 
-SRCREV = "1b077af62d83d53c34b1bde8bad6648149d5edf9"
+SRCREV = "12c74404e09755561dee40cf194954f7ff5afd60"
 
 PV .= "+git${SRCPV}"
 LK_REL = "1.0.18"
 
 SRC_URI = " \
     git://github.com/sctp/lksctp-tools.git \
-    file://0001-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch \
-    file://0001-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch \
-    file://0001-build-fix-netinet-sctp.h-not-to-be-installed.patch \
-    file://0001-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch \
-    file://0001-build-fix-probing-for-HAVE_SCTP_SENDV.patch \
-    file://0001-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch \
-    file://0001-test_1_to_1_events.c-initialize-event-properly.patch \
     file://run-ptest \
     file://v4test.sh \
     file://v6test.sh \
Signature · 1 line
2.29.2