diff --git a/.gitignore b/.gitignore index 0404062..88c8080 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,3 @@ /mod_auth_mellon-0.16.0.tar.gz /mod_auth_mellon-0.17.0.tar.gz /v0.18.0.tar.gz -/v0.18.1.tar.gz -/mod_auth_mellon-0.19.0.tar.gz -/mod_auth_mellon-0.19.1.tar.gz diff --git a/mellon_create_metadata.sh b/mellon_create_metadata.sh index 68b5a8f..9c587a6 100644 --- a/mellon_create_metadata.sh +++ b/mellon_create_metadata.sh @@ -55,9 +55,9 @@ echo umask 0077 TEMPLATEFILE="$(mktemp -t mellon_create_sp.XXXXXXXXXX)" -ERRORFILE="$(mktemp -t mellon_create_err.XXXXXXXXXX)" cat >"$TEMPLATEFILE" <"$ERRORFILE" || ( - echo "Failed to generate certificate!" >&2 - cat "$ERRORFILE" >&2; - rm -f "$TEMPLATEFILE" "$ERRORFILE" - exit 1 -) +openssl req -utf8 -batch -config "$TEMPLATEFILE" -new -x509 -days 3652 -nodes -out "$OUTFILE.cert" -keyout "$OUTFILE.key" 2>/dev/null -rm -f "$TEMPLATEFILE" "$ERRORFILE" +rm -f "$TEMPLATEFILE" CERT="$(grep -v '^-----' "$OUTFILE.cert")" diff --git a/mod_auth_mellon.spec b/mod_auth_mellon.spec index 45215ec..f803735 100644 --- a/mod_auth_mellon.spec +++ b/mod_auth_mellon.spec @@ -1,17 +1,15 @@ -%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}} - Summary: A SAML 2.0 authentication module for the Apache Httpd Server Name: mod_auth_mellon -Version: 0.19.1 +Version: 0.18.0 Release: 1%{?dist} -Source0: https://github.com/latchset/mod_auth_mellon/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/latchset/mod_auth_mellon/archive/refs/tags/v0.18.0.tar.gz Source1: auth_mellon.conf Source2: 10-auth_mellon.conf Source3: mod_auth_mellon.conf Source4: mellon_create_metadata.sh Source5: README.redhat.rst Patch0: 0000-configure.patch -License: GPL-2.0-or-later +License: GPLv2+ BuildRequires: make BuildRequires: gcc BuildRequires: curl-devel @@ -23,7 +21,6 @@ BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-openssl-devel BuildRequires: rubygem-asciidoctor BuildRequires: libtool-ltdl-devel -BuildRequires: systemd-rpm-macros Requires: httpd-mmn = %{_httpd_mmn} Requires: lasso >= 2.5.1-13 Url: https://github.com/latchset/mod_auth_mellon @@ -35,7 +32,8 @@ SAML 2.0 federation protocol. It grants access based on the attributes received in assertions generated by a IdP server. %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q -n %{name}-%{version} +%patch0 -p1 chmod +x configure %build @@ -93,7 +91,11 @@ in the doc directory for instructions on using the diagnostics build. %{_httpd_moddir}/%{name}-diagnostics.so %files +%if 0%{?rhel} && 0%{?rhel} < 7 +%doc COPYING +%else %license COPYING +%endif %doc README.md NEWS ECP.rst %doc %{_pkgdocdir}/README.redhat.rst %doc %{_pkgdocdir}/user_guide @@ -105,64 +107,12 @@ in the doc directory for instructions on using the diagnostics build. %dir /run/%{name}/ %changelog -* Mon Dec 08 2025 Xavier Bachelot - 0.19.1-1 -- Update to 0.19.1 -- Fix bogus date in changelog -- Drop support for EOL releases - -* Thu Jul 24 2025 Fedora Release Engineering - 0.19.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.19.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 0.19.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Tomas Halman - 0.19.0-1 -- Resolves: rhbz#2258342 - new version is available - -* Thu Jan 25 2024 Fedora Release Engineering - 0.18.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.18.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0.18.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Mar 7 2023 Tomas Halman - 0.18.1-3 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 0.18.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jan 6 2023 Tomas Halman - 0.18.1-1 -- Resolves: rhbz#2158456 - new version is available - -* Wed Oct 5 2022 Tomas Halman - 0.18.0-5 -- Resolves: rhbz#1306445 Support HTTP-POST binding for SingleLogoutService - -* Thu Jul 21 2022 Fedora Release Engineering - 0.18.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jun 1 2022 Tomas Halman - 0.18.0-2 -- Update mellon_create_metadata.sh to work with new openssl -- Resolves: rhbz#2097703 Use of RANDFILE = /dev/urandom in openssl config - break in OpenSSL 3 - -* Thu Jan 20 2022 Fedora Release Engineering - 0.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Fri Dec 17 2021 Tomas Halman - 0.18.0-1 - New upstream version 0.18.0 - Resolves: rhbz#1988235 CVE-2021-3639 mod_auth_mellon: Open Redirect vulnerability in logout URLs - Resolves: rhbz#1988664 mod_auth_mellon-0.18.0 is available -* Tue Sep 14 2021 Sahana Prasad - 0.17.0-4 -- Rebuilt with OpenSSL 3.0.0 - * Thu Jul 22 2021 Fedora Release Engineering - 0.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild @@ -173,7 +123,7 @@ in the doc directory for instructions on using the diagnostics build. - New upstream version 0.17.0 * Tue Jul 28 2020 Fedora Release Engineering - 0.16.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Thu Feb 13 2020 Tom Stellard - 0.16.0-2 - Use make_build macro instead of just make diff --git a/sources b/sources index bee21cc..ffc3a3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mod_auth_mellon-0.19.1.tar.gz) = d512cf0eb52b91c7f6671e5e9425eb62263e58e0d3c5daea0fab13315e6310e228fd2f736a1793dc67037dbd717727a61908eb87e7b6654d7da4c62434c9301d +SHA512 (v0.18.0.tar.gz) = 477ac302fda9ed33b2ca51e88379250a41cc85111e71cacc8ba9f16cd8a2b63af6393fb038fc8f5c211b97926ef368c5989c92570c2e3c9eae072c7b4d32d7d5