Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package torbrowser-launcher for
openSUSE:Factory checked in at 2021-12-12 00:57:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/torbrowser-launcher (Old)
and /work/SRC/openSUSE:Factory/.torbrowser-launcher.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "torbrowser-launcher"
Sun Dec 12 00:57:48 2021 rev:19 rq:939958 version:0.3.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/torbrowser-launcher/torbrowser-launcher.changes
2021-06-23 17:38:59.636534400 +0200
+++
/work/SRC/openSUSE:Factory/.torbrowser-launcher.new.2520/torbrowser-launcher.changes
2021-12-12 00:58:07.710605759 +0100
@@ -1,0 +2,7 @@
+Sat Dec 11 19:04:44 UTC 2021 - Andreas Stieger <[email protected]>
+
+- update to 0.3.5:
+ * fix refreshing Tor Browser signing key in Flatpak package
+- drop torbrowser-launcher-pt_BR-po-file-end-string.patch
+
+-------------------------------------------------------------------
Old:
----
torbrowser-launcher-0.3.4.tar.gz
torbrowser-launcher-pt_BR-po-file-end-string.patch
New:
----
torbrowser-launcher-0.3.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ torbrowser-launcher.spec ++++++
--- /var/tmp/diff_new_pack.eh26QG/_old 2021-12-12 00:58:08.130606048 +0100
+++ /var/tmp/diff_new_pack.eh26QG/_new 2021-12-12 00:58:08.130606048 +0100
@@ -17,15 +17,13 @@
Name: torbrowser-launcher
-Version: 0.3.4
+Version: 0.3.5
Release: 0
Summary: Tool for launching and easy-updates of Tor Browser
License: MIT
Group: Productivity/Networking/Web/Utilities
URL: https://github.com/micahflee/torbrowser-launcher
Source0:
https://github.com/micahflee/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM torbrowser-launcher-pt_BR-po-file-end-string.patch
gh#micahflee/torbrowser-launcher#579 [email protected] -- Fix missing
quotation marks at the end of str line in pt_BR translation file; patch taken
from upstream merge request
-Patch0: torbrowser-launcher-pt_BR-po-file-end-string.patch
BuildRequires: apparmor-abstractions
BuildRequires: gpg2
BuildRequires: hicolor-icon-theme
@@ -47,7 +45,6 @@
Requires: python3-requests
Requires: xmessage
Recommends: %{name}-lang = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -105,7 +102,6 @@
%endif
%files
-%defattr(-,root,root)
%license LICENSE
%doc CHANGELOG.md README.md
%{_bindir}/%{name}
@@ -120,8 +116,7 @@
%{python3_sitelib}/torbrowser_launcher/
%files -n torbrowser-apparmor-profile
-%defattr(-,root,root)
-%doc apparmor/license.txt
+%license apparmor/license.txt
%config %{_sysconfdir}/apparmor.d/torbrowser.*
%config %{_sysconfdir}/apparmor.d/local/torbrowser.*
%config %{_sysconfdir}/apparmor.d/tunables/torbrowser
++++++ torbrowser-launcher-0.3.4.tar.gz -> torbrowser-launcher-0.3.5.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/torbrowser-launcher-0.3.4/.github/workflows/python.yml
new/torbrowser-launcher-0.3.5/.github/workflows/python.yml
--- old/torbrowser-launcher-0.3.4/.github/workflows/python.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/torbrowser-launcher-0.3.5/.github/workflows/python.yml 2021-06-22
03:50:44.000000000 +0200
@@ -0,0 +1,19 @@
+name: Python
+
+on:
+ push:
+ branches: [ develop ]
+ pull_request:
+ branches: [ develop ]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Install system dependencies
+ run: sudo apt-get install gettext python3 libgpgme-dev
+ - name: Install torbrowser-launcher
+ run: sudo pip3 install .
+ - name: Test torbrowser-launcher install
+ run: torbrowser-launcher -h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/torbrowser-launcher-0.3.4/CHANGELOG.md
new/torbrowser-launcher-0.3.5/CHANGELOG.md
--- old/torbrowser-launcher-0.3.4/CHANGELOG.md 2021-06-19 01:35:04.000000000
+0200
+++ new/torbrowser-launcher-0.3.5/CHANGELOG.md 2021-06-22 03:50:44.000000000
+0200
@@ -1,5 +1,10 @@
# Tor Browser Launcher Changelog
+## 0.3.5
+
+* Fix refreshing Tor Browser signing key in Flatpak package
+* Fix issues with localization files
+
## 0.3.4
* Ship with latest version of the Tor Browser Developers OpenPGP public key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/torbrowser-launcher-0.3.4/po/cs.po
new/torbrowser-launcher-0.3.5/po/cs.po
--- old/torbrowser-launcher-0.3.4/po/cs.po 2021-06-19 01:35:04.000000000
+0200
+++ new/torbrowser-launcher-0.3.5/po/cs.po 2021-06-22 03:50:44.000000000
+0200
@@ -8,14 +8,14 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-23 15:47-0700\n"
-"PO-Revision-Date: 2017-01-29 21:33+0100\n"
-"Last-Translator: Marek Such??nek <[email protected]>\n"
+"PO-Revision-Date: 2021-06-20 19:42+0200\n"
+"Last-Translator: Daniel Rusek <[email protected]>\n"
"Language-Team: \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.4.3\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: __init__.py:65 launcher.py:470
@@ -60,17 +60,13 @@
msgstr "Ne v??echny kl????e byly importov??ny ??sp????n??!"
#: launcher.py:83
-#, fuzzy
msgid "Downloading Tor Browser for the first time."
-msgstr "Poprv?? se stahuje a instaluje Prohl????e?? Tor."
+msgstr "Poprv?? se stahuje Prohl????e?? Tor."
#: launcher.py:85
-#, fuzzy
msgid ""
"Your version of Tor Browser is out-of-date. Downloading the newest version."
-msgstr ""
-"Va??e verze Prohl????e??e Tor je zastaral??. St??hne se a nainstaluje
nejnov??j???? "
-"verze."
+msgstr "Va??e verze Prohl????e??e Tor je zastaral??. Stahuje se nejnov??j????
verze."
#: launcher.py:100
msgid "Downloading over Tor"
@@ -86,11 +82,11 @@
#: launcher.py:174
msgid "Yes"
-msgstr ""
+msgstr "Ano"
#: launcher.py:178
msgid "Exit"
-msgstr ""
+msgstr "Ukon??it"
#: launcher.py:192 settings.py:136
msgid "Cancel"
@@ -127,7 +123,7 @@
#: launcher.py:279 launcher.py:295
msgid "(over Tor)"
-msgstr ""
+msgstr "(p??es Tor)"
#: launcher.py:293
msgid "Downloaded"
@@ -151,9 +147,8 @@
"b??t, co?? m????e zna??it ??tok!"
#: launcher.py:446
-#, fuzzy
msgid "Downloading Tor Browser over again."
-msgstr "Znovu se stahuje bal??k Prohl????e??e Tor."
+msgstr "Znovu se stahuje Prohl????e?? Tor."
#: launcher.py:516 launcher.py:525 launcher.py:533
msgid "Download Error:"
@@ -179,6 +174,10 @@
"\n"
"You may be under attack."
msgstr ""
+"Neplatn?? SSL certifik??t pro:\n"
+"{0}\n"
+"\n"
+"M????ete b??t pod ??tokem."
#: launcher.py:550
msgid "Try the download again using Tor?"
@@ -194,6 +193,12 @@
"Trying to download over Tor. Are you sure Tor is configured correctly and "
"running?"
msgstr ""
+"Chyba p??i spou??t??n?? stahov??n??:\n"
+"\n"
+"{0}\n"
+"\n"
+"Zkou???? se stahov??n?? p??es Tor. Jste si jist??, ??e Tor b?????? a je
spr??vn?? "
+"nastaven?"
#: launcher.py:563
#, python-brace-format
@@ -247,7 +252,6 @@
msgstr "Zrcadlo"
#: settings.py:131
-#, fuzzy
msgid "Save && Exit"
msgstr "Ulo??it a ukon??it"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/torbrowser-launcher-0.3.4/po/pt_BR.po
new/torbrowser-launcher-0.3.5/po/pt_BR.po
--- old/torbrowser-launcher-0.3.4/po/pt_BR.po 2021-06-19 01:35:04.000000000
+0200
+++ new/torbrowser-launcher-0.3.5/po/pt_BR.po 2021-06-22 03:50:44.000000000
+0200
@@ -145,7 +145,7 @@
"The version of Tor Browser you have installed is earlier than it should be, "
"which could be a sign of an attack!"
msgstr ""
-"A vers??o do Navegador Tor que voc?? instalou ?? anterior ao que deveria ser,
+"A vers??o do Navegador Tor que voc?? instalou ?? anterior ao que deveria ser,
"
"o que poderia ser um sinal de ataque!"
#: launcher.py:446
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/torbrowser-launcher-0.3.4/setup.py
new/torbrowser-launcher-0.3.5/setup.py
--- old/torbrowser-launcher-0.3.4/setup.py 2021-06-19 01:35:04.000000000
+0200
+++ new/torbrowser-launcher-0.3.5/setup.py 2021-06-22 03:50:44.000000000
+0200
@@ -118,4 +118,11 @@
packages=["torbrowser_launcher"],
scripts=["torbrowser-launcher"],
data_files=datafiles,
+ install_requires=[
+ 'gpg',
+ 'packaging',
+ 'PyQt5',
+ 'requests',
+ 'PySocks',
+ ],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/torbrowser-launcher-0.3.4/share/applications/torbrowser-settings.desktop
new/torbrowser-launcher-0.3.5/share/applications/torbrowser-settings.desktop
---
old/torbrowser-launcher-0.3.4/share/applications/torbrowser-settings.desktop
2021-06-19 01:35:04.000000000 +0200
+++
new/torbrowser-launcher-0.3.5/share/applications/torbrowser-settings.desktop
2021-06-22 03:50:44.000000000 +0200
@@ -1,6 +1,7 @@
[Desktop Entry]
Name=Tor Browser Launcher Settings
Name[cs]=Tor Browser Launcher nastaven??
+Name[da]=Indstillinger for Tor Browser-opstarter
Name[fr]=Tor Browser Launcher configurations
Name[hr]=Tor preglednik ??? postavke pokretanja
Name[hu]=Tor-b??ng??sz?? ind??t?? be??ll??t??sai
@@ -10,11 +11,13 @@
Name[sv]=Inst??llningar f??r Tor Browser Launcher
Name[be]=???????????? ?????????????????????????? Tor Browser
GenericName=Tor Browser Launcher Settings
+GenericName[da]=Indstillinger for Tor Browser-opstarter
GenericName[hr]=Tor preglednik ??? postavke pokretanja
GenericName[hu]=Tor-b??ng??sz?? ind??t?? be??ll??t??sai
GenericName[be]=???????????? ?????????????????????????? Tor Browser
Comment=Tor Browser Launcher Settings
Comment[cs]=Tor Browser Launcher nastaven??
+Comment[da]=Indstillinger for Tor Browser-opstarter
Comment[fr]=Tor Browser Launcher configurations
Comment[hr]=Postavke za pokretanje Tor preglednika
Comment[hu]=Tor-b??ng??sz?? ind??t?? be??ll??t??sai
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/torbrowser-launcher-0.3.4/share/metainfo/torbrowser.appdata.xml
new/torbrowser-launcher-0.3.5/share/metainfo/torbrowser.appdata.xml
--- old/torbrowser-launcher-0.3.4/share/metainfo/torbrowser.appdata.xml
2021-06-19 01:35:04.000000000 +0200
+++ new/torbrowser-launcher-0.3.5/share/metainfo/torbrowser.appdata.xml
2021-06-22 03:50:44.000000000 +0200
@@ -29,6 +29,6 @@
<update_contact>[email protected]</update_contact>
<content_rating type="oars-1.1"/>
<releases>
- <release version="0.3.4" date="2021-06-18"/>
+ <release version="0.3.5" date="2021-06-21"/>
</releases>
</component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/torbrowser-launcher-0.3.4/share/torbrowser-launcher/version
new/torbrowser-launcher-0.3.5/share/torbrowser-launcher/version
--- old/torbrowser-launcher-0.3.4/share/torbrowser-launcher/version
2021-06-19 01:35:04.000000000 +0200
+++ new/torbrowser-launcher-0.3.5/share/torbrowser-launcher/version
2021-06-22 03:50:44.000000000 +0200
@@ -1 +1 @@
-0.3.4
+0.3.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/torbrowser-launcher-0.3.4/torbrowser_launcher/common.py
new/torbrowser-launcher-0.3.5/torbrowser_launcher/common.py
--- old/torbrowser-launcher-0.3.4/torbrowser_launcher/common.py 2021-06-19
01:35:04.000000000 +0200
+++ new/torbrowser-launcher-0.3.5/torbrowser_launcher/common.py 2021-06-22
03:50:44.000000000 +0200
@@ -36,6 +36,7 @@
import re
import gettext
import gpg
+import requests
SHARE = os.getenv("TBL_SHARE", sys.prefix + "/share") + "/torbrowser-launcher"
@@ -63,6 +64,8 @@
self.mkdir(self.paths["dirs"][d])
self.load_mirrors()
self.load_settings()
+ # some settings require a path rebuild, like force_en-US
+ self.build_paths()
self.mkdir(self.paths["download_dir"])
self.mkdir(self.paths["tbb"]["dir"])
self.init_gnupg()
@@ -167,6 +170,11 @@
)
old_tbb_data = "{0}/.torbrowser".format(homedir)
+ if hasattr(self, "settings") and self.settings["force_en-US"]:
+ language = "en-US"
+ else:
+ language = self.language
+
if tbb_version:
# tarball filename
if self.architecture == "x86_64":
@@ -174,10 +182,6 @@
else:
arch = "linux32"
- if hasattr(self, "settings") and self.settings["force_en-US"]:
- language = "en-US"
- else:
- language = self.language
tarball_filename = (
"tor-browser-" + arch + "-" + tbb_version + "_" + language +
".tar.xz"
)
@@ -213,7 +217,8 @@
"signing_keys": {
"tor_browser_developers": os.path.join(
SHARE, "tor-browser-developers.asc"
- )
+ ),
+ "wkd_tmp": os.path.join(tbb_cache, "torbrowser.gpg")
},
"mirrors_txt": [
os.path.join(SHARE, "mirrors.txt"),
@@ -230,26 +235,28 @@
+ "/tbb/"
+ self.architecture
+ "/tor-browser_"
- + self.language
+ + language
+ "/Browser/TorBrowser/Docs/ChangeLog.txt",
"dir": tbb_local + "/tbb/" + self.architecture,
"dir_tbb": tbb_local
+ "/tbb/"
+ self.architecture
+ "/tor-browser_"
- + self.language,
+ + language,
"start": tbb_local
+ "/tbb/"
+ self.architecture
+ "/tor-browser_"
- + self.language
+ + language
+ "/start-tor-browser.desktop",
},
}
# Add the expected fingerprint for imported keys:
+ tor_browser_developers_fingerprint =
"EF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
self.fingerprints = {
- "tor_browser_developers":
"EF6E286DDA85EA2A4BA7DE684E2C6E8793298290"
+ "tor_browser_developers": tor_browser_developers_fingerprint,
+ "wkd_tmp": tor_browser_developers_fingerprint,
}
# create a directory
@@ -274,41 +281,50 @@
self.mkdir(self.paths["gnupg_homedir"])
self.import_keys()
- def refresh_keyring(self, fingerprint=None):
- if fingerprint is not None:
- print("Refreshing local keyring... Missing key: " + fingerprint)
+ def proxies(self):
+ # Use tor socks5 proxy, if enabled
+ if self.settings["download_over_tor"]:
+ socks5_address =
"socks5h://{}".format(self.settings["tor_socks_address"])
+ return {"https": socks5_address, "http": socks5_address}
else:
- print("Refreshing local keyring...")
+ return None
+
+ def refresh_keyring(self):
+ print("Downloading latest Tor Browser signing key...")
# Fetch key from wkd, as per
https://support.torproject.org/tbb/how-to-verify-signature/
- p = subprocess.Popen(
- [
- "gpg",
- "--status-fd",
- "2",
- "--homedir",
- self.paths["gnupg_homedir"],
- "--auto-key-locate",
- "nodefault,wkd",
- "--locate-keys",
- "[email protected]",
- ],
- stderr=subprocess.PIPE,
+ # Sometimes GPG throws errors, so comment this out and download it
directly
+ # p = subprocess.Popen(
+ # [
+ # "gpg",
+ # "--status-fd",
+ # "2",
+ # "--homedir",
+ # self.paths["gnupg_homedir"],
+ # "--auto-key-locate",
+ # "nodefault,wkd",
+ # "--locate-keys",
+ # "[email protected]",
+ # ],
+ # stderr=subprocess.PIPE,
+ # )
+ # p.wait()
+
+ # Download the key from WKD directly
+ r = requests.get(
+
"https://torproject.org/.well-known/openpgpkey/hu/kounek7zrdx745qydx6p59t9mqjpuhdf?l=torbrowser";,
+ proxies=self.proxies(),
)
- p.wait()
+ if r.status_code != 200:
+ print(f"Error fetching key, status code = {r.status_code}")
+ else:
+ with open(self.paths["signing_keys"]["wkd_tmp"], "wb") as f:
+ f.write(r.content)
- for output in p.stderr.readlines():
- match = gnupg_import_ok_pattern.match(output)
- if match and match.group(2) == "IMPORT_OK":
- fingerprint = str(match.group(4))
- if match.group(3) == "0":
- print("Keyring refreshed successfully...")
- print(" No key updates for key: " + fingerprint)
- elif match.group(3) == "4":
- print("Keyring refreshed successfully...")
- print(" New signatures for key: " + fingerprint)
- else:
- print("Keyring refreshed successfully...")
+ if self.import_key_and_check_status("wkd_tmp"):
+ print("Key imported successfully")
+ else:
+ print("Key failed to import")
def import_key_and_check_status(self, key):
"""Import a GnuPG key and check that the operation was successful.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/torbrowser-launcher-0.3.4/torbrowser_launcher/launcher.py
new/torbrowser-launcher-0.3.5/torbrowser_launcher/launcher.py
--- old/torbrowser-launcher-0.3.4/torbrowser_launcher/launcher.py
2021-06-19 01:35:04.000000000 +0200
+++ new/torbrowser-launcher-0.3.5/torbrowser_launcher/launcher.py
2021-06-22 03:50:44.000000000 +0200
@@ -549,16 +549,6 @@
self.common = common
self.url = url
self.path = path
-
- # Use tor socks5 proxy, if enabled
- if self.common.settings["download_over_tor"]:
- socks5_address = "socks5h://{}".format(
- self.common.settings["tor_socks_address"]
- )
- self.proxies = {"https": socks5_address, "http": socks5_address}
- else:
- self.proxies = None
-
def run(self):
with open(self.path, "wb") as f:
try:
@@ -567,7 +557,7 @@
self.url,
headers={"User-Agent": "torbrowser-launcher"},
stream=True,
- proxies=self.proxies,
+ proxies=self.common.proxies(),
)
# If status code isn't 200, something went wrong
