.gitignore

@@ -1 +1 @@
-SOURCES/mod_wsgi-4.6.4.tar.gz
+SOURCES/mod_wsgi-4.7.1.tar.gz

.mod_wsgi.metadata

@@ -1 +1 @@
-6a0cc67546a5e172a885324f3e58b8be5f4e0e58 SOURCES/mod_wsgi-4.6.4.tar.gz
+e63cf367594da6d0efd685057d5b497883004599 SOURCES/mod_wsgi-4.7.1.tar.gz

SOURCES/mod_wsgi-4.6.4-warnings.patch

@@ -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)

SOURCES/mod_wsgi-4.7.1-remove-rpath.patch

@@ -0,0 +1,20 @@
+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

SOURCES/mod_wsgi-4.7.1-warning-segfaults.patch

@@ -0,0 +1,46 @@
+From 2c9d1b3e725ad2a072e9fef4cb1cb0bb9ae2d540 Mon Sep 17 00:00:00 2001
+From: Graham Dumpleton <Graham.Dumpleton@gmail.com>
+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 <Python.h>
+ 
+ #if !defined(PY_VERSION_HEX)

SPECS/mod_wsgi.spec

@@ -1,43 +1,43 @@
+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
+
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
+%{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
+# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
+%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_moddir:    %{expand: %%global _httpd_moddir    %%{_libdir}/httpd/modules}}
 
 %if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
+%global with_python3 1
 %else
-%bcond_with python3
+%global with_python3 0
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} <= 7
+%if (0%{?fedora} > 0 && 0%{?fedora} < 32) || (0%{?rhel} > 0 && 0%{?rhel} <= 7)
-%bcond_without python2
+%global with_python2 1
 %else
-%bcond_with python2
+%global with_python2 0
-%endif
-
-%if %{with python3} && !%{with python2}
-%global py3dir .
 %endif
 
 Name:           mod_wsgi
-Version:        4.6.4
+Version:        4.7.1
-Release:        5%{?dist}
+Release:        11%{?dist}
 Summary:        A WSGI interface for Python web applications in Apache
-Group:          System Environment/Libraries
 License:        ASL 2.0
 URL:            https://modwsgi.readthedocs.io/
 Source0:        https://github.com/GrahamDumpleton/mod_wsgi/archive/%{version}.tar.gz#/mod_wsgi-%{version}.tar.gz
 Source1:        wsgi.conf
 Source2:        wsgi-python3.conf
 Patch1:         mod_wsgi-4.5.20-exports.patch
-Patch2:         mod_wsgi-4.6.4-warnings.patch
+Patch2:         mod_wsgi-4.7.1-remove-rpath.patch
-Patch3:         mod_wsgi-4.9.1-request-limit.patch
+Patch3:         mod_wsgi-4.7.1-warning-segfaults.patch
+Patch4:         mod_wsgi-4.9.1-request-limit.patch
+
+BuildRequires: make
 BuildRequires:  httpd-devel
-BuildRequires:  python3-sphinx
 BuildRequires:  gcc
 
 # 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\
 The mod_wsgi adapter is an Apache module that provides a WSGI compliant\
@@ -49,11 +49,11 @@ existing WSGI adapters for mod_python or CGI.\
 
 %description %_description
 
-%if %{with python2}
+%if 0%{?with_python2} > 0
 %package -n python2-%{name}
 Summary: %summary
 Requires:       httpd-mmn = %{_httpd_mmn}
-BuildRequires:  python2-devel
+BuildRequires:  python2-devel, python2-setuptools
 %{?python_provide:%python_provide python2-%{name}}
 # Remove before F30
 Provides: mod_wsgi = %{version}-%{release}
@@ -64,51 +64,56 @@ Obsoletes: mod_wsgi < %{version}-%{release}
 
 %endif
 
-%if %{with python3}
+%if 0%{?with_python3} > 0
 %package -n python3-%{name}
 Summary:        %summary
 Requires:       httpd-mmn = %{_httpd_mmn}
-BuildRequires:  python3-devel
+BuildRequires:  python3-devel, python3-sphinx, python3-sphinx_rtd_theme
+%if 0%{?with_python2} == 0
+Provides: mod_wsgi = %{version}-%{release}
+Provides: mod_wsgi%{?_isa} = %{version}-%{release}
+Obsoletes: mod_wsgi < %{version}-%{release}
+%endif
 
 %description -n python3-%{name} %_description
 
 %endif
 
 %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
