Bug 209204 – Cherry pick usrsctp commit 790a7a2555aefb392a5a69923f1e9d17b4968467

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Alex Christensen]

Update usrsctp to 3212d5413a75d4d039e80874dffd2e44f8087ce4

[Alex Christensen]

Created attachment 393801 [details]
Patch

[Alex Christensen]

<rdar://problem/59362671>

[David Kilzer (:ddkilzer)]

Were these two patches reapplied after updating the source?

$ grep -l usrsctp Source/ThirdParty/libwebrtc/WebKit/*
Source/ThirdParty/libwebrtc/WebKit/0002-Fixing-usrctp-library-compilation-errors.patch
Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp.diff

[David Kilzer (:ddkilzer)]

(In reply to David Kilzer (:ddkilzer) from comment #3)
> Were these two patches reapplied after updating the source?
> 
> $ grep -l usrsctp Source/ThirdParty/libwebrtc/WebKit/*
> Source/ThirdParty/libwebrtc/WebKit/0002-Fixing-usrctp-library-compilation-
> errors.patch
> Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp.diff

Or if the changes already exist in the updated source tree, can they be removed?

[David Kilzer (:ddkilzer)]

(In reply to David Kilzer (:ddkilzer) from comment #4)
> (In reply to David Kilzer (:ddkilzer) from comment #3)
> > Were these two patches reapplied after updating the source?
> > 
> > $ grep -l usrsctp Source/ThirdParty/libwebrtc/WebKit/*
> > Source/ThirdParty/libwebrtc/WebKit/0002-Fixing-usrctp-library-compilation-
> > errors.patch
> > Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp.diff
> 
> Or if the changes already exist in the updated source tree, can they be
> removed?

I see part of this was removed:

Source/ThirdParty/libwebrtc/WebKit/0002-Fixing-usrctp-library-compilation-errors.patch

So maybe you already applied both of these?

[Alex Christensen]

The first one was.  The second needs double checking.
Youenn and I talked and agreed to use a different revision.

[Alex Christensen]

Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp.diff isn't applied in the current checkout, and to reduce change I think we should leave it like that.  Half of it doesn't apply any more.

My quest to find a different revision is going much slower than anticipated.  My home internet isn't as fast as my office internet...

[David Kilzer (:ddkilzer)]

(In reply to Alex Christensen from comment #7)
> Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp.diff isn't applied in the
> current checkout, and to reduce change I think we should leave it like that.
> Half of it doesn't apply any more.

It was originally added for Bug 186009, and I filed this upstream bug:

https://github.com/sctplab/usrsctp/issues/230

However, it sounds like Source/ThirdParty/libwebrtc/WebKit/patch-usrsctp.diff can simply be removed since everything was fixed upstream already, was in commented out code, or was a false positive.

[Alex Christensen]

Created attachment 393949 [details]
Patch

[EWS]

Committed r258690: <https://trac.webkit.org/changeset/258690>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 393949 [details].