From 436f1b9b789b9b47e25880f09d6408ef082400f3c01bdcd863d9273ce8f9535c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 6 Aug 2024 14:17:24 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main regionServiceClientConfigAzure
revision 76ddea81b66d341792c21b61372cde76
---
noipv6.patch | 11 +++++++++
regionServiceClientConfigAzure-2.0.0.tar.bz2 | 3 ---
regionServiceClientConfigAzure-2.2.0.tar.bz2 | 3 +++
regionServiceClientConfigAzure.changes | 26 ++++++++++++++++++++
regionServiceClientConfigAzure.spec | 20 ++++++++++++++-
5 files changed, 59 insertions(+), 4 deletions(-)
create mode 100644 noipv6.patch
delete mode 100644 regionServiceClientConfigAzure-2.0.0.tar.bz2
create mode 100644 regionServiceClientConfigAzure-2.2.0.tar.bz2
diff --git a/noipv6.patch b/noipv6.patch
new file mode 100644
index 0000000..498ca6d
--- /dev/null
+++ b/noipv6.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 = 23.100.36.229,40.121.202.140,52.187.53.250,104.45.31.195,191.237.254.253,2a01:111:f100:3001::a83d:105f,2603:1030:20e:3::4c,2603:1040:2:3::3a,2603:1020:201:f::1be,2603:1050:1:6::8
++regionsrv = 23.100.36.229,40.121.202.140,52.187.53.250,104.45.31.195,191.237.254.253
+
+ [instance]
+ dataProvider = /usr/bin/azuremetadata --api latest --subscriptionId --billingTag --attestedData --signature --xml
diff --git a/regionServiceClientConfigAzure-2.0.0.tar.bz2 b/regionServiceClientConfigAzure-2.0.0.tar.bz2
deleted file mode 100644
index d9e6548..0000000
--- a/regionServiceClientConfigAzure-2.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ccdeda66bfd1e22f8061a01fa5bf318106f07def2cd8f4070c2248e0f942f00
-size 8407
diff --git a/regionServiceClientConfigAzure-2.2.0.tar.bz2 b/regionServiceClientConfigAzure-2.2.0.tar.bz2
new file mode 100644
index 0000000..d4eb6fd
--- /dev/null
+++ b/regionServiceClientConfigAzure-2.2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec9b1cffd4b2154f2e3a7f62d4b1436ef53def860c13dee15bc895824d649e6c
+size 18590
diff --git a/regionServiceClientConfigAzure.changes b/regionServiceClientConfigAzure.changes
index 983a67c..611a54b 100644
--- a/regionServiceClientConfigAzure.changes
+++ b/regionServiceClientConfigAzure.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Jul 30 20:02:16 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
+
+- Update to version 2.2.0 (jsc#PCT-360)
+ + Add IPv6 certs to enable IPv6 access of the update infrastructure
+ + Add noipv6.patch to patch out IPv6 on SLE 12, no IPv6 support in SLE 12
+ in the Public Cloud
+
+-------------------------------------------------------------------
+Thu May 9 15:47:57 UTC 2024 - Jesús Bermúdez Velázquez <jesus.bv@suse.com>
+
+- Update to version 2.1.0 (bsc#1217537)
+ + Replace certs 23.100.36.229.pem and 40.121.202.140.pem (4096 length):
+ rgnsrv-azure-westus -> 23.100.36.229.pem expires 9 years
+ rgnsrv-azure-eastus -> 40.121.202.140.pem expires 10 years
+
+
+-------------------------------------------------------------------
+Tue Nov 28 13:46:02 UTC 2023 - Jesús Bermúdez Velázquez <jesus.bv@suse.com>
+
+- Update to version 2.0.1 (bsc#1217537)
+ + Replacing 104.45.31.195.pem 191.237.254.253.pem certs
+ expiring in 8 years and new length of 4096
+ These certs will replace the current certs that
+ expire soon
+
-------------------------------------------------------------------
Wed May 18 13:35:00 UTC 2022 - Robert Schweikert <rjschwei@suse.com>
diff --git a/regionServiceClientConfigAzure.spec b/regionServiceClientConfigAzure.spec
index 88ab76a..a15aecc 100644
--- a/regionServiceClientConfigAzure.spec
+++ b/regionServiceClientConfigAzure.spec
@@ -18,13 +18,16 @@
Name: regionServiceClientConfigAzure
-Version: 2.0.0
+Version: 2.2.0
Release: 0
License: Apache-2.0
Summary: Configuration for region service client
URL: https://gitlab.suse.de/public-cloud-team/regionServiceClientConfigAzure
Group: Productivity/Networking/Web/Servers
Source0: %{name}-%{version}.tar.bz2
+# No IPv6 support in SLE 12 in Public Cloud
+# Patch maintained in the build service only
+Patch0: noipv6.patch
Provides: cloud-regionsrv-client-config
Provides: regionServiceCertsAzure
Provides: regionsrv-certs
@@ -44,6 +47,14 @@ region server certificates
%prep
%setup -q
+%if 0%{?suse_version} == 1315
+%patch -P 0
+rm usr/lib/regionService/certs/2603:1020:201:f::1be.pem
+rm usr/lib/regionService/certs/2603:1030:20e:3::4c.pem
+rm usr/lib/regionService/certs/2603:1040:2:3::3a.pem
+rm usr/lib/regionService/certs/2603:1050:1:6::8.pem
+rm usr/lib/regionService/certs/2a01:111:f100:3001::a83d:105f.pem
+%endif
%build
@@ -65,5 +76,12 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/regionService/certs/52.187.53.250.pem
/usr/lib/regionService/certs/104.45.31.195.pem
/usr/lib/regionService/certs/191.237.254.253.pem
+%if 0%{?suse_version} > 1315
+/usr/lib/regionService/certs/2603:1020:201:f::1be.pem
+/usr/lib/regionService/certs/2603:1030:20e:3::4c.pem
+/usr/lib/regionService/certs/2603:1040:2:3::3a.pem
+/usr/lib/regionService/certs/2603:1050:1:6::8.pem
+/usr/lib/regionService/certs/2a01:111:f100:3001::a83d:105f.pem
+%endif
%changelog