From 287c818e958097a0071483ef44b6194b5e7ba10c Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 11 Oct 2024 18:41:52 -0400
Subject: [PATCH] build version 2.0.27

---
 .github/workflows/build.yml                   |  2 +-
 bin/package-version                           |  2 +-
 ...oid-interleaving-pyuwsgi-threadstate.patch | 40 -------------------
 uwsgi                                         |  2 +-
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 patches/00-avoid-interleaving-pyuwsgi-threadstate.patch

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deb6ac9..75bdd06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
           package-dir: ./${{ needs.build_sdist.outputs.sdist_name }}
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_SKIP: cp36-* cp38-macosx_arm64 cp313-* pp*
+          CIBW_SKIP: cp36-* cp38-macosx_arm64 pp*
           CIBW_ENVIRONMENT: UWSGI_PROFILE=pyuwsginossl
           CIBW_TEST_COMMAND: "pyuwsgi --help"
           CIBW_BEFORE_BUILD_MACOS: "find . -name '*.o' -delete && IS_MACOS=1 ./pre_build.sh"
diff --git a/bin/package-version b/bin/package-version
index f8e839b..7c239b1 100755
--- a/bin/package-version
+++ b/bin/package-version
@@ -7,7 +7,7 @@ _ROOT = os.path.dirname(os.path.abspath(os.path.dirname(__file__)))
 
 # if 0: use the upstream version
 # if >0: append `.post1` / `.a1` as needed
-SERIAL = 1
+SERIAL = 0
 
 
 def main() -> int:
diff --git a/patches/00-avoid-interleaving-pyuwsgi-threadstate.patch b/patches/00-avoid-interleaving-pyuwsgi-threadstate.patch
deleted file mode 100644
index 542c5d0..0000000
--- a/patches/00-avoid-interleaving-pyuwsgi-threadstate.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit bfa363472bfb861a02bdeefc7477fcab04091c66
-Author: Anthony Sottile <asottile@umich.edu>
-Date:   Mon Aug 19 15:50:31 2024 -0400
-
-    avoid interleaving pywsgi threadstate
-
-diff --git a/plugins/pyuwsgi/pyuwsgi.c b/plugins/pyuwsgi/pyuwsgi.c
-index 7a4f2249..11732e04 100644
---- a/plugins/pyuwsgi/pyuwsgi.c
-+++ b/plugins/pyuwsgi/pyuwsgi.c
-@@ -126,13 +126,6 @@ PyObject *pyuwsgi_setup(PyObject * self, PyObject * args, PyObject * kwds) {
- 		return NULL;
- 	}
- 
--
--	//TODO: ...???
--	// actually do the thing!
--	PyThreadState *_tstate = PyThreadState_Get();
--	uwsgi_setup(orig_argc, orig_argv, environ);
--	PyThreadState_Swap(_tstate);
--
- 	Py_INCREF(self);
- 	return self;
- }
-@@ -143,6 +136,7 @@ PyObject *pyuwsgi_init(PyObject * self, PyObject * args, PyObject * kwds) {
- 		return NULL;
- 	}
- 
-+	uwsgi_setup(orig_argc, orig_argv, environ);
- 	int rc = uwsgi_run();
- 
- 	// never(?) here
-@@ -156,6 +150,7 @@ PyObject *pyuwsgi_run(PyObject * self, PyObject * args, PyObject * kwds) {
- 		return NULL;
- 	}
- 
-+	uwsgi_setup(orig_argc, orig_argv, environ);
- 	int rc = uwsgi_run();
- 
- 	// never(?) here
diff --git a/uwsgi b/uwsgi
index 578dfca..a0481fe 160000
--- a/uwsgi
+++ b/uwsgi
@@ -1 +1 @@
-Subproject commit 578dfcab74e976227be44fa94980ab3abe4cbbc5
+Subproject commit a0481fe2d2f95d10f37b570df92835a7d649f7e4