From 967245bfe2a11ec3d5c354ef80fde730cac5ad94 Mon Sep 17 00:00:00 2001
From: William King <william.king@quentustech.com>
Date: Thu, 8 Oct 2015 14:31:44 -0500
Subject: [PATCH] FS-8271 Now the default will build packages with the upstream
 FS package repos. This is a change in the default behavior of the debian
 packaging system with the justification that in 1.6 it is now required to use
 the FS public repo for deps because system dependancies have been removed
 from the FS codebase which use to be included.

---
 debian/util.sh | 46 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/debian/util.sh b/debian/util.sh
index 2a8bbb26d7..6c0abc2dfb 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -275,8 +275,9 @@ build_debs () {
   {
     set -e
     local OPTIND OPTARG debug_hook=false hookdir="" cow_build_opts=""
-    local keep_pbuilder_config=false keyring="" custom_keyring=""
-    local use_custom_sources=false
+    local keep_pbuilder_config=false keyring="" custom_keyring="/tmp/fs.asc"
+    local use_custom_sources=true
+    local custom_sources_file="/tmp/fs.sources.list"
     while getopts 'BbdK:kT:t' o "$@"; do
       case "$o" in
         B) cow_build_opts="--debbuildopts '-B'";;
@@ -284,11 +285,48 @@ build_debs () {
         d) debug_hook=true;;
         k) keep_pbuilder_config=true;;
         K) custom_keyring="$OPTARG";;
-        t) use_custom_sources=true; custom_sources_file="/etc/apt/sources.list";;
-        T) use_custom_sources=true; custom_sources_file="$OPTARG";;
+        t) custom_sources_file="/etc/apt/sources.list";;
+        T) custom_sources_file="$OPTARG";;
       esac
     done
     shift $(($OPTIND-1))
+    if [ "$custom_sources_file" == "" ]; then
+        # Caller has explicitly set the custom sources file to empty string. They must intend to not use additional mirrors.
+        use_custom_sources=false
+    fi
+    if [ "$custom_source_file" == "/tmp/fs.sources.list" && ! -e "/tmp/fs.sources.list" ]; then
+        echo "deb http://files.freeswitch.org/repo/deb/debian/ jessie main" >> "/tmp/fs.sources.list"
+    fi
+    if [ "$custom_keyring" == "/tmp/fs.asc" && ! -r "/tmp/fs.asc" ]; then
+        cat << EOF > "/tmp/fs.asc"
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQGiBE8jEfIRBAC+Cca0fPQxhyhn0NMsPaMQJgTvqhWb5/f4Mel++kosmUQQ4fJq
+4U9NFvpfNyLp5MoHpnlDfAb+e57B2sr47NOJLTh83yQIAnvU+8O0Q4kvMaiiesX5
+CisApLBs6Vx28y7VWmLsY3vWu8mC7M+PORKfpBV8DWy/7569wQPx2SCsIwCgzv2T
+8YsnYsSVRrrmh46J1o4/ngsD/13ETX4ws/wNN+82RdqUxu7fjc0fNbUAb6XYddAb
+1hrw5npQulgUNWkpnVmIDRHDXLNMeT8nZDkxsA8AsT+u7ACfPFa2o3R8w9zOPSO+
+oSO0+Puhop2+z1gm6lmfMKq9HpeXG3yt/8zsEVUmOYT9m+vYEVghfpXtACVYheDq
+LzUuA/9E9HBiNPVhJ/mEpOk9bZ1gpwr3mjlpUbvX5aGwTJJ+YoTfZOCL7go3uQHn
+/sT35WoJ23wJCRlW0SYTFJqCoris9AhI+qw7xRTw9wb+txSI96uhafUUMCn6GLkN
++yAixqDwNHKkdax3GSGJtLB0t67QoBDIpcGog7ZfRMvWP3QLNLQ4RnJlZVNXSVRD
+SCBQYWNrYWdlIFNpZ25pbmcgS2V5IDxwYWNrYWdlc0BmcmVlc3dpdGNoLm9yZz6I
+YgQTEQIAIgUCTyMR8gIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ127c
+dyXgEM879ACffY0HFi+mACtfFYmX/Uk/qGELSP4An1B8D5L4dLFFr1zV9YawQUbz
+O9/MuQENBE8jEfIQBAC7vnn855YDuz1gTsUMYDxfIRH5KPmDDEAf1WXoD3QG4qOQ
+xVW5nhp/bolh2CacAxdOjZePdhGkkdNOBpcu9NlTNRru0myGN8etbnzP3O5dq0io
+VMf23C5u9KPbxwRWS+WFtC4CRFn6DafDI1qa3Gv3CkiBWtKR0Wid2SQLzl3mVwAF
+EQP9HlwGjhBfFA26LlSMPhSo0Ll+sdcOJupJ21zmGeg7c0GpBnzDzyyJg04gbahs
+xWtW3Y/+B4LGM97o6lnu0OQI7MX5gY1G4Jgu6pgYv8tQd5XyU/CAJUA5VWTxUMIi
+JP6qlzm1bz4AAPmGw4mkS1u4N+vai21Zl4iyFIQFeiuU/K2ISQQYEQIACQUCTyMR
+8gIbDAAKCRDXbtx3JeAQzxReAJ4uvms1n7xV3CcJPQlM7ndX5MZU3QCgxp8zubcL
+/SsMvw7XApSHFs5ooYc=
+=Xc8P
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+    fi
+
     local distro="$(find_distro $1)" dsc="$2" arch="$3"
     if [ -z "$distro" ] || [ "$distro" = "auto" ]; then
       if ! (echo "$dsc" | grep -e '-[0-9]*~[a-z]*+[0-9]*'); then