[Pkg-privacy-commits] [torbrowser-launcher] 57/59: d/patches: Remove all upstreamed patches

Roger Shimizu rogershimizu at gmail.com
Mon Jan 29 13:44:01 UTC 2018 

This is an automated email from the git hooks/post-receive script.

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit 4a4d3e6535aa48030ff4fdabe9d36711e02dcc05
Author: Roger Shimizu <rosh at debian.org>
Date:   Mon Jan 29 22:11:45 2018 +0900

    d/patches: Remove all upstreamed patches
---
 debian/changelog                                   |  2 +
 .../0001-AppArmor-support-sysvinit-systems.patch   | 36 ------------
 debian/patches/0002-Update-mirror-list.patch       | 66 ----------------------
 ...low-the-tor-process-to-modify-its-data-di.patch | 28 ---------
 ...d-rules-needed-with-new-mediation-support.patch | 51 -----------------
 ...ant-access-to-mostly-innocuous-stuff-Fire.patch | 23 --------
 .../patches/0006-Update-AppStream-metadata.patch   | 39 -------------
 debian/patches/series                              |  6 --
 8 files changed, 2 insertions(+), 249 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbde1e8..d5c6318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ torbrowser-launcher (0.2.9-1) UNRELEASED; urgency=medium
   * New upstream release 0.2.9
   * debian/watch:
     - Change filenamemangle to match with the filename in archive.
+  * debian/patches:
+    - Remove all upstreamed patches.
 
  -- Roger Shimizu <rosh at debian.org>  Mon, 29 Jan 2018 22:00:51 +0900
 
