From 07fa01e0351baf7c593e333a3eb6b76c6585cefe Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 15 May 2023 23:35:35 +0200 Subject: [PATCH] Replace whole repo with latest content from branch stream-4.7.1-rhel-8.8.0 Content corresponds with RHEL dist-git commit 9f9be17 --- .gitignore | 1 - ...844009075391c55419a3afb90e469facf35e.patch | 41 -------------- ...02df6318afe26052db5b0365732152cacea2.patch | 55 ------------------- gating.yaml | 9 --- mod_wsgi-4.7.1-remove-rpath.patch | 20 ------- mod_wsgi-4.7.1-warning-segfaults.patch | 46 ---------------- 6 files changed, 172 deletions(-) delete mode 100644 0f34844009075391c55419a3afb90e469facf35e.patch delete mode 100644 b03b02df6318afe26052db5b0365732152cacea2.patch delete mode 100644 gating.yaml delete mode 100644 mod_wsgi-4.7.1-remove-rpath.patch delete mode 100644 mod_wsgi-4.7.1-warning-segfaults.patch diff --git a/.gitignore b/.gitignore index 1b255a7..9619d53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/mod_wsgi-4.7.1.tar.gz /mod_wsgi-4.7.1.tar.gz diff --git a/0f34844009075391c55419a3afb90e469facf35e.patch b/0f34844009075391c55419a3afb90e469facf35e.patch deleted file mode 100644 index 1cd41bf..0000000 --- a/0f34844009075391c55419a3afb90e469facf35e.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0f34844009075391c55419a3afb90e469facf35e Mon Sep 17 00:00:00 2001 -From: Graham Dumpleton -Date: Tue, 14 May 2019 16:14:07 +1000 -Subject: [PATCH] Changed functions to pre/post actions when forking. - ---- - src/server/mod_wsgi.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c -index 2e4bb24..bf55945 100644 ---- a/src/server/mod_wsgi.c -+++ b/src/server/mod_wsgi.c -@@ -4345,8 +4345,13 @@ static void wsgi_python_child_init(apr_pool_t *p) - * do it if Python was initialised in parent process. - */ - -- if (wsgi_python_initialized && !wsgi_python_after_fork) -+ if (wsgi_python_initialized && !wsgi_python_after_fork) { -+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) -+ PyOS_AfterFork_Child(); -+#else - PyOS_AfterFork(); -+#endif -+ } - - /* Finalise any Python objects required by child process. */ - -@@ -10422,6 +10427,12 @@ static int wsgi_start_process(apr_pool_t *p, WSGIDaemonProcess *daemon) - wsgi_exit_daemon_process(0); - } - -+ if (wsgi_python_initialized) { -+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) -+ PyOS_AfterFork_Parent(); -+#endif -+ } -+ - apr_pool_note_subprocess(p, &daemon->process, APR_KILL_AFTER_TIMEOUT); - apr_proc_other_child_register(&daemon->process, wsgi_manage_process, - daemon, NULL, p); diff --git a/b03b02df6318afe26052db5b0365732152cacea2.patch b/b03b02df6318afe26052db5b0365732152cacea2.patch deleted file mode 100644 index ff5b5b5..0000000 --- a/b03b02df6318afe26052db5b0365732152cacea2.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b03b02df6318afe26052db5b0365732152cacea2 Mon Sep 17 00:00:00 2001 -From: Graham Dumpleton -Date: Tue, 14 May 2019 16:14:42 +1000 -Subject: [PATCH] Use official APIs for accessing interpreter list. - ---- - src/server/wsgi_interp.c | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/server/wsgi_interp.c b/src/server/wsgi_interp.c -index 4a94850..3fbca04 100644 ---- a/src/server/wsgi_interp.c -+++ b/src/server/wsgi_interp.c -@@ -338,9 +338,10 @@ static PyObject *ShutdownInterpreter_call( - - PyThreadState_Swap(NULL); - -- tstate = tstate->interp->tstate_head; -+ tstate = PyInterpreterState_ThreadHead(tstate->interp); -+ - while (tstate) { -- tstate_next = tstate->next; -+ tstate_next = PyThreadState_Next(tstate); - if (tstate != tstate_save) { - PyThreadState_Swap(tstate); - PyThreadState_Clear(tstate); -@@ -436,9 +437,13 @@ InterpreterObject *newInterpreterObject(const char *name) - */ - - if (!name) { -+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) -+ interp = PyInterpreterState_Main(); -+#else - interp = PyInterpreterState_Head(); -- while (interp->next) -- interp = interp->next; -+ while (PyInterpreterState_Next(interp)) -+ interp = PyInterpreterState_Next(interp); -+#endif - - name = ""; - } -@@ -1883,9 +1888,10 @@ static void Interpreter_dealloc(InterpreterObject *self) - - PyThreadState_Swap(NULL); - -- tstate = tstate->interp->tstate_head; -+ tstate = PyInterpreterState_ThreadHead(tstate->interp); -+ - while (tstate) { -- tstate_next = tstate->next; -+ tstate_next = PyThreadState_Next(tstate); - if (tstate != tstate_save) { - PyThreadState_Swap(tstate); - PyThreadState_Clear(tstate); diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 2e4e68f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier2.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional} diff --git a/mod_wsgi-4.7.1-remove-rpath.patch b/mod_wsgi-4.7.1-remove-rpath.patch deleted file mode 100644 index 3996382..0000000 --- a/mod_wsgi-4.7.1-remove-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/setup.py b/setup.py -index bf272ba..824957d 100644 ---- a/setup.py -+++ b/setup.py -@@ -465,15 +465,6 @@ EXTRA_COMPILE_FLAGS = (EXTRA_INCLUDES + CPPFLAGS + EXTRA_CPPFLAGS + - CFLAGS + EXTRA_CFLAGS + APR_INCLUDES + APU_INCLUDES) - EXTRA_LINK_ARGS = PYTHON_LDFLAGS + PYTHON_LDLIBS - --# Force adding of LD_RUN_PATH for platforms that may need it. -- --if os.name != 'nt': -- LD_RUN_PATH = os.environ.get('LD_RUN_PATH', '') -- LD_RUN_PATH += ':%s:%s' % (PYTHON_LIBDIR, PYTHON_CFGDIR) -- LD_RUN_PATH = LD_RUN_PATH.lstrip(':') -- -- os.environ['LD_RUN_PATH'] = LD_RUN_PATH -- - # On MacOS X, recent versions of Apple's Apache do not support compiling - # Apache modules with a target older than 10.8. This is because it - # screws up Apache APR % formats for apr_time_t, which breaks daemon diff --git a/mod_wsgi-4.7.1-warning-segfaults.patch b/mod_wsgi-4.7.1-warning-segfaults.patch deleted file mode 100644 index 905b04f..0000000 --- a/mod_wsgi-4.7.1-warning-segfaults.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2c9d1b3e725ad2a072e9fef4cb1cb0bb9ae2d540 Mon Sep 17 00:00:00 2001 -From: Graham Dumpleton -Date: Sat, 13 Feb 2021 11:05:39 +1100 -Subject: [PATCH] Fix deprecation warning in PyArg_ParseTuple(). - ---- - docs/release-notes/version-4.8.0.rst | 5 +++++ - src/server/wsgi_logger.c | 4 ++-- - src/server/wsgi_python.h | 2 ++ - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/server/wsgi_logger.c b/src/server/wsgi_logger.c -index 71c7d69e..df35887e 100644 ---- a/src/server/wsgi_logger.c -+++ b/src/server/wsgi_logger.c -@@ -223,7 +223,7 @@ static PyObject *Log_isatty(LogObject *self, PyObject *args) - return Py_False; - } - --static void Log_queue(LogObject *self, const char *msg, int len) -+static void Log_queue(LogObject *self, const char *msg, Py_ssize_t len) - { - const char *p = NULL; - const char *q = NULL; -@@ -330,7 +330,7 @@ static void Log_queue(LogObject *self, const char *msg, int len) - static PyObject *Log_write(LogObject *self, PyObject *args) - { - const char *msg = NULL; -- int len = -1; -+ Py_ssize_t len = -1; - - WSGIThreadInfo *thread_info = NULL; - -diff --git a/src/server/wsgi_python.h b/src/server/wsgi_python.h -index 0464fe6d..5c10cae5 100644 ---- a/src/server/wsgi_python.h -+++ b/src/server/wsgi_python.h -@@ -21,6 +21,8 @@ - - /* ------------------------------------------------------------------------- */ - -+#define PY_SSIZE_T_CLEAN 1 -+ - #include - - #if !defined(PY_VERSION_HEX)