diff --git a/.forgejo/workflows/build-edge.yaml b/.forgejo/workflows/build-edge.yaml index dcb6dc4..3ed95e3 100644 --- a/.forgejo/workflows/build-edge.yaml +++ b/.forgejo/workflows/build-edge.yaml @@ -27,7 +27,7 @@ jobs: - name: Package build run: ${{ github.workspace }}/.forgejo/bin/build.sh - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: packages @@ -48,6 +48,6 @@ jobs: - name: Repo pull uses: actions/checkout@v4 - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Package deployment run: ${{ github.workspace }}/.forgejo/bin/deploy.sh diff --git a/.forgejo/workflows/build-v3.22.yaml b/.forgejo/workflows/build-v3.22.yaml index e349cc5..76060ab 100644 --- a/.forgejo/workflows/build-v3.22.yaml +++ b/.forgejo/workflows/build-v3.22.yaml @@ -27,7 +27,7 @@ jobs: - name: Package build run: ${{ github.workspace }}/.forgejo/bin/build.sh - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: packages @@ -48,6 +48,6 @@ jobs: - name: Repo pull uses: actions/checkout@v4 - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Package deployment run: ${{ github.workspace }}/.forgejo/bin/deploy.sh diff --git a/.forgejo/workflows/build-v3.21.yaml b/.forgejo/workflows/build-v3.23.yaml similarity index 87% rename from .forgejo/workflows/build-v3.21.yaml rename to .forgejo/workflows/build-v3.23.yaml index 0134ce6..6837da0 100644 --- a/.forgejo/workflows/build-v3.21.yaml +++ b/.forgejo/workflows/build-v3.23.yaml @@ -3,7 +3,7 @@ on: types: [ assigned, opened, synchronize, reopened ] jobs: - build-v3.21: + build-v3.23: runs-on: x86_64 container: image: alpinelinux/alpine-gitlab-ci:latest @@ -12,7 +12,7 @@ jobs: CI_DEBUG_BUILD: ${{ runner.debug }} CI_MERGE_REQUEST_PROJECT_URL: ${{ github.server_url }}/${{ github.repository }} CI_MERGE_REQUEST_TARGET_BRANCH_NAME: ${{ github.base_ref }} - CI_ALPINE_TARGET: v3.21 + CI_ALPINE_TARGET: v3.23 steps: - name: Environment setup run: | @@ -27,18 +27,18 @@ jobs: - name: Package build run: ${{ github.workspace }}/.forgejo/bin/build.sh - name: Package upload - uses: forgejo/upload-artifact@v3 + uses: actions/upload-artifact@v3 with: name: package path: packages - deploy-v3.21: - needs: [build-v3.21] + deploy-v3.23: + needs: [build-v3.23] runs-on: x86_64 container: image: alpine:latest env: - CI_ALPINE_TARGET: v3.21 + CI_ALPINE_TARGET: v3.23 CI_ALPINE_REPO: 'https://ayakael.net/api/packages/forge/alpine' FORGE_REPO_TOKEN: ${{ secrets.FORGE_REPO_TOKEN }} FORGE_REPO_USER: ${{ vars.FORGE_REPO_USER }} @@ -48,6 +48,6 @@ jobs: - name: Repo pull uses: actions/checkout@v4 - name: Package download - uses: forgejo/download-artifact@v3 + uses: actions/download-artifact@v3 - name: Package deployment run: ${{ github.workspace }}/.forgejo/bin/deploy.sh diff --git a/git-remote-qubes/APKBUILD b/git-remote-qubes/APKBUILD new file mode 100644 index 0000000..017700c --- /dev/null +++ b/git-remote-qubes/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: Antoine Martin (ayakael) +pkgname=git-remote-qubes +pkgver=0.1.1 +pkgrel=2 +pkgdesc="Inter-VM Git for Qubes OS" +url="https://github.com/Rudd-O/git-remote-qubes" +license="GPL-3.0-only" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/Rudd-O/git-remote-qubes/archive/refs/tags/v$pkgver.tar.gz + do-not-use-systemd.patch + qubes-rpc-ruddo-use-sh.patch +" +arch="noarch" +makedepends="python3" + +build() { + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + make LIBEXECDIR="/usr/lib/git-remote-qubes" SITELIBDIR="$site_packages" all +} + +package() { + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + make LIBEXECDIR="/usr/lib/git-remote-qubes" DESTDIR="$pkgdir" SITELIBDIR="$site_packages" install-vm +} +sha512sums=" +69aeead4eaa3202964af9845c00115680277cbf12dbba8bd4b9669418aa17c6220708a5372db7ef76c3d7682f6a0b03b4b8a79dd438ee984db78c024fb9003ac git-remote-qubes-0.1.1.tar.gz +64475923bc4030ce96f6029732d3907a3164ac9baa0854b24ad8d206afd77120e63fa0d0bf9f7c07b07c7dea002bf3914a24cced39ed0f46893f15b891334f56 do-not-use-systemd.patch +7cbb9391aa8da81564c321b20db512968bd6a080fd90f0814fa684d85f3bdadd03236f7d88b2569f345623a1e4abd1f163fb571b63179e7633a8b28aac95b592 qubes-rpc-ruddo-use-sh.patch +" diff --git a/git-remote-qubes/do-not-use-systemd.patch b/git-remote-qubes/do-not-use-systemd.patch new file mode 100644 index 0000000..3725745 --- /dev/null +++ b/git-remote-qubes/do-not-use-systemd.patch @@ -0,0 +1,71 @@ +diff --git a/git-remote-qubes.spec.orig b/git-remote-qubes.spec +index ec745d0..80fddfb 100644 +--- a/git-remote-qubes.spec.orig ++++ b/git-remote-qubes.spec +@@ -21,14 +21,12 @@ BuildRequires: git + + Requires: python3 + Requires: git-core +-# systemd is required because of systemd-escape. +-Requires: systemd + + %package dom0 + Summary: Policy package for Qubes OS dom0s that arbitrates %{name} + Requires: qubes-core-dom0 >= 4.1 + +-Requires: systemd qubes-core-dom0-linux ++Requires: qubes-core-dom0-linux + + %description + This package lets you setup Git servers on your Qubes OS VMs. +diff --git a/src/gitremotequbes/server.py.orig b/src/gitremotequbes/server.py +index ca6e9c7..c7d06d5 100644 +--- a/src/gitremotequbes/server.py.orig ++++ b/src/gitremotequbes/server.py +@@ -2,7 +2,6 @@ import logging + import os + import shlex + import signal +-import subprocess + import sys + + import gitremotequbes.copier +@@ -35,15 +34,6 @@ def main(): + logging.basicConfig(format="remote:" + logging.BASIC_FORMAT, level=level) + l = logging.getLogger() + +- trustedarg = os.getenv("QREXEC_SERVICE_ARGUMENT") +- if trustedarg: +- # Qubes OS subsystem has sent us an argument, and that argument +- # is trusted, so trust that over whatever the remote process said. +- l.debug("trustworthy argument %r sent by Qubes OS", trustedarg) +- git_dir = subprocess.check_output([ +- "systemd-escape", "--unescape", "--", trustedarg +- ], universal_newlines=True)[:-1] +- + sys.stdout.write("confirmed\n") + + while True: +diff --git a/src/gitremotequbes/client.py.orig b/src/gitremotequbes/client.py +index 1adf379..826c17c 100644 +--- a/src/gitremotequbes/client.py.orig ++++ b/src/gitremotequbes/client.py +@@ -29,17 +29,10 @@ def main(): + + l = logging.getLogger() + +- rpcarg = subprocess.check_output([ +- "systemd-escape", "--", url.path +- ], universal_newlines=True)[:-1] +- if len(rpcarg) > 64 or "\\" in rpcarg: +- # Path is too long! We must do without rpcarg. +- rpcarg = None +- + vm = subprocess.Popen( + ["/usr/lib/qubes/qrexec-client-vm", + url.netloc, +- "ruddo.Git" + ("+%s" % rpcarg if rpcarg else "")], ++ "ruddo.Git"], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + bufsize=0, diff --git a/git-remote-qubes/qubes-rpc-ruddo-use-sh.patch b/git-remote-qubes/qubes-rpc-ruddo-use-sh.patch new file mode 100644 index 0000000..54e60cd --- /dev/null +++ b/git-remote-qubes/qubes-rpc-ruddo-use-sh.patch @@ -0,0 +1,7 @@ +diff --git a/etc/qubes-rpc/ruddo.Git.in.orig b/etc/qubes-rpc/ruddo.Git.in +index cb19123..62af422 100755 +--- a/etc/qubes-rpc/ruddo.Git.in.orig ++++ b/etc/qubes-rpc/ruddo.Git.in +@@ -1 +1,2 @@ ++#!/bin/sh + @LIBEXECDIR@/git-local-qubes diff --git a/qubes-app-linux-druide-antidote/APKBUILD b/qubes-app-linux-druide-antidote/APKBUILD index 161d706..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=4 +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 c7f8e41..a68fdba 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.1 -pkgrel=1 +pkgrel=3 _gittag="v$pkgver" pkgdesc="QubesDB libs and daemon service." arch="x86_64" @@ -46,5 +46,5 @@ sha512sums=" fcfa7321e1ca6af2943e900690695bde74e0b7e706e530ce92e297aeb036bbf9c12e191b7434ead4054690342a1c9ef517c6cf6e211debe5cc66474ceb57bd87 qubes-db-vm-v4.3.1.tar.gz af86268c264c843b94f9cefb735b9d078dc58819c890fc0a31dd79fa2761d3c2fa87aed73752bca1db07948ba86ecfe16a745b19672ccc10dfb9461df24aa207 0001-musl-build.patch 892eb29b9bab4d9e662678d13a5607df04cdb024c2f28332f40fa4b7c644476a4b26a9fc038dfcdac1e0b8d328165d21d50d894d2c1e27f792287dd57449e7eb 0001-create_pidfile.patch -6f48b4bee6a3517bdbb884bd6f7e21916e8438c5e8b8d9d1b1cfffe970c4549d941056f9022998ed7f9edb799d9b123564f01e69cdca7da241d0fb6a8e9a1c5e qubes-db.openrc +e8c8dc6975d5b59a2afed0e397dca008c95ae747a5e5dedb4b847bbd876d9d50e937d9ed3b8ea08592c8d0e05e7929d1a85467a72c4d45175ef77236a0c3fdec qubes-db.openrc " diff --git a/qubes-db-vm/qubes-db.openrc b/qubes-db-vm/qubes-db.openrc index eac5e5e..e0e0cd2 100644 --- a/qubes-db-vm/qubes-db.openrc +++ b/qubes-db-vm/qubes-db.openrc @@ -2,7 +2,7 @@ name=$RC_SVCNAME cfgfile="/etc/qubes/$RC_SVCNAME.conf" -command="/usr/sbin/qubesdb-daemon" +command="/usr/bin/qubesdb-daemon" command_args="0" command_user="root" pidfile="/run/qubes/$RC_SVCNAME.pid" diff --git a/qubes-gpg-split/APKBUILD b/qubes-gpg-split/APKBUILD index 7824a73..e788a2a 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.79 +pkgver=2.0.81 _gittag="v$pkgver" pkgrel=0 pkgdesc="Used Qubes AppVM as a “smart card”" @@ -31,5 +31,5 @@ package() { make install-vm DESTDIR="$pkgdir" } sha512sums=" -9ab1295047d5ba52225c984529f11231cf8b458615e0a1188de9f02ca6000c359858c24be5f28c6e117879fa6c55443ecc53bd0f15e1c342a45b5438cb1b39bc qubes-gpg-split-v2.0.79.tar.gz +78765694e05d2d46aeea859521dcb33b1899dfc0e49ff3d593377c47a3ff86487225f0983f7db5bdd2020463272bdfdcbe066a8dbf87c89c38da14a6fdb3e12f qubes-gpg-split-v2.0.81.tar.gz " diff --git a/qubes-input-proxy/APKBUILD b/qubes-input-proxy/APKBUILD index ebac7be..9a2c00e 100644 --- a/qubes-input-proxy/APKBUILD +++ b/qubes-input-proxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=qubes-input-proxy -pkgver=1.0.43 +pkgver=1.0.45 _gittag="v$pkgver" pkgrel=0 pkgdesc="The Qubes service for proxying input devices" @@ -46,7 +46,7 @@ package() { install -Dm755 "$srcdir"/qubes-input-sender.openrc "$pkgdir"/etc/init.d/qubes-input-sender } sha512sums=" -b113c62926b78e4d5df0194e0e3770fb8fdd9e6009dc9982c62c77a592b494fdd14d5babc1e3da660c385503a6e78eea6950818e8722208f752c02ac04b7035f qubes-input-proxy-v1.0.43.tar.gz +df7e3b34feac1479a9e181cad06dcb1973d85967dd42f45d47838615e48b98566484db39c9069882df19aadddba9d4c7fd65a6206e966def82481000e4dd0289 qubes-input-proxy-v1.0.45.tar.gz e21e6ae680f98474cbb8b6213768ca1f8d5ffb0088173a387a309e1b40a9aabbb946f3201aa143088f144f13a5c85c3710b7ade1a1189655a08ed574e3d26df4 qubes-input-trigger_use-openrc.patch d199c586e146c0846169a04419fcd72764c528f6d270388927bf79273bddd50a307b40db8be482847a93de473553c3cea00fc7b08b5f93f3d79e0a3f8e620f64 makefile_skip-systemd.patch 2d5cb4369bc4d4c83403bb3e7cd7bc784769950a8fbf581996074fe53cc65c56fe4039e2689b6fa34e51ce22e552fc145115c12e71601809767962a3682dd299 qubes-input-sender.openrc diff --git a/qubes-libvchan-xen/APKBUILD b/qubes-libvchan-xen/APKBUILD index 0e66336..0d4963d 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.7 -pkgrel=2 +pkgrel=3 _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 2a41111..0e0d91c 100644 --- a/qubes-meta-packages/APKBUILD +++ b/qubes-meta-packages/APKBUILD @@ -5,7 +5,7 @@ subpackages=" qubes-vm-dependencies qubes-vm-recommended " -pkgver=4.3.3 +pkgver=4.3.5 _gittag="v$pkgver" pkgrel=0 pkgdesc="Meta packages for Qubes-specific components" @@ -38,5 +38,5 @@ recommended() { mkdir -p "$subpkgdir" } sha512sums=" -8d369417dfcf1875009565f13ca5665a6d14db274b8247632450d1f79f2493b97d1341b651d7a13329e3b1f0ceb2d185cf9167c14f9e4a69201f2bfb4ef99505 qubes-meta-packages-v4.3.3 +ed671aee73b00a99a99039fcf690e43c20d5fdc9c82617290f1741aaefd5e2e234954e68c038c7d640207cfc04a7f8fe625a0708e220a84095cb976a6ddca013 qubes-meta-packages-v4.3.5 " diff --git a/qubes-pass/APKBUILD b/qubes-pass/APKBUILD index 67e0b60..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=6 +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 cb6ec16..3f1ef89 100644 --- a/qubes-usb-proxy/APKBUILD +++ b/qubes-usb-proxy/APKBUILD @@ -3,7 +3,7 @@ pkgname=qubes-usb-proxy pkgver=4.3.2 _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 c599600..e9b5b65 100644 --- a/qubes-vm-core/APKBUILD +++ b/qubes-vm-core/APKBUILD @@ -8,7 +8,7 @@ subpackages=" $pkgname-doc $pkgname-pyc " -pkgver=4.3.29 +pkgver=4.3.37 pkgrel=0 _gittag="v$pkgver" pkgdesc="The Qubes core files for installation inside a Qubes VM." @@ -167,7 +167,7 @@ root() { make -C passwordless-root install DESTDIR="$subpkgdir" SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib } sha512sums=" -add53d1490f5b418bd742ebb507500719aad72597826f36bfa88e13f3a15ac96eb21f1b0e795d2b6e7f09ae6554657647a026c9cd07094abca89d2c0a03c75cf qubes-vm-core-v4.3.29.tar.gz +6c54b45ad9a53fd67901e3017e4992ebae7d30093ffe7a251ade715655b327b25588c495fe50f402a2ea2b89172b9234b2e6f3c94d471984596231d302d4771c qubes-vm-core-v4.3.37.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 3eccd86..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=1 +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 67326fe..fdae92a 100644 --- a/qubes-vm-gui/APKBUILD +++ b/qubes-vm-gui/APKBUILD @@ -5,7 +5,7 @@ subpackages=" qubes-vm-pulseaudio qubes-vm-pipewire $pkgname-openrc" -pkgver=4.3.10 +pkgver=4.3.15 pkgrel=0 _gittag="v$pkgver" pkgdesc="The Qubes GUI Agent for AppVMs" @@ -22,6 +22,8 @@ depends=" makedepends=" autoconf automake + dbus-dev + gettext gcc git libtool @@ -52,7 +54,6 @@ source=" qubes-gui-agent.openrc qubes-sessions.sh qubes-gui-agent.pam - qubes-sessions_do-not-use-systemd.patch " builddir="$srcdir"/qubes-gui-agent-linux-${_gittag/v} _qubes_backend_vmm=xen @@ -117,11 +118,10 @@ pipewire() { } sha512sums=" -0a1dcf724224f8e03a5d847a5f1d6270237f48f9e434d63cdb6d386205439c78163a7ca742d04d4f02d472fb002e045333b0d31799b62d68c4cf50ec3f68383f qubes-vm-gui-v4.3.10.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 bd707f7956f58c2bb24ccb9adad1381c069e70820fcb1b01b09dc88570d9df00e0dc92a9ac3b242f828314568d5487257566a6fc61e75e62e010b7e4871f9ea0 qubes-sessions.sh b512d691f2a6b11fc329bf91dd05ca9c589bbd444308b27d3c87c75262dedf6afc68a9739229249a4bd3d0c43cb1f871eecbb93c4fe559e0f38bdabbffd06ad7 qubes-gui-agent.pam -ebd169122c4de1eb2a293eef7f462557abc45d98c696677afe3b18d5a372eb3fc9c42b4eba6718eb22abdf71a1d6885a8f3e1254ce342ffa5ad630f662503925 qubes-sessions_do-not-use-systemd.patch " diff --git a/qubes-vm-gui/qubes-sessions_do-not-use-systemd.patch b/qubes-vm-gui/qubes-sessions_do-not-use-systemd.patch deleted file mode 100644 index 6682e22..0000000 --- a/qubes-vm-gui/qubes-sessions_do-not-use-systemd.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/appvm-scripts/usrbin/qubes-session.orig b/appvm-scripts/usrbin/qubes-session -index 4417ba7..e5bedc2 100755 ---- a/appvm-scripts/usrbin/qubes-session.orig -+++ b/appvm-scripts/usrbin/qubes-session -@@ -27,17 +27,6 @@ - - loginctl activate "$XDG_SESSION_ID" - --# Now import the environment from the systemd user session. --# This is necessary to enable users to configure their --# Qubes environment using the standard environment.d --# facility. Documentation for the facility is at: --# https://www.freedesktop.org/software/systemd/man/environment.d.html --set -a # export all variables --env=$(systemctl --user show-environment) && eval "$env" || exit --set +a --unset env -- -- - if qsvc guivm-gui-agent; then - if [ -e "$HOME/.xinitrc" ]; then - . "$HOME/.xinitrc" diff --git a/qubes-vm-qrexec/APKBUILD b/qubes-vm-qrexec/APKBUILD index ee8de3b..0bdc2bb 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.10 +pkgver=4.3.11 _gittag="v$pkgver" -pkgrel=0 +pkgrel=1 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=" -6b3d72d384e65436c04a89ec504822a1ae952f39f8660f8ad65af677207a302ca355ae8904430673a902779e0df3b548b62c6eda52171adb0e5a8552e1d1f7eb qubes-vm-qrexec-v4.3.10.tar.gz +316f2608294b4e351f74962a23664f545ccf535c4b77e432335ceb5f937dc8655d82dffe37a8ce3ec7f004130a565feeb1a5ee345736cce7d059c591dc61e765 qubes-vm-qrexec-v4.3.11.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 27cdc09..a872af7 100644 --- a/qubes-vm-utils/APKBUILD +++ b/qubes-vm-utils/APKBUILD @@ -6,7 +6,7 @@ subpackages=" $pkgname-openrc $pkgname-pyc " -pkgver=4.3.11 +pkgver=4.3.13 pkgrel=1 _gittag="v$pkgver" pkgdesc="Common Linux files for Qubes VM." @@ -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=" -76dd3e8eba8751cec090d012e654706be5f94e9334bc5f86796f9be16ea931c64a8c52ecbe6f225b8abdb47bd55368984cc2fd3797fe714af3cd13c572ae9089 qubes-vm-utils-v4.3.11.tar.gz +58de5e357f560d4670a685de04cd72c173e5fa9568e6eb417370978dc5fb2cd76fadb8527232186452c7b7962d98dbc4441799e92d0e86bd934c7a915975826b qubes-vm-utils-v4.3.13.tar.gz 288636ea0ea9bda0560478f487b8f5491c2767c6460e7f4f04f653aee0121920c8d823d12e537e26cbecf4909336f6e0c360bbc221ed39407fe3f09f23462acd qubes-meminfo-writer.openrc "