[tor-commits] [tor-messenger-build/master] Use torbutton.gpg instead of gk.gpg for mozilla/

[arlo at torproject.org]

commit ca55a61fb9c4c6fc9556fdc5645425bc0e4a24eb
Author: Arlo Breault <arlolra at gmail.com>
Date:   Tue Oct 10 17:08:33 2017 -0400

    Use torbutton.gpg instead of gk.gpg for mozilla/
---
 keyring/binutils.gpg        | Bin 25772 -> 41 bytes
 keyring/mikeperry.gpg       | Bin 10790 -> 0 bytes
 keyring/python.gpg          | Bin 4213 -> 0 bytes
 keyring/tor-browser.gpg     | Bin 51598 -> 0 bytes
 keyring/torbrowser.gpg      |   1 +
 keyring/torbutton.gpg       |   1 +
 projects/mozilla/config     |   2 +-
 projects/tor-browser/config |   2 +-
 8 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/keyring/binutils.gpg b/keyring/binutils.gpg
deleted file mode 100644
index f24bb01..0000000
Binary files a/keyring/binutils.gpg and /dev/null differ
diff --git a/keyring/binutils.gpg b/keyring/binutils.gpg
new file mode 120000
index 0000000..97b63cd
--- /dev/null
+++ b/keyring/binutils.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/binutils.gpg
\ No newline at end of file
diff --git a/keyring/mikeperry.gpg b/keyring/mikeperry.gpg
deleted file mode 100644
index 64e4b33..0000000
Binary files a/keyring/mikeperry.gpg and /dev/null differ
diff --git a/keyring/python.gpg b/keyring/python.gpg
deleted file mode 100644
index 0f9314b..0000000
Binary files a/keyring/python.gpg and /dev/null differ
diff --git a/keyring/tor-browser.gpg b/keyring/tor-browser.gpg
deleted file mode 100644
index 241839a..0000000
Binary files a/keyring/tor-browser.gpg and /dev/null differ
diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg
new file mode 120000
index 0000000..cc31410
--- /dev/null
+++ b/keyring/torbrowser.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/torbrowser.gpg
\ No newline at end of file
diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg
new file mode 120000
index 0000000..59404b0
--- /dev/null
+++ b/keyring/torbutton.gpg
@@ -0,0 +1 @@
+../tor-browser-build/keyring/torbutton.gpg
\ No newline at end of file
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 915b681..ff57dad 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -3,7 +3,7 @@ version: tor-browser-52.4.0esr-7.0-1-build1
 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/tor-browser.git
 git_hash: '[% c("version") %]'
-gpg_keyring: gk.gpg
+gpg_keyring: torbutton.gpg
 tag_gpg_id: 1
 input_files:
   - filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 8563963..f2b40c8 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -7,7 +7,7 @@ input_files:
     name: torbrowser
     file_gpg_id: 1
     sig_ext: asc
-    gpg_keyring: tor-browser.gpg
+    gpg_keyring: torbrowser.gpg
     var:
       base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]"
     targets: