[cpp-linbuild] 06/07: SSPCPP-1002 Remove support for SUSE
John W. O'Brien
john at saltant.com
Fri Dec 27 17:43:15 UTC 2024
This is an automated email from the git hooks/post-receive script.
obrienjw pushed a commit to branch main
in repository cpp-linbuild.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=43cb16f8cb06bae1498d969ed4f7c290138174b4
commit 43cb16f8cb06bae1498d969ed4f7c290138174b4
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Dec 27 16:32:38 2024 +0000
SSPCPP-1002 Remove support for SUSE
---
common/SPECS/log4shib.spec | 9 ++-
common/SPECS/opensaml.spec | 9 ++-
common/SPECS/shibboleth-embedded-ds.spec | 19 ++----
common/SPECS/shibboleth.spec | 106 ++-----------------------------
common/SPECS/shibresolver.spec | 17 ++---
common/SPECS/xmltooling.spec | 9 ++-
6 files changed, 27 insertions(+), 142 deletions(-)
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index 95a6a54..492d495 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -4,7 +4,7 @@
Name: %{libname}
Version: 2.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Log for C++, Shibboleth Edition
License: LGPL-2.1-only
Group: Development/Libraries
@@ -24,11 +24,7 @@ BuildRequires: redhat-rpm-config
BuildRequires: gdb
%endif
-%if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{compname}
-%else
%define pkgdocdir %{_docdir}/%{compname}-%{version}
-%endif
%description
Log for C++ is a library of classes for flexible logging to files, syslog,
@@ -88,6 +84,9 @@ fi
%doc %{pkgdocdir}
%changelog
+* Fri Dec 27 2024 John W. O'Brien <john at saltant.com - 2.0.1-3
+- SSPCPP-1002 Remove support for SUSE
+
* Sat Jun 17 2023 John W. O'Brien <john at saltant.com> - 2.0.1-2
- Normalize SPEC file whitespace
- Delete obsolete BuildRoot macro
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index 518a0b7..0ad5f84 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -6,7 +6,7 @@
Name: %{libname}
Version: 3.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OpenSAML SAML library
Group: Development/Libraries/C and C++
Vendor: Shibboleth Consortium
@@ -32,11 +32,7 @@ BuildRequires: redhat-rpm-config
BuildRequires: gdb
%endif
-%if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{compname}
-%else
%define pkgdocdir %{_docdir}/%{compname}-%{version}
-%endif
%description
OpenSAML is an open source implementation of the OASIS Security Assertion
@@ -134,6 +130,9 @@ This package includes XML schemas and related files.
%doc %{pkgdocdir}
%changelog
+* Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.3.0-2
+- SSPCPP-1002 Remove support for SUSE
+
* Wed Oct 16 2024 Scott Cantor <cantor.2 at osu.edu> - 3.3.0-1
- Bump version and xmltooling dependency
diff --git a/common/SPECS/shibboleth-embedded-ds.spec b/common/SPECS/shibboleth-embedded-ds.spec
index 6f32010..322364b 100644
--- a/common/SPECS/shibboleth-embedded-ds.spec
+++ b/common/SPECS/shibboleth-embedded-ds.spec
@@ -1,6 +1,6 @@
Name: shibboleth-embedded-ds
Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Client-side federation discovery service for SAML-based SSO
Group: Productivity/Networking/Security
Vendor: Shibboleth Consortium
@@ -12,9 +12,6 @@ BuildArch: noarch
BuildRequires: redhat-rpm-config
%{!?_without_builtinapache:BuildRequires: httpd}
%endif
-%if "%{_vendor}" == "suse"
-%{!?_without_builtinapache:BuildRequires: apache2}
-%endif
%description
The Embedded Discovery Service is a JS/CSS/HTML-based tool for
@@ -67,19 +64,8 @@ fi
%{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
fi
%endif
-%if "%{_vendor}" == "suse"
- if [ "$1" = 0 ] ; then
- %{!?_without_builtinapache:/sbin/service apache2 status 1>/dev/null && /sbin/service apache2 restart 1>/dev/null}
- fi
-%endif
exit 0
-%postun
-%if "%{_vendor}" == "suse"
-cd /
-%{!?_without_builtinapache:%restart_on_update apache2}
-%endif
-
%files -f rpm.filelist
%defattr(-,root,root,-)
%dir %{_sysconfdir}/shibboleth-ds
@@ -92,6 +78,9 @@ cd /
%config %{_sysconfdir}/shibboleth-ds/shibboleth-ds.conf
%changelog
+* Fri Dec 27 2024 John W. O'Brien <john at saltant.com. - 1.3.0-2
+- SSPCPP-1002 Remove support for SUSE
+
* Tue Feb 27 2024 Scott Cantor <cantor.2 at osu.edu> - 1.3.0-1
- Update version.
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index 94f9c8f..da7a839 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,6 +1,6 @@
Name: shibboleth
Version: 3.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Open source system for attribute-based Web SSO
Group: Productivity/Networking/Security
Vendor: Shibboleth Consortium
@@ -16,10 +16,6 @@ Requires(pre,preun): opensaml-schemas%{?_isa} >= 3.3.0
Requires(pre,preun): xmltooling-schemas >= 3.3.0
Requires(pre,preun): opensaml-schemas >= 3.3.0
%endif
-%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
-Requires(pre,preun): %{insserv_prereq}
-Requires(pre,preun): %{fillup_prereq}
-%endif
%if 0%{?rhel} >= 7 || 0%{?amzn2023}
Requires: hostname
BuildRequires: systemd-devel
@@ -39,9 +35,6 @@ BuildRequires: libsaml-devel >= 3.2.0
Requires: libcurl-openssl%{?_isa} >= 7.21.7
BuildRequires: chrpath
%endif
-%if 0%{?suse_version} > 1300
-BuildRequires: libtool
-%endif
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: boost-devel >= 1.32.0
@@ -65,22 +58,9 @@ Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
%endif
-%if "%{_vendor}" == "suse"
-Requires(pre): pwdutils
-%{!?_without_builtinapache:BuildRequires: apache2-devel}
-%{?systemd_requires}
-%if 0%{?suse_version} >= 1210
-BuildRequires: systemd-rpm-macros
-BuildRequires: systemd-devel
-%endif
-%endif
%define runuser shibd
-%if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/shibboleth
-%else
%define pkgdocdir %{_docdir}/shibboleth-%{version}
-%endif
%description
Shibboleth is a Web Single Sign-On implementations based on OpenSAML
@@ -113,12 +93,6 @@ This package includes files needed for development with Shibboleth.
%setup -q -n %{name}-sp-%{version}
%build
-%if 0%{?suse_version} >= 1300
- %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_systemd:--enable-systemd} %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/opensuse13
-%else
-%if 0%{?suse_version} >= 1210
- %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_systemd:--enable-systemd} %{?shib_options}
-%else
%if 0%{?amzn2023}
%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{!?_without_systemd:--enable-systemd} %{?shib_options}
%else
@@ -140,18 +114,11 @@ This package includes files needed for development with Shibboleth.
%endif
%endif
%endif
-%endif
-%endif
%{__make} pkgdocdir=%{pkgdocdir}
%install
%make_install NOKEYGEN=1 pkgdocdir=%{pkgdocdir}
-%if "%{_vendor}" == "suse"
- %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
- $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/native.logger
-%endif
-
# Plug the SP into the built-in Apache on a recognized system.
touch rpm.filelist
APACHE_CONFIG="no"
@@ -185,7 +152,7 @@ fi
# Establish location of systemd file, if any.
SYSTEMD_SHIBD="no"
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?amzn2023}
+%if 0%{?rhel} >= 7 || 0%{?amzn2023}
%{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir}
echo "%attr(0444,-,-) %{_unitdir}/shibd.service" >> rpm.filelist
SYSTEMD_SHIBD="$RPM_BUILD_ROOT%{_unitdir}/shibd.service"
@@ -206,11 +173,6 @@ if [ "$SYSTEMD_SHIBD" == "no" ] ; then
echo "%config(noreplace) %{_sysconfdir}/sysconfig/shibd" >> rpm.filelist
SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/shibd"
%endif
-%if "%{_vendor}" == "suse"
- %{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates
- echo "%{_localstatedir}/adm/fillup-templates/sysconfig.shibd" >> rpm.filelist
- SYSCONFIG_SHIBD="$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.shibd"
-%endif
fi
if [ "$SYSTEMD_SHIBD" != "no" ] ; then
@@ -271,14 +233,10 @@ fi
chrpath -d $RPM_BUILD_ROOT%{_bindir}/resolvertest
%endif
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_vendor}" == "suse"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
if [ "$SYSTEMD_SHIBD" == "no" ] ; then
install -d -m 0755 $RPM_BUILD_ROOT%{_initddir}
install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initddir}/shibd
-%if "%{_vendor}" == "suse"
- install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
- %{__ln_s} -f %{_initddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
-%endif
fi
%endif
@@ -292,9 +250,6 @@ fi
getent group %{runuser} >/dev/null || groupadd -r %{runuser}
getent passwd %{runuser} >/dev/null || useradd -r -g %{runuser} \
-d %{_localstatedir}/run/shibboleth -s /sbin/nologin -c "Shibboleth SP daemon" %{runuser}
-%if 0%{?suse_version} >= 1210
- %service_add_pre shibd.service
-%endif
exit 0
%post
@@ -313,8 +268,6 @@ if [ $1 -gt 1 ] ; then
# by pointing them at new version-independent /usr/share/share tree.
# Any Aliases we didn't create we assume are custom files.
# This is to accomodate making shib.conf a noreplace config file.
- # We can't do this for SUSE, because they disallow changes to
- # packaged files in scriplets.
APACHE_CONF="no"
if [ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] ; then
APACHE_CONF="%{_sysconfdir}/httpd/conf.d/shib.conf"
@@ -338,18 +291,6 @@ if [ $1 -gt 1 ] ; then
/sbin/chkconfig --add shibd
%endif
%endif
-%if "%{_vendor}" == "suse"
-%if 0%{?suse_version} >= 1210
- %service_add_post shibd.service
- systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
-%else
- # This adds the proper /etc/rc*.d links for the script
- # and populates the sysconfig/shibd file.
- cd /
- %{fillup_only -n shibd}
- %insserv_force_if_yast shibd
-%endif
-%endif
%preun
# On final removal, stop shibd and remove service, restart Apache if running.
@@ -367,17 +308,6 @@ if [ $1 -gt 1 ] ; then
exit 0
fi
%endif
-%if "%{_vendor}" == "suse"
-%if 0%{?suse_version} >= 1210
- %service_del_preun shibd.service
-%else
- %stop_on_removal shibd
-%endif
- if [ $1 -eq 0 ] ; then
- %{!?_without_builtinapache:/sbin/service apache2 status 1>/dev/null && /sbin/service apache2 restart 1>/dev/null}
- exit 0
- fi
-%endif
exit 0
%postun
@@ -396,26 +326,8 @@ exit 0
exit 0
fi
%endif
-%if "%{_vendor}" == "suse"
-%if 0%{?suse_version} >= 1210
- %service_del_postun shibd.service
-%else
- cd /
- %restart_on_update shibd
- %{insserv_cleanup}
-%endif
- %{!?_without_builtinapache:%restart_on_update apache2}
-%endif
%posttrans
-# One-time extra restart of shibd and Apache to work around
-# SUSE bug that breaks old %%restart_on_update macro.
-# If we remove, upgrades from pre-systemd to post-systemd
-# will stop doing the final restart.
-%if "%{_vendor}" == "suse" && 0%{?suse_version} >= 1210
- /usr/bin/systemctl try-restart shibd >/dev/null 2>&1 || :
- /usr/bin/systemctl try-restart apache2 >/dev/null 2>&1 || :
-%endif
exit 0
%files -f rpm.filelist
@@ -432,9 +344,6 @@ exit 0
%{?_with_fastcgi:%{_libdir}/shibboleth/shibauthorizer}
%{?_with_fastcgi:%{_libdir}/shibboleth/shibresponder}
%attr(0750,%{runuser},%{runuser}) %dir %{_localstatedir}/log/shibboleth
-%if 0%{?suse_version} < 1300
-%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/run/shibboleth
-%endif
%attr(0755,%{runuser},%{runuser}) %dir %{_localstatedir}/cache/shibboleth
%dir %{_datadir}/xml/shibboleth
%{_datadir}/xml/shibboleth/*
@@ -458,11 +367,7 @@ exit 0
%if "%{_vendor}" == "amazon" && 0%{?amzn} == 2
%config %{_initddir}/shibd
%endif
-%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
-%config %{_initddir}/shibd
-%{_sbindir}/rcshibd
-%endif
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?amzn2023}
+%if 0%{?rhel} >= 7 || 0%{?amzn2023}
%{_tmpfilesdir}/%{name}.conf
%endif
%{_sysconfdir}/shibboleth/example-shibboleth2.xml
@@ -484,6 +389,9 @@ exit 0
%doc %{pkgdocdir}/api
%changelog
+* Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.5.0-3
+- SSPCPP-1002 Remove support for SUSE
+
* Tue Oct 22 2024 Scott Cantor <cantor.2 at osu.edu> - 3.5.0-2
- Turn off memcache option for newer platforms
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index f866870..9f7c57b 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -6,7 +6,7 @@
Name: %{libname}
Version: 3.5.0
Summary: Shibboleth SP Attribute Resolver Library
-Release: 1%{?dist}
+Release: 2%{?dist}
Vendor: Shibboleth Consortium
Group: System Environment/Libraries
License: Apache-2.0
@@ -28,11 +28,7 @@ BuildRequires: pkgconfig
BuildRequires: redhat-rpm-config
%endif
-%if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{name}
-%else
%define pkgdocdir %{_docdir}/%{name}-%{version}
-%endif
%description
This package contains a Shibboleth SP Extension that provides
@@ -66,12 +62,6 @@ This package includes files needed for development.
%setup -q -n %{distname}-%{version}
%build
-%if 0%{?suse_version} >= 1300
- %configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/opensuse13
-%else
-%if 0%{?suse_version} >= 1210
- %configure --with-gssapi %{?shib_options}
-%else
%if 0%{?rhel} >= 7
%configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
%else
@@ -81,8 +71,6 @@ This package includes files needed for development.
%configure --with-gssapi %{?shib_options}
%endif
%endif
-%endif
-%endif
%{__make} pkgdocdir=%{pkgdocdir}
%install
@@ -114,6 +102,9 @@ This package includes files needed for development.
%doc %{pkgdocdir}
%changelog
+* Fri Dec 27 2024 John W. O'Brien <john at saltant.com> = 3.5.0-2
+- SSPCPP-1002 Remove support for SUSE
+
* Wed Oct 16 2024 Scott Cantor <cantor.2 at osu.edu> - 3.5.0-1
- Bump version and our dependencies
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index bff242d..e33e402 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -5,7 +5,7 @@
Name: %{libname}
Version: 3.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OpenSAML XML Processing library
Group: Development/Libraries/C and C++
Vendor: Shibboleth Consortium
@@ -38,11 +38,7 @@ BuildRequires: redhat-rpm-config
BuildRequires: gdb
%endif
-%if "%{_vendor}" == "suse"
-%define pkgdocdir %{_docdir}/%{compname}
-%else
%define pkgdocdir %{_docdir}/%{compname}-%{version}
-%endif
# Prevent the RHEL/etc 6+ package from requiring a vanilla libcurl.
%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
@@ -144,6 +140,9 @@ This package includes XML schemas and related files.
%doc %{pkgdocdir}
%changelog
+* Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.3.0-2
+- SSPCPP-1002 Remove support for SUSE
+
* Wed Oct 16 2024 Scott Cantor <cantor.2 at osu.edu> - 3.3.0-1
- Bump version and libname
- Add conditional C++11 CXXFLAGS for older Linux
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list