From 90b41e86f247e110bae8b6334922bb08068f8be2 Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Mon, 18 Nov 2019 21:23:32 +0100
Subject: [PATCH] Fix package signing (#20451)

* Build: Fix package signing
---
 scripts/build/rpmmacros        |  1 +
 scripts/build/sign_expect      | 12 ------------
 scripts/build/sign_packages.sh |  3 ++-
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100755 scripts/build/sign_expect

diff --git a/scripts/build/rpmmacros b/scripts/build/rpmmacros
index c00c8ec2eee..eda43a6b57c 100644
--- a/scripts/build/rpmmacros
+++ b/scripts/build/rpmmacros
@@ -2,3 +2,4 @@
 %_gpg_path /root/.gnupg
 %_gpg_name Grafana
 %_gpgbin /usr/bin/gpg
+%_gpg_sign_cmd_extra_args --batch --pinentry-mode loopback --passphrase-file /tmp/gpg-passphrase
diff --git a/scripts/build/sign_expect b/scripts/build/sign_expect
deleted file mode 100755
index 923f2d0694e..00000000000
--- a/scripts/build/sign_expect
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/expect -f
-# wrapper to make rpm --sign be non-interactive
-# passwd is 1st arg, file to sign is 2nd
-#send_user «$argv0 [lrange $argv 0 2]\n"
-#set files [lrange $argv 1 $argc ]
-
-set password [lindex $argv 0]
-set files [lindex $argv 1]
-spawn rpm --addsign $files
-expect "Enter pass phrase:"
-send -- "$password\r"
-expect eof
diff --git a/scripts/build/sign_packages.sh b/scripts/build/sign_packages.sh
index b074329fc02..b15350ad557 100755
--- a/scripts/build/sign_packages.sh
+++ b/scripts/build/sign_packages.sh
@@ -17,8 +17,9 @@ fi
 gpg --batch --allow-secret-key-import --import ~/private-repo/signing/private.key
 
 cp ./scripts/build/rpmmacros ~/.rpmmacros
+echo "$GPG_KEY_PASSWORD" > /tmp/gpg-passphrase
 
 for package in $_files; do
     [ -e "$package" ] || continue
-    ./scripts/build/sign_expect "$GPG_KEY_PASSWORD" "$package"
+    rpm --addsign "$package"
 done