Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-09-22 13:35:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

feat: bump external packages version

Browse source
This commit is contained in:
Ben Grande 2025-01-08 16:34:02 +01:00
parent bfe192b802
commit b182a44bb1
No known key found for this signature in database
GPG key ID: 00C64E14F51F9E56
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
salt/electrum/configure-builder.sls
View file

@ -1,5 +1,5 @@
{# {#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
@ -12,7 +12,7 @@ include:
- dotfiles.copy-sh - dotfiles.copy-sh
## https://download.electrum.org/VERSION/Electrum-VERSION.tar.gz(.asc) ## https://download.electrum.org/VERSION/Electrum-VERSION.tar.gz(.asc)
{% set electrum_version = '4.5.5' -%} {% set electrum_version = '4.5.8' -%}
{% set electrum_url_dir = 'https://download.electrum.org/' ~ electrum_version ~ '/' -%} {% set electrum_url_dir = 'https://download.electrum.org/' ~ electrum_version ~ '/' -%}
{% set electrum_archive_dir = 'Electrum-' ~ electrum_version -%} {% set electrum_archive_dir = 'Electrum-' ~ electrum_version -%}
{% set electrum_file_archive = electrum_archive_dir ~ '.tar.gz' -%} {% set electrum_file_archive = electrum_archive_dir ~ '.tar.gz' -%}

11
salt/sys-electrs/configure-builder-source.sls
View file

@ -1,16 +1,21 @@
{# {#
SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2024 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' -%} {% if grains['nodename'] != 'dom0' -%}
{#
ElectRS dependencies might break builds in case they don't set correct Cargo
properties to rebuild if a previously statically linked build was done.
See: https://github.com/romanz/electrs/issues/1001
#}
{% set electrs_obj_type = 'tag' -%} {% set electrs_obj_type = 'tag' -%}
{% if electrs_obj_type == 'commit' -%} {% if electrs_obj_type == 'commit' -%}
{% set electrs_obj = 'ea9a924fd321086029f3e719ee8e3fff385ba8cd' -%} {% set electrs_obj = '6bfaba99d5c7c598b5e067e3bc70041bc645b84a' -%}
{% else -%} {% else -%}
{% set electrs_obj = 'v0.10.6' -%} {% set electrs_obj = 'v0.10.8' -%}
{% endif -%} {% endif -%}
{% set cfg_me_version = '0.1.1' -%} {% set cfg_me_version = '0.1.1' -%}

21
salt/sys-mirage-firewall/create.sls
View file

@ -1,21 +1,21 @@
{# {#
SPDX-FileCopyrightText: 2022 Thien Tran <contact@tommytran.io> SPDX-FileCopyrightText: 2022 Thien Tran <contact@tommytran.io>
SPDX-FileCopyrightText: 2023 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2023 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: MIT SPDX-License-Identifier: MIT
#} #}
{%- from "qvm/template.jinja" import load -%} {%- from "qvm/template.jinja" import load -%}
{% set mirage_version = 'v0.9.2' -%} {% set mirage_version = 'v0.9.3' -%}
{% set mirage_sha256sum = '78a1ee52574b9a4fc5eda265922bcbcface90f7c43ed7a68dc8e201a2ac0a7dc' %} {% set mirage_sha256sum = 'b78d6711b502f8babcc5c4083b0352b78be8e8a6bef044189ce7a00e6e564612' %}
{% set mirage_file_kernel = 'qubes-firewall.xen' -%} {% set mirage_file_kernel = 'qubes-firewall.xen' -%}
{% set mirage_url_kernel = 'https://github.com/mirage/qubes-mirage-firewall/releases/download/' ~ mirage_version ~ '/' ~ mirage_file_kernel -%} {% set mirage_url_kernel = 'https://github.com/mirage/qubes-mirage-firewall/releases/download/' ~ mirage_version ~ '/' ~ mirage_file_kernel -%}
{# Use the netvm of the default_netvm. #} {# Use the netvm of the default_netvm. #}
{% set default_netvm = salt['cmd.shell']('qubes-prefs default_netvm') -%} {% set default_netvm = salt['cmd.shell']('qubes-prefs -- default_netvm') -%}
{% set netvm = salt['cmd.shell']('qvm-prefs ' + default_netvm + ' netvm') -%} {% set netvm = salt['cmd.shell']('qvm-prefs -- ' + default_netvm + ' netvm') -%}
{# {#
If netvm of default_netvm is empty, user's default_netvm is the first in If netvm of default_netvm is empty, user's default_netvm is the first in
the chain (sys-net). the chain (sys-net).
@ -25,7 +25,7 @@ the chain (sys-net).
{% endif %} {% endif %}
{# The 'updatevm' has networking and 'curl' present. #} {# The 'updatevm' has networking and 'curl' present. #}
{% set updatevm = salt['cmd.shell']('qubes-prefs updatevm') %} {% set updatevm = salt['cmd.shell']('qubes-prefs -- updatevm') %}
"sys-mirage-firewall-start-updatevm-{{ updatevm }}": "sys-mirage-firewall-start-updatevm-{{ updatevm }}":
qvm.start: qvm.start:
@ -36,7 +36,7 @@ the chain (sys-net).
- require: - require:
- qvm: "sys-mirage-firewall-start-updatevm-{{ updatevm }}" - qvm: "sys-mirage-firewall-start-updatevm-{{ updatevm }}"
- name: | - name: |
qvm-run {{ updatevm }} -- " qvm-run --no-gui -- {{ updatevm }} "
mkdir -p -- /tmp/mirage-firewall-download mkdir -p -- /tmp/mirage-firewall-download
cd /tmp/mirage-firewall-download cd /tmp/mirage-firewall-download
curl --location \ curl --location \
@ -61,12 +61,15 @@ the chain (sys-net).
cmd.run: cmd.run:
- require: - require:
- file: "sys-mirage-firewall-create-temporary-kernel-directory" - file: "sys-mirage-firewall-create-temporary-kernel-directory"
- name: qvm-run --pass-io {{ updatevm }} -- "cat /tmp/mirage-firewall-download/qubes-firewall.xen" | tee -- /tmp/mirage-firewall-download/vmlinuz >/dev/null - name: |
qvm-run --no-gui --pass-io -- {{ updatevm }} \
"cat -- /tmp/mirage-firewall-download/qubes-firewall.xen" | \
tee -- /tmp/mirage-firewall-download/vmlinuz >/dev/null
- timeout: 10 - timeout: 10
"sys-mirage-firewall-remove-kernel-from-updatevm": "sys-mirage-firewall-remove-kernel-from-updatevm":
cmd.run: cmd.run:
- name: qvm-run {{ updatevm }} -- "rm -rf /tmp/mirage-firewall-download" - name: qvm-run --no-gui -- {{ updatevm }} "rm -rf -- /tmp/mirage-firewall-download"
"sys-mirage-firewall-move-kernel-to-usable-directory": "sys-mirage-firewall-move-kernel-to-usable-directory":
file.managed: file.managed:

4
salt/sys-pihole/install.sls
View file

@ -1,13 +1,13 @@
{# {#
SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org> SPDX-FileCopyrightText: 2022 - 2023 unman <unman@thirdeyesecurity.org>
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com> SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
#} #}
{% if grains['nodename'] != 'dom0' %} {% if grains['nodename'] != 'dom0' %}
{% set pihole_tag = 'v5.18.3' -%} {% set pihole_tag = 'v5.18.4' -%}
include: include:
- utils.tools.common.update - utils.tools.common.update