From 2681e5751eea4770f84b8da3d2a44b206bd69df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 7 Nov 2024 12:36:49 +0100 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 regionServiceClientConfigEC2 revision ef1f0790ba5ca640f4d01730ed2a6ae2 --- no-ipv6.patch | 11 +++++++ regionServiceClientConfigEC2-4.1.0.tar.bz2 | 3 -- regionServiceClientConfigEC2-4.3.0.tar.bz2 | 3 ++ regionServiceClientConfigEC2.changes | 38 ++++++++++++++++++++++ regionServiceClientConfigEC2.spec | 22 ++++++++++--- 5 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 no-ipv6.patch delete mode 100644 regionServiceClientConfigEC2-4.1.0.tar.bz2 create mode 100644 regionServiceClientConfigEC2-4.3.0.tar.bz2 diff --git a/no-ipv6.patch b/no-ipv6.patch new file mode 100644 index 0000000..1ddbeaf --- /dev/null +++ b/no-ipv6.patch @@ -0,0 +1,11 @@ +--- etc/regionserverclnt.cfg.orig ++++ etc/regionserverclnt.cfg +@@ -1,7 +1,7 @@ + [server] + api = regionInfo + certLocation = /usr/lib/regionService/certs +-regionsrv = 54.253.118.149,54.247.166.75,34.197.223.242,54.223.148.145,54.245.101.47,52.79.82.165,2406:da1c:f2a:8400:9982:83c:559d:7f56,2a05:d018:71c:e300:5ec0:8a24:7b5d:86ef,2600:1f18:4665:e200:3aa2:d7c:2176:70c3,2400:7fc0:8ad4:9e00:78bd:8464:c08c:f4f6,2600:1f13:355:4700:ee7a:f5f8:6b38:c9c,2406:da12:878:8b00:9ea4:1263:39d3:bda1 ++regionsrv = 54.253.118.149,54.247.166.75,34.197.223.242,54.223.148.145,54.245.101.47,52.79.82.165 + + [instance] + dataProvider = /usr/bin/ec2metadata --api latest --document --signature --pkcs7 --xml diff --git a/regionServiceClientConfigEC2-4.1.0.tar.bz2 b/regionServiceClientConfigEC2-4.1.0.tar.bz2 deleted file mode 100644 index fdbbb03..0000000 --- a/regionServiceClientConfigEC2-4.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae6c0624b306f76b0adc4a97dd7240c1553570277ebf258418c21296254a447f -size 18914 diff --git a/regionServiceClientConfigEC2-4.3.0.tar.bz2 b/regionServiceClientConfigEC2-4.3.0.tar.bz2 new file mode 100644 index 0000000..0fb8eff --- /dev/null +++ b/regionServiceClientConfigEC2-4.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d719fe0a63fd3914463839184c0c25da337f550335b781d50befd01072c76042 +size 21680 diff --git a/regionServiceClientConfigEC2.changes b/regionServiceClientConfigEC2.changes index c93dc6e..d7d8708 100644 --- a/regionServiceClientConfigEC2.changes +++ b/regionServiceClientConfigEC2.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Fri Jul 26 15:48:32 UTC 2024 - Robert Schweikert + +- Update to version 4.3.0 (bsc#1228363) + + The IPv6 cert was switched up for the region server running in us-west-2 + and as such the SSL handshake was failing. Drop the incorrect cert + and add the correct cert. + +------------------------------------------------------------------- +Fri Jul 26 11:53:56 UTC 2024 - Robert Schweikert + +- Switch the patch syntax away form the deprecated shorthand macro + +------------------------------------------------------------------- +Thu May 9 15:30:38 UTC 2024 - Jesús Bermúdez Velázquez + +- Version 4.2.0 + Replace certs (length 4096): + rgnsrv-ec2-cn-north1 -> 54.223.148.145 expires in 8 years + rgnsrv-ec2-us-west2-2 -> 54.245.101.47 expires in 9 years + + Sidenote: We have one server with a short cert (2048) left; + 34.197.223.242 expires in 2027 + +------------------------------------------------------------------- +Thu Jan 11 12:08:27 UTC 2024 - Jesús Bermúdez Velázquez + +- Version 4.1.1 + Add patch no-ipv6.patch to not serve IPv6 addresses on SLES12 + Related to bsc#1218656 + +------------------------------------------------------------------- +Tue Nov 28 14:01:25 UTC 2023 - Jesús Bermúdez Velázquez + +- Update to version 4.1.1 (bsc#1217536) + + Replace 54.247.166.75.pem and 54.253.118.149.pem old soon to expired certs + with new generated ones that expire in 8 years and have longer length (4096) + ------------------------------------------------------------------- Wed Sep 7 21:04:59 UTC 2022 - Robert Schweikert diff --git a/regionServiceClientConfigEC2.spec b/regionServiceClientConfigEC2.spec index 70d195c..3ad5fb7 100644 --- a/regionServiceClientConfigEC2.spec +++ b/regionServiceClientConfigEC2.spec @@ -2,7 +2,7 @@ # spec file for package regionServiceClientConfigEC2 # this code base is under development # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,15 @@ Name: regionServiceClientConfigEC2 -Version: 4.1.0 +Version: 4.3.0 Release: 0 License: Apache-2.0 Summary: Configuration for region service client URL: https://gitlab.suse.de/public-cloud-team/region-service-client-config-ec2 Group: Productivity/Networking/Web/Servers Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-SLES12SP5 no-ipv6.patch +Patch0: no-ipv6.patch Provides: cloud-regionsrv-client-config Provides: regionServiceCertsEC2 Provides: regionsrv-certs @@ -45,6 +47,15 @@ region server certificates %prep %setup -q +%if 0%{?suse_version} == 1315 +%patch -P 0 +rm usr/lib/regionService/certs/2406:da1c:f2a:8400:9982:83c:559d:7f56.pem +rm usr/lib/regionService/certs/2a05:d018:71c:e300:4343:658b:5466:d8c6.pem +rm usr/lib/regionService/certs/2600:1f18:4665:e200:3aa2:d7c:2176:70c3.pem +rm usr/lib/regionService/certs/2400:7fc0:8ad4:9e00:78bd:8464:c08c:f4f6.pem +rm usr/lib/regionService/certs/2600:1f13:355:4700:ee7a:f5f8:6b38:c9c.pem +rm usr/lib/regionService/certs/2406:da12:878:8b00:9ea4:1263:39d3:bda1.pem +%endif %build @@ -57,7 +68,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README LICENSE +%doc README +%license LICENSE %config %{_sysconfdir}/regionserverclnt.cfg %dir /usr/lib/regionService %dir /usr/lib/regionService/certs @@ -67,11 +79,13 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/regionService/certs/54.245.101.47.pem /usr/lib/regionService/certs/54.247.166.75.pem /usr/lib/regionService/certs/54.253.118.149.pem +%if 0%{?suse_version} > 1315 /usr/lib/regionService/certs/2406:da1c:f2a:8400:9982:83c:559d:7f56.pem -/usr/lib/regionService/certs/2a05:d018:71c:e300:5ec0:8a24:7b5d:86ef.pem +/usr/lib/regionService/certs/2a05:d018:71c:e300:4343:658b:5466:d8c6.pem /usr/lib/regionService/certs/2600:1f18:4665:e200:3aa2:d7c:2176:70c3.pem /usr/lib/regionService/certs/2400:7fc0:8ad4:9e00:78bd:8464:c08c:f4f6.pem /usr/lib/regionService/certs/2600:1f13:355:4700:ee7a:f5f8:6b38:c9c.pem /usr/lib/regionService/certs/2406:da12:878:8b00:9ea4:1263:39d3:bda1.pem +%endif %changelog