From de19803a53293357ea977339bbf006954ec90c4a Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Mon, 6 Nov 2023 16:45:30 -0800
Subject: [PATCH] Rotate signing key

---
 .github/workflows/deploy.yaml      |  2 +-
 t2linux-repo/t2linux-fedora-38.pub | 13 -------------
 t2linux-repo/t2linux-fedora-40.pub | 13 +++++++++++++
 t2linux-repo/t2linux-fedora.repo   |  2 +-
 t2linux-repo/t2linux-repo.spec     |  8 ++++----
 5 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 t2linux-repo/t2linux-fedora-38.pub
 create mode 100644 t2linux-repo/t2linux-fedora-40.pub

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 708c30b..587e493 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -30,7 +30,7 @@ jobs:
             ghcr.io/t2linux/fedora-dev:latest \
             /repo/create-repo.sh
         env:
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY_F38 }}
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY_F39 }}
 
       - name: "Deploy DNF repo"
         uses: nwtgck/actions-netlify@v2.0
diff --git a/t2linux-repo/t2linux-fedora-38.pub b/t2linux-repo/t2linux-fedora-38.pub
deleted file mode 100644
index f14ee4b..0000000
--- a/t2linux-repo/t2linux-fedora-38.pub
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEY8napxYJKwYBBAHaRw8BAQdAOPq3kgd3yjdZSisX3KCMPV6aSgtxZefvAA/S
-gEokMM+0IFQyTGludXggRmVkb3JhIChQYWNrYWdlIFNpZ25pbmcpiJkEExYKAEEW
-IQTB1//RwXTShow64iDT8AEEOG+FxgUCY8napwIbAwUJAcgnAAULCQgHAgIiAgYV
-CgkICwIEFgIDAQIeBwIXgAAKCRDT8AEEOG+FxtLXAQCUG9lTIzdJwLQnLaWWiesd
-l2/GevTaZcoXcJiSVqt/+gD8CT85Bkpdd2S/NIphws7qSz1toRomS8dx4wnTcQ2J
-Qwa4OARjydqnEgorBgEEAZdVAQUBAQdAfnRN159pAjibjH8gHW+1ExnLK4FHIuDK
-kcuctvTaaTIDAQgHiH4EGBYKACYWIQTB1//RwXTShow64iDT8AEEOG+FxgUCY8na
-pwIbDAUJAcgnAAAKCRDT8AEEOG+FxgkHAP4z59sNbBKaC9l8GjXe90xM9v9jSras
-tqrRxFG+jZZhugD/U1gv1NQy1XbnTRYy60xxcF59V/6p51UnP7AqOT2fCQE=
-=BYpm
------END PGP PUBLIC KEY BLOCK-----
diff --git a/t2linux-repo/t2linux-fedora-40.pub b/t2linux-repo/t2linux-fedora-40.pub
new file mode 100644
index 0000000..e4e2f1b
--- /dev/null
+++ b/t2linux-repo/t2linux-fedora-40.pub
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZR4bgBYJKwYBBAHaRw8BAQdAmGKYIOjI0YDnR/ekWcdv7YpkzkmN+xQiqxXo
+rsfN24C0E3QybGludXggRmVkb3JhICg0MCmImQQTFgoAQRYhBEXmu22+Z1uD3lb6
+1aiT31W2qs5qBQJlHhuAAhsDBQkCLVNQBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4H
+AheAAAoJEKiT31W2qs5qnBkBAKtP646Pj+FQfuorGLxbYosswMc8N6S3r3zhWIk9
+2xtpAPkBrjDSEngqVsHBB7hxr/43Ub0N4LOA+bAHOuIyxpJFCLg4BGUeG4ASCisG
+AQQBl1UBBQEBB0Bw82vstR2Q5CVUHu6x+xCv0IFJWIICYvJAh+SYxHbneAMBCAeI
+fgQYFgoAJhYhBEXmu22+Z1uD3lb61aiT31W2qs5qBQJlHhuAAhsMBQkCLVNQAAoJ
+EKiT31W2qs5qFk0A/3RzgwLgibuoIuiFEJ4KAOFRMCQs0V+aS4umvW7Y+oxQAQDu
+vAZ9/SsdqSCXqTHhrLcb6ROFluUeanxGvHVJaZdOAg==
+=o7QJ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/t2linux-repo/t2linux-fedora.repo b/t2linux-repo/t2linux-fedora.repo
index 9bc5275..4d332a2 100644
--- a/t2linux-repo/t2linux-fedora.repo
+++ b/t2linux-repo/t2linux-fedora.repo
@@ -5,4 +5,4 @@ enabled=True
 gpgcheck=True
 cost=800
 priority=80
-gpgkey=file:///etc/pki/rpm-gpg/t2linux-fedora-38.pub
+gpgkey=file:///etc/pki/rpm-gpg/t2linux-fedora-39.pub
diff --git a/t2linux-repo/t2linux-repo.spec b/t2linux-repo/t2linux-repo.spec
index 38cb01c..3e67c88 100644
--- a/t2linux-repo/t2linux-repo.spec
+++ b/t2linux-repo/t2linux-repo.spec
@@ -1,13 +1,13 @@
 Name: t2linux-repo
-Version: 6.0.0
+Version: 7.0.0
 Release: 1%{?dist}
 Summary: DNF Repo for linux on t2 macs.
 License: MIT
 URL: https://github.com/t2linux/fedora-kernel
 
 Source0: t2linux-fedora.repo
-Source1: t2linux-fedora-38.pub
 Source2: t2linux-fedora-39.pub
+Source3: t2linux-fedora-40.pub
 
 %description
 DNF repo files for linux on t2 macs.
@@ -18,10 +18,10 @@ DNF repo files for linux on t2 macs.
 
 %install
 install -D -m 644 %{SOURCE0} %{buildroot}/etc/yum.repos.d/t2linux-fedora.repo
-install -D -m 644 %{SOURCE1} %{buildroot}/etc/pki/rpm-gpg/t2linux-fedora-38.pub
 install -D -m 644 %{SOURCE2} %{buildroot}/etc/pki/rpm-gpg/t2linux-fedora-39.pub
+install -D -m 644 %{SOURCE3} %{buildroot}/etc/pki/rpm-gpg/t2linux-fedora-40.pub
 	
 %files
 /etc/yum.repos.d/t2linux-fedora.repo
-/etc/pki/rpm-gpg/t2linux-fedora-38.pub
 /etc/pki/rpm-gpg/t2linux-fedora-39.pub
+/etc/pki/rpm-gpg/t2linux-fedora-40.pub