From 32a97903750942fbd88e865e1d0032553323b570 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 12:21:12 -0400 Subject: [PATCH 1/8] qubes-gpg-split: upgrade to 2.0.83 --- qubes-gpg-split/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qubes-gpg-split/APKBUILD b/qubes-gpg-split/APKBUILD index e788a2a..5737155 100644 --- a/qubes-gpg-split/APKBUILD +++ b/qubes-gpg-split/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-gpg-split subpackages="$pkgname-doc" -pkgver=2.0.81 +pkgver=2.0.83 _gittag="v$pkgver" pkgrel=0 pkgdesc="Used Qubes AppVM as a “smart card”" @@ -31,5 +31,5 @@ package() { make install-vm DESTDIR="$pkgdir" } sha512sums=" -78765694e05d2d46aeea859521dcb33b1899dfc0e49ff3d593377c47a3ff86487225f0983f7db5bdd2020463272bdfdcbe066a8dbf87c89c38da14a6fdb3e12f qubes-gpg-split-v2.0.81.tar.gz +a9224c8e57fbb7f17c3cbbfc0f975fe375e4063b96f4a9f327e9791545c356db23c55c1f37612a277615889f104cba1bd2dfb84e190f8b7c80d31a0fda5b29d3 qubes-gpg-split-v2.0.83.tar.gz " From c35b3b9be7579c3f6e513308136a876d7b64f653 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:05:29 -0400 Subject: [PATCH 2/8] ci: main now means r4.4 --- .forgejo/bin/build.sh | 2 +- .forgejo/bin/deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/bin/build.sh b/.forgejo/bin/build.sh index c065c38..ab56866 100755 --- a/.forgejo/bin/build.sh +++ b/.forgejo/bin/build.sh @@ -75,7 +75,7 @@ get_release() { get_qubes_release() { case $BASEBRANCH in r*) echo $BASEBRANCH;; - main) echo r4.3;; + main) echo r4.4;; esac } diff --git a/.forgejo/bin/deploy.sh b/.forgejo/bin/deploy.sh index a75d5e6..2acd4a1 100755 --- a/.forgejo/bin/deploy.sh +++ b/.forgejo/bin/deploy.sh @@ -9,7 +9,7 @@ readonly TARGET_REPO=$CI_ALPINE_REPO get_qubes_release() { case $GITHUB_BASE_REF in r*) echo $GITHUB_BASE_REF;; - main) echo r4.3;; + main) echo r4.4;; esac } From 15da22638e467629448e54b7e317834e97a65e8e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:06:37 -0400 Subject: [PATCH 3/8] *: rebuild for r4.4 --- git-remote-qubes/APKBUILD | 2 +- qubes-app-linux-druide-antidote/APKBUILD | 2 +- qubes-db-vm/APKBUILD | 2 +- qubes-gpg-split/APKBUILD | 2 +- qubes-input-proxy/APKBUILD | 2 +- qubes-libvchan-xen/APKBUILD | 2 +- qubes-meta-packages/APKBUILD | 2 +- qubes-pass/APKBUILD | 2 +- qubes-usb-proxy/APKBUILD | 2 +- qubes-vm-core/APKBUILD | 2 +- qubes-vm-gui-dev/APKBUILD | 2 +- qubes-vm-gui/APKBUILD | 2 +- qubes-vm-qrexec/APKBUILD | 2 +- qubes-vm-utils/APKBUILD | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/git-remote-qubes/APKBUILD b/git-remote-qubes/APKBUILD index 3f3d4f1..31c3896 100644 --- a/git-remote-qubes/APKBUILD +++ b/git-remote-qubes/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=git-remote-qubes pkgver=0.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Inter-VM Git for Qubes OS" url="https://github.com/Rudd-O/git-remote-qubes" license="GPL-3.0-only" diff --git a/qubes-app-linux-druide-antidote/APKBUILD b/qubes-app-linux-druide-antidote/APKBUILD index 8765a19..1340b77 100644 --- a/qubes-app-linux-druide-antidote/APKBUILD +++ b/qubes-app-linux-druide-antidote/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-app-linux-druide-antidote pkgver=0.0.1_git20240201 _gittag=c724c88aa2a20b1e422b464499015ff05753316d -pkgrel=5 +pkgrel=6 arch="noarch" pkgdesc="Qubes Druide-Antidote is a Qubes Application. It send a file to the Antidote Qube, invoke Antidote, and retrieve the file" url=https://github.com/neowutran/qubes-app-linux-druide-antidote diff --git a/qubes-db-vm/APKBUILD b/qubes-db-vm/APKBUILD index 2f1dc0b..647c2cf 100644 --- a/qubes-db-vm/APKBUILD +++ b/qubes-db-vm/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-db-vm subpackages="$pkgname-openrc" pkgver=4.3.2 -pkgrel=1 +pkgrel=2 _gittag="v$pkgver" pkgdesc="QubesDB libs and daemon service." arch="x86_64" diff --git a/qubes-gpg-split/APKBUILD b/qubes-gpg-split/APKBUILD index 5737155..39f314c 100644 --- a/qubes-gpg-split/APKBUILD +++ b/qubes-gpg-split/APKBUILD @@ -4,7 +4,7 @@ pkgname=qubes-gpg-split subpackages="$pkgname-doc" pkgver=2.0.83 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Used Qubes AppVM as a “smart card”" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-split-gpg" diff --git a/qubes-input-proxy/APKBUILD b/qubes-input-proxy/APKBUILD index 8f97c2d..b9ba2ab 100644 --- a/qubes-input-proxy/APKBUILD +++ b/qubes-input-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-input-proxy pkgver=1.0.46 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes service for proxying input devices" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-input-proxy" diff --git a/qubes-libvchan-xen/APKBUILD b/qubes-libvchan-xen/APKBUILD index a0d5869..d95e6f2 100644 --- a/qubes-libvchan-xen/APKBUILD +++ b/qubes-libvchan-xen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-libvchan-xen pkgver=4.2.8 -pkgrel=0 +pkgrel=1 _gittag=v$pkgver pkgdesc="The Qubes core libraries for installation inside a Qubes Dom0 and VM." arch="x86_64" diff --git a/qubes-meta-packages/APKBUILD b/qubes-meta-packages/APKBUILD index 1ad663b..e358257 100644 --- a/qubes-meta-packages/APKBUILD +++ b/qubes-meta-packages/APKBUILD @@ -7,7 +7,7 @@ subpackages=" " pkgver=4.3.7 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="Meta packages for Qubes-specific components" arch="noarch" url="https://github.com/QubesOS/qubes-meta-packages" diff --git a/qubes-pass/APKBUILD b/qubes-pass/APKBUILD index 68df164..bf6720e 100644 --- a/qubes-pass/APKBUILD +++ b/qubes-pass/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-pass pkgver=0.1.0 _gittag="v$pkgver" -pkgrel=7 +pkgrel=8 pkgdesc="An inter-VM password manager for Qubes OS" arch="noarch" url="https://github.com/Rudd-O/qubes-pass" diff --git a/qubes-usb-proxy/APKBUILD b/qubes-usb-proxy/APKBUILD index 6d9ec0a..e960e08 100644 --- a/qubes-usb-proxy/APKBUILD +++ b/qubes-usb-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-usb-proxy pkgver=4.3.5 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 pkgdesc="The Qubes service for proxying USB devices" arch="noarch" url="https://github.com/QubesOS/qubes-app-linux-usb-proxy" diff --git a/qubes-vm-core/APKBUILD b/qubes-vm-core/APKBUILD index 3d54459..155c985 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -9,7 +9,7 @@ subpackages=" $pkgname-pyc " pkgver=4.3.40 -pkgrel=1 +pkgrel=2 _gittag="v$pkgver" pkgdesc="The Qubes core files for installation inside a Qubes VM." arch="x86_64" diff --git a/qubes-vm-gui-dev/APKBUILD b/qubes-vm-gui-dev/APKBUILD index dc3536f..80e58da 100644 --- a/qubes-vm-gui-dev/APKBUILD +++ b/qubes-vm-gui-dev/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-vm-gui-dev pkgver=4.3.1 _gittag="v$pkgver" -pkgrel=2 +pkgrel=3 pkgdesc="Common files for Qubes GUI - protocol headers." arch="noarch" url="https://github.com/QubesOS/qubes-gui-common" diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD index acbcc8e..69d8eda 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -6,7 +6,7 @@ subpackages=" qubes-vm-pipewire $pkgname-openrc" pkgver=4.3.15 -pkgrel=1 +pkgrel=2 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" arch="x86_64" diff --git a/qubes-vm-qrexec/APKBUILD b/qubes-vm-qrexec/APKBUILD index b71428f..47dde43 100644 --- a/qubes-vm-qrexec/APKBUILD +++ b/qubes-vm-qrexec/APKBUILD @@ -4,7 +4,7 @@ pkgname=qubes-vm-qrexec subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" pkgver=4.3.11 _gittag="v$pkgver" -pkgrel=2 +pkgrel=3 pkgdesc="The Qubes qrexec files (qube side)" arch="x86_64" url="https://github.com/QubesOS/qubes-core-qrexec" diff --git a/qubes-vm-utils/APKBUILD b/qubes-vm-utils/APKBUILD index 9fb9519..bb7efbf 100644 --- a/qubes-vm-utils/APKBUILD +++ b/qubes-vm-utils/APKBUILD @@ -7,7 +7,7 @@ subpackages=" $pkgname-pyc " pkgver=4.3.16 -pkgrel=0 +pkgrel=1 _gittag="v$pkgver" pkgdesc="Common Linux files for Qubes VM." arch="x86_64" From 5f09c230ad0febd7e41d5b9f26a23b9d0ec4d3ae Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:33:58 -0400 Subject: [PATCH 4/8] ci: add check for newer version matching current qubes release --- .forgejo/bin/check_ver.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.forgejo/bin/check_ver.sh b/.forgejo/bin/check_ver.sh index c62e678..ff5f9a7 100755 --- a/.forgejo/bin/check_ver.sh +++ b/.forgejo/bin/check_ver.sh @@ -84,6 +84,9 @@ for pkg in $owned_by_you; do else upstream_version=$(curl --fail -X GET -s -H 'Content-Type: application/json' "https://release-monitoring.org/api/project/Alpine/$pkg" | jq -r '.versions.[]' | head -n1) fi + + # check if a newer version available for ${release/r} qubes release + stable_version=$(curl --fail -X GET -s -H 'Content-Type: application/json' "https://release-monitoring.org/api/project/Alpine/$pkg" | jq -r ".versions.[] | match(\"${release/r}.*\").string" | head -n1) ;; esac @@ -96,6 +99,9 @@ for pkg in $owned_by_you; do elif [ "$downstream_version" != "$(printf '%s\n' $upstream_version $downstream_version | sort -V | head -n 1)" ]; then echo "$pkg higher downstream $upstream_version" continue + elif [ "$stable_version" != "$downstream_version" ] && [ -n "$stable_version" ]; then + echo "$pkg newer stable version $stable_version does not match downstream version $downstream_version in $release" + echo "$pkg $downstream_version $upstream_version $release" >> out_of_date elif [ "$upstream_version" != "$downstream_version" ]; then echo "$pkg upstream version $upstream_version does not match downstream version $downstream_version in $release" echo "$pkg $downstream_version $upstream_version $release" >> out_of_date From 53c9af28c68e0c8b01668c530199f2b16007f3fd Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:43:22 -0400 Subject: [PATCH 5/8] README: update to say that it is tracking r4.4 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5509b11..c2fbc79 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Linux template. The upstream repo uses GitLab's CI to build and deploy packages targetting multiple Alpine Linux versions. QubesOS releases are tracked using branches. -Note for `main` branch: This is currently tracking r4.3 packages, thus are -experimental. Use this branch at your own risk. For latest r4.2 packages, +Note for `main` branch: This is currently tracking r4.4 packages, thus are +experimental. Use this branch at your own risk. For latest r4.3 or r4.2 packages, navigate to that branch. #### Template builder @@ -54,7 +54,7 @@ curl -JO https://ayakael.net/api/packages/forge/alpine/key Add repository to `/etc/apk/repositories`: ```shell -echo "https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.3" > /etc/apk/repositories +echo "https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.4" > /etc/apk/repositories ``` From 06ca1db57d2488afabe2cf684510884851577393 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:35:50 -0400 Subject: [PATCH 6/8] qubes-vm-qrexec: upgrade to 4.4.1 --- qubes-vm-qrexec/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qubes-vm-qrexec/APKBUILD b/qubes-vm-qrexec/APKBUILD index 47dde43..e920a23 100644 --- a/qubes-vm-qrexec/APKBUILD +++ b/qubes-vm-qrexec/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-qrexec subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" -pkgver=4.3.11 +pkgver=4.4.1 _gittag="v$pkgver" -pkgrel=3 +pkgrel=0 pkgdesc="The Qubes qrexec files (qube side)" arch="x86_64" url="https://github.com/QubesOS/qubes-core-qrexec" @@ -52,7 +52,7 @@ package() { install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent } sha512sums=" -316f2608294b4e351f74962a23664f545ccf535c4b77e432335ceb5f937dc8655d82dffe37a8ce3ec7f004130a565feeb1a5ee345736cce7d059c591dc61e765 qubes-vm-qrexec-v4.3.11.tar.gz +ed146f55395e1821dafa03c269b7ba0c927e14456efc0ade90cd4e56716a94427d552242d75f87508284a5b615ec7c98000fb762d23f6bf5461aa56cba95b9f2 qubes-vm-qrexec-v4.4.1.tar.gz e2dd5cace82e881c40d5d37c69f7327fbabde81c9d23283de23de9f1197b7b018ef07a8d90e95c61bd249426d9d8297e7cb372333245941ffa0682c90ea3461f qubes-qrexec-agent.openrc c3009ddb97656be7d0a78910217c852f0f9b20cd37b4537d99724e629bc87f1c675ada084eba3c641c4ae54dab8aacd87514d73de72f42d6ccc976e6255212bc makefile-remove-cc-cflags.patch 69b88c8d344f0d575eac398937040ba39a0d8fb8ea0a2b160c48d84775e1da4e226a76f3c5d3be7b045f577b634bb35cd5c5536248e18117c4121a38f9f3bf13 agent-qrexec-fork-server-undef-fortify-source.patch From e5a09b3ff3dd3102dd92dd0b1917af7a81f52e05 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:36:55 -0400 Subject: [PATCH 7/8] qubes-vm-gui: upgrade to 4.4.0 --- qubes-vm-gui/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qubes-vm-gui/APKBUILD b/qubes-vm-gui/APKBUILD index 69d8eda..5382fbc 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -5,8 +5,8 @@ subpackages=" qubes-vm-pulseaudio qubes-vm-pipewire $pkgname-openrc" -pkgver=4.3.15 -pkgrel=2 +pkgver=4.4.0 +pkgrel=0 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" arch="x86_64" @@ -118,7 +118,7 @@ pipewire() { } sha512sums=" -d3fcd5b70ec27f637cac620d299c2bca8c14b15c86011aa364a6079c871abdde2b69f871e4329ccc6bce20d72ffa34c1f78d8bd3797f9084797e792815b92463 qubes-vm-gui-v4.3.15.tar.gz +8ddb5cc73f6bde88ed10e894bce2137b14dfde0d7b10c9eb2f1969390fa1292e8ad1ea35f57c49c47022f86c05ffd7322d03c09dc7414127cefd974c2195a750 qubes-vm-gui-v4.4.0.tar.gz 1a97b45ecb53926dcf840ea6954529002a6dfe3474cbe0a224dbb397d7fa91d8f08a819a2054be60883e02749b9904c128d0a226f66827dd3b7a29068662549a 0001-musl-build.patch 01beace4c130200dc8d42248349ea858d2bec746aca2bdfa5948b6e7240bb3b832bbb8b324293fba6fd6aafb0a3d7a2e3928c7fd39d318ef4d5a18cfeb48cde6 0001-initd-fix.patch 68d01e594296e18d54d8eaa17863451c3ac121e4fcacf98b64db14166bdcf38aa66f1c3659c5014c0a9cc25b5368df66f8c642b8e7af59da8d2a5ad97da9a194 qubes-gui-agent.openrc From 430e661fbf0058bb62caba71c7165cbe96362e0f Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 4 Apr 2026 13:37:44 -0400 Subject: [PATCH 8/8] qubes-vm-core: upgrade to 4.4.0 --- qubes-vm-core/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qubes-vm-core/APKBUILD b/qubes-vm-core/APKBUILD index 155c985..9a843ec 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -8,8 +8,8 @@ subpackages=" $pkgname-doc $pkgname-pyc " -pkgver=4.3.40 -pkgrel=2 +pkgver=4.4.0 +pkgrel=0 _gittag="v$pkgver" pkgdesc="The Qubes core files for installation inside a Qubes VM." arch="x86_64" @@ -167,7 +167,7 @@ root() { make -C passwordless-root install DESTDIR="$subpkgdir" SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib } sha512sums=" -6f65409b8e06f3f373a2c9a54d7e8a053b121e65ee5d9f0776fc9554be7948c14ce9cbbd3e22bac92066ed3791577f344de7ea1ab1ee68cd711c044c9a0b03f4 qubes-vm-core-v4.3.40.tar.gz +35664c151aab28d207b949dd368173e72a6c8a7dc3dc44d259e14a85af188c69edad6b1cbfdb9cdf994b6217abfbd64faaefab42a69f82d5c5b038a78a57e4f1 qubes-vm-core-v4.4.0.tar.gz 95c080a593ca1cd457ffafc0cdd6ee28999c72f67191a3955b6081a4a7d287cae4cd0c626139562e5e1eb55516c25402a174e3599daf7d4cb259d6b4bbdff155 qubes-core-early.openrc 61529413a16b7fa0df691c24adc41b90477c01ea70d572921ecec89df23932e5a2e60c4e73b9a84181dc30424e2e6af4ad1c7dcf6c42689c3cc346a9923d6e07 qubes-core-netvm.openrc da8e293520f5fce29ce76d7586e8ce1a4164798a1214079fb554c690264da1d774fdad3f45825aac52c2c3a0b0cfd39df73eb33394dedd7c043fe0f2344b90ca qubes-core.openrc