Merge pull request #980 from micahflee/developv2.1

Version 2.1

10 files changed, 133 insertions, 41 deletions

diff --git a/install/build_osx.sh b/install/build_osx.sh
index 010e3edb..40e1fe90 100755
--- a/install/build_osx.sh
+++ b/install/build_osx.sh
@@ -27,11 +27,26 @@ if [ "$1" = "--release" ]; then
   ENTITLEMENTS_PARENT_PATH="$ROOT/install/macos_sandbox/parent.plist"
 
   echo "Codesigning the app bundle"
-  codesign --deep -s "$IDENTITY_NAME_APPLICATION" -f --entitlements "$ENTITLEMENTS_CHILD_PATH" "$APP_PATH"
-  codesign -s "$IDENTITY_NAME_APPLICATION" -f --entitlements "$ENTITLEMENTS_PARENT_PATH" "$APP_PATH"
+  codesign \
+    --deep \
+    -s "$IDENTITY_NAME_APPLICATION" \
+    --force \
+    --entitlements "$ENTITLEMENTS_CHILD_PATH" \
+    --timestamp \
+    "$APP_PATH"
+  codesign \
+    -s "$IDENTITY_NAME_APPLICATION" \
+    --force \
+    --entitlements "$ENTITLEMENTS_PARENT_PATH" \
+    --timestamp \
+    "$APP_PATH"
 
   echo "Creating an installer"
-  productbuild --sign "$IDENTITY_NAME_INSTALLER" --component "$APP_PATH" /Applications "$PKG_PATH"
+  productbuild \
+    --sign "$IDENTITY_NAME_INSTALLER" \
+    --component "$APP_PATH" /Applications \
+    --timestamp \
+    "$PKG_PATH"
 
   echo "Cleaning up"
   rm -rf "$APP_PATH"
diff --git a/install/build_rpm.sh b/install/build_rpm.sh
index 7a34b271..0872a447 100755
--- a/install/build_rpm.sh
+++ b/install/build_rpm.sh
@@ -9,7 +9,7 @@ VERSION=`cat share/version.txt`
 rm -r build dist >/dev/null 2>&1
 
 # build binary package
-python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, python3-cryptography, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4"
+python3 setup.py bdist_rpm --requires="python3-flask, python3-stem, python3-qt5, python3-crypto, python3-pysocks, nautilus-python, tor, obfs4"
 
 # install it
 echo ""
