diff -Nru onionshare-0.9.1/BUILD.md onionshare-0.9.2/BUILD.md --- onionshare-0.9.1/BUILD.md 2016-09-06 20:27:59.000000000 +0000 +++ onionshare-0.9.2/BUILD.md 2016-11-13 21:07:14.000000000 +0000 @@ -27,7 +27,7 @@ A script to build a .deb package and install OnionShare easily is also provided for your convenience: ```sh -sudo apt-get install -y build-essential fakeroot python3-all python3-stdeb dh-python python-nautilus +sudo apt-get install -y build-essential fakeroot python3-all python3-stdeb dh-python python-nautilus python3-nose ./install/build_deb.sh sudo dpkg -i deb_dist/onionshare_*.deb ``` diff -Nru onionshare-0.9.1/CHANGELOG.md onionshare-0.9.2/CHANGELOG.md --- onionshare-0.9.1/CHANGELOG.md 2016-09-06 20:27:59.000000000 +0000 +++ onionshare-0.9.2/CHANGELOG.md 2016-11-13 21:07:14.000000000 +0000 @@ -1,5 +1,10 @@ # OnionShare Changelog +## 0.9.2 (Linux only) + +* Looks for `TOR_CONTROL_PORT` environment variable, to help Tails integration +* Change how OnionShare checks to see if it's installed system-wide, to help Subgraph OS integration + ## 0.9.1 * Added Nautilus extension, so you can right-click on a file and choose "Share via OnionShare", thanks to Subgraph developers diff -Nru onionshare-0.9.1/debian/changelog onionshare-0.9.2/debian/changelog --- onionshare-0.9.1/debian/changelog 2016-09-08 08:45:05.000000000 +0000 +++ onionshare-0.9.2/debian/changelog 2017-05-26 11:44:11.000000000 +0000 @@ -1,3 +1,15 @@ +onionshare (0.9.2-1) unstable; urgency=medium + + * debian/control: + * Demote dependency on torbrowser-launcher to + "Recommends". (Closes: #862391) + * Move pkg to main, as it does not depend on + torbrowser-launcher anymore. + * debian/README: + * Add instructions for running onionshare. + + -- Ulrike Uhlig Fri, 26 May 2017 13:44:11 +0200 + onionshare (0.9.1-1) unstable; urgency=medium * New upstream version. diff -Nru onionshare-0.9.1/debian/control onionshare-0.9.2/debian/control --- onionshare-0.9.1/debian/control 2016-09-08 08:45:05.000000000 +0000 +++ onionshare-0.9.2/debian/control 2017-05-26 11:44:11.000000000 +0000 @@ -1,7 +1,7 @@ Source: onionshare Maintainer: Debian Privacy Tools Maintainers -Uploaders: Ulrike Uhlig -Section: contrib/net +Uploaders: Ulrike Uhlig , anonym +Section: net Priority: optional Build-Depends: dh-python, python3-setuptools, python3-all, python3-distutils-extra, python3-nose, python3-flask, python3-stem (>= 1.4.0), python3-pyqt5, debhelper (>= 9.20120909~) X-Python3-Version: >= 3.2 @@ -12,8 +12,9 @@ Package: onionshare Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, python3-flask, python3-stem, python3-pyqt5, torbrowser-launcher +Depends: ${misc:Depends}, ${python3:Depends}, python3-flask, python3-stem (>= 1.4.0), python3-pyqt5 Suggests: tor +Recommends: torbrowser-launcher Description: Share a file over Tor Hidden Services anonymously and securely OnionShare lets you securely and anonymously share a file of any size with someone. It works by starting a web server, making it accessible as a Tor diff -Nru onionshare-0.9.1/debian/README onionshare-0.9.2/debian/README --- onionshare-0.9.1/debian/README 1970-01-01 00:00:00.000000000 +0000 +++ onionshare-0.9.2/debian/README 2017-05-26 11:38:18.000000000 +0000 @@ -0,0 +1,13 @@ +There are two possibilities to use OnionShare in Debian. +By default, OnionShare will expect a running Tor instance on your system, on +ports 9151, 9153 or 9051. OnionShare does not ship nor run its own Tor +instance. + +This means that either: +- you have manually installed TorBrowser or installed the torbrowser-launcher + package from Debian repositories. In both cases, you need to run TorBrowser, + so that OnionShare uses this Tor instance. This is the default behavior. + +Or: +- you can configure access to the control port of a system-wide Tor, and point + OnionShare to it. diff -Nru onionshare-0.9.1/onionshare/helpers.py onionshare-0.9.2/onionshare/helpers.py --- onionshare-0.9.1/onionshare/helpers.py 2016-09-06 20:27:59.000000000 +0000 +++ onionshare-0.9.2/onionshare/helpers.py 2016-11-13 21:07:14.000000000 +0000 @@ -34,7 +34,7 @@ systemwide, and whether regardless of platform """ p = get_platform() - if p == 'Linux' and sys.argv and sys.argv[0].startswith('/usr/bin/onionshare'): + if p == 'Linux' and sys.argv and sys.argv[0].startswith(sys.prefix): # OnionShare is installed systemwide in Linux resources_dir = os.path.join(sys.prefix, 'share/onionshare') elif getattr(sys, 'frozen', False): # Check if app is "frozen" with cx_Freeze diff -Nru onionshare-0.9.1/onionshare/onion.py onionshare-0.9.2/onionshare/onion.py --- onionshare-0.9.1/onionshare/onion.py 2016-09-06 20:27:59.000000000 +0000 +++ onionshare-0.9.2/onionshare/onion.py 2016-11-13 21:07:14.000000000 +0000 @@ -57,7 +57,11 @@ # connect to the tor controlport found_tor = False self.c = None - ports = [9151, 9153, 9051] + env_port = os.environ.get('TOR_CONTROL_PORT') + if env_port: + ports = [int(env_port)] + else: + ports = [9151, 9153, 9051] for port in ports: try: self.c = Controller.from_port(port=port) diff -Nru onionshare-0.9.1/resources/version.txt onionshare-0.9.2/resources/version.txt --- onionshare-0.9.1/resources/version.txt 2016-09-06 20:27:59.000000000 +0000 +++ onionshare-0.9.2/resources/version.txt 2016-11-13 21:07:14.000000000 +0000 @@ -1 +1 @@ -0.9.1 +0.9.2