rpms/mod_wsgi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove all of the patches, which have been applied upstream

Browse Source
This commit is contained in:
Luke Macken 2014-05-29 07:05:18 -06:00
parent 9dc4549f01
commit a659b256eb
5 changed files with 1 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mod_wsgi-3.4-configure-python3.patch
View File

@ -1,20 +0,0 @@
--- python3-mod_wsgi-3.4-11.fc21/configure.ac.orig 2013-11-28 13:50:26.969440552 +0100
+++ python3-mod_wsgi-3.4-11.fc21/configure.ac 2013-11-28 13:50:46.879414776 +0100
@@ -104,7 +104,7 @@ PYTHONLIBDIR=`${PYTHON} -c 'from sys imp
PYTHONCFGDIR=`${PYTHON} -c 'from sys import stdout; \
import distutils.sysconfig; \
stdout.write(distutils.sysconfig.get_python_lib(plat_specific=1, \
- standard_lib=1) +"/config")'`
+ standard_lib=1))'`
PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
from distutils import sysconfig; \
stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
@@ -120,7 +120,7 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-fr
LDFLAGS1="-L${PYTHONLIBDIR}"
LDFLAGS2="-L${PYTHONCFGDIR}"
- LDLIBS1="-lpython${PYTHON_VERSION}"
+ LDLIBS1="-lpython${PYTHON_VERSION}m"
LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
from distutils import sysconfig; \
stdout.write(sysconfig.get_config_var("LIBS"))'`

23
mod_wsgi-3.4-connsbh.patch
View File

@ -1,23 +0,0 @@
Fix scoreboard handling.
https://bugzilla.redhat.com/show_bug.cgi?id=867276
http://code.google.com/p/modwsgi/source/detail?path=/mod_wsgi.c&name=mod_wsgi-3.X&r=bdbeacb88f348909845445e9d52eb7be401abaf1
--- mod_wsgi-3.4/mod_wsgi.c.connsbh
+++ mod_wsgi-3.4/mod_wsgi.c
@@ -10600,7 +10600,13 @@ static void wsgi_process_socket(apr_pool
* will add their own input/output filters to the chain.
*/
+#if AP_MODULE_MAGIC_AT_LEAST(20110619,0)
+ /* For 2.4 a NULL sbh pointer should work. */
+ sbh = NULL;
+#else
+ /* For 2.2 a dummy sbh pointer is needed. */
ap_create_sb_handle(&sbh, p, -1, 0);
+#endif
c = (conn_rec *)apr_pcalloc(p, sizeof(conn_rec));

47
mod_wsgi-3.4-coredump.patch
View File

@ -1,47 +0,0 @@
Enable core dumps. In upstream 3.x branch:
http://code.google.com/p/modwsgi/source/detail?r=b4f55d756fa816a7eae0f7edc13d5f2da3f3d5c1&name=mod_wsgi-3.X&path=/mod_wsgi.c#
--- mod_wsgi-3.4/configure.ac.dumpcore
+++ mod_wsgi-3.4/configure.ac
@@ -39,6 +39,8 @@ fi
AC_SUBST(APXS)
+AC_CHECK_FUNCS(prctl)
+
AC_MSG_CHECKING(Apache version)
HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
HTTPD_INCLUDEDIR="`${APXS} -q INCLUDEDIR`"
--- mod_wsgi-3.4/mod_wsgi.c.coredump
+++ mod_wsgi-3.4/mod_wsgi.c
@@ -139,6 +139,10 @@ typedef regmatch_t ap_regmatch_t;
#include <pwd.h>
#endif
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
#include "Python.h"
#if !defined(PY_VERSION_HEX)
@@ -10485,6 +10489,17 @@ static void wsgi_setup_access(WSGIDaemon
"mod_wsgi (pid=%d): Unable to change to uid=%ld.",
getpid(), (long)daemon->group->uid);
}
+
+#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE)
+ /* this applies to Linux 2.4+ */
+ if (ap_coredumpdir_configured) {
+ if (prctl(PR_SET_DUMPABLE, 1)) {
+ ap_log_error(APLOG_MARK, WSGI_LOG_ALERT(errno), wsgi_server,
+ "mod_wsgi (pid=%d): set dumpable failed - this child will not coredump"
+ " after software errors", getpid());
+ }
+ }
+#endif
}
static int wsgi_setup_socket(WSGIProcessGroup *process)