diff --git a/install/build_source.sh b/install/build_source.sh
new file mode 100755
index 00000000..d7f48722
--- /dev/null
+++ b/install/build_source.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# The script builds a source package
+# See https://github.com/micahflee/onionshare/blob/develop/BUILD.md#source-package
+
+# Usage
+display_usage() {
+	echo "Usage: $0 [tag]"
+}
+
+if [ $# -lt 1 ]
+then
+  display_usage
+  exit 1
+fi
+
+# Input validation
+TAG=$1
+
+if [ "${TAG:0:1}" != "v" ]
+then
+  echo "Tag must start with 'v' character"
+  exit 1
+fi
+
+VERSION=${TAG:1}
+
+# Make sure tag exists
+git tag | grep "^$TAG\$"
+if [ $? -ne 0 ]
+then
+  echo "Tag does not exist"
+  exit 1
+fi
+
+# Clone source
+mkdir -p build/source
+mkdir -p dist
+cd build/source
+git clone https://github.com/micahflee/onionshare.git
+cd onionshare
+
+# Verify tag
+git tag -v $TAG 2> ../verify.txt
+if [ $? -ne 0 ]
+then
+  echo "Tag does not verify"
+  exit 1
+fi
+cat ../verify.txt |grep "using RSA key 927F419D7EC82C2F149C1BD1403C2657CD994F73"
+if [ $? -ne 0 ]
+then
+  echo "Tag signed with wrong key"
+  exit 1
+fi
+cat ../verify.txt |grep "^gpg: Good signature from"
+if [ $? -ne 0 ]
+then
+  echo "Tag verification missing 'Good signature from'"
+  exit 1
+fi
+
+# Checkout code
+git checkout $TAG
+
+# Delete .git, compress, and PGP sign
+cd ..
+rm -rf onionshare/.git
+tar -cf onionshare-$VERSION.tar.gz onionshare/
+gpg -a --detach-sign onionshare-$VERSION.tar.gz
+
+# Move source package to dist
+cd ../..
+mv build/source/onionshare-$VERSION.tar.gz dist
+mv build/source/onionshare-$VERSION.tar.gz.asc dist
+
+# Clean up
+rm -rf build/source/onionshare
+rm build/source/verify.txt
+
+echo "Source package complete, files are in dist"
diff --git a/install/check_lacked_trans.py b/install/check_lacked_trans.py
index 1caa6b27..010cdb7a 100644..100755
--- a/install/check_lacked_trans.py
+++ b/install/check_lacked_trans.py
@@ -56,8 +56,9 @@ def main():
 
     src = files_in(dir, 'onionshare') + \
           files_in(dir, 'onionshare_gui') + \
-          files_in(dir, 'onionshare_gui/share_mode') + \
-          files_in(dir, 'onionshare_gui/receive_mode') + \
+          files_in(dir, 'onionshare_gui/mode') + \
+          files_in(dir, 'onionshare_gui/mode/share_mode') + \
+          files_in(dir, 'onionshare_gui/mode/receive_mode') + \
           files_in(dir, 'install/scripts') + \
           files_in(dir, 'tests')
     pysrc = [p for p in src if p.endswith('.py')]
diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py
index d966173c..861dc935 100644
--- a/install/get-tor-osx.py
+++ b/install/get-tor-osx.py
@@ -35,9 +35,9 @@ import subprocess
 import requests
 
 def main():
-    dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.5/TorBrowser-8.0.5-osx64_en-US.dmg'
-    dmg_filename = 'TorBrowser-8.0.5-osx64_en-US.dmg'
-    expected_dmg_sha256 = '08f0f79181319b74f8ad3a3f8c72a46356ec47f1ca3e22eb42d92e51451d9411'
+    dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.8/TorBrowser-8.0.8-osx64_en-US.dmg'
+    dmg_filename = 'TorBrowser-8.0.8-osx64_en-US.dmg'
+    expected_dmg_sha256 = '1dc01b95146352593c3f18ece25f8735120565f921e22c2827df819effdddca3'
 
     # Build paths
     root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
diff --git a/install/get-tor-windows.py b/install/get-tor-windows.py
index aad45e94..0f4ad8c3 100644
--- a/install/get-tor-windows.py
+++ b/install/get-tor-windows.py
@@ -33,9 +33,9 @@ import subprocess
 import requests
 
 def main():
-    exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.5/torbrowser-install-8.0.5_en-US.exe'
-    exe_filename = 'torbrowser-install-8.0.5_en-US.exe'
-    expected_exe_sha256 = '860fdd06e4ea8dd4c46f221676251f5cc528676d4e256559ee3831a5f97492f1'
+    exe_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.8/torbrowser-install-8.0.8_en-US.exe'
+    exe_filename = 'torbrowser-install-8.0.8_en-US.exe'
+    expected_exe_sha256 = 'bfe32a737e9fa37bf0c8837dbf3385be41cd9e8f9a88850d8f2946bb736e784f'
     # Build paths
     root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
     working_path = os.path.join(os.path.join(root_path, 'build'), 'tor')
diff --git a/install/onionshare.desktop b/install/onionshare.desktop
index a0861cf8..697668db 100644
--- a/install/onionshare.desktop
+++ b/install/onionshare.desktop
@@ -7,7 +7,7 @@ Comment[de]=Teile Dateien sicher und anonym über das Tor-Netzwerk
 Exec=/usr/bin/onionshare-gui
 Terminal=false
 Type=Application
-Icon=/usr/share/pixmaps/onionshare80.xpm
+Icon=onionshare80
 Categories=Network;FileTransfer;
 Keywords=tor;anonymity;privacy;onion service;file sharing;file hosting;
 Keywords[da]=tor;anonymitet;privatliv;onion-tjeneste;fildeling;filhosting;
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 3a4c6c2a..68213528 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -5,8 +5,8 @@
 # change these with each release
 !define INSTALLSIZE 115186
 !define VERSIONMAJOR 2
-!define VERSIONMINOR 0
-!define VERSIONSTRING "2.0"
+!define VERSIONMINOR 1
+!define VERSIONSTRING "2.1"
 
 RequestExecutionLevel admin
 
diff --git a/install/requirements-tests.txt b/install/requirements-tests.txt
index 89f37572..599b9808 100644
--- a/install/requirements-tests.txt
+++ b/install/requirements-tests.txt
@@ -1,10 +1,10 @@
-atomicwrites==1.2.1
-attrs==18.2.0
-more-itertools==4.3.0
-pluggy==0.8.0
-py==1.7.0
-pytest==4.0.1
+atomicwrites==1.3.0
+attrs==19.1.0
+more-itertools==5.0.0
+pluggy==0.9.0
+py==1.8.0
+pytest==4.4.1
 pytest-faulthandler==1.5.0
-pytest-qt==3.2.1
-six==1.11.0
-urllib3==1.24.1
+pytest-qt==3.2.2
+six==1.12.0
+urllib3==1.24.2
diff --git a/install/requirements.txt b/install/requirements.txt
index 76dfb1ef..0abd773f 100644
--- a/install/requirements.txt
+++ b/install/requirements.txt
@@ -1,25 +1,20 @@
 altgraph==0.16.1
-asn1crypto==0.24.0
-certifi==2018.10.15
-cffi==1.11.5
+certifi==2019.3.9
 chardet==3.0.4
 Click==7.0
-cryptography==2.4.2
 Flask==1.0.2
 future==0.17.1
-idna==2.7
+idna==2.8
 itsdangerous==1.1.0
-Jinja2==2.10
+Jinja2==2.10.1
 macholib==1.11
-MarkupSafe==1.1.0
-pefile==2018.8.8
-pycparser==2.19
-pycryptodome==3.7.2
-PyQt5==5.11.3
-PyQt5-sip==4.19.13
+MarkupSafe==1.1.1
+pefile==2019.4.18
+pycryptodome==3.8.1
+PyQt5==5.12.1
+PyQt5-sip==4.19.15
 PySocks==1.6.8
-requests==2.20.1
-six==1.11.0
-stem==1.7.0
-urllib3==1.24.1
-Werkzeug==0.14.1
+requests==2.21.0
+stem==1.7.1
+urllib3==1.24.2
+Werkzeug==0.15.2