diff --git a/.forgejo/bin/build.sh b/.forgejo/bin/build.sh index ab56866..c065c38 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.4;; + main) echo r4.3;; esac } diff --git a/.forgejo/bin/check_ver.sh b/.forgejo/bin/check_ver.sh index ff5f9a7..c62e678 100755 --- a/.forgejo/bin/check_ver.sh +++ b/.forgejo/bin/check_ver.sh @@ -84,9 +84,6 @@ 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 @@ -99,9 +96,6 @@ 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 diff --git a/.forgejo/bin/deploy.sh b/.forgejo/bin/deploy.sh index 2acd4a1..a75d5e6 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.4;; + main) echo r4.3;; esac } diff --git a/README.md b/README.md index c2fbc79..a519913 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,6 @@ 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.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 The template builder is housed in its [own repo](https://ayakael.net/forge/qubes-builder-alpine) RPMs are built in-pipeline using the build artifacts produced by this repo. These RPMs facilitate @@ -54,7 +50,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.4" > /etc/apk/repositories +echo "https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.3" > /etc/apk/repositories ``` diff --git a/git-remote-qubes/APKBUILD b/git-remote-qubes/APKBUILD index 31c3896..3f3d4f1 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=4 +pkgrel=3 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 1340b77..8765a19 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=6 +pkgrel=5 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 647c2cf..2f1dc0b 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=2 +pkgrel=1 _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 39f314c..e788a2a 100644 --- a/qubes-gpg-split/APKBUILD +++ b/qubes-gpg-split/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-gpg-split subpackages="$pkgname-doc" -pkgver=2.0.83 +pkgver=2.0.81 _gittag="v$pkgver" -pkgrel=1 +pkgrel=0 pkgdesc="Used Qubes AppVM as a “smart card”" arch="x86_64" url="https://github.com/QubesOS/qubes-app-linux-split-gpg" @@ -31,5 +31,5 @@ package() { make install-vm DESTDIR="$pkgdir" } sha512sums=" -a9224c8e57fbb7f17c3cbbfc0f975fe375e4063b96f4a9f327e9791545c356db23c55c1f37612a277615889f104cba1bd2dfb84e190f8b7c80d31a0fda5b29d3 qubes-gpg-split-v2.0.83.tar.gz +78765694e05d2d46aeea859521dcb33b1899dfc0e49ff3d593377c47a3ff86487225f0983f7db5bdd2020463272bdfdcbe066a8dbf87c89c38da14a6fdb3e12f qubes-gpg-split-v2.0.81.tar.gz " diff --git a/qubes-input-proxy/APKBUILD b/qubes-input-proxy/APKBUILD index b9ba2ab..8f97c2d 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=1 +pkgrel=0 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-meta-packages/APKBUILD b/qubes-meta-packages/APKBUILD index e358257..1ad663b 100644 --- a/qubes-meta-packages/APKBUILD +++ b/qubes-meta-packages/APKBUILD @@ -7,7 +7,7 @@ subpackages=" " pkgver=4.3.7 _gittag="v$pkgver" -pkgrel=1 +pkgrel=0 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 bf6720e..68df164 100644 --- a/qubes-pass/APKBUILD +++ b/qubes-pass/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-pass pkgver=0.1.0 _gittag="v$pkgver" -pkgrel=8 +pkgrel=7 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 e960e08..6d9ec0a 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=1 +pkgrel=0 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 9a843ec..3d54459 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -8,8 +8,8 @@ subpackages=" $pkgname-doc $pkgname-pyc " -pkgver=4.4.0 -pkgrel=0 +pkgver=4.3.40 +pkgrel=1 _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=" -35664c151aab28d207b949dd368173e72a6c8a7dc3dc44d259e14a85af188c69edad6b1cbfdb9cdf994b6217abfbd64faaefab42a69f82d5c5b038a78a57e4f1 qubes-vm-core-v4.4.0.tar.gz +6f65409b8e06f3f373a2c9a54d7e8a053b121e65ee5d9f0776fc9554be7948c14ce9cbbd3e22bac92066ed3791577f344de7ea1ab1ee68cd711c044c9a0b03f4 qubes-vm-core-v4.3.40.tar.gz 95c080a593ca1cd457ffafc0cdd6ee28999c72f67191a3955b6081a4a7d287cae4cd0c626139562e5e1eb55516c25402a174e3599daf7d4cb259d6b4bbdff155 qubes-core-early.openrc 61529413a16b7fa0df691c24adc41b90477c01ea70d572921ecec89df23932e5a2e60c4e73b9a84181dc30424e2e6af4ad1c7dcf6c42689c3cc346a9923d6e07 qubes-core-netvm.openrc da8e293520f5fce29ce76d7586e8ce1a4164798a1214079fb554c690264da1d774fdad3f45825aac52c2c3a0b0cfd39df73eb33394dedd7c043fe0f2344b90ca qubes-core.openrc diff --git a/qubes-vm-gui-dev/APKBUILD b/qubes-vm-gui-dev/APKBUILD index 80e58da..dc3536f 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=3 +pkgrel=2 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 5382fbc..acbcc8e 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.4.0 -pkgrel=0 +pkgver=4.3.15 +pkgrel=1 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" arch="x86_64" @@ -118,7 +118,7 @@ pipewire() { } sha512sums=" -8ddb5cc73f6bde88ed10e894bce2137b14dfde0d7b10c9eb2f1969390fa1292e8ad1ea35f57c49c47022f86c05ffd7322d03c09dc7414127cefd974c2195a750 qubes-vm-gui-v4.4.0.tar.gz +d3fcd5b70ec27f637cac620d299c2bca8c14b15c86011aa364a6079c871abdde2b69f871e4329ccc6bce20d72ffa34c1f78d8bd3797f9084797e792815b92463 qubes-vm-gui-v4.3.15.tar.gz 1a97b45ecb53926dcf840ea6954529002a6dfe3474cbe0a224dbb397d7fa91d8f08a819a2054be60883e02749b9904c128d0a226f66827dd3b7a29068662549a 0001-musl-build.patch 01beace4c130200dc8d42248349ea858d2bec746aca2bdfa5948b6e7240bb3b832bbb8b324293fba6fd6aafb0a3d7a2e3928c7fd39d318ef4d5a18cfeb48cde6 0001-initd-fix.patch 68d01e594296e18d54d8eaa17863451c3ac121e4fcacf98b64db14166bdcf38aa66f1c3659c5014c0a9cc25b5368df66f8c642b8e7af59da8d2a5ad97da9a194 qubes-gui-agent.openrc diff --git a/qubes-vm-qrexec/APKBUILD b/qubes-vm-qrexec/APKBUILD index e920a23..a07e354 100644 --- a/qubes-vm-qrexec/APKBUILD +++ b/qubes-vm-qrexec/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoine Martin (ayakael) pkgname=qubes-vm-qrexec subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" -pkgver=4.4.1 +pkgver=4.3.12 _gittag="v$pkgver" pkgrel=0 pkgdesc="The Qubes qrexec files (qube side)" @@ -52,7 +52,7 @@ package() { install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent } sha512sums=" -ed146f55395e1821dafa03c269b7ba0c927e14456efc0ade90cd4e56716a94427d552242d75f87508284a5b615ec7c98000fb762d23f6bf5461aa56cba95b9f2 qubes-vm-qrexec-v4.4.1.tar.gz +4f166c79a01395691044a5e8c005a2115fb5ff4c12819f46bb39522e1fa2670fef4c09ddfc2b392841b376f0717b49ce9f284281824e72555067947cace205c6 qubes-vm-qrexec-v4.3.12.tar.gz e2dd5cace82e881c40d5d37c69f7327fbabde81c9d23283de23de9f1197b7b018ef07a8d90e95c61bd249426d9d8297e7cb372333245941ffa0682c90ea3461f qubes-qrexec-agent.openrc c3009ddb97656be7d0a78910217c852f0f9b20cd37b4537d99724e629bc87f1c675ada084eba3c641c4ae54dab8aacd87514d73de72f42d6ccc976e6255212bc makefile-remove-cc-cflags.patch 69b88c8d344f0d575eac398937040ba39a0d8fb8ea0a2b160c48d84775e1da4e226a76f3c5d3be7b045f577b634bb35cd5c5536248e18117c4121a38f9f3bf13 agent-qrexec-fork-server-undef-fortify-source.patch diff --git a/qubes-vm-utils/APKBUILD b/qubes-vm-utils/APKBUILD index bb7efbf..0d4b97f 100644 --- a/qubes-vm-utils/APKBUILD +++ b/qubes-vm-utils/APKBUILD @@ -6,8 +6,8 @@ subpackages=" $pkgname-openrc $pkgname-pyc " -pkgver=4.3.16 -pkgrel=1 +pkgver=4.3.17 +pkgrel=0 _gittag="v$pkgver" pkgdesc="Common Linux files for Qubes VM." arch="x86_64" @@ -59,6 +59,6 @@ support() { install -m 755 "$builddir"/dracut/full-dmroot/qubes_cow_setup.sh "$subpkgdir"/usr/lib/qubes/qubes_cow_setup.sh } sha512sums=" -e6f6b909bdab59cc5ba8ee5a5657703b0224aa5429606f41b2df6de544e76dc81b5fb3ac8512426832b710992a20bc1f30e68f63a9e59d505785356f0f159309 qubes-vm-utils-v4.3.16.tar.gz +cfbaa805d83c178809cbf6565fda8c666dd2b9d6ac4d7e62987758a26b83fbe4f42ccb3abb462724fb51ff94e22566178d53ba85d467a2e34128102783b11d4e qubes-vm-utils-v4.3.17.tar.gz 288636ea0ea9bda0560478f487b8f5491c2767c6460e7f4f04f653aee0121920c8d823d12e537e26cbecf4909336f6e0c360bbc221ed39407fe3f09f23462acd qubes-meminfo-writer.openrc "