Merge branch 'dev' into fix-64

BusKill · May 31, 2023 · 54333ce · 54333ce
2 parents c47d236 + 1435ca1
commit 54333ce
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,14 +101,14 @@ jobs:
         ls -lah
         RELEASE_FILE="`ls -1 | grep buskill-win*.zip | head -n1`"
         echo ${RELEASE_FILE}
-        curl --location --header "authorization: token ${GITHUB_TOKEN}" --header "Content-Type: application/zlib" --data-binary "@${RELEASE_FILE}" "https://uploads.github.com/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${RELEASE_FILE}"
+        curl --verbose --location --http1.1 --header "authorization: token ${GITHUB_TOKEN}" --header "Content-Type: application/zlib" --data-binary "@${RELEASE_FILE}" "https://uploads.github.com/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${RELEASE_FILE}"
       shell: bash
 
     - name: Trigger cryptographic signature workflow
       env:
         BUSKILL_BOT_DISPATCH_TOKEN: ${{ secrets.BUSKILL_BOT_DISPATCH_TOKEN }}
       run: |
-        curl -i --header "Authorization: Bearer ${BUSKILL_BOT_DISPATCH_TOKEN}" -d '{"event_type":"sign_release", "client_payload": {"release_id":"${{ steps.create_release.outputs.id }}"}}' https://api.github.com/repos/${GITHUB_REPOSITORY}/dispatches
+        curl --verbose -i --header "Authorization: Bearer ${BUSKILL_BOT_DISPATCH_TOKEN}" -d '{"event_type":"sign_release", "client_payload": {"release_id":"${{ steps.create_release.outputs.id }}"}}' https://api.github.com/repos/${GITHUB_REPOSITORY}/dispatches
       shell: bash
 
   mac:

diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh
@@ -189,7 +189,10 @@ ${PIP_PATH} download python-gnupg
 ${PYTHON_PATH} -m pip download python-gnupg
 filename="`ls -1 | head -n1`"
 signature_url=`curl -s https://pypi.org/simple/python-gnupg/ | grep -oE "https://.*${filename}#" | sed 's/#/.asc/'`
-wget "${signature_url}"
+#wget "${signature_url}"
+# switching from wget to curl to avoid "dyld Library not loaded" brew issues
+#  * https://github.com/BusKill/buskill-app/issues/70
+curl --remote-name "${signature_url}"
 
 mkdir gnupg
 chmod 0700 gnupg
@@ -215,7 +218,10 @@ pushd "${tmpDir}"
 ${PIP_PATH} download libusb1
 filename="`ls -1 | head -n1`"
 signature_url=`curl -s https://pypi.org/simple/libusb1/ | grep -oE "https://.*${filename}#" | sed 's/#/.asc/'`
-wget "${signature_url}"
+#wget "${signature_url}"
+# switching from wget to curl to avoid "dyld Library not loaded" brew issues
+#  * https://github.com/BusKill/buskill-app/issues/70
+curl --remote-name "${signature_url}"
 
 mkdir gnupg
 chmod 0700 gnupg
@@ -304,11 +310,19 @@ a = Analysis(['../src/main.py'],
              binaries=[],
              datas=[
               ( '../KEYS', '.' ),
+
               # needed for the taskbar icon when the app is running (kivy)
               ('../src/images/buskill-icon-150.png', '.'),
+
               # needed for the icon of the .app when viewed in Finder
               ('buskill-icon.icns', '.'),
-              ('/usr/local/bin/gpg', '.')
+
+              # needed for gpg https://github.com/BusKill/buskill-app/issues/71
+              ('/usr/local/bin/gpg', '.'),
+              ('/usr/local/lib/libgcrypt.20.dylib', '.'),
+              ('/usr/local/lib/libassuan.0.dylib', '.'),
+              ('/usr/local/lib/libnpth.0.dylib', '.'),
+              ('/usr/local/lib/libgpg-error.0.dylib', '.')
              ],
              hiddenimports=['pkg_resources.py2_warn'],
              hookspath=[],

diff --git a/docs/attribution.rst b/docs/attribution.rst
@@ -54,9 +54,9 @@ The reader may be interested to investigate the following similar projects:
  * `s53 <https://github.com/BrassHornCommunications/s53>`_
  * `swatd <https://github.com/defuse/swatd>`_
  * `Centry <https://github.com/0xPoly/Centry>`_
- * `xxUSBSentinel <https://github.com/thereisnotime/xxUSBSentinel>`_
  * `PanicKit <https://guardianproject.info/code/panickit/>`_ & `Ripple <https://guardianproject.info/apps/info.guardianproject.ripple/>`_
- * `Duress <https://github.com/x13a/Duress>`_xxUSBSentinel <https://github.com/thereisnotime/xxUSBSentinel>`_
+ * `Duress <https://github.com/x13a/Duress>`_
+ * `xxUSBSentinel <https://github.com/thereisnotime/xxUSBSentinel>`_
  * `lockup <https://github.com/levlesec/lockup>`_
  * `pam_duress <https://github.com/rafket/pam_duress>`_
  * `pam_panic <https://github.com/pampanic/pam_panic>`_

diff --git a/docs/software_usr/requirements.rst b/docs/software_usr/requirements.rst
@@ -23,7 +23,11 @@ You can help the BusKill project by testing the BusKill app on other platforms a
 +------------+-----------------------------------+-------------------------------------------------------+
 | MacOS      | 10.15 (Catalina)                  | Supported                                             |
 +------------+-----------------------------------+-------------------------------------------------------+
+| MacOS      | 12.6.5 (Monterey)                 | Supported                                             |
++------------+-----------------------------------+-------------------------------------------------------+
+| MacOS      | 13.4 (Ventura)                    | Supported                                             |
++------------+-----------------------------------+-------------------------------------------------------+
 | Linux      | Ubuntu 20.04 LTS (Focal Fossa)    | Supported                                             | 
 +------------+-----------------------------------+-------------------------------------------------------+
-| Linux	     | Ubuntu 18.04 LTS (Bionic)         | Supported						 |
+| Linux	    | Ubuntu 18.04 LTS (Bionic)         | Supported                                             |
 +------------+-----------------------------------+-------------------------------------------------------+