[tbb-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40964: Update keyring/torbrowser.gpg for new subkey

[morgan (@morgan)]

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
67416f82 by Nicolas Vigier at 2024-07-23T13:40:11+02:00
Bug 40964: Update keyring/torbrowser.gpg for new subkey

- - - - -
f72eb030 by Nicolas Vigier at 2024-07-23T13:43:27+02:00
Bug 40964: Sign alpha release using new gpg subkey

- - - - -


4 changed files:

- keyring/torbrowser.gpg
- tools/signing/linux-signer-gpg-sign
- tools/signing/machines-setup/sudoers.d/sign-gpg
- tools/signing/wrappers/sign-gpg


Changes:

=====================================
keyring/torbrowser.gpg
=====================================
Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ


=====================================
tools/signing/linux-signer-gpg-sign
=====================================
@@ -4,6 +4,8 @@ set -e
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 
+test "$tbb_version_type" = "alpha" && export GPG_NEWSUBKEY=1
+
 cd ~/"$SIGNING_PROJECTNAME-$tbb_version"
 
 test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS


=====================================
tools/signing/machines-setup/sudoers.d/sign-gpg
=====================================
@@ -1,2 +1,2 @@
-Defaults>signing-gpg env_keep += SIGNING_PROJECTNAME
+Defaults>signing-gpg env_keep += "SIGNING_PROJECTNAME GPG_NEWSUBKEY"
 %signing ALL = (signing-gpg) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-gpg


=====================================
tools/signing/wrappers/sign-gpg
=====================================
@@ -11,4 +11,6 @@ if test $(whoami) != 'signing-gpg'; then
   exit 1
 fi
 
-exec gpg --homedir /home/signing-gpg/.gnupg -absu 0xe53d989a9e2d47bf! --batch --no-tty -o- --passphrase-fd 0 -- "$1"
+gpg_subkey='0xe53d989a9e2d47bf!'
+test -n "$GPG_NEWSUBKEY" && gpg_subkey='0x157432CF78A65729!'
+exec gpg --homedir /home/signing-gpg/.gnupg -absu "$gpg_subkey" --batch --no-tty -o- --passphrase-fd 0 -- "$1"



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/2303997c8d9cb336ec79fed2f2685c22894d6f17...f72eb030a29a5bad6a088bc887d3070dc74d07d2

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/2303997c8d9cb336ec79fed2f2685c22894d6f17...f72eb030a29a5bad6a088bc887d3070dc74d07d2
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240724/714d287c/attachment-0001.htm>