28
mod_wsgi-3.4-procexit.patch
View File

@ -1,28 +0,0 @@
Log exit status in daemon manager; improves diagnosics.
http://code.google.com/p/modwsgi/source/detail?path=/mod_wsgi.c&name=mod_wsgi-3.X&r=b4f55d756fa816a7eae0f7edc13d5f2da3f3d5c1
--- mod_wsgi-3.3/mod_wsgi.c.procexit
+++ mod_wsgi-3.3/mod_wsgi.c
@@ -9845,6 +9845,20 @@ static void wsgi_manage_process(int reas
wsgi_server, "mod_wsgi (pid=%d): "
"Process '%s' has died, restarting.",
daemon->process.pid, daemon->group->name);
+ if (WIFEXITED(status)) {
+ ap_log_error(APLOG_MARK, WSGI_LOG_INFO(0),
+ wsgi_server, "mod_wsgi (pid=%d): "
+ "Process '%s' terminated normally, exit code %d",
+ daemon->process.pid, daemon->group->name,
+ WEXITSTATUS(status));
+ }
+ else if (WIFSIGNALED(status)) {
+ ap_log_error(APLOG_MARK, WSGI_LOG_INFO(0),
+ wsgi_server, "mod_wsgi (pid=%d): "
+ "Process '%s' terminated by signal %d",
+ daemon->process.pid, daemon->group->name,
+ WTERMSIG(status));
+ }
wsgi_start_process(wsgi_parent_pool, daemon);
}

17
mod_wsgi.spec
View File

@ -22,10 +22,6 @@ URL: http://modwsgi.org
Source0: http://modwsgi.googlecode.com/files/%{name}-%{version}.tar.gz
Source1: wsgi.conf
Source2: wsgi-python3.conf
Patch0: mod_wsgi-3.4-connsbh.patch
Patch1: mod_wsgi-3.4-procexit.patch
Patch2: mod_wsgi-3.4-coredump.patch
Patch3: mod_wsgi-3.4-configure-python3.patch
BuildRequires: httpd-devel, python-devel, autoconf
%if 0%{?with_python3}
@ -62,22 +58,12 @@ existing WSGI adapters for mod_python or CGI.
%prep
%setup -q
%patch0 -p1 -b .connsbh
%patch1 -p1 -b .procexit
%patch2 -p1 -b .coredump
%if 0%{?with_python3}
cp -a . %{py3dir}
pushd %{py3dir}
%patch3 -p1 -b .python3
popd
%endif
%build
# Regenerate configure for -coredump patch change to configure.in
autoconf
export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}"
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --enable-shared --with-apxs=%{_httpd_apxs}
@ -85,8 +71,6 @@ make %{?_smp_mflags}
%if 0%{?with_python3}
pushd %{py3dir}
# Regenerate configure for -coredump patch change to configure.in
autoconf
%configure --enable-shared --with-apxs=%{_httpd_apxs} --with-python=python3
make %{?_smp_mflags}
popd
@ -136,6 +120,7 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-wsgi.conf
%changelog
* Thu May 29 2014 Luke Macken <lmacken@redhat.com> - 3.5-1
- Update to 3.5 to fix CVE-2014-0240 (#1101863)
- Remove all of the patches, which have been applied upstream
* Wed May 28 2014 Joe Orton <jorton@redhat.com> - 3.4-14
- rebuild for Python 3.4