Compare revisions

Kali Kaneko · Kali Kaneko · Kali Kaneko · Kali Kaneko · Kali Kaneko · meskio
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,11 @@ NOTES
 # temporary home folders for functional tests
 /tmp/
+# snaps
+parts
+prime
+stage
+*.snap
+*.tar.bz2
+snap/.snapcraft
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 ---
 stages:
  - test
+  - e2e
  - publish
 variables:
@@ -8,6 +9,7 @@ variables:
 # Cache gems in between stages for this pipeline only
 cache:
+  key: "$CI_RUNNER_TAGS-$CI_COMMIT_REF_SLUG"
  paths:
    - .tox/py27-dev
@@ -32,23 +34,25 @@ osx_test:
    - yosemite
    - osx
-bitmask_latest_bundle:
+# disabling latest builds for now. should enable them when I can test
-  image: 0xacab.org:4567/leap/docker/bitmask-bundler:latest
+# the new docker builder w/o virtualenvs.
-  stage: publish
+# bitmask_latest_bundle:
-  script:
+# image: 0xacab.org:4567/leap/docker/bitmask-bundler:latest
-    - pkg/build_bundle_with_venv.sh
+#  stage: publish
-    - mv "dist/bitmask-`cat pkg/next-version`" .
+#  script:
-  artifacts:
+#    - pkg/build_bundle_with_venv.sh
-    paths:
+#    - mv "dist/bitmask-`cat pkg/next-version`" .
-      - "bitmask-`cat pkg/next-version`"
+#  artifacts:
-    name: "Bitmask_linux64_latest_${CI_BUILD_REF}"
+#    paths:
-    expire_in: 1 month
+#      - "bitmask-`cat pkg/next-version`"
-  tags:
+#    name: "Bitmask_linux64_latest_${CI_BUILD_REF}"
-    - linux
+#    expire_in: 1 month
+#  tags:
+#    - linux
 e2e_test_mail:
  image: 0xacab.org:4567/leap/bitmask-dev:latest
-  stage: test
+  stage: e2e
  script:
    - dpkg -l tox gnupg1 haveged  > /dev/null || apt-get -y --no-install-recommends install tox gnupg1 haveged
    - tox -e py27-dev --notest
@@ -62,7 +66,7 @@ e2e_test_mail:
 e2e_test_vpn:
  image: 0xacab.org:4567/leap/bitmask-dev:latest
-  stage: test
+  stage: e2e
  script:
    - dpkg -l tox gnupg1 haveged  > /dev/null || apt-get -y --no-install-recommends install tox gnupg1 haveged
    - tox -e py27-dev --notest
@@ -76,7 +80,7 @@ e2e_test_vpn:
 e2e_test_conditional_downloads:
  image: 0xacab.org:4567/leap/bitmask-dev:latest
-  stage: test
+  stage: e2e
  allow_failure: true
  script:
    - dpkg -l tox gnupg1 haveged  > /dev/null || apt-get -y --no-install-recommends install tox gnupg1 haveged
@@ -91,7 +95,7 @@ e2e_test_conditional_downloads:
 functional_tests:
  image: 0xacab.org:4567/leap/bitmask-dev:latest
-  stage: test
+  stage: e2e
  before_script:
    - dpkg -l tox > /dev/null || apt-get -y --no-install-recommends install tox
    - tox -e py27-dev --notest
@@ -127,7 +131,7 @@ functional_tests:
 build_ui:
  image: 0xacab.org:4567/leap/bitmask-dev:latest
-  stage: test
+  stage: e2e
  script:
    - cd ui && make dev-build
  tags:
@@ -258,3 +262,14 @@ package:amd64_artful:
    # unless all lintian warnings are fixed (#9033)
    LINTIAN_OPTS: "-X filename-length, --suppress-tags newer-standards-version"
  <<: *job_definition
+package:amd64_bionic:
+  variables:
+    ARCH: "amd64"
+    DIST: "bionic"
+    REPONAMES: "client"
+    # Default is to fail on warnings, we disable it here
+    # unless all lintian warnings are fixed (#9033)
+    LINTIAN_OPTS: "-X filename-length, --suppress-tags newer-standards-version"
+  <<: *job_definition
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ ANONVPN_DIST=dist/anonvpn
 ANONVPN_DIST_VERSION = $(ANONVPN_DIST)-$(NEXT_VERSION)/
 BITMASK_ROOT = src/leap/bitmask/vpn/helpers/linux/bitmask-root
