From e1be938fec6958c88979e7767dc2b942f151d781 Mon Sep 17 00:00:00 2001 From: Stephan Krinetzki Date: Wed, 13 Mar 2019 13:37:36 +0100 Subject: [PATCH 1/4] updated shibboleth.repo and GPG Keys URL... --- configs/centos-6/Dockerfile | 2 +- configs/centos-6/shibboleth.repo | 2 +- configs/centos-7/Dockerfile | 2 +- configs/centos-7/shibboleth.repo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/centos-6/Dockerfile b/configs/centos-6/Dockerfile index e5d2f18..4b9bca6 100644 --- a/configs/centos-6/Dockerfile +++ b/configs/centos-6/Dockerfile @@ -5,7 +5,7 @@ FROM centos:6 ADD configs/centos-6/shibboleth.repo /etc/yum.repos.d/shibboleth.repo # Accept Shibboleth's GPG key -RUN rpm --import https://downloadcontent.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/repodata/repomd.xml.key +RUN rpm --import https://shibboleth.net/downloads/service-provider/RPMS/repomd.xml.key # Configure EPEL for fcgi-devel RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm diff --git a/configs/centos-6/shibboleth.repo b/configs/centos-6/shibboleth.repo index d7cb695..c790bd6 100644 --- a/configs/centos-6/shibboleth.repo +++ b/configs/centos-6/shibboleth.repo @@ -4,5 +4,5 @@ name=Shibboleth (CentOS_CentOS-6) type=rpm-md mirrorlist=https://shibboleth.net/cgi-bin/mirrorlist.cgi/CentOS_CentOS-6 gpgcheck=1 -gpgkey=https://downloadcontent.opensuse.org/repositories/security:/shibboleth/CentOS_CentOS-6/repodata/repomd.xml.key +gpgkey=https://shibboleth.net/downloads/service-provider/RPMS/repomd.xml.key enabled=1 diff --git a/configs/centos-7/Dockerfile b/configs/centos-7/Dockerfile index 60b7f3c..ec53812 100644 --- a/configs/centos-7/Dockerfile +++ b/configs/centos-7/Dockerfile @@ -5,7 +5,7 @@ FROM centos:7 ADD configs/centos-7/shibboleth.repo /etc/yum.repos.d/shibboleth.repo # Accept Shibboleth's GPG key -RUN rpm --import https://downloadcontent.opensuse.org/repositories/security:/shibboleth/CentOS_7/repodata/repomd.xml.key +RUN rpm --import https://shibboleth.net/downloads/service-provider/RPMS/repomd.xml.key # Install EPEL for fcgi-devel RUN yum install -y epel-release diff --git a/configs/centos-7/shibboleth.repo b/configs/centos-7/shibboleth.repo index a94c260..02877bb 100644 --- a/configs/centos-7/shibboleth.repo +++ b/configs/centos-7/shibboleth.repo @@ -4,5 +4,5 @@ name=Shibboleth (CentOS_7) type=rpm-md mirrorlist=https://shibboleth.net/cgi-bin/mirrorlist.cgi/CentOS_7 gpgcheck=1 -gpgkey=https://downloadcontent.opensuse.org/repositories/security:/shibboleth/CentOS_7/repodata/repomd.xml.key +gpgkey=https://shibboleth.net/downloads/service-provider/RPMS/repomd.xml.key enabled=1 From 300eba5885636890c60f07bd5ca6b56eb851bfbc Mon Sep 17 00:00:00 2001 From: David Beitey Date: Wed, 21 Aug 2019 05:40:51 +0000 Subject: [PATCH 2/4] Add link to README for package URL --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index a6984a2..9b20598 100644 --- a/README.rst +++ b/README.rst @@ -17,8 +17,8 @@ Why? Unfortunately, the default distributions of the Shibboleth SP don't come with FastCGI support built by default. Questions have been raised on the Shibboleth mailing list about adding this support to the core build, but to -date this hasn't happened because the ``fcgi-devel`` package lives in the EPEL -repositories and not the core. +date this hasn't happened because the ``fcgi-devel`` package lives in the `EPEL +repositories `_ and not the core. If you can help twist someone's arm to adjust this decision, that'd help eliminate the need for this repository and us manually rebuilding Shibboleth From c21a2d70e358ece4252f3dbe9931afdad2c6dcb2 Mon Sep 17 00:00:00 2001 From: David Beitey Date: Wed, 21 Aug 2019 05:46:28 +0000 Subject: [PATCH 3/4] Readme cleanup --- README.rst | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 9b20598..e2661cc 100644 --- a/README.rst +++ b/README.rst @@ -1,15 +1,18 @@ -Recompiling Shibboleth SP RPMs with FastCGI support -=================================================== +Shibboleth SP RPMs with FastCGI support +======================================= .. image:: https://travis-ci.org/nginx-shib/shibboleth-fastcgi.svg?branch=master :target: https://travis-ci.org/nginx-shib/shibboleth-fastcgi The Shibboleth SP software features FastCGI authorizer and responder applications for use with any web server that supports FastCGI. -This is used with Nginx with the `nginx-http-shibboleth -`_ module, but is -entirely web-server agnostic as it is simply a rebuild of the existing -packages. +These applications can be used with nginx with the +`nginx-http-shibboleth module +`_, but are +entirely web-server agnostic. Whilst present in the Shibboleth SP +source code, these FastCGI applications are not built into existing +Shibboleth packages. Hence, this repository – scripts for rebuilding +the existing Shibboleth packages with FastCGI support. Why? ---- @@ -25,7 +28,8 @@ eliminate the need for this repository and us manually rebuilding Shibboleth each time a new release comes out. By "manually", we mean watching for or otherwise being told about new -Shibboleth SP releases. Here's the `current ATOM feed `_ +Shibboleth SP releases, and then ensuring the package rebuild process +continues to function. Here's the `current ATOM feed `_ from the Shibboleth wiki covering their blog post announcements, which occasionally includes SP software releases. From 840605d2d6ef157cff2b8e75136e90c618ceb3aa Mon Sep 17 00:00:00 2001 From: David Beitey Date: Wed, 25 Sep 2019 03:25:49 +0000 Subject: [PATCH 4/4] Bump version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bbda3f9..3672712 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ env: - _SHIBBOLETH_VERSION=2.5.6 - _SHIBBOLETH_VERSION=2.6.1 - - _SHIBBOLETH_VERSION=3.0.3 + - _SHIBBOLETH_VERSION=3.0.4 - _SHIBBOLETH_VERSION= sudo: required services: