From bb79c578cb7183028fc4d20f76f0e732bbed4f82 Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Wed, 12 Aug 2020 21:55:31 +0400
Subject: [PATCH] [Packaging] fix debian/util.sh to work properly with new
 cowbuilder/pbuilder requirements for gpg keyfile formatting. add gpg to to
 Build-Depends as its needed to reformat the ascii  armored key into the
 required binary format.

---
 debian/bootstrap.sh | 2 ++
 debian/util.sh      | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 66adadd025..c9b2d522f9 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -334,6 +334,8 @@ Build-Depends:
  libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
  bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.12.12),
  libspandsp3-dev,
+# used to format the private freeswitch apt-repo key properly
+ gnupg,
 # module build-depends
  $(debian_wrap "${mod_build_depends}")
 Standards-Version: 3.9.3
diff --git a/debian/util.sh b/debian/util.sh
index ccf38cdc2a..88cee7949b 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -298,7 +298,9 @@ build_debs () {
         for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
       fi
       custom_sources_file="/tmp/fs.sources.list"
-      apt-key exportall > "/tmp/fs.gpg"
+      apt-key exportall > "/tmp/fs.tmp.gpg"
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --import /tmp/fs.tmp.gpg
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --export > "/tmp/fs.gpg"
       custom_keyring="/tmp/fs.gpg"
     fi
     if [ "$custom_sources_file" == "" ]; then
@@ -309,7 +311,7 @@ build_debs () {
       echo "deb [trusted=yes] http://files.freeswitch.org/repo/deb/freeswitch-1.8/ stretch main" >> "/tmp/fs.sources.list"
     fi
     if [[ "$custom_keyring" == "/tmp/fs.gpg" && ! -r "/tmp/fs.gpg" ]]; then
-      cat << EOF > "/tmp/fs.gpg"
+      cat << EOF > "/tmp/fs.tmp.gpg"
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQINBFlVeA4BEADg3MkzUvnbuqG7S6ppt0BJIYx2WIlDzsj2EBPBBo7VpppWPGa/
@@ -363,6 +365,8 @@ Y4o4oqgePeTYzkxVYj8=
 =XPvO
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --import /tmp/fs.tmp.gpg
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --export > "/tmp/fs.gpg"
     fi
 
     local distro="$(find_distro $1)" dsc="$2" arch="$3"