-POLKIT_POLICY = src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy
+POLKIT_POLICY = src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy
 SUDO = /usr/bin/sudo
 include pkg/bundles/build.mk
@@ -73,7 +73,7 @@ test_functional_graphical_wip:
 install_helpers:
 	# if there's no sudo, assumming this is running as root by the CI
 	test -f $(SUDO) && sudo cp $(BITMASK_ROOT) /usr/local/sbin/ || cp $(BITMASK_ROOT) /usr/local/sbin/
-	test -f $(SUDO) && sudo cp $(POLKIT_POLICY) /usr/share/polkit-1/actions/se.bitmask.bundle.policy || cp $(POLKIT_POLICY) /usr/share/polkit-1/actions/se.bitmask.bundle.policy
+	test -f $(SUDO) && sudo cp $(POLKIT_POLICY) /usr/share/polkit-1/actions/se.leap.bitmask.bundle.policy || cp $(POLKIT_POLICY) /usr/share/polkit-1/actions/se.leap.bitmask.bundle.policy
 install_pixelated:
 	pip install leap.pixelated leap.pixelated-www
@@ -109,6 +109,9 @@ bundle_riseupvpn:
 	# to chown it first.
 	cat pkg/bundle_riseupvpn_from_docker | docker run -i -v /srv/bitmask-builds:/dist -w /dist -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash
+bundle_riseupvpn_osx_in_virtualenv:
+	pkg/build_osx_bundle_riseupvpn_with_venv.sh
 bundle_in_docker_virtualenv:
 	# this runs bundles inside a virtualenv. it is kind of slow because it compiles all python extensions in dependencies each time.
 	cat pkg/bundle_from_docker_venv | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-venv bash
@@ -116,6 +119,15 @@ bundle_in_docker_virtualenv:
 	cp -r bitmaskbuild/$(DIST_VERSION) dist/
 	rm -rf bitmaskbuild
+snap_in_docker:
+	cd pkg/riseupvpn && ./pack_installers && cd ..
+	cp snap/snapcraft.yaml snap/snapcraft.yaml.orig && cd snap && sed -i s/"#PRAGMA:XENIAL "// snapcraft.yaml && cd ..
+	echo "apt update && apt -f install && snapcraft" | sudo docker run -i -v $(PWD):$(PWD) -w $(PWD) snapcore/snapcraft bash
+	mv snap/snapcraft.yaml.orig snap/snapcraft.yaml
+snap_clean:
+	sudo rm -rf stage prime parts
 upload:
 	python setup.py sdist bdist_wheel --universal upload --sign -i kali@leap.se -r pypi

--- a/debian/bitmask-core.install
+++ b/debian/bitmask-core.install
@@ -5,7 +5,8 @@
 /usr/lib/python2.7/dist-packages/leap/bitmask/bonafide/
 /usr/lib/python2.7/dist-packages/leap/bitmask/__init__.py
 /usr/lib/python2.7/dist-packages/leap/bitmask/_version.py
-/usr/lib/python2.7/dist-packages/leap/bitmask/util.py
-/usr/lib/python2.7/dist-packages/leap/bitmask/hooks.py
 /usr/lib/python2.7/dist-packages/leap/bitmask/config.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/hooks.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/system.py
+/usr/lib/python2.7/dist-packages/leap/bitmask/util.py
 /usr/lib/python2.7/dist-packages/leap.bitmask-*.egg-info
--- a/debian/changelog
+++ b/debian/changelog
+bitmask (0.10.7) unstable; urgency=medium
+  * Update to 0.10.7 release.
+ -- meskio <meskio@sindominio.net>  Thu, 12 Jul 2018 19:30:34 +0200
+bitmask (0.10.6) unstable; urgency=medium
+  * Update to 0.10.6 release.
+ -- Kali Kaneko <kali@leap.se>  Thu, 24 May 2018 01:54:34 +0200
+bitmask (0.10.5) unstable; urgency=medium
+  * Update to 0.10.5 release.
+ -- Kali Kaneko <kali@leap.se>  Wed, 28 Mar 2018 23:45:40 +0200
+bitmask (0.10.4) unstable; urgency=medium
+  * Update to 0.10.4 release.
+ -- Kali Kaneko <kali@leap.se>  Fri, 02 Mar 2018 04:07:26 +0100
 bitmask (0.10.3) unstable; urgency=medium
  * Update to 0.10.3 release.

