From 7b6b2c1f585c2a453516b4645d95a6a7385f0c2b Mon Sep 17 00:00:00 2001
From: Lonlone Lee <lonlone@solitude.stanford.edu>
Date: Fri, 19 Jan 2024 09:44:34 -0800
Subject: [PATCH 1/2] Removed stretch chroot and replaced the trusted.gpg.d
 ubuntu archive with the usr/share keyring

---
 .../ubuntu-keyring-2018-archive.gpg              | Bin 1733 -> 0 bytes
 .../share/keyrings/ubuntu-archive-keyring.gpg    | Bin 0 -> 7399 bytes
 manifests/chroots.pp                             |   1 -
 manifests/ubuntu_keyring.pp                      |   4 ++--
 4 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 files/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
 create mode 100644 files/usr/share/keyrings/ubuntu-archive-keyring.gpg

diff --git a/files/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg b/files/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg
deleted file mode 100644
index 1cc9f3f2df5734dc3ea7c33be841594b0fcf38ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1733
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
b&OHy3Zw9st&)G_VTKv9=8eUNiql-gadmbGN

diff --git a/files/usr/share/keyrings/ubuntu-archive-keyring.gpg b/files/usr/share/keyrings/ubuntu-archive-keyring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..bb22338544fe6d4c7698048f4ba5b4533c6ec74a
GIT binary patch
literal 7399
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
Rb>xybNuxjY{Qa>3{uc{#j-&tp

literal 0
HcmV?d00001

diff --git a/manifests/chroots.pp b/manifests/chroots.pp
index 3db104a..7623de0 100644
--- a/manifests/chroots.pp
+++ b/manifests/chroots.pp
@@ -25,7 +25,6 @@ class su_debuild::chroots (
       'bookworm' =>  'debian',
       'bullseye' =>  'debian',
       'buster'   =>  'debian',
-      'stretch'  =>  'debian',
       'jessie'   =>  'debian',
       'wheezy'   =>  'debian',
       'jammy'    =>  'ubuntu',
diff --git a/manifests/ubuntu_keyring.pp b/manifests/ubuntu_keyring.pp
index cc76fb0..7791a16 100644
--- a/manifests/ubuntu_keyring.pp
+++ b/manifests/ubuntu_keyring.pp
@@ -19,9 +19,9 @@ class su_debuild::ubuntu_keyring {
     # Debian bullseye and bookworm do not include any ubuntu-keyring packages so we
     # install the needed GPG key file directly.
     'bullseye', 'bookworm': {
-      file { '/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg':
+      file { '/usr/share/keyrings/ubuntu-archive-keyring.gpg':
         ensure => present,
-        source => 'puppet:///modules/su_debuild/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg',
+        source => 'puppet:///modules/su_debuild/usr/share/keyrings/ubuntu-archive-keyring.gpg',
         mode   => '0644',
       }
     }
-- 
GitLab


From 4ce1f90cdf30b37eb5508405e3dd5144c6f21266 Mon Sep 17 00:00:00 2001
From: Lonlone Lee <lonlone@solitude.stanford.edu>
Date: Fri, 19 Jan 2024 09:53:37 -0800
Subject: [PATCH 2/2] Added stretch back in

---
 manifests/chroots.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/chroots.pp b/manifests/chroots.pp
index 7623de0..3db104a 100644
--- a/manifests/chroots.pp
+++ b/manifests/chroots.pp
@@ -25,6 +25,7 @@ class su_debuild::chroots (
       'bookworm' =>  'debian',
       'bullseye' =>  'debian',
       'buster'   =>  'debian',
+      'stretch'  =>  'debian',
       'jessie'   =>  'debian',
       'wheezy'   =>  'debian',
       'jammy'    =>  'ubuntu',
-- 
GitLab