From d8740bf21a5c75d9e419da1c03492f029816f112 Mon Sep 17 00:00:00 2001 From: Jorge Gallegos Date: Mon, 12 Feb 2018 20:34:02 -0600 Subject: [PATCH] Conditionally disable router-access on f28 f28 retired tcp_wrappers, which are needed for router_access --- fedora.ini | 1 - uwsgi.spec | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/fedora.ini b/fedora.ini index 864ab2f..67ca940 100644 --- a/fedora.ini +++ b/fedora.ini @@ -42,7 +42,6 @@ plugins = airbrake, rack, rawrouter, redislog, - router_access, router_basicauth, router_cache, router_expires, diff --git a/uwsgi.spec b/uwsgi.spec index a71bc67..96b3cff 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -115,6 +115,13 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %endif +# Disable router_access in fedora >= 28 because tcp_wrappers deprecation +%if 0%{?fedora} >= 28 +%bcond_with tcp_wrappers +%else +%bcond_without tcp_wrappers +%endif + Name: uwsgi Version: %{majornumber}.%{minornumber}.%{releasenumber} Release: 0%{?dist} @@ -139,6 +146,9 @@ Patch6: uwsgi_v8-314_compatibility.patch Patch7: uwsgi_fix_mono.patch BuildRequires: curl, python2-devel, libxml2-devel, libuuid-devel, jansson-devel BuildRequires: libyaml-devel, ruby-devel +%if %{with tcp_wrappers} +BuildRequires: tcp_wrappers-devel +%endif %if %{with python3} BuildRequires: python%{python3_pkgversion}-devel %endif @@ -164,7 +174,7 @@ BuildRequires: java-1.8.0-openjdk-headless BuildRequires: java-1.8.0-openjdk-devel %endif BuildRequires: java-devel, sqlite-devel, libcap-devel -BuildRequires: httpd-devel, tcp_wrappers-devel, libcurl-devel +BuildRequires: httpd-devel, libcurl-devel BuildRequires: gloox-devel, libstdc++-devel BuildRequires: GeoIP-devel, libevent-devel, zlib-devel BuildRequires: openldap-devel, boost-devel @@ -198,6 +208,11 @@ BuildRequires: v8-devel BuildRequires: libmongodb-devel %endif +%if 0%{?fedora} >= 28 +BuildRequires: libargon2-devel +Obsoletes: %{name}-router-access <= 2.0.16 +%endif + Obsoletes: %{name}-loggers <= 1.9.8-1 Obsoletes: %{name}-routers <= 2.0.6 Obsoletes: %{name}-plugin-erlang <= 1.9.20-1 @@ -1198,6 +1213,9 @@ CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/jwsgi fedora CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/ring fedora %endif +%if %{with tcp_wrappers} +CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/router_access fedora +%endif %{_httpd_apxs} -Wc,-Wall -Wl -c apache2/mod_proxy_uwsgi.c %install