From 545629e38601846b4b79bc3ac932355f0621d750 Mon Sep 17 00:00:00 2001
From: Peter Stadler <peter.stadler@student.uibk.ac.at>
Date: Thu, 28 Oct 2021 10:36:00 +0200
Subject: [PATCH] uwsgi: bump version and use less workarounds

* adopt pypi name and line numbers in patches
* remove custom tar command and patch for using python3 (changed upstream)

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
---
 net/uwsgi/Makefile                                       | 9 +++------
 net/uwsgi/patches/001-dont-hardcode-zlib.patch           | 2 +-
 .../002-dont-override-toolchain-optimization.patch       | 2 +-
 .../patches/003-hard-code-Linux-as-compilation-os.patch  | 2 +-
 net/uwsgi/patches/020-uwsgiconfig-system-python3.patch   | 8 --------
 5 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 net/uwsgi/patches/020-uwsgiconfig-system-python3.patch

diff --git a/net/uwsgi/Makefile b/net/uwsgi/Makefile
index bf522481e..9f4592542 100644
--- a/net/uwsgi/Makefile
+++ b/net/uwsgi/Makefile
@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uwsgi
-PKG_VERSION:=2.0.19.1
+PKG_VERSION:=2.0.20
 PKG_RELEASE:=1
 
-PYPI_NAME:=uWSGI
-PKG_HASH:=faa85e053c0b1be4d5585b0858d3a511d2cd10201802e8676060fd0a109e5869
+PYPI_NAME:=uwsgi
+PKG_HASH:=88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
 PKG_BUILD_DEPENDS:=python3/host
 PYTHON3_PKG_BUILD:=0
 
@@ -19,9 +19,6 @@ include ../../lang/python/python3-package.mk
 #for LINUX_UNAME_VERSION:
 include $(INCLUDE_DIR)/kernel.mk
 
-#the .tar.gz does not wrap it into a uWSGI dir; do not use "$(1)/..":
-TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
-
 define Package/uwsgi
   SECTION:=net
   CATEGORY:=Network
diff --git a/net/uwsgi/patches/001-dont-hardcode-zlib.patch b/net/uwsgi/patches/001-dont-hardcode-zlib.patch
index df007ce06..38a42c045 100644
--- a/net/uwsgi/patches/001-dont-hardcode-zlib.patch
+++ b/net/uwsgi/patches/001-dont-hardcode-zlib.patch
@@ -1,6 +1,6 @@
 --- a/uwsgiconfig.py
 +++ b/uwsgiconfig.py
-@@ -856,11 +856,11 @@ class uConf(object):
+@@ -859,11 +859,11 @@ class uConf(object):
                  self.cflags.append('-DUWSGI_HAS_EXECINFO')
                  report['execinfo'] = True
  
diff --git a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
index ff8de5df9..a6c71e143 100644
--- a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
+++ b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
@@ -1,6 +1,6 @@
 --- a/uwsgiconfig.py
 +++ b/uwsgiconfig.py
-@@ -685,7 +685,7 @@ class uConf(object):
+@@ -688,7 +688,7 @@ class uConf(object):
              self.include_path += os.environ['UWSGI_INCLUDES'].split(',')
  
  
diff --git a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
index 6f496ef0d..81c11164b 100644
--- a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
+++ b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
@@ -1,6 +1,6 @@
 --- a/uwsgiconfig.py
 +++ b/uwsgiconfig.py
-@@ -5,9 +5,9 @@ uwsgi_version = '2.0.19.1'
+@@ -5,9 +5,9 @@ uwsgi_version = '2.0.20'
  import os
  import re
  import time
diff --git a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch
deleted file mode 100644
index 7c7389269..000000000
--- a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
--PYTHON := python
-+PYTHON ?= python3
- 
- all:
- 	$(PYTHON) uwsgiconfig.py --build $(PROFILE)