From c3842b6bf98f2b51bf9bf7855c1944fb9dd00528 Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Wed, 21 Mar 2018 12:07:18 -0400 Subject: [PATCH] upgrade python-saml for CVE fix --- requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- tools/docker-compose/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index e531173499..cf00960cbe 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -40,7 +40,7 @@ pyparsing==2.2.0 python-logstash==0.4.6 python-memcached==1.58 python-radius==1.0 -python-saml==2.2.1 +python-saml==2.2.4 python-social-auth==0.2.21 pyvmomi==6.5 redbaron==0.6.3 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index fbd0b0b6b6..7bc1abb2e3 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -151,7 +151,7 @@ python-novaclient==9.0.1 # via python-openstackclient, shade python-openid==2.2.5 # via python-social-auth python-openstackclient==3.11.0 # via python-ironicclient python-radius==1.0 -python-saml==2.2.1 +python-saml==2.2.4 python-social-auth==0.2.21 pytz==2017.2 # via babel, celery, irc, oslo.serialization, oslo.utils, tempora, twilio pyvmomi==6.5 diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 712c7cd607..79b133ac73 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -30,7 +30,7 @@ RUN ln -s /awx_devel/tools/docker-compose/bootstrap_development.sh /bootstrap_de RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost" RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt WORKDIR /tmp -RUN SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev +RUN CFLAGS="-DXMLSEC_NO_SIZE_T" SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" VENV_BASE="/venv" make requirements_dev RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en