From 9b32700e816eea4e3a2f5e799e9ee918f793d5b1 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@gmail.com>
Date: Mon, 16 Sep 2019 21:06:59 +0000
Subject: [PATCH] Change gpg key to use -8 versus -$releasever. This fixes bash
 problem

---
 epel-playground.repo | 6 +++---
 epel-release.spec    | 5 ++++-
 epel-testing.repo    | 6 +++---
 epel.repo            | 6 +++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/epel-playground.repo b/epel-playground.repo
index 37fea92..8e81eea 100644
--- a/epel-playground.repo
+++ b/epel-playground.repo
@@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release
 failovermethod=priority
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-playground-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug
@@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -
 metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 failovermethod=priority
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-playground-source]
@@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch -
 metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 failovermethod=priority
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
diff --git a/epel-release.spec b/epel-release.spec
index 0e08191..923a21a 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -1,6 +1,6 @@
 Name:           epel-release
 Version:        8
-Release:        5%{dist}
+Release:        6%{dist}
 Summary:        Extra Packages for Enterprise Linux repository configuration
 
 Group:          System Environment/Base
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/systemd/system-preset/90-epel.preset
 
 %changelog
+* Mon Sep 16 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-6%{dist}
+- Change gpg key to use -8 versus -$releasever. This fixes bash problem
+
 * Tue Aug  6 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-5%{dist}
 - Fix playground release to have os/ on its name [Kevin Fenzi]
 - Make sure all values of $release are $releasever
diff --git a/epel-testing.repo b/epel-testing.repo
index ee727c1..924a671 100644
--- a/epel-testing.repo
+++ b/epel-testing.repo
@@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever
 failovermethod=priority
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-testing-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug
@@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Deb
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 failovermethod=priority
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-testing-source]
@@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Sou
 metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
 failovermethod=priority
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
diff --git a/epel.repo b/epel.repo
index 129fb01..411f2c1 100644
--- a/epel.repo
+++ b/epel.repo
@@ -5,7 +5,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$
 failovermethod=priority
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-debuginfo]
 name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
@@ -13,7 +13,7 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 failovermethod=priority
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-source]
@@ -22,5 +22,5 @@ name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
 metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
 failovermethod=priority
 enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1