From 99ced630b38aa6009630b06c4fa45d4f094239d2 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Thu, 22 Sep 2016 08:47:21 +0200 Subject: [PATCH] Revert "script/release.sh: use 8 byte gpg key ids" This reverts commit 28d82306b720487ab93474171d91d318afff7b78. --- script/release.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/release.sh b/script/release.sh index 769f742c3f0..7db4e53c4b5 100755 --- a/script/release.sh +++ b/script/release.sh @@ -662,7 +662,7 @@ announcement_samba_rc() { echo "================" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" + echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" echo "from:" echo "" echo " ${download_url}" @@ -845,7 +845,7 @@ announcement_samba_stable() { echo "================" echo "" echo "The uncompressed tarballs and patch files have been signed" - echo "using GnuPG (ID ${GPG_KEYID}). The source code can be downloaded" + echo "using GnuPG (ID 6568B7EA). The source code can be downloaded" echo "from:" echo "" echo " ${release_url}" @@ -1052,7 +1052,7 @@ talloc | tdb | tevent | ldb) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='4793916113084025' + GPG_KEYID='13084025' } productbase="${product}" @@ -1071,7 +1071,7 @@ samba-rc) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6F33915B6568B7EA' + GPG_KEYID='6568B7EA' } productbase="samba" @@ -1092,7 +1092,7 @@ samba-stable) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6F33915B6568B7EA' + GPG_KEYID='6568B7EA' } productbase="samba" @@ -1114,7 +1114,7 @@ TODO-samba-security) } test -z "${GPG_KEYID-}" && { - GPG_KEYID='6F33915B6568B7EA' + GPG_KEYID='6568B7EA' } productbase="samba" -- 2.34.1