Skip to content

Commit

Permalink
try without setsid
Browse files Browse the repository at this point in the history
  • Loading branch information
heronhaye committed Oct 3, 2023
1 parent b48689f commit c4191c9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packaging/linux/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions packaging/linux/rpm/layout_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c4191c9

Please sign in to comment.