From b5c8294dc6e8067e2e966f468be3b35f364632ad Mon Sep 17 00:00:00 2001
From: Daniel Fancsali <fancsali@gmail.com>
Date: Fri, 8 Jul 2022 15:57:42 +0100
Subject: [PATCH] Refinements on __apt_source & --signed-by

Allow multple GPG keys/keyrings to be specified, and also include them
for the source repositories (deb-src lines).

Also fix cases where we ended up with extra leading/trainling or double
space character(s) between parts of the config line.
---
 cdist/conf/type/__apt_source/files/source.list.template  | 6 ++++--
 cdist/conf/type/__apt_source/man.rst                     | 3 ++-
 cdist/conf/type/__apt_source/manifest                    | 4 ++--
 cdist/conf/type/__apt_source/parameter/optional          | 1 -
 cdist/conf/type/__apt_source/parameter/optional_multiple | 1 +
 5 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 cdist/conf/type/__apt_source/parameter/optional_multiple

diff --git a/cdist/conf/type/__apt_source/files/source.list.template b/cdist/conf/type/__apt_source/files/source.list.template
index a28bb45f..de9677a1 100755
--- a/cdist/conf/type/__apt_source/files/source.list.template
+++ b/cdist/conf/type/__apt_source/files/source.list.template
@@ -2,6 +2,8 @@
 set -u
 
 entry="$uri $distribution $component"
+options="$forcedarch $signed_by"
+options=${options## }; options=${options%% }
 
 cat << DONE
 # Created by cdist ${__type##*/}
@@ -9,8 +11,8 @@ cat << DONE
 #
 
 # $name
-deb ${options} $entry
+deb ${options:+[${options}] }$entry
 DONE
 if [ -f "$__object/parameter/include-src" ]; then
-   echo "deb-src $entry"
+   echo "deb-src ${signed_by:+[${signed_by}] }$entry"
 fi
diff --git a/cdist/conf/type/__apt_source/man.rst b/cdist/conf/type/__apt_source/man.rst
index d317a135..401b0f59 100644
--- a/cdist/conf/type/__apt_source/man.rst
+++ b/cdist/conf/type/__apt_source/man.rst
@@ -24,7 +24,7 @@ arch
    set this if you need to force and specific arch (ubuntu specific)
 
 signed-by
-   provide a GPG key fingerprint or keyring path for signature checks
+   provide a GPG key fingerprint or keyring path for signature checks. May be repeated.
 
 state
    'present' or 'absent', defaults to 'present'
@@ -68,6 +68,7 @@ EXAMPLES
 AUTHORS
 -------
 Steven Armstrong <steven-cdist--@--armstrong.cc>
+Daniel Fancsali <fancsali--@--gmail.com>
 
 
 COPYING
diff --git a/cdist/conf/type/__apt_source/manifest b/cdist/conf/type/__apt_source/manifest
index cdb526d3..1bdebff0 100755
--- a/cdist/conf/type/__apt_source/manifest
+++ b/cdist/conf/type/__apt_source/manifest
@@ -31,11 +31,11 @@ fi
 component="$(cat "$__object/parameter/component")"
 
 if [ -f "$__object/parameter/arch" ]; then
-   options="arch=$(cat "$__object/parameter/arch")"
+	forcedarch="arch=$(cat "$__object/parameter/arch")"
 fi
 
 if [ -f "$__object/parameter/signed-by" ]; then
-   options="$options signed-by=$(cat "$__object/parameter/signed-by")"
+   signed_by="${signed_by:${signed_by} }signed-by=$(cat "$__object/parameter/signed-by")"
 fi
 
 if [ "$options" ]; then
diff --git a/cdist/conf/type/__apt_source/parameter/optional b/cdist/conf/type/__apt_source/parameter/optional
index 0b5470a1..142d4120 100644
--- a/cdist/conf/type/__apt_source/parameter/optional
+++ b/cdist/conf/type/__apt_source/parameter/optional
@@ -2,4 +2,3 @@ state
 distribution
 component
 arch
-signed-by
diff --git a/cdist/conf/type/__apt_source/parameter/optional_multiple b/cdist/conf/type/__apt_source/parameter/optional_multiple
new file mode 100644
index 00000000..d4f31df0
--- /dev/null
+++ b/cdist/conf/type/__apt_source/parameter/optional_multiple
@@ -0,0 +1 @@
+signed-by