diff --git a/debian/patches/0001-AppArmor-support-sysvinit-systems.patch b/debian/patches/0001-AppArmor-support-sysvinit-systems.patch
deleted file mode 100644
index c74c943..0000000
--- a/debian/patches/0001-AppArmor-support-sysvinit-systems.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Sat, 9 Sep 2017 17:28:02 +0000
-Subject: AppArmor: support sysvinit systems.
-
-With systemd (at least on current Debian sid), /run/shm is a symlink to
-/dev/shm, so "owner /dev/shm/org.chromium.* rw," is enough. With sysvinit,
-apparently things are set up differently (perhaps the symlinks are in the
-opposite direction?) so Firefox tries to access /run/shm/org.chromium.*,
-which was rejected.
-
-Let's support both!
-
-Thanks to gregor herrmann <gregoa at debian.org> for the bug report:
-https://bugs.debian.org/874383
-
-Note that this problem happens with pristine 0.2.8 profiles,
-without the changes brought by my apparmor-e10s branch.
-
-(cherry picked from commit 72d385fb95f85fa7e6d1c2a8b7102b73f61c8e80)
----
- 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 ff1bcdd..b1883c6 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -88,7 +88,7 @@
-   owner /{dev,run}/shm/shmfd-* rw,
- 
-   # Required for multiprocess Firefox (aka Electrolysis, i.e. e10s)
--  owner /dev/shm/org.chromium.* rw,
-+  owner /{dev,run}/shm/org.chromium.* rw,
- 
-   # Deny access to DRM nodes, that's granted by the X abstraction, which is
-   # sourced by the gnome abstraction, that we include.
diff --git a/debian/patches/0002-Update-mirror-list.patch b/debian/patches/0002-Update-mirror-list.patch
deleted file mode 100644
index 8054664..0000000
--- a/debian/patches/0002-Update-mirror-list.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Roger Shimizu <rogershimizu at gmail.com>
-Date: Sun, 24 Sep 2017 11:55:15 +0900
-Subject: Update mirror list
-Forwarded: https://github.com/micahflee/torbrowser-launcher/pull/289
-
-Except the official site, there're only 3 working mirror in current
-mirror list. So it's really necessary to update the list now.
-
-Got the latest list from:
- - https://www.torproject.org/getinvolved/mirrors.html.en
-And only keeps https links for security sake.
----
- share/torbrowser-launcher/mirrors.txt | 42 +++++++++++++++++++----------------
- 1 file changed, 23 insertions(+), 19 deletions(-)
-
-diff --git a/share/torbrowser-launcher/mirrors.txt b/share/torbrowser-launcher/mirrors.txt
-index cc24c7a..529b0bf 100644
---- a/share/torbrowser-launcher/mirrors.txt
-+++ b/share/torbrowser-launcher/mirrors.txt
-@@ -1,23 +1,27 @@
- https://www.torproject.org/dist/
--https://www.torservers.net/mirrors/torproject.org/dist/
--https://mirror.ml/tor/dist/
--https://tor.spline.inf.fu-berlin.de/dist/
--https://tormirror.almnet.de/dist/
--https://tor.dev-random.de/dist/
--https://www.unicorncloud.org/public/torproject.org/dist
--https://www.oignon.net/dist/
--https://mirror.hackthissite.org/tor
--https://tor.linuxlounge.net/dist/
--https://torproject.cryptowars.info/dist/
--https://tor.crazyhaze.de/dist/
-+https://mirror.unicorncloud.org/torproject.org/dist/
- https://creep.im/tor/dist/
--https://mirror.torland.me/torproject.org/dist/
-+https://mirror.velcommuta.de/tor/dist/
-+https://reichster.de/mirrors/torproject.org/dist/
-+https://www.moparisthebest.com/tor/dist/
-+https://sela.io/mirrors/torproject.org/dist/
-+https://nl.mirror.babylon.network/torproject/dist/
-+https://fr.mirror.babylon.network/torproject/dist/
-+https://fbnaia.homelinux.net/torproject/dist/
- https://tor.myrl.net/dist/
--https://torprojekt.userzap.de/dist/
--https://tor.myrl.net/dist/
--https://tor.beme-it.de/dist/
--http://tor.borgmann.tv/dist/
--https://otivpn.com/tor/dist
--https://www.eprci.com/tor/dist/
-+https://tor.eprci.net/dist/
- https://tor.stalkr.net/dist/
--https://torproject.gtor.org/dist/
-+https://tormirror.tb-itf-tor.de/dist/
-+https://tor.zilog.es/dist/
-+https://torproject.ph3x.at/dist/
-+https://tor-mirror.cyberguerrilla.org/dist/
-+https://tor.fr33tux.org/dist/
-+https://tor.ludikovsky.name/dist/
-+https://tor.ybti.net/dist/
-+https://tor.0x3d.lu/dist/
-+https://torproject.urown.net/dist/
-+https://tor.armbrust.me/dist/
-+https://torproject.mirror.metalgamer.eu/dist/
-+https://tor.heikorichter.name/dist/
-+https://tor.eff.org/dist/
-+https://tor.void.gr/dist/
diff --git a/debian/patches/0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch b/debian/patches/0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch
deleted file mode 100644
index 9f63230..0000000
--- a/debian/patches/0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Sun, 24 Sep 2017 05:33:35 +0000
-Subject: AppArmor: allow the tor process to modify its data directory.
-Forwarded: https://github.com/micahflee/torbrowser-launcher/pull/290
-
-It's unclear to me why this is not needed _all the time_, but it does make sense
-that at least in some circumstances, it needs to do that, e.g. to create
-that directory.
-
-Originally reported by Chris Lamb <lamby at debian.org> on
-https://bugs.debian.org/876484.
----
- apparmor/torbrowser.Tor.tor | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apparmor/torbrowser.Tor.tor b/apparmor/torbrowser.Tor.tor
-index 013f458..2410637 100644
---- a/apparmor/torbrowser.Tor.tor
-+++ b/apparmor/torbrowser.Tor.tor
-@@ -11,7 +11,7 @@
-   /etc/passwd r,
-   /etc/resolv.conf r,
-   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Tor/tor mr,
--  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/ r,
-+  owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/ rw,
-   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/* rw,
-   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Tor/lock rwk,
-   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/Tor,Lib}/*.so mr,
diff --git a/debian/patches/0004-AppArmor-add-rules-needed-with-new-mediation-support.patch b/debian/patches/0004-AppArmor-add-rules-needed-with-new-mediation-support.patch
deleted file mode 100644
index df7d9e0..0000000
--- a/debian/patches/0004-AppArmor-add-rules-needed-with-new-mediation-support.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Thu, 26 Oct 2017 11:12:05 +0000
-Subject: AppArmor: add rules needed with new mediation support added in Linux 4.14.
-Forwarded: https://github.com/micahflee/torbrowser-launcher/pull/294
-
----
- apparmor/torbrowser.Browser.firefox | 3 +++
- apparmor/torbrowser.Tor.tor         | 7 +++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index b1883c6..39ac6a2 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -15,8 +15,11 @@
-   # @{HOME}/ r,
- 
-   #dbus,
-+  network netlink raw,
-   network tcp,
- 
-+  ptrace (trace) peer=@{profile_name},
-+
-   deny /etc/host.conf r,
-   deny /etc/hosts r,
-   deny /etc/nsswitch.conf r,
-diff --git a/apparmor/torbrowser.Tor.tor b/apparmor/torbrowser.Tor.tor
-index 2410637..0ccd737 100644
---- a/apparmor/torbrowser.Tor.tor
-+++ b/apparmor/torbrowser.Tor.tor
-@@ -3,6 +3,7 @@
- /home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Tor/tor {
-   #include <abstractions/base>
- 
-+  network netlink raw,
-   network tcp,
-   network udp,
- 
-@@ -17,6 +18,12 @@
-   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/Tor,Lib}/*.so mr,
-   owner @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/Tor,Lib}/*.so.* mr,
- 
-+  # Silence file_inherit logs
-+  deny @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/{browser/,}omni.ja r,
-+  deny @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Browser/profile.default/.parentlock rw,
-+  deny @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Browser/profile.default/extensions/*.xpi r,
-+  deny @{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/{Browser/TorBrowser/,}Data/Browser/profile.default/startupCache/* r,
-+
-   @{PROC}/sys/kernel/random/uuid r,
-   /sys/devices/system/cpu/ r,
- 
diff --git a/debian/patches/0005-AppArmor-grant-access-to-mostly-innocuous-stuff-Fire.patch b/debian/patches/0005-AppArmor-grant-access-to-mostly-innocuous-stuff-Fire.patch
deleted file mode 100644
index 3a1abf4..0000000
--- a/debian/patches/0005-AppArmor-grant-access-to-mostly-innocuous-stuff-Fire.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Thu, 26 Oct 2017 11:12:52 +0000
-Subject: AppArmor: grant access to mostly innocuous stuff Firefox tries to read.
-Forwarded: https://github.com/micahflee/torbrowser-launcher/pull/294
----
- apparmor/torbrowser.Browser.firefox | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 39ac6a2..6a2c148 100644
---- a/apparmor/torbrowser.Browser.firefox
-+++ b/apparmor/torbrowser.Browser.firefox
-@@ -31,6 +31,10 @@
-   deny /etc/machine-id r,
-   deny /var/lib/dbus/machine-id r,
- 
-+  /dev/ r,
-+  /dev/shm/ r,
-+
-+  owner @{PROC}/@{pid}/fd/ r,
-   owner @{PROC}/@{pid}/mountinfo r,
-   owner @{PROC}/@{pid}/stat r,
-   owner @{PROC}/@{pid}/status r,
diff --git a/debian/patches/0006-Update-AppStream-metadata.patch b/debian/patches/0006-Update-AppStream-metadata.patch
deleted file mode 100644
index b95ddc9..0000000
--- a/debian/patches/0006-Update-AppStream-metadata.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Roger Shimizu <rosh at debian.org>
-Date: Sun, 24 Dec 2017 23:18:09 +0900
-Subject: Update AppStream metadata
-Forwarded: https://github.com/micahflee/torbrowser-launcher/pull/302
-
-Upgrade to the new spec of AppStream metadata:
- - https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
-
-And rename to share/metainfo/torbrowser.appdata.xml
----
- share/{appdata => metainfo}/torbrowser.appdata.xml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
- rename share/{appdata => metainfo}/torbrowser.appdata.xml (93%)
-
-diff --git a/share/appdata/torbrowser.appdata.xml b/share/metainfo/torbrowser.appdata.xml
-similarity index 93%
-rename from share/appdata/torbrowser.appdata.xml
-rename to share/metainfo/torbrowser.appdata.xml
-index 5a5a0bd..5577868 100644
---- a/share/appdata/torbrowser.appdata.xml
-+++ b/share/metainfo/torbrowser.appdata.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2014 Micah Lee <micah at micahflee.com> -->
--<application>
-- <id type="desktop">torbrowser.desktop</id>
-+<component>
-+ <id>org.torproject.torbrowser.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MIT</project_license>
-  <name>Tor Browser Launcher</name>
-@@ -26,5 +26,5 @@
-   </screenshot>
-  </screenshots>
-  <url type="homepage">https://github.com/micahflee/torbrowser-launcher</url>
-- <updatecontact>micah at micahflee.com</updatecontact>
--</application>
-+ <update_contact>micah at micahflee.com</update_contact>
-+</component>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 76719da..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-0001-AppArmor-support-sysvinit-systems.patch
-0002-Update-mirror-list.patch
-0003-AppArmor-allow-the-tor-process-to-modify-its-data-di.patch
-0004-AppArmor-add-rules-needed-with-new-mediation-support.patch
-0005-AppArmor-grant-access-to-mostly-innocuous-stuff-Fire.patch
-0006-Update-AppStream-metadata.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git

More information about the Pkg-privacy-commits mailing list