-make -C docs html
+%if %{with_python3}
+make -C docs html SPHINXBUILD=%{_bindir}/sphinx-build-3
+%endif
 
 export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 
-%if %{with python2}
+%if 0%{?with_python3} > 0
-%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python2
+mkdir py3build/
-make %{?_smp_mflags}
+# this always produces an error (because of trying to copy py3build
-%py2_build
+# into itself) but we don't mind, so || :
-%endif
+cp -R * py3build/ || :
-
+pushd py3build
-%if %{with python3}
-pushd %{py3dir}
 %configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3
-make %{?_smp_mflags}
+%{make_build}
 %py3_build
 popd
 %endif
 
+%if 0%{?with_python2} > 0
+%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python2
+%{make_build}
+%py2_build
+%endif
+
 %install
 # first install python3 variant and rename the so file
-%if %{with python3}
+%if 0%{?with_python3} > 0
-
+pushd py3build
-pushd %{py3dir}
 make install DESTDIR=$RPM_BUILD_ROOT LIBEXECDIR=%{_httpd_moddir}
 mv  $RPM_BUILD_ROOT%{_httpd_moddir}/mod_wsgi{,_python3}.so
 
@@ -123,7 +128,7 @@ popd
 %endif
 
 # second install python2 variant
-%if %{with python2}
+%if 0%{?with_python2} > 0
 make install DESTDIR=$RPM_BUILD_ROOT LIBEXECDIR=%{_httpd_moddir}
 
 install -d -m 755 $RPM_BUILD_ROOT%{_httpd_modconfdir}
@@ -135,7 +140,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express{,-2}
 ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
 %endif
 
-%if %{with python2}
+%if 0%{?with_python2} > 0
 %files -n python2-%{name}
 %license LICENSE
 %doc CREDITS.rst README.rst
@@ -147,7 +152,7 @@ ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
 %{_bindir}/mod_wsgi-express
 %endif
 
-%if %{with python3}
+%if 0%{?with_python3} > 0
 %files -n python3-%{name}
 %license LICENSE
 %doc CREDITS.rst README.rst
@@ -159,31 +164,98 @@ ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
 %endif
 
 %changelog
-* Tue Sep 06 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.6.4-5
+* Thu Sep 01 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.7.1-11
-- Resolves: #2122695 - Core dumped upon file upload >= 1GB
+- Resolves: #2122694 - Core dumped upon file upload >= 1GB
 
-* Wed Dec 04 2019 Lubos Uhliarik <luhliari@redhat.com> - 4.6.4-4
+* Thu Apr 07 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.7.1-10
-- Resolves: #1779705 - python3-mod_wsgi: Remove the Provides and Obsoletes for
+- Resolves: #2072969 - Missing debuginfo
-  the name `mod_wsgi`
 
-* Thu Dec 13 2018 Joe Orton <jorton@redhat.com> - 4.6.4-3
+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 4.7.1-9
-- avoid unstripped binaries, re-enable debugsource generation (#1659086)
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Use the modern way of filtering Provides not to interfere with modern Python
+  RPM generators
+- Related: rhbz#1990421
 
-* Tue Dec 11 2018 Joe Orton <jorton@redhat.com> - 4.6.4-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.7.1-8
-- fix covscan warnings (#1602620)
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Wed Jun 27 2018 Joe Orton <jorton@redhat.com> - 4.6.4-1
+* Thu Jul 01 2021 Luboš Uhliarik <luhliari@redhat.com> - 4.7.1-7
-- update to 4.6.4 (#1592687)
+- Resolves: #1976169 - mod_wsgi segfaults when python program outputs a warning
+  message
 
-* Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 4.6.2-5
+* Tue Jun 08 2021 Luboš Uhliarik <luhliari@redhat.com> - 4.7.1-6
-- Switch to using Python 3 version of sphinx
+- Resolves: #1969555 - remove rpath
 
-* Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 4.6.2-4
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.7.1-5
-- Update conditionals into bcond's so they can be manipulated during modular
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-  builds
 
-* Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 4.6.2-3
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.1-4
-- Fix the invocation of Python 2 to a versioned executable
+- 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
 - Update conditionals.