[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/buster-backports] 8 commits: d/patches: Add back patch origin
Roger Shimizu
rosh at debian.org
Mon Nov 25 17:22:40 GMT 2019
Roger Shimizu pushed to branch debian/buster-backports at Privacy Maintainers / torbrowser-launcher
Commits:
23e2d9cf by Roger Shimizu at 2019-08-24T15:27:30Z
d/patches: Add back patch origin
Patch origin is from git log.
- - - - -
252531b4 by Roger Shimizu at 2019-08-27T12:10:02Z
Rebuild as 0.3.2-2~bpo9+1 for stretch-backports-sloppy
- - - - -
59c1b2da by Roger Shimizu at 2019-11-19T15:43:23Z
d/patches: Backports a few patches from upstream
[0bd4779] pt_BR translation
[f12222d] pt_BR translation
[88046fb] Update French translation
[0b78aea] AppArmor: allow new path for the Firefox 68 IPC
[73fc84b] AppArmor: Pass the environment to Firefox content processes
[b8a13f9] AppArmor: allow running the Firefox updater from its new path
Closes: #942901
- - - - -
57277301 by Roger Shimizu at 2019-11-20T15:32:41Z
d/changelog: Create entry for 0.3.2-3
- - - - -
fffb55b3 by Roger Shimizu at 2019-11-20T16:49:28Z
d/patches: Cherry-pick a patch to fix FTBFS issue
https://github.com/micahflee/torbrowser-launcher/pull/444
This also introduces another change:
debian/control: Add python3-distro to Build-Depends.
Thanks to Carl Joseph Hirner III.
- - - - -
57cc75de by Roger Shimizu at 2019-11-20T17:01:05Z
Prepare to release 0.3.2-3
- - - - -
27031e1e by Roger Shimizu at 2019-11-25T16:10:00Z
Merge tag 'debian/0.3.2-3' into debian/buster-backports
- - - - -
46941db4 by Roger Shimizu at 2019-11-25T16:10:18Z
Rebuild as 0.3.2-3~bpo10+1 for buster-backports
- - - - -
17 changed files:
- debian/changelog
- debian/control
- debian/patches/0001-show-gui-only-if-tbb-not-installed.patch
- debian/patches/0002-remove-double-common-assignment.patch
- debian/patches/0003-Update-Hungarian-translation.patch
- debian/patches/0004-Create-da.po.patch
- debian/patches/0005-Fix-two-spelling-errors.patch
- debian/patches/0006-Add-Swedish-translation.patch
- debian/patches/0007-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
- + debian/patches/0009-pt_BR-translation.patch
- + debian/patches/0010-pt_BR-translation.patch
- + debian/patches/0011-Update-French-translation.patch
- + debian/patches/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
- + debian/patches/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
- + debian/patches/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
- + debian/patches/0015-Update-setup.py.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,32 @@
+torbrowser-launcher (0.3.2-3~bpo10+1) buster-backports; urgency=medium
+
+ * Rebuild for buster-backports.
+
+ -- Roger Shimizu <rosh at debian.org> Tue, 26 Nov 2019 01:10:17 +0900
+
+torbrowser-launcher (0.3.2-3) unstable; urgency=medium
+
+ * debian/patches:
+ - Add back patch origin.
+ - Backports a few patches from upstream (Closes: #942901).
+ + [0bd4779] pt_BR translation
+ + [f12222d] pt_BR translation
+ + [88046fb] Update French translation
+ + [0b78aea] AppArmor: allow new path for the Firefox 68 IPC
+ + [73fc84b] AppArmor: Pass the environment to Firefox content processes
+ + [b8a13f9] AppArmor: allow running the Firefox updater from its new path
+ - Cherry-pick a patch from upstream pull-request queue to fix FTBFS issue.
+ Thanks to Carl Joseph Hirner III.
+ * debian/control: Add python3-distro to Build-Depends.
+
+ -- Roger Shimizu <rosh at debian.org> Thu, 21 Nov 2019 02:01:05 +0900
+
+torbrowser-launcher (0.3.2-2~bpo9+1) stretch-backports-sloppy; urgency=medium
+
+ * Rebuild for stretch-backports-sloppy.
+
+ -- Roger Shimizu <rosh at debian.org> Tue, 27 Aug 2019 21:10:01 +0900
+
torbrowser-launcher (0.3.2-2~bpo10+1) buster-backports; urgency=medium
* Rebuild for buster-backports.
=====================================
debian/control
=====================================
@@ -9,7 +9,8 @@ Build-Depends:
dh-python,
help2man,
lsb-release,
- python3-all
+ python3-all,
+ python3-distro
Standards-Version: 3.9.8
Homepage: https://micahflee.com/torbrowser-launcher/
Vcs-Git: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher.git
=====================================
debian/patches/0001-show-gui-only-if-tbb-not-installed.patch
=====================================
@@ -1,6 +1,7 @@
From: troubadoour <trobador at riseup.net>
Date: Tue, 27 Mar 2018 18:19:26 -0400
Subject: show gui only if tbb not installed
+Origin: https://github.com/troubadoour/torbrowser-launcher/commit/1402015487db5559847492ca294ac6c895245dca
---
torbrowser_launcher/__init__.py | 29 ++++++++++++++++-------------
=====================================
debian/patches/0002-remove-double-common-assignment.patch
=====================================
@@ -1,6 +1,7 @@
From: troubadoour <trobador at riseup.net>
Date: Wed, 28 Mar 2018 03:52:42 -0400
Subject: remove double 'common' assignment
+Origin: https://github.com/troubadoour/torbrowser-launcher/commit/63646cb69521d40bf25484831d58bcf691f71cca
---
torbrowser_launcher/__init__.py | 3 +--
=====================================
debian/patches/0003-Update-Hungarian-translation.patch
=====================================
@@ -1,6 +1,7 @@
From: Charles Barcza <info at blackpanther.hu>
Date: Sun, 23 Sep 2018 19:49:31 +0200
Subject: Update Hungarian translation
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/359
---
README.md | 8 ++++++++
=====================================
debian/patches/0004-Create-da.po.patch
=====================================
@@ -1,6 +1,7 @@
From: scootergrisen <scootergrisen at gmail.com>
Date: Sun, 30 Sep 2018 16:33:05 +0200
Subject: Create da.po
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/364
---
po/da.po | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
=====================================
debian/patches/0005-Fix-two-spelling-errors.patch
=====================================
@@ -1,6 +1,7 @@
From: scootergrisen <scootergrisen at gmail.com>
Date: Mon, 1 Oct 2018 16:07:16 +0200
Subject: Fix two spelling errors
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/364
---
po/da.po | 4 ++--
=====================================
debian/patches/0006-Add-Swedish-translation.patch
=====================================
@@ -1,6 +1,7 @@
From: Jony <23194385+jony0008 at users.noreply.github.com>
Date: Sat, 10 Nov 2018 11:40:47 +0100
Subject: Add Swedish translation
+Origin: https://github.com/micahflee/torbrowser-launcher/pull/377
---
po/sv.po | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
=====================================
debian/patches/0007-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
=====================================
@@ -1,6 +1,7 @@
From: Roger Shimizu <rosh at debian.org>
Date: Sun, 11 Nov 2018 00:55:36 +0900
Subject: Remove mention of modem sound in docs and translation po files
+Origin: https://bugs.debian.org/913151
---
README.md | 1 -
=====================================
debian/patches/0009-pt_BR-translation.patch
=====================================
@@ -0,0 +1,36 @@
+From: =?utf-8?b?Ikpvw6NvIFbDrXRvciBTLiBGIg==?=
+ <48962164+jjoaovitor7 at users.noreply.github.com>
+Date: Mon, 29 Jul 2019 08:13:54 -0300
+Subject: pt_BR translation.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Name[pt_BR]=Navegador Tor (Configurações do Lançador)
+Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
+
+(cherry picked from commit 0bd4779cc639e549cb408a6130b4022c647414c0)
+---
+ share/applications/torbrowser-settings.desktop | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/share/applications/torbrowser-settings.desktop b/share/applications/torbrowser-settings.desktop
+index c2c18d1..4f12adb 100644
+--- a/share/applications/torbrowser-settings.desktop
++++ b/share/applications/torbrowser-settings.desktop
+@@ -3,6 +3,7 @@ Name=Tor Browser Launcher Settings
+ Name[fr]=Tor Browser Launcher configurations
+ Name[hu]=Tor-böngésző indító beállításai
+ Name[nl]=Tor Browser Launcher Instellingen
++Name[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Name[ru]=Tor Browser (настройки запуска)
+ GenericName=Tor Browser Launcher Settings
+ GenericName[hu]=Tor-böngésző indító beállításai
+@@ -10,6 +11,7 @@ Comment=Tor Browser Launcher Settings
+ Comment[fr]=Tor Browser Launcher configurations
+ Comment[hu]=Tor-böngésző indító beállításai
+ Comment[nl]=Tor Browser Launcher Instellingen
++Comment[pt_BR]=Navegador Tor (Configurações do Lançador)
+ Comment[ru]=Tor Browser (настройки запуска)
+ Exec=torbrowser-launcher --settings
+ Terminal=false
=====================================
debian/patches/0010-pt_BR-translation.patch
=====================================
@@ -0,0 +1,30 @@
+From: =?utf-8?b?Ikpvw6NvIFbDrXRvciBTLiBGIg==?=
+ <48962164+jjoaovitor7 at users.noreply.github.com>
+Date: Mon, 29 Jul 2019 08:35:16 -0300
+Subject: pt_BR translation.
+
+Name[pt_BR]=Navegador Tor
+Comment[pt_BR]=Navegador Tor
+
+(cherry picked from commit f12222d5d18a29cc51009897174986c14911b9d0)
+---
+ share/applications/torbrowser.desktop | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/share/applications/torbrowser.desktop b/share/applications/torbrowser.desktop
+index 739be8d..7a25076 100644
+--- a/share/applications/torbrowser.desktop
++++ b/share/applications/torbrowser.desktop
+@@ -1,10 +1,12 @@
+ [Desktop Entry]
+ Name=Tor Browser
+ Name[hu]=Tor-böngésző
++Name[pt_BR]=Navegador Tor
+ GenericName=Tor browser
+ GenericName[hu]=Tor böngésző indító
+ Comment=Launch Tor Browser
+ Comment[hu]=Tor böngésző indító
++Comment[pt_BR]=Navegador Tor
+ Exec=torbrowser-launcher %u
+ Terminal=false
+ Type=Application
=====================================
debian/patches/0011-Update-French-translation.patch
=====================================
@@ -0,0 +1,231 @@
+From: xin <xinxinxinxinxin at users.noreply.github.com>
+Date: Sun, 6 Oct 2019 19:30:20 +0000
+Subject: Update French translation
+
+(cherry picked from commit 88046fb6011fb07ff89505af61840af644af5b39)
+---
+ po/fr.po | 73 +++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 40 insertions(+), 33 deletions(-)
+
+diff --git a/po/fr.po b/po/fr.po
+index 3c3afc6..c0b60be 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -24,12 +24,12 @@ msgstr "Tor Browser Launcher"
+
+ #: __init__.py:66
+ msgid "By Micah Lee, licensed under MIT"
+-msgstr "Par Micah Lee, sous license MIT"
++msgstr "Par Micah Lee, sous licence MIT"
+
+ #: __init__.py:67
+ #, python-brace-format
+ msgid "version {0}"
+-msgstr ""
++msgstr "version {0}"
+
+ #: common.py:100
+ #, python-brace-format
+@@ -48,29 +48,27 @@ msgstr "Impossible de créer le dossier {0}"
+
+ #: common.py:187
+ msgid "Creating GnuPG homedir"
+-msgstr "Creation du dossier GnuPG"
++msgstr "Création du dossier GnuPG"
+
+ #: common.py:254
+ #, python-format
+ msgid "Could not import key with fingerprint: %s."
+-msgstr "Impossible d'importer la clé: %s"
++msgstr "Impossible d'importer la clé avec l'empreinte : %s."
+
+ #: common.py:259
+ msgid "Not all keys were imported successfully!"
+-msgstr "Certaines clés n'ont pas pu être importées"
++msgstr "Certaines clés n'ont pas pu être importées !"
+
+ #: launcher.py:83
+-#, fuzzy
+ msgid "Downloading Tor Browser for the first time."
+-msgstr "Premier téléchargement et installation du Tor Browser"
++msgstr "Téléchargement du Navigateur Tor pour la première fois."
+
+ #: launcher.py:85
+-#, fuzzy
+ msgid ""
+ "Your version of Tor Browser is out-of-date. Downloading the newest version."
+ msgstr ""
+-"Votre version du Tor Browser est obsolète. Téléchargement et installation de "
+-"la nouvelle version."
++"Votre version du Navigateur Tor est obsolète. Téléchargement de la nouvelle "
++"version."
+
+ #: launcher.py:100
+ msgid "Downloading over Tor"
+@@ -78,7 +76,7 @@ msgstr "Télécharger à travers Tor"
+
+ #: launcher.py:111
+ msgid "Tor Browser"
+-msgstr "Tor Browser"
++msgstr "Navigateur Tor"
+
+ #: launcher.py:128
+ msgid "Start"
+@@ -86,11 +84,11 @@ msgstr "Démarrer"
+
+ #: launcher.py:174
+ msgid "Yes"
+-msgstr ""
++msgstr "Oui"
+
+ #: launcher.py:178
+ msgid "Exit"
+-msgstr ""
++msgstr "Quitter"
+
+ #: launcher.py:192 settings.py:136
+ msgid "Cancel"
+@@ -103,11 +101,11 @@ msgstr "Téléchargement"
+
+ #: launcher.py:238
+ msgid "Latest version: {}"
+-msgstr "Dernière version: {}"
++msgstr "Dernière version : {}"
+
+ #: launcher.py:241
+ msgid "Error detecting Tor Browser version."
+-msgstr "Impossible de détecter la version du Tor Browser."
++msgstr "Impossible de détecter la version du Navigateur Tor."
+
+ #: launcher.py:256 launcher.py:357
+ msgid "Verifying Signature"
+@@ -127,7 +125,7 @@ msgstr "Télécharger à nouveau"
+
+ #: launcher.py:279 launcher.py:295
+ msgid "(over Tor)"
+-msgstr ""
++msgstr "(à travers Tor)"
+
+ #: launcher.py:293
+ msgid "Downloaded"
+@@ -147,29 +145,29 @@ msgid ""
+ "The version of Tor Browser you have installed is earlier than it should be, "
+ "which could be a sign of an attack!"
+ msgstr ""
+-"La version du Tor Browser installée est antérieure à l'actuelle, ce qui peut "
+-"être la signature d'une attaque!"
++"La version du Navigateur Tor que vous avez installé est antérieure à ce "
++"qu'elle devrait, ce qui peut être le signe d'une attaque !"
+
+ #: launcher.py:446
+-#, fuzzy
+ msgid "Downloading Tor Browser over again."
+-msgstr "Nouveau téléchargement du Tor Browser Bundle."
++msgstr "Télécharger le Navigateur Tor à nouveau."
+
+ #: launcher.py:516 launcher.py:525 launcher.py:533
+ msgid "Download Error:"
+-msgstr "Erreur de téléchargement:"
++msgstr "Erreur de téléchargement :"
+
+ #: launcher.py:517
+ msgid "You are currently using a non-default mirror"
+-msgstr "Vous utilisez actuellement un miroir non-défaut"
++msgstr "Vous utilisez actuellement un miroir n'étant pas celui par défaut"
+
+ #: launcher.py:518
+ msgid "Would you like to switch back to the default?"
+-msgstr "Voulez-vous revenir à la valeur par défaut?"
++msgstr "Voulez-vous revenir à la valeur par défaut ?"
+
+ #: launcher.py:527
+ msgid "Would you like to try the English version of Tor Browser instead?"
+-msgstr "Voulez-vous essayer la version anglophone du Tor Browser à la place?"
++msgstr ""
++"Voulez-vous essayer la version anglophone du Navigateur Tor à la place ?"
+
+ #: launcher.py:548
+ #, python-brace-format
+@@ -179,10 +177,14 @@ msgid ""
+ "\n"
+ "You may be under attack."
+ msgstr ""
++"Certificat SSL invalide pour :\n"
++"{0}\n"
++"\n"
++"Vous pourriez être attaqué."
+
+ #: launcher.py:550
+ msgid "Try the download again using Tor?"
+-msgstr "Essayez de télécharger à nouveau à travers Tor?"
++msgstr "Essayer de télécharger à nouveau à travers Tor ?"
+
+ #: launcher.py:559
+ #, python-brace-format
+@@ -194,6 +196,12 @@ msgid ""
+ "Trying to download over Tor. Are you sure Tor is configured correctly and "
+ "running?"
+ msgstr ""
++"Impossible de démarrer le téléchargement :\n"
++"\n"
++"{0}\n"
++"\n"
++"Essayez de télécharger à travers Tor. Êtes-vous sûr que Tor est configuré "
++"correctement et fonctionne ?"
+
+ #: launcher.py:563
+ #, python-brace-format
+@@ -204,11 +212,11 @@ msgid ""
+ "\n"
+ "Are you connected to the internet?"
+ msgstr ""
+-"Impossible de démarrer le téléchargement:\n"
++"Impossible de démarrer le téléchargement :\n"
+ "\n"
+ "{0}\n"
+ "\n"
+-"Êtes-vous connecté à Internet?"
++"Êtes-vous connecté à Internet ?"
+
+ #: settings.py:46
+ msgid "Tor Browser Launcher Settings"
+@@ -220,7 +228,7 @@ msgstr "Télécharger à travers le Tor installé sur le système"
+
+ #: settings.py:57
+ msgid "Force downloading English version of Tor Browser"
+-msgstr "Forcer le téléchargement de la version anglophone du Tor Browser"
++msgstr "Forcer le téléchargement de la version anglophone du Navigateur Tor"
+
+ #: settings.py:66
+ msgid "Tor server"
+@@ -228,26 +236,25 @@ msgstr "Serveur Tor"
+
+ #: settings.py:82
+ msgid "Status: Installed"
+-msgstr "Status: Installé"
++msgstr "Statut : Installé"
+
+ #: settings.py:84
+ msgid "Status: Not Installed"
+-msgstr "Status: Pas installé"
++msgstr "Statut : Pas installé"
+
+ #: settings.py:87
+ msgid "Install Tor Browser"
+-msgstr "Installer le Tor Browser"
++msgstr "Installer le Navigateur Tor"
+
+ #: settings.py:92
+ msgid "Reinstall Tor Browser"
+-msgstr "Réinstaller le Tor Browser"
++msgstr "Réinstaller le Navigateur Tor"
+
+ #: settings.py:115
+ msgid "Mirror"
+ msgstr "Miroir"
+
+ #: settings.py:131
+-#, fuzzy
+ msgid "Save && Exit"
+ msgstr "Enregistrer et quitter"
+
=====================================
debian/patches/0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
=====================================
@@ -0,0 +1,21 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Mon, 9 Sep 2019 08:32:52 +0000
+Subject: AppArmor: allow new path for the Firefox 68 IPC
+
+(cherry picked from commit 0b78aea138daee5de1ba5fad126625f245134c6b)
+---
+ apparmor/torbrowser.Browser.firefox | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index f782f35..c6d8a26 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -105,6 +105,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+
+ # Required for multiprocess Firefox (aka Electrolysis, i.e. e10s)
+ owner /{dev,run}/shm/org.chromium.* rw,
++ owner /dev/shm/org.mozilla.ipc.[0-9]*.[0-9]* rw, # for Chromium IPC
+
+ # Deny access to DRM nodes, that's granted by the X abstraction, which is
+ # sourced by the gnome abstraction, that we include.
=====================================
debian/patches/0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
=====================================
@@ -0,0 +1,36 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Mon, 9 Sep 2019 09:07:55 +0000
+Subject: AppArmor: Pass the environment to Firefox content processes
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Without this, LD_LIBRARY_PATH is not passed to these processes, and then:
+
+ - Tor Browser cannot load libmozsandbox.so
+
+ - Tor Browser 9.0a6 does not start correctly:
+
+ /usr/lib/x86_64-linux-gnu/libstdc++.so.6: version `GLIBCXX_3.4.23' not
+ found (required by /usr/local/lib/tor-browser/libxul.so)
+
+ … while it should use its own copy of libstdc++.so.6.
+
+(cherry picked from commit 73fc84bc3cfffef710a5bd96aeff681a7db6c350)
+---
+ apparmor/torbrowser.Browser.firefox | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index c6d8a26..42516b6 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -73,7 +73,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+ owner @{torbrowser_home_dir}/TorBrowser/Tor/*.so.* mr,
+
+ # parent Firefox process when restarting after upgrade, Web Content processes
+- owner @{torbrowser_firefox_executable} ixmr -> torbrowser_firefox,
++ owner @{torbrowser_firefox_executable} pxmr -> torbrowser_firefox,
+
+ /etc/mailcap r,
+ /etc/mime.types r,
=====================================
debian/patches/0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
=====================================
@@ -0,0 +1,21 @@
+From: intrigeri <intrigeri at boum.org>
+Date: Thu, 7 Nov 2019 07:47:27 +0000
+Subject: AppArmor: allow running the Firefox updater from its new path
+
+(cherry picked from commit b8a13f96c22d668b5fb07da83e1b5ac399f471cb)
+---
+ apparmor/torbrowser.Browser.firefox | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
+index 42516b6..8d96043 100644
+--- a/apparmor/torbrowser.Browser.firefox
++++ b/apparmor/torbrowser.Browser.firefox
+@@ -63,6 +63,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+ owner @{torbrowser_home_dir}/firefox rix,
+ owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/* rw,
+ owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/{,MozUpdater/bgupdate/}updater ix,
++ owner @{torbrowser_home_dir}/updater ix,
+ owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/.parentwritetest rw,
+ owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profiles.ini r,
+ owner @{torbrowser_home_dir}/TorBrowser/Data/Browser/profile.default/{,**} rwk,
=====================================
debian/patches/0015-Update-setup.py.patch
=====================================
@@ -0,0 +1,30 @@
+From: Carl Joseph Hirner III <k.j.hirner.wisdom at gmail.com>
+Date: Sat, 16 Nov 2019 02:08:30 -0800
+Subject: Update setup.py
+
+modified to enable getting distro for python3.8 while maintaining ability to use python3.7 and below
+---
+ setup.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f9739ab..ebeb3e9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,9 +33,13 @@ import subprocess
+ from distutils.core import setup
+
+ SHARE = 'share'
+-
+-# detect linux distribution
+-distro = platform.dist()[0]
++try:
++ #for distributions that use python3.8
++ import distro as d
++ distro=d.LinuxDistribution()._os_release_info['name']
++except:
++ # detect linux distribution on python >=3.7
++ distro = platform.dist()[0]
+
+
+ def file_list(path):
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,10 @@
0006-Add-Swedish-translation.patch
0007-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
0008-Revert-Properly-detect-the-system-s-locale.patch
+0009-pt_BR-translation.patch
+0010-pt_BR-translation.patch
+0011-Update-French-translation.patch
+0012-AppArmor-allow-new-path-for-the-Firefox-68-IPC.patch
+0013-AppArmor-Pass-the-environment-to-Firefox-content-pro.patch
+0014-AppArmor-allow-running-the-Firefox-updater-from-its-.patch
+0015-Update-setup.py.patch
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/compare/dfa401a0743c7ef3d718be739ba68b2410795299...46941db4d7eb93381bf7ad054df7ea8d3403541f
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/compare/dfa401a0743c7ef3d718be739ba68b2410795299...46941db4d7eb93381bf7ad054df7ea8d3403541f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20191125/71a57f88/attachment-0001.html>
More information about the Pkg-privacy-commits
mailing list