[cpp-linbuild] branch main updated: Drop support for CentOS 6
John W. O'Brien
john at saltant.com
Fri May 21 14:41:16 UTC 2021
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=9567d887394725b885ecce92b154446f7df9b61a
The following commit(s) were added to refs/heads/main by this push:
new 9567d88 Drop support for CentOS 6
9567d88 is described below
commit 9567d887394725b885ecce92b154446f7df9b61a
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri May 21 14:39:20 2021 +0000
Drop support for CentOS 6
---
Makefile | 4 +---
os/centos6/image/CentOS-Base.repo | 2 --
os/centos6/image/CentOS-Vault-Base.repo | 17 -----------------
os/centos6/image/Dockerfile | 25 -------------------------
os/centos6/image/build-curl-openssl.sh | 4 ----
os/centos6/image/build-log4shib.sh | 3 ---
os/centos6/image/build-opensaml.sh | 8 --------
os/centos6/image/build-shibboleth.sh | 10 ----------
os/centos6/image/build-xerces-c.sh | 3 ---
os/centos6/image/build-xml-security-c.sh | 4 ----
os/centos6/image/build-xmltooling.sh | 7 -------
os/centos6/image/local.repo | 5 -----
12 files changed, 1 insertion(+), 91 deletions(-)
diff --git a/Makefile b/Makefile
index 8693d8a..e9e8607 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ CURLOPENSSL_DISTNAME=curl
CURLOPENSSL_VERSION=7.63.0
CURLOPENSSL_DISTFILE=$(CURLOPENSSL_DISTNAME)-$(CURLOPENSSL_VERSION).$(DEFAULT_DIST_EXT)
CURLOPENSSL_URL=https://curl.haxx.se/download/$(CURLOPENSSL_DISTFILE)
-CURLOPENSSL_VALID_PLATFORMS=centos6 centos7 amazonlinux2
+CURLOPENSSL_VALID_PLATFORMS=centos7 amazonlinux2
# Look closely: these variables refer to the OPENSAML variables
XMLTOOLING_COMPNAME=xmltooling
@@ -93,7 +93,6 @@ XMLTOOLING_VERSION=3.2.0
XMLTOOLING_DISTFILE=$(XMLTOOLING_COMPNAME)-$(XMLTOOLING_VERSION).$(DEFAULT_DIST_EXT)
XMLTOOLING_URL=https://shibboleth.net/downloads/c++-opensaml/$(OPENSAML_VERSION)/$(XMLTOOLING_DISTFILE)
XMLTOOLING_DEPENDS=LOG4SHIB XERCESC XMLSECURITYC
-XMLTOOLING_DEPENDS_centos6=CURLOPENSSL
XMLTOOLING_DEPENDS_centos7=CURLOPENSSL
XMLTOOLING_DEPENDS_amazonlinux2=CURLOPENSSL
@@ -140,7 +139,6 @@ distfiles: $(foreach component,$(COMPONENTS),$(SOURCEDIR)/$($(component)_DISTFIL
#
PLATFORMS=\
- centos6 \
centos7 \
centos8 \
amazonlinux2
diff --git a/os/centos6/image/CentOS-Base.repo b/os/centos6/image/CentOS-Base.repo
deleted file mode 100644
index 5421e95..0000000
--- a/os/centos6/image/CentOS-Base.repo
+++ /dev/null
@@ -1,2 +0,0 @@
-# Install an empty file to disable defunct default repos following
-# CentOS 6 EoL 2020-11-30
diff --git a/os/centos6/image/CentOS-Vault-Base.repo b/os/centos6/image/CentOS-Vault-Base.repo
deleted file mode 100644
index f595077..0000000
--- a/os/centos6/image/CentOS-Vault-Base.repo
+++ /dev/null
@@ -1,17 +0,0 @@
-[base]
-name=CentOS-6.10 - Base
-baseurl=http://vault.centos.org/6.10/os/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-
-[extras]
-name=CentOS-6.10 - Base
-baseurl=http://vault.centos.org/6.10/extras/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
-
-[updates]
-name=CentOS-6.10 - Base
-baseurl=http://vault.centos.org/6.10/updates/$basearch/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
diff --git a/os/centos6/image/Dockerfile b/os/centos6/image/Dockerfile
deleted file mode 100644
index 94ed7ee..0000000
--- a/os/centos6/image/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM centos:6.10
-
-COPY *.repo /etc/yum.repos.d/
-
-RUN yum -y update \
- && yum -y install \
- autoconf automake boost-devel chrpath doxygen gcc-c++ git groff \
- httpd-devel libidn-devel libmemcached-devel libtool make \
- openldap-devel openssl-devel pkgconfig \
- rpm-build stunnel systemd-devel unixODBC-devel zlib-devel \
- createrepo \
- && yum clean all
-
-# internal and external are w.r.t. a container, where external locations
-# are expected to be mounted and pre-populated with required inputs
-ENV BUILD_BASE=/opt/build
-ENV INT_BASE=${BUILD_BASE}/internal
-ENV EXT_BASE=${BUILD_BASE}/external
-
-RUN mkdir -p \
- ${INT_BASE}/{BUILD,BUILDROOT} \
- ${EXT_BASE}/{in,out} \
- && ln -s ${EXT_BASE}/in/macros/macros.shibboleth /etc/rpm/
-
-WORKDIR ${EXT_BASE}/in/SPECS
diff --git a/os/centos6/image/build-curl-openssl.sh b/os/centos6/image/build-curl-openssl.sh
deleted file mode 100644
index dcb4882..0000000
--- a/os/centos6/image/build-curl-openssl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xerces*
-rpmbuild -ba --clean curl-openssl.spec
-rpmspec -q --rpms curl-openssl.spec > ${EXT_BASE}/out/curl-openssl.rpms
-rpmspec -q --srpm curl-openssl.spec > ${EXT_BASE}/out/curl-openssl.srpm
diff --git a/os/centos6/image/build-log4shib.sh b/os/centos6/image/build-log4shib.sh
deleted file mode 100644
index 1523208..0000000
--- a/os/centos6/image/build-log4shib.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-rpmbuild -ba --clean log4shib.spec
-rpmspec -q --rpms log4shib.spec > ${EXT_BASE}/out/log4shib.rpms
-rpmspec -q --srpm log4shib.spec > ${EXT_BASE}/out/log4shib.srpm
diff --git a/os/centos6/image/build-opensaml.sh b/os/centos6/image/build-opensaml.sh
deleted file mode 100644
index 0fc784f..0000000
--- a/os/centos6/image/build-opensaml.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xerces*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xml-security-c*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*log4shib*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*curl-openssl*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xmltooling*
-rpmbuild -ba --clean opensaml.spec
-rpmspec -q --rpms opensaml.spec > ${EXT_BASE}/out/opensaml.rpms
-rpmspec -q --srpm opensaml.spec > ${EXT_BASE}/out/opensaml.srpm
diff --git a/os/centos6/image/build-shibboleth.sh b/os/centos6/image/build-shibboleth.sh
deleted file mode 100644
index 22c98e3..0000000
--- a/os/centos6/image/build-shibboleth.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xerces*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xml-security-c*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*log4shib*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*curl-openssl*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xmltooling*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*libsaml*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*opensaml*
-rpmbuild -ba --clean shibboleth.spec
-rpmspec -q --rpms shibboleth.spec > ${EXT_BASE}/out/shibboleth.rpms
-rpmspec -q --srpm shibboleth.spec > ${EXT_BASE}/out/shibboleth.srpm
diff --git a/os/centos6/image/build-xerces-c.sh b/os/centos6/image/build-xerces-c.sh
deleted file mode 100644
index c59cf31..0000000
--- a/os/centos6/image/build-xerces-c.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-rpmbuild -ba --clean xerces-c.spec
-rpmspec -q --rpms xerces-c.spec > ${EXT_BASE}/out/xerces-c.rpms
-rpmspec -q --srpm xerces-c.spec > ${EXT_BASE}/out/xerces-c.srpm
diff --git a/os/centos6/image/build-xml-security-c.sh b/os/centos6/image/build-xml-security-c.sh
deleted file mode 100644
index b7e0ebd..0000000
--- a/os/centos6/image/build-xml-security-c.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xerces*
-rpmbuild -ba --clean xml-security-c.spec
-rpmspec -q --rpms xml-security-c.spec > ${EXT_BASE}/out/xml-security-c.rpms
-rpmspec -q --srpm xml-security-c.spec > ${EXT_BASE}/out/xml-security-c.srpm
diff --git a/os/centos6/image/build-xmltooling.sh b/os/centos6/image/build-xmltooling.sh
deleted file mode 100644
index 11a9d8c..0000000
--- a/os/centos6/image/build-xmltooling.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xerces*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*log4shib*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*xml-security-c*
-rpm --install ${EXT_BASE}/out/RPMS/x86_64/*curl-openssl*
-rpmbuild -ba --clean xmltooling.spec
-rpmspec -q --rpms xmltooling.spec > ${EXT_BASE}/out/xmltooling.rpms
-rpmspec -q --srpm xmltooling.spec > ${EXT_BASE}/out/xmltooling.srpm
diff --git a/os/centos6/image/local.repo b/os/centos6/image/local.repo
deleted file mode 100644
index abe1732..0000000
--- a/os/centos6/image/local.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[local]
-name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
-gpgcheck=0
-enabled=0
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list