[cpp-linbuild] branch main updated: SSPCPP-1007 Reconcile libmemcached-devel dependency

[John W. O'Brien]

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=919d6d78681fa9bb46aee896380d7aaa447d0ea5

The following commit(s) were added to refs/heads/main by this push:
     new 919d6d7  SSPCPP-1007 Reconcile libmemcached-devel dependency
919d6d7 is described below

commit 919d6d78681fa9bb46aee896380d7aaa447d0ea5
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Feb 7 18:52:15 2025 +0000

    SSPCPP-1007 Reconcile libmemcached-devel dependency
---
 common/SPECS/shibboleth.spec    | 7 +++++--
 os/centos8/image/Dockerfile     | 2 +-
 os/rhel8/image/Dockerfile       | 2 +-
 os/rhel9/image/Dockerfile       | 2 +-
 os/rockylinux8/image/Dockerfile | 2 +-
 os/rockylinux9/image/Dockerfile | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index b2f5b0d..d73c684 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,6 +1,6 @@
 Name: shibboleth
 Version: 3.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Open source system for attribute-based Web SSO
 Group: Productivity/Networking/Security
 Vendor: Shibboleth Consortium
@@ -42,7 +42,7 @@ BuildRequires: boost-devel >= 1.32.0
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
-%if 0%{?centos} == 7 || 0%{?rhel} == 7 || 0%{?amzn2023}
+%if 0%{?centos} == 7 || 0%{?rhel} == 7
 BuildRequires: libmemcached-devel
 %endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
@@ -379,6 +379,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Fri Feb 7 2025 John W. O'Brien <john at saltant.com> - 3.5.0-5
+- SSPCPP-1007 Remove gratuitous libmemcached-devel from BuildRequires on AL2023
+
 * Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.5.0-4
 - SSPCPP-1003 Remove support for RHEL 6
 - SSPCPP-1004 Remove support for Amazon Linux 1
diff --git a/os/centos8/image/Dockerfile b/os/centos8/image/Dockerfile
index da576c4..d81fb20 100644
--- a/os/centos8/image/Dockerfile
+++ b/os/centos8/image/Dockerfile
@@ -11,7 +11,7 @@ RUN sed -i "s/enabled=0/enabled=1/" /etc/yum.repos.d/CentOS-Linux-PowerTools.rep
     && yum -y install \
         autoconf automake boost-devel curl-devel doxygen \
         gcc-c++ gdb git groff httpd-devel \
-        libmemcached-devel libtool make openldap-devel openssl-devel \
+        libtool make openldap-devel openssl-devel \
         pkgconfig rpm-build stunnel systemd-devel unixODBC-devel \
         zlib-devel createrepo_c yum-utils \
     && yum clean all
diff --git a/os/rhel8/image/Dockerfile b/os/rhel8/image/Dockerfile
index 0f41be9..575bb99 100644
--- a/os/rhel8/image/Dockerfile
+++ b/os/rhel8/image/Dockerfile
@@ -9,7 +9,7 @@ RUN dnf \
     && dnf -y install \
         autoconf automake boost-devel chrpath curl-devel doxygen \
         gcc-c++ gdb git groff httpd-devel \
-        libmemcached-devel libtool make openldap-devel openssl-devel \
+        libtool make openldap-devel openssl-devel \
         pkgconfig rpm-build stunnel systemd-devel unixODBC-devel \
         zlib-devel createrepo_c yum-utils \
     && dnf clean all
diff --git a/os/rhel9/image/Dockerfile b/os/rhel9/image/Dockerfile
index 539738f..4ee8348 100644
--- a/os/rhel9/image/Dockerfile
+++ b/os/rhel9/image/Dockerfile
@@ -9,7 +9,7 @@ RUN dnf \
     && dnf -y install \
         autoconf automake boost-devel chrpath curl-devel doxygen \
         gcc-c++ gdb git groff httpd-devel \
-        libmemcached-devel libtool make openldap-devel openssl-devel \
+        libtool make openldap-devel openssl-devel \
         pkgconfig rpm-build stunnel systemd-devel unixODBC-devel \
         zlib-devel createrepo_c yum-utils \
     && dnf clean all
diff --git a/os/rockylinux8/image/Dockerfile b/os/rockylinux8/image/Dockerfile
index 7f3859c..2bdcf02 100644
--- a/os/rockylinux8/image/Dockerfile
+++ b/os/rockylinux8/image/Dockerfile
@@ -7,7 +7,7 @@ RUN sed -i "s/enabled=0/enabled=1/" /etc/yum.repos.d/Rocky-PowerTools.repo \
     && yum -y install \
         autoconf automake boost-devel curl-devel doxygen \
         gcc-c++ gdb git groff httpd-devel \
-        libmemcached-devel libtool make openldap-devel openssl-devel \
+        libtool make openldap-devel openssl-devel \
         pkgconfig rpm-build stunnel systemd-devel unixODBC-devel \
         zlib-devel createrepo_c yum-utils \
     && yum clean all
diff --git a/os/rockylinux9/image/Dockerfile b/os/rockylinux9/image/Dockerfile
index 75a7d9e..79b2336 100644
--- a/os/rockylinux9/image/Dockerfile
+++ b/os/rockylinux9/image/Dockerfile
@@ -6,7 +6,7 @@ RUN yum -y update \
     && yum -y install --enablerepo crb \
         autoconf automake boost-devel curl-devel doxygen \
         gcc-c++ gdb git groff httpd-devel \
-        libmemcached-devel libtool make openldap-devel openssl-devel \
+        libtool make openldap-devel openssl-devel \
         pkgconfig rpm-build stunnel systemd-devel unixODBC-devel \
         zlib-devel createrepo_c yum-utils \
     && yum clean all

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.