From dbaa1776f576053dffc9f2d12a78d19311a77147 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy@turnkeylinux.org>
Date: Thu, 22 Jan 2026 04:01:30 +0000
Subject: [PATCH] cleaner method to kill gpg-agent; fix malformed sources file
 & handle proxy related vars

---
 conf/bootstrap_apt | 3 +--
 mk/turnkey.mk      | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/bootstrap_apt b/conf/bootstrap_apt
index b9d2919a..e68dab98 100755
--- a/conf/bootstrap_apt
+++ b/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
diff --git a/mk/turnkey.mk b/mk/turnkey.mk
index be27f7d7..75baac19 100644
--- a/mk/turnkey.mk
+++ b/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)