Compare commits

...

5 commits
0.6.0 ... main

Author SHA1 Message Date
Morgan McMillian 7d6f6f232c Updated README for new project location 2023-02-10 05:59:08 -08:00
Morgan McMillian cb1aa162ce updated links in README 2022-06-22 06:25:24 -07:00
Morgan McMillian 3eaf32d215 update min clickable version to 7 2022-02-12 10:30:49 -08:00
Morgan McMillian 51b7dea71b don't upgrade pip, bad things happen 2022-02-12 09:41:39 -08:00
Morgan McMillian a36c12ad5c update python version 2021-10-31 08:39:41 -07:00
3 changed files with 15 additions and 36 deletions

View file

@ -1,11 +1,12 @@
# Pantalaimon UT
*This project is no longer in active development.*
End-to-end encryption aware Matrix reverse proxy daemon for Ubuntu Touch.
[source code](https://git.sr.ht/~thrrgilag/pantalaimon-ut) -
[issue tracker](https://todo.sr.ht/~thrrgilag/pantalaimon-ut) -
[mailing list](https://lists.sr.ht/~thrrgilag/pantalaimon-ut) -
[releases](https://git.sr.ht/~thrrgilag/pantalaimon-ut/refs)
[source code](https://git.dreamfall.space/thrrgilag/pantalaimon-ut) -
[issue tracker](https://git.dreamfall.space/thrrgilag/pantalaimon-ut/issues) -
[releases](https://git.dreamfall.space/thrrgilag/pantalaimon-ut/releases)
## TODO
@ -13,12 +14,13 @@ End-to-end encryption aware Matrix reverse proxy daemon for Ubuntu Touch.
- [x] App icon
- [x] Fix image fetching (fixed in fluffychat)
- [x] Cross compile python+pantalaimon
- [-] Import/export keys
- [-] Ability to verify, ignore, or blacklist devices
- [x] Import/export keys (panctl only)
- [x] Ability to verify, ignore, or blacklist devices (panctl only)
## Known Issues
- Previously encrypted messages may not be decrypted
- Slow to sync on certain devices
## panctl
@ -40,13 +42,7 @@ The background daemon (pantalaimon) and shell utility (panctl) are built directl
## Contributing
Report bugs or send patches to
[~thrrgilag/pantalaimon-ut@lists.sr.ht](https://lists.sr.ht/~thrrgilag/pantalaimon-ut).
A tutorial for git send-email can be found at [git-send-email.io](https://git-send-email.io/)
if you're not familiar with this method.
You can also join my public chat room at [#dev:thrrgilag.ems.host](https://matrix.to/#/#dev:thrrgilag.ems.host) or [dev@conference.dreamfall.space](xmpp:dev@conference.dreamfall.space?join) (*xmpp*).
Report bugs or send patches to morgan@mcmillian.dev.
## License

View file

@ -1,5 +1,6 @@
{
"clickable_minimum_required": "6.12.2",
"builder": "cmake",
"kill": "qmlscene"
"always_clean": true,
"clickable_minimum_required": "7",
"kill": "qmlscene",
"builder": "cmake"
}

View file

@ -6,8 +6,8 @@ TMP_DIR="${PROJECT_DIR}/tmp"
OLM_DIR="${PROJECT_DIR}/olm"
PANTALAIMON_DIR="${PROJECT_DIR}/pantalaimon"
PYTHON_VERSION_MINOR="3.7"
PYTHON_VERSION_PATCH="7"
PYTHON_VERSION_MINOR="3.8"
PYTHON_VERSION_PATCH="12"
PYTHON_VERSION="${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}"
PYTHON_DIR="${PROJECT_DIR}/python"
PYTHON_SRC_DIR="${TMP_DIR}/Python-${PYTHON_VERSION}"
@ -19,21 +19,6 @@ mkdir -p "${TMP_DIR}"
PACKAGES="make cmake build-essential zlibc python3-venv libffi-dev ppa-purge libssl-dev libsqlite3-dev zlib1g-dev rustc cargo libgirepository1.0-dev libdbus-1-dev libcairo2-dev"
PANTALAIMON_PATCH_CONTENT="
diff --git a/pantalaimon/main.py b/pantalaimon/main.py
index 896d29e..3e0fee8 100644
--- a/pantalaimon/main.py
+++ b/pantalaimon/main.py
@@ -32,6 +32,7 @@ from pantalaimon.log import logger
from pantalaimon.thread_messages import DaemonResponse
from pantalaimon.ui import UI_ENABLED
+keyring.core.set_keyring(keyring.core.load_keyring('keyring.backends.SecretService.Keyring'))
def create_dirs(data_dir, conf_dir):
try:
"
echo "Remounting RootFS writable..."
sudo mount -o remount,rw /
@ -77,7 +62,6 @@ export LD_LIBRARY_PATH
echo "Updating setuptools..."
${PIP} install --upgrade setuptools
${PIP} install --upgrade pip
${PIP} install --upgrade wheel
echo "Installing PyInstaller..."
@ -102,8 +86,6 @@ CFLAGS=-I${OLM_DIR}/usr/local/include LDFLAGS=-L${OLM_DIR}/usr/local/lib ${PIP}
echo "Bundling Pantalaimon..."
cd ${PROJECT_DIR}
echo "${PANTALAIMON_PATCH_CONTENT}" > main.patch
# patch ${PYTHON_DIR}/lib/python${PYTHON_VERSION_MINOR}/site-packages/pantalaimon/main.py main.patch
${PYTHON_DIR}/bin/pyinstaller --onefile ${PYTHON_DIR}/bin/pantalaimon
${PYTHON_DIR}/bin/pyinstaller --onefile ${PYTHON_DIR}/bin/panctl