Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e111ee6ac9 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/mod_wsgi-4.6.4.tar.gz
|
mod_wsgi-5.0.0.tar.gz
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
6a0cc67546a5e172a885324f3e58b8be5f4e0e58 SOURCES/mod_wsgi-4.6.4.tar.gz
|
|
||||||
@ -1,131 +0,0 @@
|
|||||||
|
|
||||||
https://github.com/GrahamDumpleton/mod_wsgi/pull/364
|
|
||||||
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1602620
|
|
||||||
|
|
||||||
--- mod_wsgi-4.6.4/src/server/__init__.py.warnings
|
|
||||||
+++ mod_wsgi-4.6.4/src/server/__init__.py
|
|
||||||
@@ -103,7 +103,6 @@
|
|
||||||
for name in mimetypes.knownfiles:
|
|
||||||
if os.path.exists(name):
|
|
||||||
return name
|
|
||||||
- break
|
|
||||||
else:
|
|
||||||
return name
|
|
||||||
|
|
||||||
--- mod_wsgi-4.6.4/src/server/mod_wsgi.c.warnings
|
|
||||||
+++ mod_wsgi-4.6.4/src/server/mod_wsgi.c
|
|
||||||
@@ -2108,9 +2108,11 @@
|
|
||||||
/* Publish event for the start of the response. */
|
|
||||||
|
|
||||||
if (wsgi_event_subscribers()) {
|
|
||||||
+#if 0
|
|
||||||
WSGIThreadInfo *thread_info;
|
|
||||||
|
|
||||||
thread_info = wsgi_thread_info(0, 0);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
event = PyDict_New();
|
|
||||||
|
|
||||||
@@ -6349,10 +6351,7 @@
|
|
||||||
|
|
||||||
/* Need to cast const away. */
|
|
||||||
|
|
||||||
- if (r)
|
|
||||||
- id = &((request_rec *)r)->log_id;
|
|
||||||
- else
|
|
||||||
- id = &((conn_rec *)c)->log_id;
|
|
||||||
+ id = &((request_rec *)r)->log_id;
|
|
||||||
|
|
||||||
ap_run_generate_log_id(c, r, id);
|
|
||||||
}
|
|
||||||
@@ -8510,6 +8509,7 @@
|
|
||||||
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, wsgi_server,
|
|
||||||
"mod_wsgi (pid=%d): Couldn't bind unix domain "
|
|
||||||
"socket '%s'.", getpid(), process->socket_path);
|
|
||||||
+ close(sockfd);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -8521,6 +8521,7 @@
|
|
||||||
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, wsgi_server,
|
|
||||||
"mod_wsgi (pid=%d): Couldn't listen on unix domain "
|
|
||||||
"socket.", getpid());
|
|
||||||
+ close(sockfd);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -8555,6 +8556,7 @@
|
|
||||||
"mod_wsgi (pid=%d): Couldn't change owner of unix "
|
|
||||||
"domain socket '%s' to uid=%ld.", getpid(),
|
|
||||||
process->socket_path, (long)socket_uid);
|
|
||||||
+ close(sockfd);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -13338,8 +13340,10 @@
|
|
||||||
for (i = 0; i < wsgi_daemon_list->nelts; ++i) {
|
|
||||||
entry = &entries[i];
|
|
||||||
|
|
||||||
- close(entry->listener_fd);
|
|
||||||
- entry->listener_fd = -1;
|
|
||||||
+ if (entry->listener_fd != -1) {
|
|
||||||
+ close(entry->listener_fd);
|
|
||||||
+ entry->listener_fd = -1;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -13751,8 +13755,8 @@
|
|
||||||
|
|
||||||
if (trusted_proxy) {
|
|
||||||
for (i=0; i<trusted_proxy_headers->nelts; i++) {
|
|
||||||
- const char *name = NULL;
|
|
||||||
- const char *value = NULL;
|
|
||||||
+ const char *name;
|
|
||||||
+ const char *value;
|
|
||||||
|
|
||||||
name = ((const char**)trusted_proxy_headers->elts)[i];
|
|
||||||
value = apr_table_get(r->subprocess_env, name);
|
|
||||||
@@ -13879,11 +13883,9 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
for (i=0; i<trusted_proxy_headers->nelts; i++) {
|
|
||||||
- const char *name = NULL;
|
|
||||||
- const char *value = NULL;
|
|
||||||
+ const char *name;
|
|
||||||
|
|
||||||
name = ((const char**)trusted_proxy_headers->elts)[i];
|
|
||||||
- value = apr_table_get(r->subprocess_env, name);
|
|
||||||
|
|
||||||
if (!strcmp(name, "HTTP_X_FORWARDED_FOR") ||
|
|
||||||
!strcmp(name, "HTTP_X_REAL_IP")) {
|
|
||||||
--- mod_wsgi-4.6.4/src/server/wsgi_logger.c.warnings
|
|
||||||
+++ mod_wsgi-4.6.4/src/server/wsgi_logger.c
|
|
||||||
@@ -694,9 +694,11 @@
|
|
||||||
PyObject *object = NULL;
|
|
||||||
|
|
||||||
if (wsgi_event_subscribers()) {
|
|
||||||
+#if 0
|
|
||||||
WSGIThreadInfo *thread_info;
|
|
||||||
|
|
||||||
thread_info = wsgi_thread_info(0, 0);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
event = PyDict_New();
|
|
||||||
|
|
||||||
--- mod_wsgi-4.6.4/src/server/wsgi_python.h.warnings
|
|
||||||
+++ mod_wsgi-4.6.4/src/server/wsgi_python.h
|
|
||||||
@@ -21,6 +21,12 @@
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
+#ifdef _POSIX_C_SOURCE
|
|
||||||
+#undef _POSIX_C_SOURCE
|
|
||||||
+#endif
|
|
||||||
+#ifdef _XOPEN_SOURCE
|
|
||||||
+#undef _XOPEN_SOURCE
|
|
||||||
+#endif
|
|
||||||
#include <Python.h>
|
|
||||||
|
|
||||||
#if !defined(PY_VERSION_HEX)
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c
|
|
||||||
index 59aad90..ef5f5af 100644
|
|
||||||
--- a/src/server/mod_wsgi.c
|
|
||||||
+++ b/src/server/mod_wsgi.c
|
|
||||||
@@ -12586,6 +12586,9 @@ static apr_status_t wsgi_header_filter(ap_filter_t *f, apr_bucket_brigade *b)
|
|
||||||
|
|
||||||
/* Output status line. */
|
|
||||||
|
|
||||||
+ if (!r->status_line)
|
|
||||||
+ r->status_line = ap_get_status_line(r->status);
|
|
||||||
+
|
|
||||||
vec1[0].iov_base = (void *)"Status:";
|
|
||||||
vec1[0].iov_len = strlen("Status:");
|
|
||||||
vec1[1].iov_base = (void *)" ";
|
|
||||||
@@ -12699,6 +12702,7 @@ static int wsgi_hook_daemon_handler(conn_rec *c)
|
|
||||||
apr_bucket_brigade *bb;
|
|
||||||
|
|
||||||
core_request_config *req_cfg;
|
|
||||||
+ core_dir_config *d;
|
|
||||||
|
|
||||||
ap_filter_t *current = NULL;
|
|
||||||
ap_filter_t *next = NULL;
|
|
||||||
@@ -12890,6 +12894,23 @@ static int wsgi_hook_daemon_handler(conn_rec *c)
|
|
||||||
|
|
||||||
r->per_dir_config = r->server->lookup_defaults;
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * Try and ensure that request body limit in daemon mode process
|
|
||||||
+ * is unlimited as Apache 2.4.54 changed rules for limit and if
|
|
||||||
+ * unset is now overridden by HTTP filters to be 1GiB rather than
|
|
||||||
+ * unlimited. This is required since we populate configuration
|
|
||||||
+ * from the base server config only so setting unlimited in a more
|
|
||||||
+ * specific context such as a virtual host wouldn't be visible.
|
|
||||||
+ * Note that setting this to unlimited in the daemon mode process
|
|
||||||
+ * is okay as the request limit body is checked in the Apache
|
|
||||||
+ * child process before request is proxied specifically to avoid
|
|
||||||
+ * unecessarily passing the content across to the daemon process.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ d = (core_dir_config *)ap_get_core_module_config(r->per_dir_config);
|
|
||||||
+
|
|
||||||
+ d->limit_req_body = 0;
|
|
||||||
+
|
|
||||||
r->sent_bodyct = 0;
|
|
||||||
|
|
||||||
r->read_length = 0;
|
|
||||||
88
mod_wsgi-5.0.0-ldflags.patch
Normal file
88
mod_wsgi-5.0.0-ldflags.patch
Normal file
@ -0,0 +1,88 @@
|
|||||||
|
From dbbbd249c5726767793fa0146a61941abba766f1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||||
|
Date: Mon, 15 Jan 2024 12:50:02 +0100
|
||||||
|
Subject: [PATCH 1/2] Stop adding PYTHON_CFGDIR to LD_RUN_PATH and
|
||||||
|
PYTHON_LDFLAGS if there is no libpython
|
||||||
|
|
||||||
|
The PYTHON_CFGDIR variable is more or less something like /usr/lib64/python3.12/config.
|
||||||
|
|
||||||
|
Not only does this directory not exist on Python 3.6+ (it is called differently),
|
||||||
|
but there is no libpython.so in it.
|
||||||
|
Adding it to LD paths makes no difference.
|
||||||
|
|
||||||
|
I could fix up the way the path is determined,
|
||||||
|
but I decided not to touch this code not to break old use cases.
|
||||||
|
|
||||||
|
Instead, the directory is only added to LD paths when there is something relevant in it.
|
||||||
|
|
||||||
|
Fixes https://github.com/GrahamDumpleton/mod_wsgi/issues/872
|
||||||
|
---
|
||||||
|
setup.py | 10 +++++++---
|
||||||
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index edbe7c8f..c51bee70 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -300,19 +300,21 @@ def get_apu_includes():
|
||||||
|
if not os.path.exists(PYTHON_CFGDIR):
|
||||||
|
PYTHON_CFGDIR = '%s-%s' % (PYTHON_CFGDIR, sys.platform)
|
||||||
|
|
||||||
|
- PYTHON_LDFLAGS = ['-L%s' % PYTHON_CFGDIR]
|
||||||
|
+ PYTHON_LDFLAGS = []
|
||||||
|
if PYTHON_LIBDIR != APXS_LIBDIR:
|
||||||
|
- PYTHON_LDFLAGS.insert(0, '-L%s' % PYTHON_LIBDIR)
|
||||||
|
+ PYTHON_LDFLAGS.append('-L%s' % PYTHON_LIBDIR)
|
||||||
|
|
||||||
|
PYTHON_LDLIBS = ['-lpython%s' % PYTHON_LDVERSION]
|
||||||
|
|
||||||
|
if os.path.exists(os.path.join(PYTHON_LIBDIR,
|
||||||
|
'libpython%s.a' % PYTHON_VERSION)):
|
||||||
|
PYTHON_LDLIBS = ['-lpython%s' % PYTHON_VERSION]
|
||||||
|
+ PYTHON_LDFLAGS.append('-L%s' % PYTHON_CFGDIR)
|
||||||
|
|
||||||
|
if os.path.exists(os.path.join(PYTHON_CFGDIR,
|
||||||
|
'libpython%s.a' % PYTHON_VERSION)):
|
||||||
|
PYTHON_LDLIBS = ['-lpython%s' % PYTHON_VERSION]
|
||||||
|
+ PYTHON_LDFLAGS.append('-L%s' % PYTHON_CFGDIR)
|
||||||
|
|
||||||
|
# Create the final set of compilation flags to be used.
|
||||||
|
|
||||||
|
@@ -326,7 +328,9 @@ def get_apu_includes():
|
||||||
|
LD_RUN_PATHS = []
|
||||||
|
if os.name != 'nt':
|
||||||
|
LD_RUN_PATH = os.environ.get('LD_RUN_PATH', '')
|
||||||
|
- LD_RUN_PATHS = [PYTHON_CFGDIR]
|
||||||
|
+ LD_RUN_PATHS = []
|
||||||
|
+ if '-L%s' % PYTHON_CFGDIR in PYTHON_LDFLAGS:
|
||||||
|
+ LD_RUN_PATHS.append(PYTHON_CFGDIR)
|
||||||
|
if PYTHON_LIBDIR != APXS_LIBDIR:
|
||||||
|
LD_RUN_PATHS.insert(0, PYTHON_LIBDIR)
|
||||||
|
LD_RUN_PATH += ':' + ':'.join(LD_RUN_PATHS)
|
||||||
|
|
||||||
|
From 7532634a52cdad466766c3ea52a539fd5fa5822d Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||||
|
Date: Tue, 16 Jul 2024 11:10:12 +0200
|
||||||
|
Subject: [PATCH 2/2] Don't set $LD_RUN_PATH when empty
|
||||||
|
|
||||||
|
That lead to this failure when building in Fedora:
|
||||||
|
|
||||||
|
ERROR 0010: file '/usr/lib64/python3.12/site-packages/mod_wsgi/server/mod_wsgi-py312.cpython-312-x86_64-linux-gnu.so' contains an empty runpath in []
|
||||||
|
---
|
||||||
|
setup.py | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/setup.py b/setup.py
|
||||||
|
index c51bee70..670bccac 100644
|
||||||
|
--- a/setup.py
|
||||||
|
+++ b/setup.py
|
||||||
|
@@ -336,7 +336,8 @@ def get_apu_includes():
|
||||||
|
LD_RUN_PATH += ':' + ':'.join(LD_RUN_PATHS)
|
||||||
|
LD_RUN_PATH = LD_RUN_PATH.lstrip(':')
|
||||||
|
|
||||||
|
- os.environ['LD_RUN_PATH'] = LD_RUN_PATH
|
||||||
|
+ if LD_RUN_PATH:
|
||||||
|
+ 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
|
||||||
@ -2,42 +2,30 @@
|
|||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||||
%bcond_without python3
|
%bcond_without python3
|
||||||
|
%bcond_with python2
|
||||||
%else
|
%else
|
||||||
%bcond_with python3
|
%bcond_with python3
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} <= 7
|
|
||||||
%bcond_without python2
|
%bcond_without python2
|
||||||
%else
|
|
||||||
%bcond_with python2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3} && !%{with python2}
|
|
||||||
%global py3dir .
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: mod_wsgi
|
Name: mod_wsgi
|
||||||
Version: 4.6.4
|
Version: 5.0.0
|
||||||
Release: 5%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A WSGI interface for Python web applications in Apache
|
Summary: A WSGI interface for Python web applications in Apache
|
||||||
Group: System Environment/Libraries
|
License: Apache-2.0 AND CC-BY-3.0
|
||||||
License: ASL 2.0
|
|
||||||
URL: https://modwsgi.readthedocs.io/
|
URL: https://modwsgi.readthedocs.io/
|
||||||
Source0: https://github.com/GrahamDumpleton/mod_wsgi/archive/%{version}.tar.gz#/mod_wsgi-%{version}.tar.gz
|
Source0: https://github.com/GrahamDumpleton/mod_wsgi/archive/%{version}.tar.gz#/mod_wsgi-%{version}.tar.gz
|
||||||
Source1: wsgi.conf
|
Source1: wsgi.conf
|
||||||
Source2: wsgi-python3.conf
|
Source2: wsgi-python3.conf
|
||||||
|
Patch0: mod_wsgi-5.0.0-ldflags.patch
|
||||||
Patch1: mod_wsgi-4.5.20-exports.patch
|
Patch1: mod_wsgi-4.5.20-exports.patch
|
||||||
Patch2: mod_wsgi-4.6.4-warnings.patch
|
|
||||||
Patch3: mod_wsgi-4.9.1-request-limit.patch
|
|
||||||
BuildRequires: httpd-devel
|
BuildRequires: httpd-devel
|
||||||
BuildRequires: python3-sphinx
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
# Suppress auto-provides for module DSO
|
# Suppress auto-provides for module DSO
|
||||||
%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$}
|
%global __provides_exclude_from %{_httpd_moddir}/.*\\.so$
|
||||||
%{?filter_setup}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%global _description\
|
%global _description\
|
||||||
The mod_wsgi adapter is an Apache module that provides a WSGI compliant\
|
The mod_wsgi adapter is an Apache module that provides a WSGI compliant\
|
||||||
@ -53,12 +41,13 @@ existing WSGI adapters for mod_python or CGI.\
|
|||||||
%package -n python2-%{name}
|
%package -n python2-%{name}
|
||||||
Summary: %summary
|
Summary: %summary
|
||||||
Requires: httpd-mmn = %{_httpd_mmn}
|
Requires: httpd-mmn = %{_httpd_mmn}
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel, python2-setuptools
|
||||||
%{?python_provide:%python_provide python2-%{name}}
|
%{?python_provide:%python_provide python2-%{name}}
|
||||||
# Remove before F30
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||||
Provides: mod_wsgi = %{version}-%{release}
|
Provides: mod_wsgi = %{version}-%{release}
|
||||||
Provides: mod_wsgi%{?_isa} = %{version}-%{release}
|
Provides: mod_wsgi%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: mod_wsgi < %{version}-%{release}
|
Obsoletes: mod_wsgi < %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n python2-%{name} %_description
|
%description -n python2-%{name} %_description
|
||||||
|
|
||||||
@ -68,48 +57,54 @@ Obsoletes: mod_wsgi < %{version}-%{release}
|
|||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
Summary: %summary
|
Summary: %summary
|
||||||
Requires: httpd-mmn = %{_httpd_mmn}
|
Requires: httpd-mmn = %{_httpd_mmn}
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel, python3-sphinx, python3-sphinx_rtd_theme
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
%if !%{with python2}
|
||||||
|
Provides: mod_wsgi = %{version}-%{release}
|
||||||
|
Provides: mod_wsgi%{?_isa} = %{version}-%{release}
|
||||||
|
Obsoletes: mod_wsgi < %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description -n python3-%{name} %_description
|
%description -n python3-%{name} %_description
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qn %{name}-%{version}
|
%autosetup -p1 -n %{name}-%{version}
|
||||||
%patch1 -p1 -b .exports
|
|
||||||
%patch2 -p1 -b .warnings
|
|
||||||
%patch3 -p1 -b .request-limit
|
|
||||||
|
|
||||||
%if "%{py3dir}" != "."
|
: Python2=%{with python2} Python3=%{with python3}
|
||||||
cp -a . %{py3dir}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make -C docs html
|
%if %{with python3}
|
||||||
|
%make_build -C docs html
|
||||||
|
%endif
|
||||||
|
|
||||||
export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
|
export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python2
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
%py2_build
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
pushd %{py3dir}
|
mkdir py3build/
|
||||||
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3
|
# this always produces an error (because of trying to copy py3build
|
||||||
make %{?_smp_mflags}
|
# into itself) but we don't mind, so || :
|
||||||
|
cp -R * py3build/ || :
|
||||||
|
pushd py3build
|
||||||
|
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=%{python3}
|
||||||
|
%make_build
|
||||||
%py3_build
|
%py3_build
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with python2}
|
||||||
|
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=%{python2}
|
||||||
|
%make_build
|
||||||
|
%py2_build
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# first install python3 variant and rename the so file
|
# first install python3 variant and rename the so file
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
|
pushd py3build
|
||||||
pushd %{py3dir}
|
%make_install LIBEXECDIR=%{_httpd_moddir}
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT LIBEXECDIR=%{_httpd_moddir}
|
|
||||||
mv $RPM_BUILD_ROOT%{_httpd_moddir}/mod_wsgi{,_python3}.so
|
mv $RPM_BUILD_ROOT%{_httpd_moddir}/mod_wsgi{,_python3}.so
|
||||||
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
|
install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
|
||||||
@ -124,7 +119,7 @@ popd
|
|||||||
|
|
||||||
# second install python2 variant
|
# second install python2 variant
|
||||||
%if %{with python2}
|
%if %{with python2}
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT LIBEXECDIR=%{_httpd_moddir}
|
%make_install LIBEXECDIR=%{_httpd_moddir}
|
||||||
|
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
|
install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
|
||||||
# httpd >= 2.4.x
|
# httpd >= 2.4.x
|
||||||
@ -159,31 +154,150 @@ ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Sep 06 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.6.4-5
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.0.0-4
|
||||||
- Resolves: #2122695 - Core dumped upon file upload >= 1GB
|
- Bump release for October 2024 mass rebuild:
|
||||||
|
Resolves: RHEL-64018
|
||||||
|
|
||||||
* Wed Dec 04 2019 Lubos Uhliarik <luhliari@redhat.com> - 4.6.4-4
|
* Tue Jul 16 2024 Joe Orton <jorton@redhat.com> - 5.0.0-3
|
||||||
- Resolves: #1779705 - python3-mod_wsgi: Remove the Provides and Obsoletes for
|
- fix LD_RUN_PATH handling
|
||||||
the name `mod_wsgi`
|
Resolves: RHEL-48718
|
||||||
|
|
||||||
* Thu Dec 13 2018 Joe Orton <jorton@redhat.com> - 4.6.4-3
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.0.0-2
|
||||||
- avoid unstripped binaries, re-enable debugsource generation (#1659086)
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
* Tue Dec 11 2018 Joe Orton <jorton@redhat.com> - 4.6.4-2
|
* Thu Jan 25 2024 Joe Orton <jorton@redhat.com> - 5.0.0-1
|
||||||
- fix covscan warnings (#1602620)
|
- update to 5.0.0 (#2250905)
|
||||||
|
- remove redundant _httpd_ macro definitions
|
||||||
|
|
||||||
* Wed Jun 27 2018 Joe Orton <jorton@redhat.com> - 4.6.4-1
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.4-8
|
||||||
- update to 4.6.4 (#1592687)
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 4.6.2-5
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.4-7
|
||||||
- Switch to using Python 3 version of sphinx
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 4.6.2-4
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.4-6
|
||||||
- Update conditionals into bcond's so they can be manipulated during modular
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
builds
|
|
||||||
|
|
||||||
* Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 4.6.2-3
|
* Thu Jun 15 2023 Tomas Orsava <torsava@redhat.com> - 4.9.4-5
|
||||||
- Fix the invocation of Python 2 to a versioned executable
|
- Use the modern way of filtering Provides not to interfere with modern Python
|
||||||
|
RPM generators
|
||||||
|
|
||||||
|
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 4.9.4-4
|
||||||
|
- Rebuilt for Python 3.12
|
||||||
|
|
||||||
|
* Thu Jun 01 2023 Luboš Uhliarik <luhliari@redhat.com> - 4.9.4-3
|
||||||
|
- SPDX migration
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Sep 14 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.9.4-1
|
||||||
|
- new version 4.9.4
|
||||||
|
|
||||||
|
* Wed Aug 31 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.9.3-1
|
||||||
|
- new version 4.9.3
|
||||||
|
|
||||||
|
* Fri Aug 19 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.9.1-4
|
||||||
|
- Resolves: #2119280 - Core dumped upon file upload >= 1GB
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 4.9.1-2
|
||||||
|
- Rebuilt for Python 3.11
|
||||||
|
|
||||||
|
* Mon May 02 2022 Alexander Bokovoy <abokovoy@redhat.com> - 4.9.1-1
|
||||||
|
- Update to 4.9.1
|
||||||
|
- Fixes: rhbz#2049695
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 4.9.0-1
|
||||||
|
- Update to 4.9.0
|
||||||
|
- Enable needlessly disabled debuginfo package
|
||||||
|
- Fixes: rhbz#1960695
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 18 2021 Joe Orton <jorton@redhat.com> - 4.8.0-2
|
||||||
|
- adjust to use bconds (lbalhar, PR#6)
|
||||||
|
- adjust to use make_install macro (tstellar, PR#8)
|
||||||
|
|
||||||
|
* Thu Jun 17 2021 Alexander Bokovoy <abokovoy@redhat.com> - 4.8.0-1
|
||||||
|
- update to 4.8.0
|
||||||
|
- Add experimental Python 3.10 support (#1898158)
|
||||||
|
- Upstream PR: https://github.com/GrahamDumpleton/mod_wsgi/pull/688
|
||||||
|
|
||||||
|
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.7.1-5
|
||||||
|
- Rebuilt for Python 3.10
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.7.1-2
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Wed May 13 2020 Joe Orton <jorton@redhat.com> - 4.7.1-1
|
||||||
|
- update to 4.7.1 (#1721376)
|
||||||
|
|
||||||
|
* Thu Feb 13 2020 Tom Stellard <tstellar@redhat.com> - 4.6.8-3
|
||||||
|
- Use make_build macro instead of just make
|
||||||
|
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.8-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 11 2019 Joe Orton <jorton@redhat.com> - 4.6.8-1
|
||||||
|
- update to 4.6.8 (#1721376)
|
||||||
|
|
||||||
|
* Mon Nov 11 2019 Joe Orton <jorton@redhat.com> - 4.6.6-6
|
||||||
|
- try again to drop Python 2
|
||||||
|
|
||||||
|
* Tue Oct 29 2019 Joe Orton <jorton@redhat.com> - 4.6.6-5
|
||||||
|
- drop python2 build
|
||||||
|
|
||||||
|
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.6-4
|
||||||
|
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.6-3
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.6-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 07 2019 Matthias Runge <mrunge@redhat.com> - 4.6.6-1
|
||||||
|
- update to 4.6.6 (rhbz#1718151)
|
||||||
|
|
||||||
|
* Wed May 29 2019 Miro Hrončok <mhroncok@redhat.com> - 4.6.5-1
|
||||||
|
- update to 4.6.5
|
||||||
|
|
||||||
|
* Tue Apr 16 2019 Joe Orton <jorton@redhat.com> - 4.6.4-4
|
||||||
|
- only build docs with Python 3
|
||||||
|
- fix build on Fedora>30 and RHEL 7
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 31 2018 Adam Williamson <awilliam@redhat.com> - 4.6.4-2
|
||||||
|
- Run Python 3 build in a subdir, so module isn't linked against both
|
||||||
|
libpython 2 and libpython 3 (rhbz#1609491)
|
||||||
|
|
||||||
|
* Fri Jul 20 2018 Matthias Runge <mrunge@redhat.com> - 4.6.4-1
|
||||||
|
- update to 4.6.4 (rhbz#1560329)
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.2-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.6.2-4
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
|
* Fri Apr 20 2018 Joe Orton <jorton@redhat.com> - 4.6.2-3
|
||||||
|
- use sphinx-build-3 if python2 support is disabled
|
||||||
|
|
||||||
* Thu Mar 22 2018 Troy Dawson <tdawson@redhat.com> - 4.6.2-2
|
* Thu Mar 22 2018 Troy Dawson <tdawson@redhat.com> - 4.6.2-2
|
||||||
- Update conditionals.
|
- Update conditionals.
|
||||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
|||||||
|
SHA512 (mod_wsgi-5.0.0.tar.gz) = 3ecc3ad2fd05164929915541be61201db8d35d1e27183ce26c67583b836bb404bd10c88a2ada94714a14140a7f885eb67256cf02bf47aa0dbd81aecd0894a984
|
||||||
Loading…
Reference in New Issue
Block a user