--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Homepage: https://bitmask.net
 Standards-Version: 4.1.0
 Build-Depends: debhelper (>= 9.0.0),
               dh-python,
+               lintian,
               python,
               python-docutils,
               python-setuptools,

--- a/docs/changelog.rst
+++ b/docs/changelog.rst
 Changelog
 =====================
-0.10.4 -  `master`_ 
+0.10.8 -  `master`_ 
 -------------------------------
 .. note:: This version is not yet released and is under active development.
+0.10.6
+-------------------------------
+Bugfixes
+~~~~~~~~
+- Various systray fixes
 Features
 ~~~~~~~~
+- Add support for tcp management on openvpn
+0.10.6
+-------------------------------
+Bugfixes
+~~~~~~~~
+- `#9278 <https://0xacab.org/leap/bitmask-dev/issues/9278>`_: Workaround for QtWebview bug causing a crash.
+Misc
+~~~~
+- Fix snap bug in install hook when python2 was not installed.
+- Install only the polkit file outside of classic confinement snap.
+- Document algorithm for picking bitmask-root.
+- Use LD_LIBRARY_PATH for bitmask_systray in RiseupVPN snap (makes snap run fine in bionic).
+- Move snap folder to topmost folder.
+0.10.5
+-------------------------------
+Misc
+~~~~
+- OSX packaging fixes.
+0.10.4
+-------------------------------
 Bugfixes
 ~~~~~~~~
+- Make check for stale pidfiles fail gracefully.
 Misc
 ~~~~
+- `#9259 <https://0xacab.org/leap/bitmask-dev/issues/9259>`_: Initial snappification of RiseupVPN.
+- `#9260 <https://0xacab.org/leap/bitmask-dev/issues/9259>`_: Install of helpers with classic confinement.
 0.10.3
 ------------------------------

--- a/docs/code-of-conduct.txt
+++ b/docs/code-of-conduct.txt
@@ -29,7 +29,7 @@ Examples of unacceptable behavior by participants include:
 advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others&rsquo; private information, such as a physical or electronic
+* Publishing others private information, such as a physical or electronic
 address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
 professional setting
@@ -59,7 +59,7 @@ further defined and clarified by project maintainers.
 Enforcement
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+reported by contacting the project team at community@leap.se. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.
@@ -67,7 +67,7 @@ Further details of specific enforcement policies may be posted separately.
 Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
-members of the project&rsquo;s leadership.
+members of the project's leadership.
 Attribution

--- a/docs/conf.py
+++ b/docs/conf.py
@@ -61,7 +61,7 @@ author = u'LEAP Encryption Access Project'
 # The short X.Y version.
 version = u'0.10'
 # The full version, including alpha/beta/rc tags.
-release = u'0.10.3'
+release = u'0.10.7'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/docs/hacking/contributing.rst
+++ b/docs/hacking/contributing.rst
@@ -9,7 +9,7 @@ Contributing
 This project adheres to the `Contributor Covenant 1.4`_. By participating you
 are expected to uphold this code. Please report unacceptable behavior to
-info@leap.se.
+community@leap.se.
 * Fork the code at https://0xacab.org/leap/bitmask-dev. New users may be
  limited in how many forks they can have, so if this is a problem for you,
@@ -20,7 +20,7 @@ info@leap.se.
 * Please base your branch for master, and keep it rebased when you push.
 * After review, please squash your commits.
-.. _`Contributor Covenant 1.4`: http://contributor-covenant.org/version/1/4/0
+.. _`Contributor Covenant 1.4`: https://www.contributor-covenant.org/version/1/4/code-of-conduct
 .. _`support ticket`: https://0xacab.org/riseup/0xacab/issues
 .. _`github mirror`: https://github.com/leapcode/bitmask-dev
 .. _`0xacab`: https://0xacab.org/leap/bitmask-dev

