From 99560542ddb4e6f10fc6d953d286bfbd08165f2e Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Wed, 22 Apr 2020 08:17:41 -0500
Subject: [PATCH] Update Shibboleth SP to version 3.1.0

Update the Shibboleth SP base image and the default for the
COmanage Registry Shibboleth SP image to use version 3.1.0
of the Shibboleth SP.
---
 comanage-registry-shibboleth-sp-base/Dockerfile | 11 ++++++-----
 comanage-registry-shibboleth-sp/Dockerfile      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/comanage-registry-shibboleth-sp-base/Dockerfile b/comanage-registry-shibboleth-sp-base/Dockerfile
index f30aea1..1eb1f58 100644
--- a/comanage-registry-shibboleth-sp-base/Dockerfile
+++ b/comanage-registry-shibboleth-sp-base/Dockerfile
@@ -22,6 +22,7 @@ RUN apt-get update \
       && apt-get install -y --no-install-recommends \
             apache2 \
             apache2-dev \
+            ca-certificates \
             file \
             gcc \
             g++ \
@@ -50,7 +51,7 @@ RUN wget -O log4shib.tar.gz "${LOG4SHIB_URL}" \
       && cd .. \
       && rm -r src 
 
-ARG XERCESC_URL=http://ftp.wayne.edu/apache//xerces/c/3/sources/xerces-c-3.2.2.tar.gz
+ARG XERCESC_URL=https://apache.cs.utah.edu/xerces/c/3/sources/xerces-c-3.2.3.tar.gz
 
 RUN wget -O xerces.tar.gz "${XERCESC_URL}" \
       && mkdir -p src \
@@ -63,7 +64,7 @@ RUN wget -O xerces.tar.gz "${XERCESC_URL}" \
       && cd .. \
       && rm -r src 
 
-ARG XMLSECC_URL=http://ftp.wayne.edu/apache/santuario/c-library/xml-security-c-2.0.2.tar.gz
+ARG XMLSECC_URL=https://apache.cs.utah.edu/santuario/c-library/xml-security-c-2.0.2.tar.gz
 
 RUN wget -O xmlsecc.tar.gz "${XMLSECC_URL}" \
       && mkdir -p src \
@@ -79,7 +80,7 @@ RUN wget -O xmlsecc.tar.gz "${XMLSECC_URL}" \
       && cd .. \
       && rm -r src 
 
-ARG XMLTOOLING_URL=http://shibboleth.net/downloads/c++-opensaml/3.0.1/xmltooling-3.0.4.tar.gz
+ARG XMLTOOLING_URL=http://shibboleth.net/downloads/c++-opensaml/3.1.0/xmltooling-3.1.0.tar.gz
 
 RUN wget -O xmltooling.tar.gz "${XMLTOOLING_URL}" \
       && mkdir -p src \
@@ -96,7 +97,7 @@ RUN wget -O xmltooling.tar.gz "${XMLTOOLING_URL}" \
       && cd .. \
       && rm -r src 
 
-ARG OPENSAMLC_URL=http://shibboleth.net/downloads/c++-opensaml/3.0.1/opensaml-3.0.1.tar.gz
+ARG OPENSAMLC_URL=http://shibboleth.net/downloads/c++-opensaml/3.1.0/opensaml-3.1.0.tar.gz
 
 RUN wget -O opensamlc.tar.gz "${OPENSAMLC_URL}" \
       && mkdir -p src \
@@ -113,7 +114,7 @@ RUN wget -O opensamlc.tar.gz "${OPENSAMLC_URL}" \
       && cd .. \
       && rm -r src 
 
-ARG SHIBBOLETH_SP_URL=http://shibboleth.net/downloads/service-provider/3.0.4/shibboleth-sp-3.0.4.tar.gz
+ARG SHIBBOLETH_SP_URL=http://shibboleth.net/downloads/service-provider/3.1.0/shibboleth-sp-3.1.0.tar.gz
 
 RUN wget -O shibboleth-sp.tar.gz "${SHIBBOLETH_SP_URL}" \
       && mkdir -p src \
diff --git a/comanage-registry-shibboleth-sp/Dockerfile b/comanage-registry-shibboleth-sp/Dockerfile
index 0d2e375..fb122a1 100644
--- a/comanage-registry-shibboleth-sp/Dockerfile
+++ b/comanage-registry-shibboleth-sp/Dockerfile
@@ -18,7 +18,7 @@
 # limitations under the License.
 ARG COMANAGE_REGISTRY_VERSION=develop
 ARG COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
-ARG COMANAGE_REGISTRY_SHIBBOLETH_SP_VERSION="3.0.3"
+ARG COMANAGE_REGISTRY_SHIBBOLETH_SP_VERSION="3.1.0"
 ARG COMANAGE_REGISTRY_SHIBBOLETH_SP_BASE_IMAGE_VERSION=1
 
 FROM comanage-registry-shibboleth-sp-base:${COMANAGE_REGISTRY_SHIBBOLETH_SP_VERSION}-${COMANAGE_REGISTRY_SHIBBOLETH_SP_BASE_IMAGE_VERSION} AS shib-base