From d9887de9c29d7905a7ec28409d4818fd2fce120d Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Fri, 15 Aug 2025 10:56:21 +0200
Subject: [PATCH] Support Debian 13

With debian 13 and what will be Ubuntu 26.04 we switch
to deb822 sources format.
---
 manifests/apt.pp | 29 +++++++++++++++++++++++------
 metadata.json    |  3 +--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/manifests/apt.pp b/manifests/apt.pp
index 743cfea..d4704c4 100644
--- a/manifests/apt.pp
+++ b/manifests/apt.pp
@@ -10,15 +10,32 @@
   Boolean $repo_gpgcheck                                                = $cvmfs::repo_gpgcheck,
 
 ) {
-  Apt::Source {
-    allow_unsigned => ! $repo_gpgcheck,
-    comment        => 'CernVM File System',
-    location       => $repo_base,
-    key            => {
+  if ($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'],'12') <= 0 ) or
+  ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'],'24.04') <= 0 ) {
+    $_source_format = 'list'
+    $_key           = {
       ensure  => refreshed,
       id      => 'FD80468D49B3B24C341741FC8CE0A76C497EA957',
       source  => $repo_gpgkey,
-    },
+    }
+    $_keyring       = undef
+  } else {
+    $_source_format = 'sources'
+    $_key           = undef
+    $_keyring       = '/etc/apt/keyrings/cernvm.gpg'
+
+    apt::keyring { 'cernvm.gpg':
+      source => $repo_gpgkey,
+    }
+  }
+
+  Apt::Source {
+    source_format  => $_source_format,
+    allow_unsigned => ! $repo_gpgcheck,
+    comment        => 'CernVM File System',
+    location       => assert_type(String[1], $repo_base),
+    key            => $_key,
+    keyring        => $_keyring,
     repos          => 'main',
     notify_update  => true,
   }
diff --git a/metadata.json b/metadata.json
index 2a2bffc..a419b7a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -28,8 +28,7 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "11",
-        "12"
+        "13"
       ]
     },
     {