--- a/docs/hacking/osx.rst
+++ b/docs/hacking/osx.rst
@@ -5,13 +5,21 @@ Setting up a development environment in OSX™
 .. note: work in progress. send a MR if you spot any mistake or missing info!
+This is a small tutorial to get you started setting a development environment in OSX.
+For developing on a mac, and testing and debugging in a native environment, we tend to focus on the last two releases (Sierra and High Sierra at the time of writing this).
+However, for compatibility reasons, we choose an older release for shipping bundles with the maximum compatibility. See the :ref:`OSX Virtualization <osx-vms>` page for tips on getting a virtualized Yosemite inside virtualbox.
 * You will need to install xcode and the command line developer tools (``xcode-select --install``).
-* Use ``brew`` to install ``OpenSSL``: ``brew install openssl``
+* Use ``brew`` to install ``OpenSSL`` and some other dependencies::
+  brew install openssl
+  brew install zeromq  # needed for shipping the libs for riseupvpn for the moment.
 * Install ``wget``: ``brew install wget`` (interestingly, this installs openssl 1.1, which we might want in order not to use the python scrypt extension).
-* Install a recent python: ``brew install python``
+* Install a recent python: ``brew install python2``
 * Put the installed python in your path: ``echo 'export PATH="/usr/local/opt/python/libexec/bin:$PATH"' >> ~/.bash_profile``
@@ -60,6 +68,11 @@ And, to load it again::
  sudo launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist
+For convenience while developing, you can find a Makefile to install and load
+the helpers in ``pkg/tools/osx``. Be aware that, for the time being, Bitmask
+and RiseupVPN share the same bitmask-helper, so you should have installed only
+one of them at the same time.
 Debugging bitmask-helper
 ------------------------
@@ -69,7 +82,7 @@ socket. If you need to debug the privileged helper (for instance, if you need to
 tear down the firewall after a crash), you can do it like this with
 ``socat``::
-  echo 'firewall_stop/CMD' | socat - UNIX-CONNECT:/tmp/bitmask-helper.socket
+  echo 'firewall_stop/CMD' | socat - UNIX-CONNECT:/var/run/bitmask-helper.socket
 Other helpers
@@ -91,11 +104,38 @@ installed to the same path mentioned in the previous section.
 Uninstalling
 ===================================
-There's an uninstall script in `pkg/osx/uninstall.sh`.
+There's an uninstall script in `pkg/osx/uninstall.sh`. This is bundled with Bitmask.app
+Troubleshooting
+===================================
+Debug logs
+----------
+Bitmask rotates logs. The latest one can be found at::
+  /Users/<youruser>/Library/Preferences/leap/bitmaskd.log
+Conflicting python versions
+---------------------------
+From time to time, you will find issues regarding conflicting python versions in your machine.
+The best you can do for this is to tell explicitely which python to use when creating a virtualenv::
+  virtualenv --python=/usr/local/Cellar/python@2/2.7.15/bin/python venv
+In general, to fix some issues, it's a good idea to update also openssl::
+  brew update
+  brew reinstall openssl
+  brew reinstall python2
 Installing the bundle with homebrew
 ===================================
+**unused at the moment, but it can be interesting to bring it back**
 For testing purposes, `homebrew`_ can be used to distribute and install
 experimental versions of the bundle. This should download and install the
 latest version of the bundle::
@@ -110,13 +150,6 @@ After that, you should be able to launch the bundle::
 .. _`homebrew`: https://brew.sh/
-Debug logs
----------
-Bitmask rotates logs. The latest one can be found at::
-  /Users/<youruser>/Library/Preferences/leap/bitmaskd.log
 Known Issues
 ------------

--- a/pkg/branding/riseupvpn.svg
+++ b/pkg/branding/riseupvpn.svg
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   viewBox="0 0 33.866666 33.866668"
-   version="1.1"
-   id="svg896"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="riseupvpn-launcher.svg">
-  <defs
-     id="defs890" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#d7d7d7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.12"
-     inkscape:cx="26.899914"
-     inkscape:cy="56.22909"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:window-width="1869"
-     inkscape:window-height="1025"
-     inkscape:window-x="51"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1471"
-       empspacing="4" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata893">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-263.13332)">
-    <path
-       style="fill:#006cb2;fill-opacity:1;stroke-width:0.26458335"
-       d="M 15.617988,295.66418 C 9.9401302,292.50672 5.6959906,287.52131 4.7342129,282.87951 4.4622971,281.56718 4.4516145,281.24899 4.4519256,274.47112 l 2.394e-4,-6.47461 0.5616386,-0.36177 c 2.3734615,-1.52883 4.8841786,-2.55103 7.4419094,-3.06699 5.221864,-1.05337 10.639669,0.003 15.485448,3.16684 l 0.398232,0.25998 v 6.50684 c 0,6.8044 -0.01093,7.13134 -0.280843,8.43104 -0.956329,4.6043 -4.632206,9.09553 -10.057782,12.28874 -1.576255,0.9277 -1.527525,0.91863 -2.382844,0.44299 z"
-       id="path5137"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccssscssscc" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#007cc3;fill-opacity:1;stroke-width:0.26458335"
-       d="m 16.396917,264.17336 c -1.317958,-4.7e-4 -2.635612,0.13103 -3.941076,0.39437 -2.5577318,0.51596 -5.068528,1.53812 -7.4419895,3.06696 l -0.5615828,0.36177 -4.707e-4,6.47466 c -2.394e-4,6.77787 0.010371,7.096 0.2822554,8.40832 0.9617776,4.64181 5.2059168,9.62724 10.8837756,12.7847 h 1.19e-4 c 0.368953,0.20517 0.569745,0.32326 0.805249,0.31706 v -31.80747 c -0.0088,-2e-5 -0.01755,-4.8e-4 -0.02641,-4.8e-4 z"
-       id="path887" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458338"
-       d="m 16.989143,272.54844 c 0,0 -0.315707,-0.61165 -0.336761,-0.69601 -0.02106,-0.0844 -0.189431,-0.94909 -0.189431,-0.94909 l 0.210485,-0.37963 0.463046,-0.696 0.673531,-0.52727 0.168377,-0.0633 1.620684,-0.61164 0.147331,-0.14764 -0.168385,-0.25308 -0.231523,-0.12655 -0.424879,-0.10907 -1.064407,-0.10907 -0.825967,0.007 -0.568293,0.12654 -0.505146,-0.18981 -0.63143,-0.0844 -0.9261,-0.0211 -0.463054,-0.0211 -0.778761,0.29527 -1.178677,1.37091 -0.147339,0.52727 -0.08418,0.464 -0.399908,0.86473 -0.252577,0.82254 -0.126285,0.88582 v 0.18982 l -0.610384,0.92799 -0.336761,0.69601 v 0.99126 l 0.10523,2.04581 0.189431,0.73821 0.378861,0.6749 0.4841,0.44292 0.210477,0.8647 0.799815,1.77155 0.947154,1.13886 0.06311,0.0633 0.336761,1.70835 -1.157623,2.10911 -0.363408,0.28169 -0.272426,0.22054 -0.467179,-0.0129 -0.260603,0.13452 -0.316122,0.0134 -0.190994,0.19047 -0.408963,-0.0616 -0.4044091,-0.0196 -0.311982,0.24606 -0.044916,0.36556 0.207365,-0.23472 0.3488649,-0.10158 0.03654,0.33552 0.5512672,-0.18726 0.316122,-0.0134 0.557721,0.0667 c 0,0 0.483518,-0.0316 0.567216,-0.0407 0.0837,-0.009 0.597276,0.0411 0.597276,0.0411 l 0.376644,-0.041 0.199723,0.0844 0.267456,-0.0716 0.290265,0.13818 0.418488,-0.0455 0.05401,-0.28169 -0.01596,-0.14678 0.28571,0.0962 0.232049,0.18692 0.150642,0.21701 -0.0088,-0.27495 -0.182953,-0.31946 c 0,0 -0.125159,-0.17737 -0.208857,-0.16824 -0.0837,0.009 -0.408971,-0.0616 -0.408971,-0.0616 l -0.223321,0.088 -0.243857,-0.10085 -0.239677,0.13226 -0.220665,-0.0822 -0.106491,-0.20049 -0.153322,-0.0471 0.164763,-0.42962 0.378861,-0.52859 0.505146,-0.84364 0.442,-0.5273 0.168385,-0.21088 c 0,0 0.210477,-0.31633 0.210477,-0.40071 0,-0.0844 0.04212,-0.97016 0.04212,-0.97016 l -0.273623,-0.56947 -0.126285,-0.46402 2.441546,0.59059 h 0.147331 l 2.083731,1.49744 0.294669,0.37959 0.10523,1.49729 -0.04212,0.33746 -0.147338,0.27419 -0.105358,0.16875 -0.09101,0.23675 -0.06215,0.1583 -0.386712,0.11988 -0.393086,-0.0709 -0.238209,-0.0294 -0.437428,0.0633 -0.184118,0.19713 -0.07084,0.24475 0.05712,0.24744 0.09172,-0.24769 0.124641,-0.16724 0.121984,-0.0388 0.0094,0.21174 0.163957,0.10406 0.338995,-0.15563 0.166646,-0.0242 0.05409,0.22658 0.508999,-0.01 0.345035,-0.11394 0.282886,0.0443 0.410893,0.047 0.142823,-0.0417 0.112881,-0.10156 0.182442,0.37841 0.0024,-0.42654 -0.176722,-0.48581 -0.256358,-0.15463 0.04324,-0.12712 -0.189423,-0.35849 0.02106,-1.37079 1.052392,1.2444 1.389154,1.09674 c 0,0 0.947146,0.33749 1.03133,0.33749 0.08419,0 0.736677,-0.0844 0.736677,-0.0844 l 0.420954,-0.69598 -0.315715,-0.94908 0.126284,-0.31642 -0.673531,-0.88574 -1.426794,-1.45279 -0.341213,-1.14141 0.02106,-0.78037 -0.315707,-0.82257 -0.357816,-0.65376 0.210477,-0.65377 -0.168377,-0.94904 -0.717785,-1.61568 0.265151,-0.0448 -0.444984,-0.77034 0.289101,-0.0918 -0.508218,-0.82847 0.213764,-0.11524 -0.380944,-0.62543 0.124202,-0.0696 -0.460971,-0.37337 0.168384,-0.0875 -1.199723,-0.84051 z"
-       id="path5892"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccsccccccccccccscccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccc" />
-  </g>
-</svg>
--- a/pkg/build_osx_bundle_riseupvpn_with_venv.sh
+++ b/pkg/build_osx_bundle_riseupvpn_with_venv.sh
+#!/bin/bash
+###########################################################
+# Build a RiseupVPN bundle inside a fresh virtualenv (OSX).
+###########################################################
+# Stop bundling in case of errors
+set -e
+VENV=venv
+echo "[+] BUILDING RiseupVPN BUNDLE..."
+echo "[+] GIT VERSION" `git describe`
+if [ ! -d "$VENV" ]; then
+  echo "[+] creating virtualenv in venv"
+  virtualenv $VENV
+fi
+source "$VENV"/bin/activate
+echo "[+] Using venv in" $VIRTUAL_ENV
+$VIRTUAL_ENV/bin/pip install -U pyinstaller
+$VIRTUAL_ENV/bin/pip install zope.interface zope.proxy
+$VIRTUAL_ENV/bin/pip install -r pkg/requirements-vpn.pip
+# Get the bundled libzmq
+$VIRTUAL_ENV/bin/pip install -I pyzmq --install-option="--zmq=bundled"
+# Install bitmask in development mode
+$VIRTUAL_ENV/bin/pip install -e .
+# Get latest tags from repo
+git fetch --tags
+make bundle_anonvpn_osx
--- a/pkg/bundles/build.mk
+++ b/pkg/bundles/build.mk
 # This makefile should be called from the topmost bitmask folder
-#
 OSX_RES = dist/Bitmask.app/Contents/Resources
 OSX_CON = dist/Bitmask.app/Contents/MacOS
+OSX_ANON_RES= dist/RiseupVPN.app/Contents/Resources
+OSX_ANON_CON= dist/RiseupVPN.app/Contents/MacOS
 OSX_CERT = "Developer ID Installer: LEAP Encryption Access Project"
 BUILD_RELEASE?=no
@@ -128,7 +130,7 @@ bundle_headless:
 	mkdir -p $(HEADLESS_DIST)/leap/soledad/client/_db
 	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/soledad/client/_db/dbschema.sql $(HEADLESS_DIST)/leap/soledad/client/_db/
 	echo `git describe` > $(HEADLESS_DIST)/version
-	mv $(HEADLESS_DIST) _bundlelib && mkdir $(HEADLESS_DIST_VERSION) && mv _bundlelib $(HEADLESS_DIST_VERSION)lib/
+	mv $(HEADLESS_DIST) _bundlelib && mkdir -p $(HEADLESS_DIST_VERSION) && mv _bundlelib $(HEADLESS_DIST_VERSION)lib/
 	ln $(HEADLESS_DIST_VERSION)lib/bitmask-nox $(HEADLESS_DIST_VERSION)lib/bitmask
 	mkdir -p $(HEADLESS_DIST_VERSION)apps/mail
 	test -f /usr/bin/gpg1 && cp /usr/bin/gpg1 $(HEADLESS_DIST_VERSION)apps/mail/gpg || cp /usr/bin/gpg $(HEADLESS_DIST_VERSION)apps/mail/gpg
@@ -136,14 +138,24 @@ bundle_headless:
 	cp release-notes.rst $(HEADLESS_DIST_VERSION)
 	cp pkg/launcher/bitmask $(HEADLESS_DIST_VERSION)
+icons_riseup:
+	# if this fails, you need to install (does not work on yosemite):
+	# brew install imagemagick --with-librsvg
+	pkg/osx/makeicons.sh pkg/branding/riseupvpn.svg
+	mv icon.icns pkg/branding/riseupvpn.icns
 bundle_anonvpn:
 	pyinstaller -y pkg/pyinst/anonvpn.spec
+	# rm pkg/branding/riseupvpn.icns
+	rm -rf icon.iconset
 	cp src/leap/bitmask/core/bitmaskd.tac $(ANONVPN_DIST)
 	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem $(ANONVPN_DIST)/
 	echo `git describe` > $(ANONVPN_DIST)/version
-	mv $(ANONVPN_DIST) _bundlelib && mkdir $(ANONVPN_DIST_VERSION) && mv _bundlelib $(ANONVPN_DIST_VERSION)lib/
+	mv $(ANONVPN_DIST) _bundlelib && mkdir -p $(ANONVPN_DIST_VERSION) && mv _bundlelib $(ANONVPN_DIST_VERSION)lib/
 	mkdir -p $(ANONVPN_DIST_VERSION)/apps/providers
 	cp -r src/leap/bitmask/bonafide/providers/* $(ANONVPN_DIST_VERSION)/apps/providers/
+bundle_anonvpn_helpers_linux:
 	# openvpn
 	mkdir -p $(ANONVPN_DIST_VERSION)/apps/vpn
 	wget https://downloads.leap.se/thirdparty/linux/openvpn/openvpn-x64 -O $(ANONVPN_DIST_VERSION)/apps/vpn/openvpn.leap
@@ -153,4 +165,36 @@ bundle_anonvpn:
 	cp src/leap/bitmask/vpn/helpers/linux/bitmask-root $(ANONVPN_DIST_VERSION)/apps/helpers/
 	cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.bundle.policy $(ANONVPN_DIST_VERSION)/apps/helpers/
-bundle_anonvpn_linux: bundle_anonvpn 
+bundle_anonvpn_osx_missing:
+	mv $(OSX_ANON_CON)/anonvpn $(OSX_ANON_CON)/bitmask-app
+	cp pkg/osx/bitmask-wrapper $(OSX_ANON_CON)/anonvpn
+	mkdir -p $(OSX_ANON_RES)/bitmask-helper
+	cp -r pkg/osx/openvpn/* $(OSX_ANON_RES)/
+	cp -r pkg/osx/daemon/* $(OSX_ANON_RES)/bitmask-helper/
+	mkdir -p $(OSX_ANON_RES)/../apps/providers
+	cp -r src/leap/bitmask/bonafide/providers/* $(OSX_ANON_RES)/../apps/providers/
+	cp -r $(ANONVPN_DIST_VERSION)/apps/providers/* $(OSX_ANON_RES)/../apps/providers
+	cp src/leap/bitmask/vpn/helpers/osx/bitmask-helper $(OSX_ANON_RES)/bitmask-helper/
+	chmod +x $(OSX_ANON_RES)/bitmask-helper/bitmask-helper
+	sed "s/.*Bitmask.app.*/APP_PATH='\/Applications\/RiseupVPN\.app\/'/" $(OSX_ANON_RES)/bitmask-helper/bitmask-helper > $(OSX_ANON_RES)/bitmask-helper/bitmask-helper2 && mv $(OSX_ANON_RES)/bitmask-helper/bitmask-helper2 $(OSX_ANON_RES)/bitmask-helper/bitmask-helper
+	cp src/leap/bitmask/vpn/helpers/osx/bitmask.pf.conf $(OSX_ANON_RES)/bitmask-helper/
+	cp pkg/osx/scripts-riseupvpn/se.leap.bitmask-helper.plist $(OSX_ANON_RES)/bitmask-helper/
+	wget https://downloads.leap.se/thirdparty/osx/openvpn/openvpn -O $(OSX_ANON_RES)/openvpn.leap
+	chmod +x $(OSX_ANON_RES)/openvpn.leap
+bundle_anonvpn_osx_pkg:
+	cp src/leap/bitmask/core/bitmaskd.tac $(OSX_ANON_CON)/
+	cp ../bitmask-systray/bitmask-systray $(OSX_ANON_CON)/bitmask-systray
+	cp /usr/local/opt/zeromq/lib/libzmq.5.dylib $(OSX_ANON_CON)/libzmq.5.dylib
+	install_name_tool -change /usr/local/opt/zeromq/lib/libzmq.5.dylib "@loader_path/libzmq.5.dylib" $(OSX_ANON_CON)/bitmask-systray
+	pkg/osx/quickpkg --output dist/RiseupVPN-$(NEXT_VERSION)_pre.pkg --scripts pkg/osx/scripts-riseupvpn/ dist/RiseupVPN.app/
+	@if [ $(BUILD_RELEASE) = no ]; then\
+		echo "[!] BUILD_RELEASE=no, skipping signature";\
+	else\
+		echo "[+] Signing the bundle";\
+		productsign --sign $(OSX_CERT) dist/RiseupVPN-$(NEXT_VERSION)_pre.pkg dist/RiseupVPN-$(NEXT_VERSION).pkg;\
+	fi
+bundle_anonvpn_linux: bundle_anonvpn bundle_anonvpn_helpers_linux
+bundle_anonvpn_osx: bundle_anonvpn bundle_anonvpn_osx_missing bundle_anonvpn_osx_pkg
--- a/pkg/next-version
+++ b/pkg/next-version
-0.10.4
+0.10.8
--- a/pkg/osx/README
+++ b/pkg/osx/README
+Removed all osx packaging scripts for now.
+Maintenance now happens in riseup_vpn repo.
--- a/pkg/osx/README.rst
+++ b/pkg/osx/README.rst
-Helper files needed for OSX
-===========================
-* The bitmask-helper that is run as root can be found in the source tree, in
-``src/leap/bitmask/vpn/helpers/osx``.
-* python ``daemon`` is a dependency for the bitmask-helper, here it is vendored.
-* The plist file ``se.leap.bitmask-helper.plist`` (this should be installed into
-  /Library/LaunchDaemons/se.leap.bitmask-helper.plist).
-* OpenVPN up/down scripts: ``openvpn/client.down.sh`` and
-  ``openvpn/client.up.sh``.
--- a/pkg/osx/bitmask-wrapper
+++ b/pkg/osx/bitmask-wrapper
-#!/bin/sh
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-exec $DIR/bitmask-app
--- a/pkg/osx/bitmask.icns
+++ b/pkg/osx/bitmask.icns
--- a/pkg/osx/daemon/LICENSE
+++ b/pkg/osx/daemon/LICENSE
-Copying
-=======
-This work, ‘python-daemon’, is free software: you may copy, modify,
-and/or distribute this work under certain conditions; see the relevant
-files for specific grant of license. No warranty expressed or implied.
-* Parts of this work are licensed to you under the terms of the GNU
-General Public License as published by the Free Software Foundation;
-version 3 of that license or any later version.
-See the file ‘LICENSE.GPL-3’ for details.
-* Parts of this work are licensed to you under the terms of the Apache
-License, version 2.0 as published by the Apache Software Foundation.
-See the file ‘LICENSE.ASF-2’ for details.
No results found