From 2be1ecf8fad06d4d4cfddce140a260a9f2344e12 Mon Sep 17 00:00:00 2001
From: Kimpe Andy <andykimpe@gmail.com>
Date: Mon, 3 Jun 2024 10:06:54 +0200
Subject: [PATCH 1/4] Update centos-stream-8.tpl

---
 .../etc/mock/templates/centos-stream-8.tpl    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mock-core-configs/etc/mock/templates/centos-stream-8.tpl b/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
index 1d06c7163..85d792fca 100644
--- a/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
+++ b/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
@@ -40,16 +40,16 @@ skip_if_unavailable=False
 
 [baseos]
 name=CentOS Stream $releasever - BaseOS
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=BaseOS&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=BaseOS&infra=$infra
+baseurl=http://mirror.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 skip_if_unavailable=False
 
 [appstream]
 name=CentOS Stream $releasever - AppStream
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=AppStream&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=AppStream&infra=$infra
+baseurl=http://mirror.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -84,32 +84,32 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 
 [extras]
 name=CentOS Stream $releasever - Extras
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=extras&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever-stream/extras/$basearch/os/
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=extras&infra=$infra
+baseurl=http://mirror.centos.org/centos/$releasever-stream/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [powertools]
 name=CentOS Stream $releasever - PowerTools
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=PowerTools&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=PowerTools&infra=$infra
+baseurl=http://mirror.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [rt]
 name=CentOS Stream $releasever - RealTime
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=RT&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever-stream/RT/$basearch/os/
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=RT&infra=$infra
+baseurl=http://mirror.centos.org/centos/$releasever-stream/RT/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [ha]
 name=CentOS Stream $releasever - HighAvailability
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=HighAvailability&infra=$infra
-#baseurl=http://mirror.centos.org/centos/$releasever-stream/HighAvailability/$basearch/os/
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=HighAvailability&infra=$infra
+baseurl=http://mirror.centos.org/centos/$releasever-stream/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

From 224fecccbdf7e3c295d2277718b82c6b90fa4c3e Mon Sep 17 00:00:00 2001
From: Kimpe Andy <andykimpe@gmail.com>
Date: Mon, 3 Jun 2024 10:22:17 +0200
Subject: [PATCH 2/4] Update mock-core-configs.spec

---
 mock-core-configs/mock-core-configs.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-core-configs/mock-core-configs.spec b/mock-core-configs/mock-core-configs.spec
index f729b87e7..998ff4ba9 100644
--- a/mock-core-configs/mock-core-configs.spec
+++ b/mock-core-configs/mock-core-configs.spec
@@ -4,7 +4,7 @@
 
 Name:       mock-core-configs
 Version:    40.4.post1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Mock core config files basic chroots
 
 License:    GPL-2.0-or-later

From 07b6466fd44e82e9bc4373fa9cf29163da4be250 Mon Sep 17 00:00:00 2001
From: Kimpe Andy <andykimpe@gmail.com>
Date: Mon, 3 Jun 2024 15:41:46 +0200
Subject: [PATCH 3/4] change to vault

---
 .../etc/mock/templates/centos-stream-8.tpl     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mock-core-configs/etc/mock/templates/centos-stream-8.tpl b/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
index 85d792fca..05b51cea7 100644
--- a/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
+++ b/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
@@ -41,7 +41,7 @@ skip_if_unavailable=False
 [baseos]
 name=CentOS Stream $releasever - BaseOS
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=BaseOS&infra=$infra
-baseurl=http://mirror.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 skip_if_unavailable=False
@@ -49,7 +49,7 @@ skip_if_unavailable=False
 [appstream]
 name=CentOS Stream $releasever - AppStream
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=AppStream&infra=$infra
-baseurl=http://mirror.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -63,14 +63,14 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 
 [Stream-centosplus]
 name=CentOS-Stream - Plus
-baseurl=http://mirror.centos.org/centos/$releasever-stream/centosplus/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/centosplus/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [cr]
 name=CentOS-$releasever - cr
-baseurl=http://mirror.centos.org/centos/$releasever/cr/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -85,7 +85,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [extras]
 name=CentOS Stream $releasever - Extras
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=extras&infra=$infra
-baseurl=http://mirror.centos.org/centos/$releasever-stream/extras/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -93,7 +93,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [powertools]
 name=CentOS Stream $releasever - PowerTools
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=PowerTools&infra=$infra
-baseurl=http://mirror.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -101,7 +101,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [rt]
 name=CentOS Stream $releasever - RealTime
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=RT&infra=$infra
-baseurl=http://mirror.centos.org/centos/$releasever-stream/RT/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/RT/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -109,14 +109,14 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [ha]
 name=CentOS Stream $releasever - HighAvailability
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=HighAvailability&infra=$infra
-baseurl=http://mirror.centos.org/centos/$releasever-stream/HighAvailability/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-Devel]
 name=CentOS-Stream - Devel (WARNING: UNSUPPORTED - FOR BUILDROOT USE ONLY!)
