Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update airplay-protocol dependency #1

Closed
wants to merge 1 commit into from

Conversation

hicom150
Copy link
Collaborator

@hicom150 hicom150 commented Sep 8, 2019

What is the purpose of this pull request? (put an "X" next to item)

[ ] Documentation update
[ ] Bug fix
[ ] New feature
[x] Other, please explain:

Dependency update to fix security vulnerabilities

What changes did you make? (Give an overview)

Update airplay-protocol dependency to point to master as in this branch vulnerabilities are already fixed.

Is there anything you'd like reviewers to focus on?

No

@Borewit
Copy link
Member

Borewit commented Sep 8, 2019

@hicom150 Are you sure you want to merge into the master?

We could create branch from which we release, and reserve the master for changes from upstream repo. Although the desired situation is that they include your PR's directly ofcourse.

@Borewit
Copy link
Member

Borewit commented Sep 8, 2019

I merged your changes to https://github.com/webtorrent/airplayer/tree/fix-security

So they are in. For us, fix-security, is the main branch.

@Borewit Borewit closed this Sep 8, 2019
@hicom150
Copy link
Collaborator Author

hicom150 commented Sep 8, 2019

Yes you are totally right 👍

@Borewit
Copy link
Member

Borewit commented Sep 8, 2019

If changes are made to package, for releasing an interim package, it is best to keep those as well on another branch. This way we have:

  1. master branch, reserved for changes from upstream watson/airplayer master
  2. fix-security branch, which hold the fix, which is suitable to PR back to upstream project
  3. release branch, used to adjust package settings for the interim release. The last branch we do not want mix up with fixes we potentially sent back.

@Borewit
Copy link
Member

Borewit commented Sep 8, 2019

So you could indeed release it with github dependency: airplayer@github:fix-security or release a fixed NPM with a different scoped package name using the release branch.

@Borewit
Copy link
Member

Borewit commented Sep 8, 2019

Yarn would have been able to fix this issues by the way, it can override indirect dependencies.

package.json Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants