From c4191c94b2ffe0d05243209ef0ffcdc399364644 Mon Sep 17 00:00:00 2001
From: heronhaye <surya@keyba.se>
Date: Tue, 3 Oct 2023 15:06:16 -0400
Subject: [PATCH] try without setsid

---
 packaging/linux/docker_build.sh    | 2 +-
 packaging/linux/rpm/layout_repo.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packaging/linux/docker_build.sh b/packaging/linux/docker_build.sh
index 3fcb6e2f490e..99f741c85229 100755
--- a/packaging/linux/docker_build.sh
+++ b/packaging/linux/docker_build.sh
@@ -57,7 +57,7 @@ gpg_tempfile="$gpg_tempdir/code_signing_key"
 gpg --export-secret-key --armor "$code_signing_fingerprint" > "$gpg_tempfile"
 
 # Make sure the Docker image is built.
-image=keybase_packaging_v45
+image=keybase_packaging_v46
 if [ -z "$(sudo docker images -q "$image")" ] ; then
   echo "Docker image '$image' not yet built. Building..."
   sudo docker build -t "$image" "$clientdir/packaging/linux"
diff --git a/packaging/linux/rpm/layout_repo.sh b/packaging/linux/rpm/layout_repo.sh
index f3ba77505733..6ddd9dad4f43 100755
--- a/packaging/linux/rpm/layout_repo.sh
+++ b/packaging/linux/rpm/layout_repo.sh
@@ -71,13 +71,15 @@ for arch in x86_64 ; do
   # password prompt that appears despite the agent configs.
   echo "Signing '$rpmcopy'..."
   echo "Signing '$rpmcopy'...1.. $(which gpg) $(which gpg1)"
-  setsid -w rpm \
+  # setsid -w rpm \
+  rpm \
    --define "_gpg_name $code_signing_fingerprint"  \
    --define '_signature gpg' \
    --define '_gpgbin /usr/bin/gpg1' \
    --define '__gpg_check_password_cmd /bin/true' \
    --define '__gpg_sign_cmd %{__gpg} /usr/bin/gpg1 --batch --no-verbose --no-armor --use-agent --no-secmem-warning -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}' \
-   --addsign "$rpmcopy" < /dev/null
+   --addsign "$rpmcopy"
+   # --addsign "$rpmcopy" < /dev/null
 
   echo "Signing '$rpmcopy'...2"
   # Add a standalone signature file, for user convenience. Other packaging