-baseurl=http://mirror.centos.org/centos/$releasever-stream/Devel/$basearch/os/
+baseurl=http://vault.centos.org/centos/$releasever-stream/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official

From 1c2b72d0c9eacbb2f51b7131b5a09882dee9236f Mon Sep 17 00:00:00 2001
From: Kimpe Andy <andykimpe@gmail.com>
Date: Mon, 3 Jun 2024 15:48:22 +0200
Subject: [PATCH 4/4] Update centos-stream-8.tpl

---
 .../etc/mock/templates/centos-stream-8.tpl    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/mock-core-configs/etc/mock/templates/centos-stream-8.tpl b/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
index 05b51cea7..3e92234be 100644
--- a/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
+++ b/mock-core-configs/etc/mock/templates/centos-stream-8.tpl
@@ -41,7 +41,7 @@ skip_if_unavailable=False
 [baseos]
 name=CentOS Stream $releasever - BaseOS
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=BaseOS&infra=$infra
-baseurl=http://vault.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/BaseOS/$basearch/os/
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 gpgcheck=1
 skip_if_unavailable=False
@@ -49,7 +49,7 @@ skip_if_unavailable=False
 [appstream]
 name=CentOS Stream $releasever - AppStream
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=AppStream&infra=$infra
-baseurl=http://vault.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -63,14 +63,14 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 
 [Stream-centosplus]
 name=CentOS-Stream - Plus
-baseurl=http://vault.centos.org/centos/$releasever-stream/centosplus/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/centosplus/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [cr]
 name=CentOS-$releasever - cr
-baseurl=http://vault.centos.org/centos/$releasever/cr/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever/cr/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -85,7 +85,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [extras]
 name=CentOS Stream $releasever - Extras
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=extras&infra=$infra
-baseurl=http://vault.centos.org/centos/$releasever-stream/extras/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/extras/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -93,7 +93,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [powertools]
 name=CentOS Stream $releasever - PowerTools
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=PowerTools&infra=$infra
-baseurl=http://vault.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/PowerTools/$basearch/os/
 gpgcheck=1
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -101,7 +101,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [rt]
 name=CentOS Stream $releasever - RealTime
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=RT&infra=$infra
-baseurl=http://vault.centos.org/centos/$releasever-stream/RT/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/RT/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
@@ -109,49 +109,49 @@ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Officia
 [ha]
 name=CentOS Stream $releasever - HighAvailability
 #mirrorlist=http://mirrorlist.centos.org/?release=$releasever-stream&arch=$basearch&repo=HighAvailability&infra=$infra
-baseurl=http://vault.centos.org/centos/$releasever-stream/HighAvailability/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-Devel]
 name=CentOS-Stream - Devel (WARNING: UNSUPPORTED - FOR BUILDROOT USE ONLY!)
-baseurl=http://vault.centos.org/centos/$releasever-stream/Devel/$basearch/os/
+baseurl=https://vault.centos.org/centos/$releasever-stream/Devel/$basearch/os/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-BaseOS-source]
 name=CentOS-Stream - BaseOS Sources
-baseurl=http://vault.centos.org/centos/$releasever-stream/BaseOS/Source/
+baseurl=https://vault.centos.org/centos/$releasever-stream/BaseOS/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-AppStream-source]
 name=CentOS-Stream - AppStream Sources
-baseurl=http://vault.centos.org/centos/$releasever-stream/AppStream/Source/
+baseurl=https://vault.centos.org/centos/$releasever-stream/AppStream/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-PowerTools-source]
 name=CentOS-Stream - PowerTools Sources
-baseurl=http://vault.centos.org/centos/$releasever-stream/PowerTools/Source/
+baseurl=https://vault.centos.org/centos/$releasever-stream/PowerTools/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-extras-source]
 name=CentOS-Stream - Extras Sources
-baseurl=http://vault.centos.org/centos/$releasever-stream/extras/Source/
+baseurl=https://vault.centos.org/centos/$releasever-stream/extras/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
 [Stream-centosplus-source]
 name=CentOS-Stream - Plus Sources
-baseurl=http://vault.centos.org/centos/$releasever-stream/centosplus/Source/
+baseurl=https://vault.centos.org/centos/$releasever-stream/centosplus/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official