release: restore ZUPT and harden source-only 5.2.2
This commit is contained in:
Cristian Cezar Moisés
parent
74e393ba3e
commit
ff99770bd0
205 changed files with 19627 additions and 13215 deletions
|
|
@ -1,17 +1,17 @@
|
|||
;;; SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
;;; Copyright (c) 2026 Cristian Cezar Moisés
|
||||
;;;
|
||||
;;; GNU Guix package definitions for VaptVupt (CLI + PySide6 GUI).
|
||||
;;; GNU Guix package definitions for ZUPT (CLI + PySide6 GUI).
|
||||
;;; Source-only build (no vendored libraries): the CLI links only libc/libm/
|
||||
;;; pthread from the store.
|
||||
;;;
|
||||
;;; Install into your profile (additive; keeps everything else):
|
||||
;;; guix package -f packaging/guix/vaptvupt.scm ; installs the GUI
|
||||
;;; guix package -f packaging/guix/zupt.scm ; installs the GUI
|
||||
;;; guix package -e '(@ (guix) …)' — or, for the CLI on its own:
|
||||
;;; guix install -f packaging/guix/vaptvupt.scm ; (last expr = GUI)
|
||||
;;; guix install -f packaging/guix/zupt.scm ; (last expr = GUI)
|
||||
;;; The last expression is the GUI, which carries the CLI as an input; to get
|
||||
;;; the `vaptvupt` command in your profile too, also run:
|
||||
;;; guix package --install-from-expression='(begin (load "packaging/guix/vaptvupt.scm") vaptvupt)'
|
||||
;;; the `zupt` command in your profile too, also run:
|
||||
;;; guix package --install-from-expression='(begin (load "packaging/guix/zupt.scm") zupt)'
|
||||
;;;
|
||||
;;; GUI-on-Guix note: PySide6's Qt6 links several leaf libraries (libGL from
|
||||
;;; mesa, libxkbcommon, the X11/xcb family, libzstd, harfbuzz, icu, ...) that are
|
||||
|
|
@ -62,29 +62,30 @@
|
|||
xcb-util-renderutil xcb-util-wm xcb-util-cursor
|
||||
libinput-minimal mtdev libevdev eudev))
|
||||
|
||||
(define %vaptvupt-version "5.2.1")
|
||||
(define %zupt-version "5.2.2")
|
||||
|
||||
(define %vaptvupt-source
|
||||
(define %zupt-source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://git.securityops.co/cristiancmoises/vaptvupt"
|
||||
"/releases/download/v" %vaptvupt-version
|
||||
"/vaptvupt-" %vaptvupt-version ".tar.gz"))
|
||||
"https://github.com/cristiancmoises/zupt"
|
||||
"/releases/download/v" %zupt-version
|
||||
"/zupt-" %zupt-version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1mzl5za5k80x74p1hb9kfi199fs74ymmlcdhhxkzxr9ls8gpg6z2"))))
|
||||
(base32 "REPLACE_AFTER_FINAL_RELEASE_ARCHIVE_IS_BUILT"))))
|
||||
|
||||
(define-public vaptvupt
|
||||
(define-public zupt
|
||||
(package
|
||||
(name "vaptvupt")
|
||||
(version %vaptvupt-version)
|
||||
(source %vaptvupt-source)
|
||||
(name "zupt")
|
||||
(version %zupt-version)
|
||||
(source %zupt-source)
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:make-flags
|
||||
#~(list (string-append "PREFIX=" #$output)
|
||||
"WITH_SDK=0"
|
||||
"WITH_PQBOX=0"
|
||||
(string-append "CC=" #$(cc-for-target)))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
|
|
@ -94,38 +95,49 @@
|
|||
;; SP 800-38A, RFC 4231/7748) are the crypto gate.
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "make" "WITH_SDK=0"
|
||||
(invoke "make" "WITH_SDK=0" "WITH_PQBOX=0"
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
"test-vectors")
|
||||
(invoke "./test_vectors")))))))
|
||||
(home-page "https://git.securityops.co/cristiancmoises/vaptvupt")
|
||||
(home-page "https://github.com/cristiancmoises/zupt")
|
||||
(synopsis "Post-quantum backup compression utility")
|
||||
(description
|
||||
"VaptVupt (formerly Zupt) is a pure-C11 backup compressor with native
|
||||
"ZUPT is a pure-C11 backup compressor with native
|
||||
post-quantum encryption. Two in-tree PQ modes: @code{--pq} hybridizes
|
||||
ML-KEM-768 (FIPS 203, validated against OpenSSL) with X25519 (recommended), and
|
||||
ML-KEM-768 with X25519 (recommended), and
|
||||
@code{--pq-only} uses ML-KEM-768 alone for @dfn{PQ-only} compliance postures.
|
||||
Payload protection is AES-256-CTR + HMAC-SHA256 Encrypt-then-MAC with a fresh
|
||||
random per-block nonce and measured constant-time tag comparison; AES-NI/SHA-NI
|
||||
dispatch at runtime; the embedded VaptVupt 2.60.4 LZ+ANS codec ships
|
||||
CBMC-verified BCJ filters. Password mode uses PBKDF2-SHA256. The tool is
|
||||
AGPL-3.0-or-later; the embedded codec is GPL-3.0-or-later.")
|
||||
(license (list license:agpl3+ license:gpl3+))))
|
||||
random per-block nonce; AES-NI/SHA-NI dispatch at runtime; the bundled
|
||||
VaptVupt 2.65.3 LZ+ANS codec has portable fallbacks. Password mode uses
|
||||
PBKDF2-SHA256. The tool is
|
||||
AGPL-3.0-or-later; the embedded codec is GPL-3.0-or-later; the two
|
||||
xxHash-derived XXH64 units additionally carry BSD-2-Clause; and portions of
|
||||
native ML-KEM adapted from pq-crystals/kyber carry CC0-1.0. Native X25519
|
||||
portions adapted from curve25519-donna retain BSD-3-Clause.
|
||||
The x86 BCJ filter and SHA-NI path also record their public-domain LZMA SDK
|
||||
and SHA-Intrinsics origins; installed NOTICE and THIRD-PARTY-NOTICES.md carry
|
||||
the full provenance record.")
|
||||
(license (list license:agpl3+ license:gpl3+ license:bsd-2 license:bsd-3 license:cc0))))
|
||||
|
||||
(define-public vaptvupt-gui
|
||||
(define-public zupt-gui
|
||||
(package
|
||||
(name "vaptvupt-gui")
|
||||
(version %vaptvupt-version)
|
||||
(source (package-source vaptvupt)) ; same release tarball
|
||||
(name "zupt-gui")
|
||||
(version %zupt-version)
|
||||
(source (package-source zupt)) ; same release tarball
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:install-plan
|
||||
#~'(("gui/src/zupt_gui.py" "lib/vaptvupt-gui/")
|
||||
#~'(("gui/src/zupt_gui.py" "lib/zupt-gui/")
|
||||
("gui/assets/zupt-icon.png"
|
||||
"share/icons/hicolor/256x256/apps/vaptvupt-gui.png")
|
||||
("gui/README.md" "share/doc/vaptvupt-gui/")
|
||||
("gui/LICENSE-GUI" "share/doc/vaptvupt-gui/"))
|
||||
"share/icons/hicolor/256x256/apps/zupt-gui.png")
|
||||
("gui/README.md" "share/doc/zupt-gui/")
|
||||
("LICENSE-AGPL-3.0"
|
||||
"share/licenses/zupt-gui/LICENSE-AGPL-3.0")
|
||||
("gui/LICENSE-GUI"
|
||||
"share/licenses/zupt-gui/LICENSE-GUI")
|
||||
("gui/assets/README.md"
|
||||
"share/licenses/zupt-gui/ASSET-PROVENANCE.md"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'make-launcher
|
||||
|
|
@ -133,10 +145,10 @@ AGPL-3.0-or-later; the embedded codec is GPL-3.0-or-later.")
|
|||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(gui (string-append
|
||||
out "/lib/vaptvupt-gui/zupt_gui.py"))
|
||||
out "/lib/zupt-gui/zupt_gui.py"))
|
||||
(sh (search-input-file inputs "/bin/sh"))
|
||||
(python3 (search-input-file inputs "/bin/python3"))
|
||||
(cli (search-input-file inputs "/bin/vaptvupt"))
|
||||
(cli (search-input-file inputs "/bin/zupt"))
|
||||
(pyside (assoc-ref inputs "python-pyside-6"))
|
||||
(site (car (find-files pyside "^site-packages$"
|
||||
#:directories? #t)))
|
||||
|
|
@ -156,32 +168,31 @@ AGPL-3.0-or-later; the embedded codec is GPL-3.0-or-later.")
|
|||
(list (string-append zstdlib "/lib")))
|
||||
":")))
|
||||
(mkdir-p bin)
|
||||
(call-with-output-file (string-append bin "/vaptvupt-gui")
|
||||
(call-with-output-file (string-append bin "/zupt-gui")
|
||||
(lambda (port)
|
||||
(format port "#!~a
|
||||
export VAPTVUPT_BIN=\"~a\"
|
||||
export ZUPT_BIN=\"~a\"
|
||||
export GUIX_PYTHONPATH=\"~a:~a${GUIX_PYTHONPATH:+:}$GUIX_PYTHONPATH\"
|
||||
export QT_PLUGIN_PATH=\"~a/lib/qt6/plugins:~a/lib/qt6/plugins${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH\"
|
||||
export LD_LIBRARY_PATH=\"~a${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH\"
|
||||
exec \"~a\" \"~a\" \"$@\"\n"
|
||||
sh cli site shsite qtbase qtwl ldpath python3 gui)))
|
||||
(chmod (string-append bin "/vaptvupt-gui") #o755)
|
||||
(symlink "vaptvupt-gui" (string-append bin "/zupt-gui")))))
|
||||
(chmod (string-append bin "/zupt-gui") #o755))))
|
||||
(add-after 'make-launcher 'install-desktop-file
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(apps (string-append out "/share/applications")))
|
||||
(mkdir-p apps)
|
||||
(call-with-output-file
|
||||
(string-append apps "/vaptvupt-gui.desktop")
|
||||
(string-append apps "/zupt-gui.desktop")
|
||||
(lambda (port)
|
||||
(format port "[Desktop Entry]
|
||||
Type=Application
|
||||
Name=VaptVupt
|
||||
Name=ZUPT
|
||||
GenericName=Post-Quantum Backup
|
||||
Comment=Compress, encrypt and restore .zupt archives
|
||||
Exec=~a/bin/vaptvupt-gui %F
|
||||
Icon=vaptvupt-gui
|
||||
Exec=~a/bin/zupt-gui %F
|
||||
Icon=zupt-gui
|
||||
Terminal=false
|
||||
Categories=Utility;Archiving;Security;
|
||||
MimeType=application/x-zupt;
|
||||
|
|
@ -189,20 +200,20 @@ Keywords=backup;encryption;post-quantum;compression;zupt;\n"
|
|||
out)))))))))
|
||||
(inputs
|
||||
(append (list bash-minimal python python-pyside-6 python-shiboken-6
|
||||
qtbase qtwayland vaptvupt
|
||||
qtbase qtwayland zupt
|
||||
(list zstd "lib")) ; libzstd.so.1 is in zstd's "lib" output
|
||||
%gui-runtime-libs))
|
||||
(home-page "https://git.securityops.co/cristiancmoises/vaptvupt")
|
||||
(synopsis "Desktop frontend for the VaptVupt post-quantum backup tool")
|
||||
(home-page "https://github.com/cristiancmoises/zupt")
|
||||
(synopsis "Desktop frontend for the ZUPT post-quantum backup tool")
|
||||
(description
|
||||
"PySide6 (Qt 6) graphical frontend for VaptVupt: create, inspect and
|
||||
"PySide6 (Qt 6) graphical frontend for ZUPT: create, inspect and
|
||||
extract @code{.zupt} archives with password or post-quantum recipient
|
||||
encryption, including the @code{--pq} hybrid and @code{--pq-only} full
|
||||
post-quantum modes. The launcher pins the matching @code{vaptvupt} CLI from the
|
||||
store via @env{VAPTVUPT_BIN} and sets @env{LD_LIBRARY_PATH} to the Qt6 leaf
|
||||
post-quantum modes. The launcher pins the matching @code{zupt} CLI from the
|
||||
store via @env{ZUPT_BIN} and sets @env{LD_LIBRARY_PATH} to the Qt6 leaf
|
||||
libraries PySide6 needs but does not carry in its RUNPATH.")
|
||||
(license license:agpl3+)))
|
||||
|
||||
;; `guix package -f' evaluates the file's last expression — the GUI, which
|
||||
;; carries the CLI as an input.
|
||||
vaptvupt-gui
|
||||
zupt-gui
|
||||
Loading…
Reference in a new issue