GUI rework for source-only builds + CLI security fixes + packaging + cross-platform scaffolding
Fixes the "GUI functions don't work on GNU Guix" report and a batch of
adversarial-audit findings across the CLI, decoder, crypto and packaging.
GUI (gui/src/zupt_gui.py)
- Root cause of the broken GUI: every encryption path defaulted to the
libzuptsdk "SDK v2" modes, which are absent from the source-only build and
exit 1. Reworked Keys/Compress/Extract around the native modes with a
build-aware PQ-mode selector: Hybrid (--pq, default), Full PQ (--pq-only),
and SDK v2 only when the binary reports WITH_SDK support. Capability is
detected from `version` ("Build:"/"KDF:" lines) with a `help` fallback.
- Extract/Verify gain a PQ private-key input with auto-detect (reads the
archive via `info` to pick --pq vs --pq-only). Verify could not verify any
PQ archive before (password field only).
- run_async now holds a LIST of in-flight (thread, worker) refs; DiskTab's two
buttons previously shared one slot, so a second op GC'd the first QThread
mid-run. About tab corrected (codec 2.60.4, PBKDF2 default, --pq-only, URL).
CLI (src/zupt_main.c)
- compress -p <archive> <files> swallowed the archive name as the password and
truncated the first input file (silent data loss, exit 0). Added a
data-loss guard: refuse to overwrite an existing non-.zupt file as the output
archive unless -y/--force; plus a self-overwrite guard.
- compress <archive> <src> -p <pw> wrote an UNENCRYPTED archive (exit 0)
because options after the first positional were treated as files. Now errors
on a misplaced option (with a `--` escape for real dashed filenames).
- Removed duplicated dead --pq-box/--pq-sdk branches. version/banner/usage now
state the build's real KDF (PBKDF2 on source-only) and repo URL; examples
lead with native --pq / --pq-only.
Security (audit findings)
- vv_decoder.c: the two AVX2 fast-path token decoders read a 2-/3-byte match
offset after only checking 1 byte remained -> heap over-read on a crafted
archive. Added the `ip + off_bytes > ip_end` guard the tail path already had.
- zupt_crypto.c: wipe ML-KEM/X25519 secret-key buffers when hybrid decrypt
init fails on key read (matches the pq-only path).
- zupt_format.c: bound attacker-controlled encryption_header_off before the
(off_t)+7 arithmetic in the info enc_type reader (avoid signed-overflow UB).
Packaging (would fail source-only)
- debian/rules (staged into debian/zupt, installed vendored .so), aur/PKGBUILD,
nix/flake.nix, homebrew (vendored .so + nonexistent AUDIT.md, stale /zupt
URLs) now build source-only. opensuse spec %files ships the shell completions
make install writes (rpmbuild no longer fails on unpackaged files);
_service + debian/control point at the vaptvupt repo; KDF claim corrected.
Cross-platform GUI packaging (new)
- packaging/portable/: OS-agnostic GUI package (zupt_gui.py + .bat/.command/.sh
launchers + README) that runs on Windows/macOS/Linux/BSD with Python+PySide6.
- .github/workflows/cross-platform.yml: builds real native binaries on
windows-latest + macos-latest runners (CLI, PyInstaller GUI, Inno Setup
installer, .dmg) and the portable zip, attaching them to the release on tag.
- packaging/windows/vaptvupt-gui.iss: Inno Setup installer script.
Validation: make check 16/16 (all distro-safe checks), GUI imports + command
contracts verified against the fixed CLI. test_help_consistency updated to
assert the truthful (build-aware) default KDF.
This commit is contained in:
Cristian Cezar Moisés
parent
e8f7b3adb2
commit
43d6306a06
19 changed files with 750 additions and 169 deletions
|
|
@ -18,7 +18,7 @@ replaces=('zupt')
|
|||
conflicts=('zupt')
|
||||
pkgdesc='Pure-C11 post-quantum backup compression utility (AES-256-CTR + HMAC-SHA256 + ML-KEM-768 + X25519)'
|
||||
arch=('x86_64' 'aarch64')
|
||||
url='https://git.securityops.co/cristiancmoises/zupt'
|
||||
url='https://git.securityops.co/cristiancmoises/vaptvupt'
|
||||
license=('AGPL-3.0-or-later')
|
||||
depends=('glibc')
|
||||
makedepends=('gcc')
|
||||
|
|
@ -26,39 +26,31 @@ checkdepends=('python')
|
|||
|
||||
# Replace SHA256 placeholder with output of:
|
||||
# sha256sum /tmp/zupt-2.4.4.tar.gz
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://git.securityops.co/cristiancmoises/zupt/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://git.securityops.co/cristiancmoises/vaptvupt/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
build() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
# Strict-warning build that the project's own §6 verification matrix uses.
|
||||
# Source-only build (WITH_SDK=0) with the project's strict warning set.
|
||||
CFLAGS="${CFLAGS:--O2 -std=c11} -Wall -Wextra -Wpedantic" \
|
||||
make -j"$(nproc)"
|
||||
make WITH_SDK=0 -j"$(nproc)"
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
# Project regression suite — F-06 HMAC, F-08 top-MAC, F-09 byte sweep, etc.
|
||||
make test
|
||||
# Distro-safe regression subset (F-06..F-12, dedup-nonce, NIST/RFC vectors).
|
||||
make WITH_SDK=0 check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" PREFIX=/usr install
|
||||
# Source-only build (no vendored libraries); `make install` places the
|
||||
# binary, the zupt symlink, the man pages and the shell completions.
|
||||
make DESTDIR="${pkgdir}" PREFIX=/usr WITH_SDK=0 install
|
||||
|
||||
# Docs that aren't part of `make install`
|
||||
install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
|
||||
install -Dm644 SECURITY.md "${pkgdir}/usr/share/doc/${pkgname}/SECURITY.md"
|
||||
install -Dm644 CHANGELOG.md "${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG.md"
|
||||
install -Dm644 AUDIT.md "${pkgdir}/usr/share/doc/${pkgname}/AUDIT.md"
|
||||
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
|
||||
# Vendored libzuptsdk shipped alongside the binary because the binary
|
||||
# is linked with -Wl,-rpath,$ORIGIN/vendor/zuptsdk. For system install
|
||||
# we move it to /usr/lib/zupt/ and the binary's rpath remains relative.
|
||||
install -d "${pkgdir}/usr/lib/${pkgname}"
|
||||
install -Dm755 vendor/zuptsdk/libzuptsdk.so.2.0.0 \
|
||||
"${pkgdir}/usr/lib/${pkgname}/libzuptsdk.so.2.0.0"
|
||||
ln -sf libzuptsdk.so.2.0.0 "${pkgdir}/usr/lib/${pkgname}/libzuptsdk.so.2"
|
||||
ln -sf libzuptsdk.so.2.0.0 "${pkgdir}/usr/lib/${pkgname}/libzuptsdk.so"
|
||||
install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
|
||||
install -Dm644 SECURITY.md "${pkgdir}/usr/share/doc/${pkgname}/SECURITY.md"
|
||||
install -Dm644 CHANGELOG.md "${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG.md"
|
||||
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ Build-Depends:
|
|||
libc6-dev,
|
||||
python3 (>= 3.8)
|
||||
Standards-Version: 4.6.2
|
||||
Homepage: https://git.securityops.co/cristiancmoises/zupt
|
||||
Vcs-Browser: https://git.securityops.co/cristiancmoises/zupt
|
||||
Vcs-Git: https://git.securityops.co/cristiancmoises/zupt.git
|
||||
Homepage: https://git.securityops.co/cristiancmoises/vaptvupt
|
||||
Vcs-Browser: https://git.securityops.co/cristiancmoises/vaptvupt
|
||||
Vcs-Git: https://git.securityops.co/cristiancmoises/vaptvupt.git
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: vaptvupt
|
||||
|
|
@ -24,7 +24,7 @@ Description: Post-quantum backup compression utility (formerly Zupt)
|
|||
a pure-C11 backup compression utility featuring:
|
||||
* Post-quantum hybrid encryption (ML-KEM-768 + X25519, FIPS 203)
|
||||
* AES-256-CTR + HMAC-SHA256 authenticated encryption (Encrypt-then-MAC)
|
||||
* Argon2id password-based key derivation (default since 2.4.1)
|
||||
* PBKDF2-SHA256 password key derivation (Argon2id in WITH_SDK=1 builds)
|
||||
* Multi-threaded compression with the VaptVupt LZ + ANS codec 2.48.5
|
||||
* Full-disk backup and restore with sparse-region detection
|
||||
* End-to-end byte-level tamper detection on encrypted archives
|
||||
|
|
|
|||
|
|
@ -14,20 +14,18 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
|
|||
dh $@
|
||||
|
||||
override_dh_auto_build:
|
||||
$(MAKE) -j$$(nproc)
|
||||
# Source-only build: no vendored libraries, native crypto only.
|
||||
$(MAKE) WITH_SDK=0 -j$$(nproc)
|
||||
|
||||
override_dh_auto_test:
|
||||
# Project's own regression suite covers F-06..F-12.
|
||||
$(MAKE) test
|
||||
# Distro-safe regression subset (F-06..F-12, dedup-nonce, NIST/RFC vectors).
|
||||
$(MAKE) WITH_SDK=0 check
|
||||
|
||||
override_dh_auto_install:
|
||||
$(MAKE) DESTDIR=$(CURDIR)/debian/zupt PREFIX=/usr install
|
||||
# Vendored libzuptsdk goes alongside the binary at a relative rpath.
|
||||
install -d $(CURDIR)/debian/zupt/usr/lib/zupt
|
||||
install -m 0755 vendor/zuptsdk/libzuptsdk.so.2.0.0 \
|
||||
$(CURDIR)/debian/zupt/usr/lib/zupt/libzuptsdk.so.2.0.0
|
||||
ln -sf libzuptsdk.so.2.0.0 $(CURDIR)/debian/zupt/usr/lib/zupt/libzuptsdk.so.2
|
||||
ln -sf libzuptsdk.so.2.0.0 $(CURDIR)/debian/zupt/usr/lib/zupt/libzuptsdk.so
|
||||
# Binary package is `vaptvupt` -> stage into debian/vaptvupt (dh derives the
|
||||
# staging dir from the Package: name in debian/control). Source-only: nothing
|
||||
# to install beyond `make install` (no .so).
|
||||
$(MAKE) DESTDIR=$(CURDIR)/debian/vaptvupt PREFIX=/usr WITH_SDK=0 install
|
||||
|
||||
override_dh_auto_clean:
|
||||
$(MAKE) clean
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
|
||||
class Vaptvupt < Formula
|
||||
desc "Post-quantum backup compression utility (ML-KEM-768 + AES-256-CTR + HMAC-SHA256)"
|
||||
homepage "https://git.securityops.co/cristiancmoises/zupt"
|
||||
url "https://git.securityops.co/cristiancmoises/zupt/releases/download/v4.2.1/vaptvupt-4.2.1.tar.gz"
|
||||
homepage "https://git.securityops.co/cristiancmoises/vaptvupt"
|
||||
url "https://git.securityops.co/cristiancmoises/vaptvupt/releases/download/v4.2.1/vaptvupt-4.2.1.tar.gz"
|
||||
version "4.2.1"
|
||||
sha256 "REPLACE_WITH_SHA256_OF_RELEASE_TARBALL"
|
||||
license "AGPL-3.0-or-later"
|
||||
|
|
@ -31,30 +31,16 @@ class Vaptvupt < Formula
|
|||
depends_on "python@3.12" => :test # only for test-suite tamper harness
|
||||
|
||||
def install
|
||||
# macOS build: no Jasmin, C-fallback crypto paths are used.
|
||||
# The Makefile auto-detects Jasmin availability and falls back cleanly.
|
||||
# Source-only build (WITH_SDK=0): native crypto only, no vendored libraries.
|
||||
# macOS uses the C-fallback crypto paths (no Jasmin); the Makefile detects
|
||||
# this and falls back cleanly.
|
||||
ENV["CFLAGS"] = "#{ENV.cflags} -O2 -std=c11 -Wall -Wextra"
|
||||
|
||||
system "make", "-j#{ENV.make_jobs}"
|
||||
system "make", "DESTDIR=#{prefix}", "PREFIX=", "install"
|
||||
system "make", "WITH_SDK=0", "-j#{ENV.make_jobs}"
|
||||
system "make", "DESTDIR=#{prefix}", "PREFIX=", "WITH_SDK=0", "install"
|
||||
|
||||
# Vendored libzuptsdk goes into lib/zupt/ with @loader_path rpath.
|
||||
# Note: Linux ships .so.2.0.0; macOS .dylib equivalent must be built
|
||||
# separately by the vendored makefile. For the initial Homebrew
|
||||
# submission this assumes the upstream tarball includes a .dylib build;
|
||||
# if not, build it here.
|
||||
lib_zupt = lib/"zupt"
|
||||
lib_zupt.mkpath
|
||||
if File.exist?("vendor/zuptsdk/libzuptsdk.dylib")
|
||||
cp "vendor/zuptsdk/libzuptsdk.dylib", lib_zupt
|
||||
elsif File.exist?("vendor/zuptsdk/libzuptsdk.so.2.0.0")
|
||||
# Fallback: link Linux-style .so on macOS (works for direct loads but
|
||||
# not for dlopen-on-Darwin scenarios). Upstream is tracking this.
|
||||
cp "vendor/zuptsdk/libzuptsdk.so.2.0.0", lib_zupt
|
||||
end
|
||||
|
||||
# Docs
|
||||
doc.install "README.md", "SECURITY.md", "CHANGELOG.md", "AUDIT.md"
|
||||
# Docs (no vendored .so/.dylib in the source-only build).
|
||||
doc.install "README.md", "SECURITY.md", "CHANGELOG.md"
|
||||
end
|
||||
|
||||
test do
|
||||
|
|
|
|||
|
|
@ -52,48 +52,38 @@
|
|||
# hardening flags. Don't override -O2 from stdenv.
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -std=c11";
|
||||
|
||||
# `make` builds the binary using vendored libzuptsdk via rpath.
|
||||
# Source-only build (WITH_SDK=0): native crypto, no vendored libraries.
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make -j$NIX_BUILD_CORES
|
||||
make WITH_SDK=0 -j$NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# Run the full upstream regression suite. Disable per-package by
|
||||
# setting doCheck = false; on by default.
|
||||
# Distro-safe regression subset. Disable with doCheck = false;.
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
make test
|
||||
make WITH_SDK=0 check
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
make DESTDIR=$out PREFIX= install
|
||||
|
||||
# Move libzuptsdk into $out/lib/zupt/. The binary's rpath is
|
||||
# $ORIGIN/../lib/zupt after autopatchelf rewrites it during
|
||||
# the fixup phase.
|
||||
mkdir -p $out/lib/zupt
|
||||
install -m 0755 vendor/zuptsdk/libzuptsdk.so.2.0.0 \
|
||||
$out/lib/zupt/libzuptsdk.so.2.0.0
|
||||
ln -sf libzuptsdk.so.2.0.0 $out/lib/zupt/libzuptsdk.so.2
|
||||
ln -sf libzuptsdk.so.2.0.0 $out/lib/zupt/libzuptsdk.so
|
||||
make DESTDIR=$out PREFIX= WITH_SDK=0 install
|
||||
|
||||
# Docs
|
||||
mkdir -p $out/share/doc/zupt
|
||||
cp README.md SECURITY.md CHANGELOG.md AUDIT.md $out/share/doc/zupt/
|
||||
mkdir -p $out/share/doc/vaptvupt
|
||||
cp README.md SECURITY.md CHANGELOG.md $out/share/doc/vaptvupt/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "Post-quantum backup compression utility (ML-KEM-768 + AES-256-CTR + HMAC-SHA256 + Argon2id)";
|
||||
homepage = "https://git.securityops.co/cristiancmoises/zupt";
|
||||
description = "Post-quantum backup compression utility (ML-KEM-768 + X25519 + AES-256-CTR + HMAC-SHA256)";
|
||||
homepage = "https://git.securityops.co/cristiancmoises/vaptvupt";
|
||||
license = with licenses; [ agpl3Plus gpl3Plus ];
|
||||
maintainers = [ ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
mainProgram = "zupt";
|
||||
mainProgram = "vaptvupt";
|
||||
};
|
||||
};
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<services>
|
||||
<service name="tar_scm" mode="manual">
|
||||
<param name="url">https://github.com/cristiancmoises/zupt</param>
|
||||
<param name="url">https://github.com/cristiancmoises/vaptvupt</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">v4.2.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
|
|
|
|||
|
|
@ -97,6 +97,11 @@ chmod +x tests/*.sh
|
|||
%doc README.md SECURITY.md CHANGELOG.md
|
||||
%{_bindir}/vaptvupt
|
||||
%{_bindir}/zupt
|
||||
%{_datadir}/bash-completion/completions/vaptvupt
|
||||
%{_datadir}/bash-completion/completions/zupt
|
||||
%{_datadir}/zsh/site-functions/_vaptvupt
|
||||
%{_datadir}/zsh/site-functions/_zupt
|
||||
%{_datadir}/fish/vendor_completions.d/vaptvupt.fish
|
||||
%{_mandir}/man1/vaptvupt.1%{?ext_man}
|
||||
%{_mandir}/man1/zupt.1%{?ext_man}
|
||||
|
||||
|
|
|
|||
57
packaging/portable/README.txt
Normal file
57
packaging/portable/README.txt
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
VaptVupt GUI — portable cross-platform package
|
||||
==============================================
|
||||
|
||||
The VaptVupt GUI is a single Python file (zupt_gui.py) built on Qt for Python
|
||||
(PySide6, or PyQt6 as a fallback). It runs on Windows, macOS, Linux and the
|
||||
BSDs — anywhere Python 3 and a Qt binding are installed. This portable package
|
||||
contains the GUI plus a launcher for each platform; it drives the `vaptvupt`
|
||||
command-line tool under the hood.
|
||||
|
||||
Contents
|
||||
--------
|
||||
zupt_gui.py The GUI (PySide6 / PyQt6).
|
||||
vaptvupt-gui.bat Windows launcher.
|
||||
vaptvupt-gui.command macOS launcher (double-clickable in Finder).
|
||||
vaptvupt-gui.sh Linux / BSD launcher.
|
||||
assets/zupt-icon.png Application icon.
|
||||
|
||||
Requirements
|
||||
------------
|
||||
1. Python 3.8 or newer.
|
||||
Windows: https://python.org (tick "Add python.exe to PATH")
|
||||
macOS: python.org, or `brew install python`
|
||||
Linux: your distro's python3 package
|
||||
FreeBSD: pkg install python311
|
||||
OpenBSD: pkg_add python%3
|
||||
2. A Qt binding:
|
||||
pip (any OS): python3 -m pip install PySide6
|
||||
Debian/Ubuntu: sudo apt install python3-pyqt6
|
||||
Fedora/RHEL: sudo dnf install python3-pyqt6
|
||||
FreeBSD: pkg install py311-pyside6
|
||||
OpenBSD: pkg_add py3-pyside6
|
||||
3. The vaptvupt CLI, either:
|
||||
* placed next to the launcher (vaptvupt.exe on Windows, vaptvupt
|
||||
elsewhere) — the launcher auto-detects it via VAPTVUPT_BIN, or
|
||||
* installed on PATH (deb/rpm/AppImage/Homebrew/pkg — see the project
|
||||
release page).
|
||||
|
||||
Running
|
||||
-------
|
||||
Windows: double-click vaptvupt-gui.bat
|
||||
macOS: double-click vaptvupt-gui.command
|
||||
(first run: right-click > Open to bypass Gatekeeper for an
|
||||
unsigned script, or `xattr -dr com.apple.quarantine .`)
|
||||
Linux/BSD: ./vaptvupt-gui.sh
|
||||
|
||||
Troubleshooting
|
||||
---------------
|
||||
* "requires PySide6 or PyQt6" -> install a Qt binding (requirement 2).
|
||||
* "vaptvupt not found" -> put the CLI next to the launcher or on PATH.
|
||||
* Set VAPTVUPT_DEBUG=1 to print the binary-discovery log to stderr.
|
||||
|
||||
Fully self-contained native installers (Windows .exe/.msi, macOS .dmg) that
|
||||
bundle Python + Qt + the CLI are produced by the project's CI on real Windows
|
||||
and macOS runners — see the release page. This portable package is the
|
||||
dependency-light option that works identically on every platform.
|
||||
|
||||
License: AGPL-3.0-or-later. Project: https://git.securityops.co/cristiancmoises/vaptvupt
|
||||
31
packaging/portable/vaptvupt-gui.bat
Normal file
31
packaging/portable/vaptvupt-gui.bat
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
@echo off
|
||||
rem SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
rem VaptVupt GUI launcher for Windows (portable package).
|
||||
rem
|
||||
rem Requirements on the target machine:
|
||||
rem * Python 3.8+ (https://python.org — tick "Add python.exe to PATH")
|
||||
rem * PySide6 or PyQt6: py -m pip install PySide6
|
||||
rem * The vaptvupt CLI: vaptvupt.exe next to this file, or on PATH.
|
||||
rem
|
||||
rem If vaptvupt.exe sits beside this launcher we pin it via VAPTVUPT_BIN so the
|
||||
rem GUI drives the bundled CLI rather than any other copy on PATH.
|
||||
setlocal
|
||||
set "HERE=%~dp0"
|
||||
if exist "%HERE%vaptvupt.exe" set "VAPTVUPT_BIN=%HERE%vaptvupt.exe"
|
||||
|
||||
rem Prefer the py launcher, fall back to python on PATH.
|
||||
where py >nul 2>nul
|
||||
if %ERRORLEVEL%==0 (
|
||||
py -3 "%HERE%zupt_gui.py" %*
|
||||
) else (
|
||||
python "%HERE%zupt_gui.py" %*
|
||||
)
|
||||
set "RC=%ERRORLEVEL%"
|
||||
if not "%RC%"=="0" (
|
||||
echo.
|
||||
echo vaptvupt-gui exited with code %RC%.
|
||||
echo If you saw an import error, install the Qt binding: py -m pip install PySide6
|
||||
echo If the CLI was not found, put vaptvupt.exe next to this launcher or on PATH.
|
||||
pause
|
||||
)
|
||||
endlocal
|
||||
17
packaging/portable/vaptvupt-gui.command
Normal file
17
packaging/portable/vaptvupt-gui.command
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# VaptVupt GUI launcher for macOS (portable package).
|
||||
# Double-clickable in Finder (.command). Requirements on the target Mac:
|
||||
# * Python 3.8+ (python.org, Homebrew `brew install python`, or Xcode CLT)
|
||||
# * PySide6 or PyQt6: python3 -m pip install PySide6
|
||||
# * The vaptvupt CLI: `vaptvupt` next to this file, or on PATH
|
||||
# (Homebrew: `brew install cristiancmoises/tap/vaptvupt`).
|
||||
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
[ -x "$HERE/vaptvupt" ] && export VAPTVUPT_BIN="$HERE/vaptvupt"
|
||||
|
||||
PY="$(command -v python3 || command -v python || true)"
|
||||
if [ -z "$PY" ]; then
|
||||
osascript -e 'display alert "VaptVupt GUI" message "Python 3 not found. Install it from python.org or `brew install python`, then run: python3 -m pip install PySide6"' 2>/dev/null
|
||||
echo "Python 3 not found." >&2; exit 1
|
||||
fi
|
||||
exec "$PY" "$HERE/zupt_gui.py" "$@"
|
||||
21
packaging/portable/vaptvupt-gui.sh
Normal file
21
packaging/portable/vaptvupt-gui.sh
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# VaptVupt GUI launcher for Linux and the BSDs (portable package).
|
||||
# Requirements on the target system:
|
||||
# * Python 3.8+
|
||||
# * PySide6 or PyQt6
|
||||
# Debian/Ubuntu: sudo apt install python3-pyqt6
|
||||
# Fedora/RHEL: sudo dnf install python3-pyqt6
|
||||
# FreeBSD: pkg install py311-pyside6 (or py311-qt6-pyqt)
|
||||
# OpenBSD: pkg_add py3-pyside6
|
||||
# any OS via pip: python3 -m pip install PySide6
|
||||
# * The vaptvupt CLI: `vaptvupt` next to this file, or on PATH.
|
||||
HERE="$(cd "$(dirname "$0")" && pwd)"
|
||||
[ -x "$HERE/vaptvupt" ] && export VAPTVUPT_BIN="$HERE/vaptvupt"
|
||||
|
||||
PY="$(command -v python3 || command -v python || true)"
|
||||
if [ -z "$PY" ]; then
|
||||
echo "vaptvupt-gui: Python 3 not found on PATH." >&2
|
||||
exit 1
|
||||
fi
|
||||
exec "$PY" "$HERE/zupt_gui.py" "$@"
|
||||
73
packaging/windows/vaptvupt-gui.iss
Normal file
73
packaging/windows/vaptvupt-gui.iss
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
; SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
; Inno Setup script for the VaptVupt GUI Windows installer.
|
||||
;
|
||||
; Compiled by the cross-platform CI (.github/workflows/cross-platform.yml) with:
|
||||
; ISCC.exe /DAppVersion=<version> packaging/windows/vaptvupt-gui.iss
|
||||
; after PyInstaller has produced dist\vaptvupt-gui.exe (a onefile bundle that
|
||||
; already contains Python, PySide6 and vaptvupt.exe). Requires Inno Setup 6+.
|
||||
;
|
||||
; To build locally on Windows: install Inno Setup, then run the same ISCC line
|
||||
; from the repo root (with dist\vaptvupt-gui.exe present).
|
||||
|
||||
#ifndef AppVersion
|
||||
#define AppVersion "0.0.0"
|
||||
#endif
|
||||
|
||||
[Setup]
|
||||
AppName=VaptVupt
|
||||
AppVersion={#AppVersion}
|
||||
AppPublisher=Cristian Cezar Moises
|
||||
AppPublisherURL=https://git.securityops.co/cristiancmoises/vaptvupt
|
||||
DefaultDirName={autopf}\VaptVupt
|
||||
DefaultGroupName=VaptVupt
|
||||
UninstallDisplayIcon={app}\vaptvupt-gui.exe
|
||||
OutputDir=packaging\windows\Output
|
||||
OutputBaseFilename=VaptVupt-Setup-{#AppVersion}
|
||||
Compression=lzma2
|
||||
SolidCompression=yes
|
||||
ArchitecturesAllowed=x64compatible
|
||||
ArchitecturesInstallIn64BitMode=x64compatible
|
||||
WizardStyle=modern
|
||||
LicenseFile=LICENSE
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
|
||||
[Files]
|
||||
; PyInstaller onefile bundle (Python + PySide6 + the GUI + vaptvupt.exe).
|
||||
Source: "dist\vaptvupt-gui.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||
; Ship the raw CLI too so it can be added to PATH and used from a terminal.
|
||||
Source: "vaptvupt.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist
|
||||
Source: "README.md"; DestDir: "{app}"; Flags: ignoreversion isreadme
|
||||
Source: "CHANGELOG.md"; DestDir: "{app}"; Flags: ignoreversion
|
||||
|
||||
[Icons]
|
||||
Name: "{group}\VaptVupt"; Filename: "{app}\vaptvupt-gui.exe"
|
||||
Name: "{group}\Uninstall VaptVupt"; Filename: "{uninstallexe}"
|
||||
Name: "{autodesktop}\VaptVupt"; Filename: "{app}\vaptvupt-gui.exe"; Tasks: desktopicon
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "Create a desktop shortcut"; GroupDescription: "Additional icons:"
|
||||
Name: "addtopath"; Description: "Add the vaptvupt CLI to PATH (current user)"; GroupDescription: "Command line:"
|
||||
|
||||
[Registry]
|
||||
; Optionally add the install dir to the user PATH (for the vaptvupt.exe CLI).
|
||||
Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; \
|
||||
ValueData: "{olddata};{app}"; Tasks: addtopath; Check: NeedsAddPath('{app}')
|
||||
|
||||
[Run]
|
||||
Filename: "{app}\vaptvupt-gui.exe"; Description: "Launch VaptVupt"; \
|
||||
Flags: nowait postinstall skipifsilent
|
||||
|
||||
[Code]
|
||||
function NeedsAddPath(Param: string): Boolean;
|
||||
var
|
||||
OrigPath: string;
|
||||
begin
|
||||
if not RegQueryStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', OrigPath) then
|
||||
begin
|
||||
Result := True;
|
||||
exit;
|
||||
end;
|
||||
Result := Pos(';' + ExpandConstant(Param) + ';', ';' + OrigPath + ';') = 0;
|
||||
end;
|
||||
Loading…
Reference in a new issue