Skip to content
Snippets Groups Projects
Verified Commit eb61faac authored by Josef Schlehofer's avatar Josef Schlehofer
Browse files

patches: packages: python-urllib3: update to 1.25, add Python 3

parent 4b9dd4e7
No related branches found
No related tags found
No related merge requests found
From 763229161f81e1267fdf15e9bb8819517ba713cc Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Mon, 22 Apr 2019 18:28:03 +0200
Subject: [PATCH] python-urllib3: add Python 3, update to 1.25
- Fixes CVE-2019-11324
- Fix for TITLE, which was too long for make menuconfig
- Add PKG_LICENSE_FILES
- Remove current maintainer
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
lang/python/python-urllib3/Makefile | 47 ++++++++++++++++++++---------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/lang/python/python-urllib3/Makefile b/lang/python/python-urllib3/Makefile
index e014fca09..0ffb5e921 100644
--- a/lang/python/python-urllib3/Makefile
+++ b/lang/python/python-urllib3/Makefile
@@ -8,41 +8,58 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-urllib3
-PKG_VERSION:=1.22
+PKG_VERSION:=1.25
PKG_RELEASE:=1
+
PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE.txt
PKG_SOURCE:=urllib3-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/urllib3-$(PKG_VERSION)/
-PKG_SOURCE_URL:=https://pypi.python.org/packages/ee/11/7c59620aceedcc1ef65e156cc5ce5a24ef87be4107c2b74458464e437a5d/
-PKG_HASH:=cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/u/urllib3
+PKG_HASH:=f03eeb431c77b88cf8747d47e94233a91d0e0fdae1cf09e0b21405a885700266
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-urllib3-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../python-package.mk
+include ../python3-package.mk
-define Package/python-urllib3
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/python-urllib3/Default
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
- MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
- TITLE:=HTTP library with thread-safe connection pooling, file post, and more.
+ TITLE:=Sanity-friendly HTTP client
URL:=https://urllib3.readthedocs.io/
- DEPENDS:=+python
+endef
+
+define Package/python-urllib3
+$(call Package/python-urllib3/Default)
+ DEPENDS:=+PACKAGE_python-urllib3:python
+ VARIANT:=python
endef
define Package/python-urllib3/description
HTTP library with thread-safe connection pooling, file post, and more.
endef
-define Build/Compile
- $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
+define Package/python3-urllib3
+$(call Package/python-urllib3/Default)
+ DEPENDS:=+PACKAGE_python3-urllib3:python3
+ VARIANT:=python3
endef
-define Package/python-urllib3/install
- $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
- $(CP) \
- $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
- $(1)$(PYTHON_PKG_DIR)
+define Package/python3-urllib3/description
+$(call Package/python-urllib3/description)
+.
+(Variant for Python3)
endef
+$(eval $(call PyPackage,python-urllib3))
$(eval $(call BuildPackage,python-urllib3))
+$(eval $(call BuildPackage,python-urllib3-src))
+
+$(eval $(call Py3Package,python3-urllib3))
+$(eval $(call BuildPackage,python3-urllib3))
+$(eval $(call BuildPackage,python3-urllib3-src))
--
2.20.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment