Bug 209204

Summary:

Cherry pick usrsctp commit 790a7a2555aefb392a5a69923f1e9d17b4968467

Product:

WebKit

Reporter:

Alex Christensen <achristensen>

Component:

New Bugs

Assignee:

Alex Christensen <achristensen>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

annulen, ddkilzer, eric.carlson, ews-watchlist, gyuyoung.kim, ryuan.choi, sergio, webkit-bug-importer, youennf

Priority:

Keywords:

InRadar

Version:

WebKit Nightly Build

Hardware:

Unspecified

OS:

Unspecified

Attachments:

Description	Flags
Patch	none
Patch	none

Description Alex Christensen 2020-03-17 16:27:02 PDT

Update usrsctp to 3212d5413a75d4d039e80874dffd2e44f8087ce4

Comment 1 Alex Christensen 2020-03-17 16:29:28 PDT

Created attachment 393801 [details]
Patch

Comment 2 Alex Christensen 2020-03-17 16:29:31 PDT

<rdar://problem/59362671>

Comment 3 David Kilzer (:ddkilzer) 2020-03-18 10:10:24 PDT

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

Comment 4 David Kilzer (:ddkilzer) 2020-03-18 10:10:50 PDT

(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?

Comment 5 David Kilzer (:ddkilzer) 2020-03-18 10:22:01 PDT

(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?

Comment 6 Alex Christensen 2020-03-18 10:22:15 PDT

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

Comment 7 Alex Christensen 2020-03-18 19:58:31 PDT

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...

Comment 8 David Kilzer (:ddkilzer) 2020-03-18 20:41:09 PDT

(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.

Comment 9 Alex Christensen 2020-03-18 21:50:28 PDT

Created attachment 393949 [details]
Patch

Comment 10 EWS 2020-03-19 03:15:07 PDT

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

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