cleaner method to kill gpg-agent; fix malformed sources file & handle proxy related vars

Author: JedMeister

conf/bootstrap_apt

@@ -192,7 +192,7 @@ else
         chmod a+r "$keyring"
     done
     # ensure that gpg-agent is killed after processing keys
-    kill -9 "$(pidof gpg-agent)" || true
+    gpgconf --kill gpg-agent
     rm -rf "$key_dir"/*~
     rm -rf "$HOME/.gnupg"
 fi
@@ -210,7 +210,6 @@ Suites: $KEY_CODENAME
 Components: main
 Architectures: ${SUPPORTED_ARCH[*]}
 Enabled: $tkl_apt_repo_enabled
-
 Signed-By: /usr/share/keyrings/tkl-archive-keyring.gpg
 
 Types: deb

mk/turnkey.mk

@@ -15,6 +15,8 @@ CONF_VARS += CREDIT_STYLE CREDIT_STYLE_EXTRA CREDIT_ANCHORTEXT CREDIT_LOCATION
 CONF_VARS += GITHUB_USER GITHUB_USER_TOKEN
 # for dynamically adding pins to sury & backports respectively
 CONF_VARS += PHP_EXTRA_PINS BACKPORTS_PINS
+# proxy vars
+CONF_VARS += NO_PROXY HTTP_PROXY HTTPS_PROXY
 
 COMMON_OVERLAYS := turnkey.d $(COMMON_OVERLAYS)
 COMMON_CONF := turnkey.d $(COMMON_CONF)