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

python-requests: allow urllib3 1.25.x #8807

Merged
merged 2 commits into from May 13, 2019
Merged

Conversation

BKPepe
Copy link
Member

@BKPepe BKPepe commented Apr 26, 2019

Maintainer: me and @commodo
Compile tested: Turris MOX, cortexa53, OpenWrt master
Run tested: Turris MOX, cortexa53, OpenWrt master

Description:

  • Add patch, which allows urllib3 1.25.x
    Version 1.25 of urllib3 was merged to master 2 days ago, which fixes CVE-2019-11324, but requests is still using the older version. AFAIK, there's no mention, when requests will release a new version.
    I found on their website:

Requests 2.x is officially in maintinence-mode only. This means we only respond to CVE-level tickets. All of our limited available attention / energy is being allocated towards the development of Requests III.

  • Add PKG_CPE_ID
  • Add PKG_LICENSE_FILES
  • Update URL

@jefferyto
Copy link
Member

They appear to be preparing a release, not sure where it is being tracked though.

@BKPepe
Copy link
Member Author

BKPepe commented Apr 29, 2019

It seems that it will be soon, so we will see, but the patch what I have included will be in their new release - kennethreitz/requests@d6b5b40

@@ -0,0 +1,32 @@
Pull request: https://github.com/kennethreitz/requests/pull/5063
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: one good practice about patches is to number them;
in this case, it should be fine to leave them as-is here, since it will be remove when requests updates;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I forget to do this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added number, also added note about their commit, which they have prepared in their branch.

@commodo
Copy link
Contributor

commodo commented May 3, 2019

a global nitpick: i would have made this into 3 patches:

  1. python-requests: allow urllib3 1.25.x (just the patch that adds support for urllib3 1.25.x)
  2. one for PKG_CPE_ID & PKG_LICENSE_FILES ; this looks like stuff for audit
  3. one for rest (cosmetics)

it is also fine (from my side) to leave these as-is here

so, LGTM from my side :)

@BKPepe BKPepe force-pushed the requests branch 3 times, most recently from aa84714 to c1dbbac Compare May 8, 2019 17:39
BKPepe added 2 commits May 8, 2019 19:42
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Add PKG_CPE_ID, PKG_LICENSE_FILES
Reorder things in Makefile
Update URL

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
@BKPepe
Copy link
Member Author

BKPepe commented May 8, 2019

As suggested, I made the following changes:

  • Split one commit into two
  1. Commit - Allow urllib 1.25.x.
  2. Commit - Polishing makefile (reordered things, added PKG_CPE_ID, PKG_LICENSE_FILES and changed url)

It is included in commit messages.

@commodo
Copy link
Contributor

commodo commented May 13, 2019

this has been fine (from my side) to merge for some time now

no idea about other blockers

@jefferyto ?

Copy link
Member

@jefferyto jefferyto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thanks!

@BKPepe BKPepe merged commit 5d2eb58 into openwrt:master May 13, 2019
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.

None yet

3 participants