Compare commits

..

66 commits

Author SHA1 Message Date
6d964453be
qubes-vm-core: upgrade to 4.3.15
All checks were successful
/ lint (pull_request) Successful in 41s
/ deploy-v3.20 (pull_request) Successful in 38s
/ build-v3.20 (pull_request) Successful in 1m29s
/ deploy-edge (pull_request) Successful in 34s
/ build-edge (pull_request) Successful in 1m41s
/ deploy-v3.21 (pull_request) Successful in 30s
/ build-v3.21 (pull_request) Successful in 1m42s
2025-01-15 09:19:00 -05:00
c7100461e4 qubes-vm-gui: upgrade to 4.3.4 2024-12-29 18:32:16 +00:00
6a70005a3a
qubes-vm-core: upgrade to 4.3.14
All checks were successful
/ lint (pull_request) Successful in 31s
/ deploy-v3.20 (pull_request) Successful in 1m5s
/ build-v3.20 (pull_request) Successful in 1m39s
/ deploy-edge (pull_request) Successful in 57s
/ build-edge (pull_request) Successful in 1m49s
/ deploy-v3.21 (pull_request) Successful in 57s
/ build-v3.21 (pull_request) Successful in 1m32s
2024-12-29 13:22:18 -05:00
c1166d75b5 qubes-db-vm: upgrade to 4.2.7 2024-12-26 06:25:03 +00:00
47c44f0ff9
qubes-vm-utils: upgrade to 4.3.7
All checks were successful
/ lint (pull_request) Successful in 34s
/ build-v3.20 (pull_request) Successful in 1m18s
/ deploy-v3.20 (pull_request) Successful in 1m18s
/ deploy-edge (pull_request) Successful in 1m50s
/ build-edge (pull_request) Successful in 1m28s
/ build-v3.21 (pull_request) Successful in 1m20s
/ deploy-v3.21 (pull_request) Successful in 1m13s
2024-12-26 00:12:44 -05:00
c4a33f0f82 qubes-input-proxy: upgrade to 1.0.40 2024-12-13 21:09:19 +00:00
e2e5c67379 qubes-vm-core: upgrade to 4.3.13 2024-12-13 21:07:05 +00:00
d5fac1bec3 qubes-usb-proxy: upgrade to 4.3.0 2024-12-13 21:06:16 +00:00
32686a4754 qubes-vm-gui: upgrade to 4.3.2 2024-12-13 21:03:02 +00:00
101031d8d8 qubes-vm-utils: upgrade to 4.3.6 2024-12-13 21:02:56 +00:00
2072bf2d03 qubes-vm-qrexec: upgrade to 4.3.1 2024-12-13 21:02:55 +00:00
7d9253d8c9
qubes-input-proxy: fix openrc patch
All checks were successful
/ lint (pull_request) Successful in 26s
/ deploy-v3.20 (pull_request) Successful in 29s
/ build-v3.20 (pull_request) Successful in 1m14s
/ deploy-edge (pull_request) Successful in 29s
/ build-edge (pull_request) Successful in 1m20s
/ deploy-v3.21 (pull_request) Successful in 27s
/ build-v3.21 (pull_request) Successful in 1m8s
2024-12-02 19:15:32 -05:00
e867721ad6
forgejo: import build.sh in repo
All checks were successful
/ lint (pull_request) Successful in 33s
/ deploy-v3.20 (pull_request) Successful in 1m57s
/ build-v3.20 (pull_request) Successful in 4m20s
/ build-v3.21 (pull_request) Successful in 5m52s
/ deploy-v3.21 (pull_request) Successful in 52s
/ deploy-edge (pull_request) Successful in 1m39s
/ build-edge (pull_request) Successful in 4m59s
2024-11-30 21:07:29 -05:00
3254fe9738
*: rebuild for 3.21
Some checks failed
/ deploy-v3.21 (pull_request) Has been skipped
/ build-v3.21 (pull_request) Failing after 38s
/ lint (pull_request) Successful in 30s
/ deploy-edge (pull_request) Successful in 1m7s
/ build-edge (pull_request) Successful in 6m20s
/ deploy-v3.20 (pull_request) Successful in 1m13s
/ build-v3.20 (pull_request) Successful in 5m10s
2024-11-30 20:56:01 -05:00
1a427d854d
forgejo-ci: drop 3.19 builder, add 3.21 2024-11-30 20:55:39 -05:00
9a48d213f3 qubes-input-proxy: upgrade to 1.0.39 2024-11-10 19:36:05 +00:00
a4800f9e03
qubes-vm-gui: upgrade to 4.3.1
All checks were successful
/ lint (pull_request) Successful in 34s
/ deploy-v3.19 (pull_request) Successful in 57s
/ build-v3.19 (pull_request) Successful in 2m4s
/ build-v3.20 (pull_request) Successful in 1m57s
/ deploy-v3.20 (pull_request) Successful in 36s
/ deploy-edge (pull_request) Successful in 30s
/ build-edge (pull_request) Successful in 1m54s
2024-11-10 09:33:38 -05:00
e9170df040 qubes-vm-utils: upgrade to 4.3.5 2024-11-08 00:41:33 +00:00
8ecc7b48ea
qubes-vm-core: upgrade to 4.3.11
All checks were successful
/ lint (pull_request) Successful in 32s
/ deploy-edge (pull_request) Successful in 37s
/ build-edge (pull_request) Successful in 2m10s
/ deploy-v3.19 (pull_request) Successful in 33s
/ build-v3.19 (pull_request) Successful in 1m39s
/ deploy-v3.20 (pull_request) Successful in 34s
/ build-v3.20 (pull_request) Successful in 2m3s
2024-11-07 18:54:57 -05:00
e65971b3ab qubes-vm-gui-dev: upgrade to 4.3.0 2024-10-31 20:08:25 +00:00
a914b685f2 qubes-vm-gui: upgrade to 4.3.0 2024-10-31 20:08:25 +00:00
1c13a950c2
qubes-libvchan-xen: rebuild against xen 4.19
All checks were successful
/ lint (pull_request) Successful in 35s
/ build-v3.20 (pull_request) Successful in 1m52s
/ deploy-v3.20 (pull_request) Successful in 36s
/ build-v3.19 (pull_request) Successful in 1m54s
/ deploy-v3.19 (pull_request) Successful in 37s
/ deploy-edge (pull_request) Successful in 31s
/ build-edge (pull_request) Successful in 2m41s
2024-10-31 15:58:53 -04:00
7779c42918
qubes-vm-core: upgrade to 4.3.0
Some checks failed
/ lint (pull_request) Successful in 31s
/ deploy-edge (pull_request) Has been skipped
/ build-edge (pull_request) Failing after 44s
/ build-v3.19 (pull_request) Successful in 1m56s
/ deploy-v3.19 (pull_request) Successful in 33s
/ build-v3.20 (pull_request) Successful in 1m40s
/ deploy-v3.20 (pull_request) Successful in 28s
2024-10-31 15:54:29 -04:00
637a92578a
forcejo: fix bad if statement 2024-10-31 15:45:21 -04:00
4953c4c159
forgego: add package version checks 2024-10-31 15:32:52 -04:00
a0e397c918
*: /usr merge
Some checks failed
/ deploy-v3.20 (pull_request) Has been cancelled
/ build-v3.20 (pull_request) Has been cancelled
/ deploy-v3.19 (pull_request) Has been cancelled
/ build-v3.19 (pull_request) Has been cancelled
/ deploy-edge (pull_request) Has been cancelled
/ build-edge (pull_request) Has been cancelled
/ lint (pull_request) Successful in 24s
2024-10-16 20:10:31 -04:00
8109344b8e qubes-vm-qrexec: upgrade to 4.3.0 2024-10-10 16:21:31 +00:00
2cdae9bc59 qubes-vm-gui: upgrade to 4.2.18 2024-10-10 16:18:23 +00:00
573c747ff9 qubes-vm-gui-dev: upgrade to 4.2.5 2024-10-10 16:18:23 +00:00
64d500c042 qubes-vm-utils: upgrade to 4.3.4 2024-10-10 16:18:15 +00:00
907e65b867 qubes-vm-core: upgrade to 4.3.7 2024-10-10 16:02:34 +00:00
c7d021b224 qubes-usb-proxy: upgrade to 1.3.2 2024-10-10 16:01:16 +00:00
df786a0292 qubes-libvchan-xen: upgrade to 4.2.4 2024-10-10 16:01:10 +00:00
5ebb82e9d3
qubes-input-proxy: fix url
Some checks failed
/ lint (pull_request) Successful in 29s
/ deploy-edge (pull_request) Failing after 1m48s
/ build-edge (pull_request) Successful in 44s
/ deploy-v3.19 (pull_request) Failing after 1m49s
/ build-v3.19 (pull_request) Successful in 45s
/ deploy-v3.20 (pull_request) Failing after 1m41s
/ build-v3.20 (pull_request) Successful in 45s
2024-10-10 12:00:30 -04:00
79be5d7efa qubes-gpg-split: upgrade to 2.0.75 2024-10-10 15:57:39 +00:00
43a72bd078
qubes-input-proxy: upgrade to 1.0.38
All checks were successful
/ lint (pull_request) Successful in 34s
/ deploy-v3.20 (pull_request) Successful in 32s
/ build-v3.20 (pull_request) Successful in 1m10s
/ build-v3.19 (pull_request) Successful in 1m12s
/ deploy-v3.19 (pull_request) Successful in 35s
/ deploy-edge (pull_request) Successful in 31s
/ build-edge (pull_request) Successful in 1m19s
2024-10-10 11:49:19 -04:00
931be466e8
README: update 2024-08-16 21:45:56 -04:00
a138662e44
qubes-vm-utils: bump
Some checks failed
/ lint (pull_request) Successful in 33s
/ build-edge (pull_request) Successful in 37s
/ deploy-edge (pull_request) Failing after 1m45s
/ deploy-v3.19 (pull_request) Failing after 1m41s
/ build-v3.19 (pull_request) Successful in 38s
/ deploy-v3.20 (pull_request) Failing after 1m38s
/ build-v3.20 (pull_request) Successful in 44s
2024-08-16 08:13:01 -04:00
6909ec2185
forgejo-ci: add multitarget build workflows 2024-08-16 08:12:42 -04:00
b117d95024
qubes-vm-utils: bump
All checks were successful
/ lint (pull_request) Successful in 32s
/ build-edge (pull_request) Successful in 1m24s
/ deploy-edge (pull_request) Successful in 28s
2024-08-16 01:17:02 -04:00
88c519bae4
qubes-input-proxy: bump 2024-08-16 01:16:52 -04:00
69eb028438
forgejo-ci: initial
Some checks failed
/ lint (pull_request) Successful in 25s
/ build-edge (pull_request) Successful in 32s
/ deploy-edge (pull_request) Failing after 1m41s
2024-08-16 01:16:26 -04:00
1a3e88d955
gitlab-ci: drop for forgejo-ci 2024-08-15 21:59:02 -04:00
a7e184bf93
gitlab-ci: use git-annex instead of git-lfs 2024-08-10 12:01:01 -04:00
264c954d9b
qubes-vm-core: add missing rsvg-convert and dbus-x11 depend 2024-07-27 19:18:49 -04:00
bd6e8cac43
qubes-usb-proxy: fix usb reset with udevadm 2024-07-27 19:18:17 -04:00
cc021097dc
qubes-usb-proxy: add vhci-hcd module to modules-load.d 2024-07-27 19:17:41 -04:00
01db78f365
qubes-pass: add service subpackage 2024-07-27 19:17:02 -04:00
34f3abf6b1
qubes-vm-core: pull findutils depend 2024-07-27 19:16:49 -04:00
339e3da21b
qubes-input-proxy: add openrc support 2024-07-27 15:01:53 -04:00
fbba245e39
qubes-input-proxy: new aport 2024-07-27 01:04:34 -04:00
c04972d9f1
qubes-usb-proxy: fix usb import 2024-07-27 00:13:13 -04:00
0c45e05df1 README: update for r4.3 2024-07-11 17:26:23 +00:00
1a7b0e2a7f qubes-vm-gui-dev: bump pkgrel 2024-07-11 17:26:23 +00:00
4472d7d6a2 qubes-vm-utils: upgrade to 4.3.3 2024-07-11 17:26:23 +00:00
55581b72cb qubes-vm-qrexec: upgrade to 4.2.21 2024-07-11 17:26:23 +00:00
47011fa7a7 qubes-vm-gui: upgrade to 4.2.16 2024-07-11 17:26:23 +00:00
1f86673220 qubes-vm-core: upgrade to 4.3.4 2024-07-11 17:26:23 +00:00
e06a14c1c2 qubes-usb-proxy; upgrade to 1.3.0 2024-07-11 17:26:23 +00:00
4254194dd5 qubes-pass: push rel 2024-07-11 17:26:23 +00:00
26dee9677c qubes-meta-packages: upgrade to 4.3.0 2024-07-11 17:26:23 +00:00
8d62b30e1e qubes-libvchan-xen: bump pkgrel 2024-07-11 17:26:23 +00:00
9c720e6fa9 qubes-gpg-split: upgrade to 2.0.71 2024-07-11 17:26:23 +00:00
bee9163ca4 qubes-db-vm: upgrade to 4.2.6 2024-07-11 17:26:23 +00:00
2e9c021866 qubes-app-linux-druide-antidore: bump rel 2024-07-11 17:26:23 +00:00
24126beac8
gitlab/bin: consider main as r4.3 2024-07-11 12:51:58 -04:00
15 changed files with 278 additions and 77 deletions

35
.forgejo/bin/check_ver.sh Executable file
View file

@ -0,0 +1,35 @@
#!/bin/bash
# expects the following env variables:
# downstream: downstream repo
repo=${downstream/*\/}
curl --silent $downstream/x86_64/APKINDEX.tar.gz | tar -O -zx APKINDEX > APKINDEX
owned_by_you=$(awk -v RS= -v ORS="\n\n" '/m:Antoine Martin \(ayakael\) <dev@ayakael.net>/' APKINDEX | awk -F ':' '{if($1=="o"){print $2}}' | sort | uniq)
echo "Found $(printf '%s\n' $owned_by_you | wc -l ) packages owned by you"
rm -f out_of_date not_in_anitya
for pkg in $owned_by_you; do
if [ $CHECK_LATEST -eq 1 ]; then
upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].version')
else
upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].stable_version')
fi
downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1)
downstream_version=${downstream_version/-*}
if [ -z "$upstream_version" ]; then
echo "$pkg not in anitya"
echo "$pkg" >> not_in_anitya
elif [ "$downstream_version" != "$(printf '%s\n' $upstream_version $downstream_version | sort -V | head -n 1)" ]; then
echo "$pkg higher downstream"
continue
elif [ "$upstream_version" != "$downstream_version" ]; then
echo "$pkg upstream version $upstream_version does not match downstream version $downstream_version"
echo "$pkg $downstream_version $upstream_version $repo" >> out_of_date
fi
done

165
.forgejo/bin/create_issue.sh Executable file
View file

@ -0,0 +1,165 @@
#!/bin/bash
# expects:
# env variable FORGEJO_TOKEN
# file out_of_date
IFS='
'
repo=${downstream/*\/}
does_it_exist() {
name=$1
downstream_version=$2
upstream_version=$3
repo=$4
query="$repo/$name: upgrade to $upstream_version"
query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )"
result="$(curl --silent -X 'GET' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN"
)"
if [ "$result" == "[]" ]; then
return 1
fi
}
is_it_old() {
name=$1
downstream_version=$2
upstream_version=$3
repo=$4
query="$repo/$name: upgrade to"
query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )"
result="$(curl --silent -X 'GET' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN"
)"
result_title="$(echo $result | jq -r '.[].title' )"
result_id="$(echo $result | jq -r '.[].number' )"
result_upstream_version="$(echo $result_title | awk '{print $4}')"
if [ "$upstream_version" != "$result_upstream_version" ]; then
echo $result_id
else
echo 0
fi
}
update_title() {
name=$1
downstream_version=$2
upstream_version=$3
repo=$4
id=$5
result=$(curl --silent -X 'PATCH' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues/$id" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN" \
-H 'Content-Type: application/json' \
-d "{
\"title\": \"$repo/$name: upgrade to $upstream_version\"
}"
)
return 0
}
create_issue() {
name=$1
downstream_version=$2
upstream_version=$3
repo=$4
result=$(curl --silent -X 'POST' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN" \
-H 'Content-Type: application/json' \
-d "{
\"title\": \"$repo/$name: upgrade to $upstream_version\",
\"labels\": [
$LABEL_NUMBER
]
}")
return 0
}
if [ -f out_of_date ]; then
out_of_date="$(cat out_of_date)"
echo "Detected $(wc -l out_of_date) out-of-date packages, creating issues"
for pkg in $out_of_date; do
name="$(echo $pkg | awk '{print $1}')"
downstream_version="$(echo $pkg | awk '{print $2}')"
upstream_version="$(echo $pkg | awk '{print $3}')"
repo="$(echo $pkg | awk '{print $4}')"
if does_it_exist $name $downstream_version $upstream_version $repo; then
echo "Issue for $repo/$name already exists"
continue
fi
id=$(is_it_old $name $downstream_version $upstream_version $repo)
if [ "$id" != "0" ] && [ -n "$id" ]; then
echo "Issue for $repo/$name needs updating"
update_title $name $downstream_version $upstream_version $repo $id
continue
fi
echo "Creating issue for $repo/$name"
create_issue $name $downstream_version $upstream_version $repo
done
fi
if [ -f not_in_anitya ]; then
query="Add missing $repo packages to anitya"
query="$(echo $query | sed 's| |%20|g')"
result="$(curl --silent -X 'GET' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN"
)"
if [ "$result" == "[]" ]; then
echo "Creating anitya issue"
result=$(curl --silent -X 'POST' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN" \
-H 'Content-Type: application/json' \
-d "{
\"title\": \"Add missing $repo packages to anitya\",
\"body\": \"- [ ] $(sed '{:q;N;s/\n/\\n- [ ] /g;t q}' not_in_anitya)\",
\"labels\": [
$LABEL_NUMBER
]
}")
else
echo "Updating anitya issue"
result_id="$(echo $result | jq -r '.[].number' )"
result=$(curl --silent -X 'PATCH' \
"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues/$result_id" \
-H 'accept: application/json' \
-H "authorization: Basic $FORGEJO_TOKEN" \
-H 'Content-Type: application/json' \
-d "{
\"body\": \"- [ ] $(sed '{:q;N;s/\n/\\n- [ ] /g;t q}' not_in_anitya)\"
}"
)
fi
fi

View file

@ -0,0 +1,28 @@
on:
workflow_dispatch:
schedule:
- cron: '0 5 * * *'
jobs:
check-r4.2:
name: Check user repo
runs-on: x86_64
container:
image: alpine:latest
env:
downstream: https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.2
FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
LABEL_NUMBER: 9
CHECK_LATEST: 0
steps:
- name: Environment setup
run: apk add grep coreutils gawk curl wget bash nodejs git jq sed
- name: Get scripts
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Check out-of-date packages
run: ${{ github.workspace }}/.forgejo/bin/check_ver.sh
- name: Create issues
run: ${{ github.workspace }}/.forgejo/bin/create_issue.sh

View file

@ -0,0 +1,28 @@
on:
workflow_dispatch:
schedule:
- cron: '0 5 * * *'
jobs:
check-r4.3:
name: Check user repo
runs-on: x86_64
container:
image: alpine:latest
env:
downstream: https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.3
FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
LABEL_NUMBER: 9
CHECK_LATEST: 1
steps:
- name: Environment setup
run: apk add grep coreutils gawk curl wget bash nodejs git jq sed
- name: Get scripts
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Check out-of-date packages
run: ${{ github.workspace }}/.forgejo/bin/check_ver.sh
- name: Create issues
run: ${{ github.workspace }}/.forgejo/bin/create_issue.sh

View file

@ -8,6 +8,10 @@ Linux template. The upstream repo uses GitLab's CI to build and deploy packages
targetting multiple Alpine Linux versions. QubesOS releases are tracked using targetting multiple Alpine Linux versions. QubesOS releases are tracked using
branches. 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,
navigate to that branch.
#### Template builder #### Template builder
The template builder is housed in its [own repo](https://ayakael.net/forge/qubes-builder-alpine) 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 RPMs are built in-pipeline using the build artifacts produced by this repo. These RPMs facilitate
@ -50,7 +54,7 @@ curl -JO https://ayakael.net/api/packages/forge/alpine/key
Add repository to `/etc/apk/repositories`: Add repository to `/etc/apk/repositories`:
```shell ```shell
echo "https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.2" > /etc/apk/repositories echo "https://ayakael.net/api/packages/forge/alpine/edge/qubes-r4.3" > /etc/apk/repositories
``` ```

View file

@ -3,7 +3,7 @@
pkgname=qubes-app-linux-druide-antidote pkgname=qubes-app-linux-druide-antidote
pkgver=0.0.1_git20240201 pkgver=0.0.1_git20240201
_gittag=c724c88aa2a20b1e422b464499015ff05753316d _gittag=c724c88aa2a20b1e422b464499015ff05753316d
pkgrel=2 pkgrel=3
arch="noarch" arch="noarch"
pkgdesc="Qubes Druide-Antidote is a Qubes Application. It send a file to the Antidote Qube, invoke Antidote, and retrieve the file" 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 url=https://github.com/neowutran/qubes-app-linux-druide-antidote

View file

@ -2,7 +2,7 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=qubes-input-proxy pkgname=qubes-input-proxy
pkgver=1.0.40 pkgver=1.0.40
_gittag="v$pkgver" _gittag=v$pkgver
pkgrel=0 pkgrel=0
pkgdesc="The Qubes service for proxying input devices" pkgdesc="The Qubes service for proxying input devices"
arch="x86_64" arch="x86_64"

View file

@ -1,59 +0,0 @@
From 8c4c3807119f27957e6c7f87d505d66d0ea4c3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Sat, 18 Nov 2023 18:27:28 +0100
Subject: [PATCH] Support changed libxenctrl API in Xen 4.18.0
The xc_domain_getinfo() is gone, it's replaced with
xc_domain_getinfo_single. While the new API is a bit nicer, xenctrl.h
does not provide any #define to know which one is available. Check
library version in the makefile for that.
---
vchan/Makefile.linux | 4 ++++
vchan/io.c | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/vchan/Makefile.linux b/vchan/Makefile.linux
index 281f2b5..587cb34 100644
--- a/vchan/Makefile.linux
+++ b/vchan/Makefile.linux
@@ -27,6 +27,10 @@ CFLAGS += -g -Wall -Wextra -Werror -fPIC -O2 -D_GNU_SOURCE -MD -MP -MF $@.dep
all: libvchan-xen.so vchan-xen.pc
-include *.dep
+# xenctrl.h does not provide any #define to distinguish API versions
+XENCTRL_VERSION := $(shell pkg-config --modversion xencontrol)
+CFLAGS += $(shell if printf '%s\n' '4.18.0' '$(XENCTRL_VERSION)' | \
+ sort -CV; then echo -DHAVE_XC_DOMAIN_GETINFO_SINGLE; fi)
SO_VER = 1
libvchan-xen.so.$(SO_VER): init.o io.o
diff --git a/vchan/io.c b/vchan/io.c
index 3d0ed35..0c23223 100644
--- a/vchan/io.c
+++ b/vchan/io.c
@@ -33,14 +33,24 @@
/* check if domain is still alive */
int libvchan__check_domain_alive(xc_interface *xc_handle, int dom) {
struct evtchn_status evst;
+#ifdef HAVE_XC_DOMAIN_GETINFO_SINGLE
+ xc_domaininfo_t dominfo;
+#else
xc_dominfo_t dominfo;
+#endif
int ret;
/* first try using domctl, more reliable but available in a privileged
* domain only */
+#ifdef HAVE_XC_DOMAIN_GETINFO_SINGLE
+ ret = xc_domain_getinfo_single(xc_handle, dom, &dominfo);
+ if (ret == 0)
+ return !(dominfo.flags & XEN_DOMINF_dying);
+#else
ret = xc_domain_getinfo(xc_handle, dom, 1, &dominfo);
if (ret == 1)
return dominfo.domid == (uint32_t)dom && !dominfo.dying;
+#endif
else if (ret == -1 && errno == ESRCH)
return 0;
/* otherwise fallback to xc_evtchn_status method */

View file

@ -5,7 +5,7 @@ subpackages="
qubes-vm-dependencies qubes-vm-dependencies
qubes-vm-recommended qubes-vm-recommended
" "
pkgver=4.2.14 pkgver=4.3.0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=1 pkgrel=1
pkgdesc="Meta packages for Qubes-specific components" pkgdesc="Meta packages for Qubes-specific components"
@ -38,5 +38,5 @@ recommended() {
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
} }
sha512sums=" sha512sums="
6227eb7dbbfd10d047c8f31222702a171f9134b404db7c2da6cf154a3d4856bc50c2f6bd0016860255a50d4f6e12723ea82026368ab8ee0d1aff8c316f2f77e9 qubes-meta-packages-v4.2.14 7567bc7edd6a17315bb5a968ff512a7758ef9697d11ed5200f8ffefe7069b0ebbbb790bffdc7a8717b9707c24309bb6d83cfc6306eb1d48724480af36ba95594 qubes-meta-packages-v4.3.0
" "

View file

@ -1,7 +1,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=qubes-usb-proxy pkgname=qubes-usb-proxy
pkgver=1.3.3 pkgver=4.3.0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=0 pkgrel=0
pkgdesc="The Qubes service for proxying USB devices" pkgdesc="The Qubes service for proxying USB devices"
@ -37,6 +37,6 @@ package() {
echo "vhci-hcd" > "$pkgdir"/etc/modules-load.d/qubes-usb-proxy.conf echo "vhci-hcd" > "$pkgdir"/etc/modules-load.d/qubes-usb-proxy.conf
} }
sha512sums=" sha512sums="
975f851f674d7ef30bc7b4661c8725667e068da5d149244d63c4f929492eb515b5edc23a1e7b849924cf715a10b13eccbbe7de83f6dbed9a80500e57470d1221 qubes-usb-proxy-v1.3.3.tar.gz b193a4df3b0281b2619528ac0a6542a47bd7204a073c9f0cb7c17233d0537f742eb83a58d591fc0e2599aea1a4783f07c7c90dcccdf08fa5845d36e14adae1e3 qubes-usb-proxy-v4.3.0.tar.gz
c6519982f7eef8586ee823dc96efa7b1b90f489114edcc348bc5221837090d19a2a3533eac83e3269ba68c2cf24447c018e0ac850ed1423a1280ebae364223fa usb-import-alpine-udevadm.patch c6519982f7eef8586ee823dc96efa7b1b90f489114edcc348bc5221837090d19a2a3533eac83e3269ba68c2cf24447c018e0ac850ed1423a1280ebae364223fa usb-import-alpine-udevadm.patch
" "

View file

@ -8,7 +8,7 @@ subpackages="
$pkgname-doc $pkgname-doc
$pkgname-pyc $pkgname-pyc
" "
pkgver=4.2.39 pkgver=4.3.15
pkgrel=0 pkgrel=0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="The Qubes core files for installation inside a Qubes VM." 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 make -C passwordless-root install DESTDIR="$subpkgdir" SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
} }
sha512sums=" sha512sums="
60f674805a3fdcdc9aa9edda30c705c5815b5ab61a66967f1bf5974c4c23175d5265b0eec5d5067e03fa87aa5c1cc90ec1eafee092a5b807c3e96c4adef2da0e qubes-vm-core-v4.2.39.tar.gz bf065cb5037ba8ef80b7c50dc9d37fb80e8337357496d3bfca8c052d34be29fa57e96e48af3a3354b93ac9adb81bd18ed00f32a91f7cee76867dbb4c4d446c79 qubes-vm-core-v4.3.15.tar.gz
95c080a593ca1cd457ffafc0cdd6ee28999c72f67191a3955b6081a4a7d287cae4cd0c626139562e5e1eb55516c25402a174e3599daf7d4cb259d6b4bbdff155 qubes-core-early.openrc 95c080a593ca1cd457ffafc0cdd6ee28999c72f67191a3955b6081a4a7d287cae4cd0c626139562e5e1eb55516c25402a174e3599daf7d4cb259d6b4bbdff155 qubes-core-early.openrc
61529413a16b7fa0df691c24adc41b90477c01ea70d572921ecec89df23932e5a2e60c4e73b9a84181dc30424e2e6af4ad1c7dcf6c42689c3cc346a9923d6e07 qubes-core-netvm.openrc 61529413a16b7fa0df691c24adc41b90477c01ea70d572921ecec89df23932e5a2e60c4e73b9a84181dc30424e2e6af4ad1c7dcf6c42689c3cc346a9923d6e07 qubes-core-netvm.openrc
da8e293520f5fce29ce76d7586e8ce1a4164798a1214079fb554c690264da1d774fdad3f45825aac52c2c3a0b0cfd39df73eb33394dedd7c043fe0f2344b90ca qubes-core.openrc da8e293520f5fce29ce76d7586e8ce1a4164798a1214079fb554c690264da1d774fdad3f45825aac52c2c3a0b0cfd39df73eb33394dedd7c043fe0f2344b90ca qubes-core.openrc

View file

@ -1,7 +1,7 @@
# Contributor: Antoine Martin (ayakael) <dev@ayakael.net> # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=qubes-vm-gui-dev pkgname=qubes-vm-gui-dev
pkgver=4.2.5 pkgver=4.3.0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=1 pkgrel=1
pkgdesc="Common files for Qubes GUI - protocol headers." pkgdesc="Common files for Qubes GUI - protocol headers."
@ -18,5 +18,5 @@ package() {
cp include/*.h $pkgdir/usr/include/ cp include/*.h $pkgdir/usr/include/
} }
sha512sums=" sha512sums="
12bdf5c2dfcc594b034f5dd94a4fa398ef51a42e8bf425386ff34af63510b749fb0aaa6966f569cc16205efbb310076bd370ceefcd1d254fa5d2e8599554a64d qubes-vm-gui-dev-v4.2.5.tar.gz c1046fda6395c6c7907fa3d9c963089169e860d4e0f79c2cf7bafe8a673c93ac0aec3ca312f97510541127510dc7d2ad585949599ed1fffbb0758ff1098ea518 qubes-vm-gui-dev-v4.3.0.tar.gz
" "

View file

@ -5,7 +5,7 @@ subpackages="
qubes-vm-pulseaudio qubes-vm-pulseaudio
qubes-vm-pipewire qubes-vm-pipewire
$pkgname-openrc" $pkgname-openrc"
pkgver=4.2.20 pkgver=4.3.4
pkgrel=0 pkgrel=0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="The Qubes GUI Agent for AppVMs" pkgdesc="The Qubes GUI Agent for AppVMs"
@ -116,7 +116,7 @@ pipewire() {
} }
sha512sums=" sha512sums="
a44acb287ac5c67fa8a35f8f6589ebd2d4bf17781c7074d3b0b79a4e4ff535de409b9da4d8175d9712bce9bbe6eb98ceab21d5e1f0526e359090ab44efac54a7 qubes-vm-gui-v4.2.20.tar.gz 8d3ed290496ccb667020c53b2171f4616d8078c3e554ce32154ca32465594217d025ebd54dfc374c7e7c4a2d09c07bae445d56f23980c47424468555af584e9c qubes-vm-gui-v4.3.4.tar.gz
f0bbb936e14689d0cbced2f564b8911f9287c0217616f02f3bd0c3060e516d080ad538219f089f5841c2b9d18bb4ad8efb63516ddfd46c18b038218378996a7d 0001-musl-build.patch f0bbb936e14689d0cbced2f564b8911f9287c0217616f02f3bd0c3060e516d080ad538219f089f5841c2b9d18bb4ad8efb63516ddfd46c18b038218378996a7d 0001-musl-build.patch
01beace4c130200dc8d42248349ea858d2bec746aca2bdfa5948b6e7240bb3b832bbb8b324293fba6fd6aafb0a3d7a2e3928c7fd39d318ef4d5a18cfeb48cde6 0001-initd-fix.patch 01beace4c130200dc8d42248349ea858d2bec746aca2bdfa5948b6e7240bb3b832bbb8b324293fba6fd6aafb0a3d7a2e3928c7fd39d318ef4d5a18cfeb48cde6 0001-initd-fix.patch
68d01e594296e18d54d8eaa17863451c3ac121e4fcacf98b64db14166bdcf38aa66f1c3659c5014c0a9cc25b5368df66f8c642b8e7af59da8d2a5ad97da9a194 qubes-gui-agent.openrc 68d01e594296e18d54d8eaa17863451c3ac121e4fcacf98b64db14166bdcf38aa66f1c3659c5014c0a9cc25b5368df66f8c642b8e7af59da8d2a5ad97da9a194 qubes-gui-agent.openrc

View file

@ -2,9 +2,9 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=qubes-vm-qrexec pkgname=qubes-vm-qrexec
subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc"
pkgver=4.2.22 pkgver=4.3.1
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=2 pkgrel=0
pkgdesc="The Qubes qrexec files (qube side)" pkgdesc="The Qubes qrexec files (qube side)"
arch="x86_64" arch="x86_64"
url="https://github.com/QubesOS/qubes-core-qrexec" 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 install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent
} }
sha512sums=" sha512sums="
df93577344af228a8fc699576155e2327164ff7d80236dad234919ad686a457e81942a7e57d50bf2e76886b64b23dd4fc3e848f003bdc15defff2621f4514d84 qubes-vm-qrexec-v4.2.22.tar.gz f25d4a6ae587666bc2db6c42978779f6ea52bac10c17e399aed7cd99ecf9b6cedb48a2baa54386f8994c086a9f12b8ed6f8d911f63eee17f86c8e36c0ea7049c qubes-vm-qrexec-v4.3.1.tar.gz
e2dd5cace82e881c40d5d37c69f7327fbabde81c9d23283de23de9f1197b7b018ef07a8d90e95c61bd249426d9d8297e7cb372333245941ffa0682c90ea3461f qubes-qrexec-agent.openrc e2dd5cace82e881c40d5d37c69f7327fbabde81c9d23283de23de9f1197b7b018ef07a8d90e95c61bd249426d9d8297e7cb372333245941ffa0682c90ea3461f qubes-qrexec-agent.openrc
c3009ddb97656be7d0a78910217c852f0f9b20cd37b4537d99724e629bc87f1c675ada084eba3c641c4ae54dab8aacd87514d73de72f42d6ccc976e6255212bc makefile-remove-cc-cflags.patch c3009ddb97656be7d0a78910217c852f0f9b20cd37b4537d99724e629bc87f1c675ada084eba3c641c4ae54dab8aacd87514d73de72f42d6ccc976e6255212bc makefile-remove-cc-cflags.patch
69b88c8d344f0d575eac398937040ba39a0d8fb8ea0a2b160c48d84775e1da4e226a76f3c5d3be7b045f577b634bb35cd5c5536248e18117c4121a38f9f3bf13 agent-qrexec-fork-server-undef-fortify-source.patch 69b88c8d344f0d575eac398937040ba39a0d8fb8ea0a2b160c48d84775e1da4e226a76f3c5d3be7b045f577b634bb35cd5c5536248e18117c4121a38f9f3bf13 agent-qrexec-fork-server-undef-fortify-source.patch

View file

@ -6,7 +6,7 @@ subpackages="
$pkgname-openrc $pkgname-openrc
$pkgname-pyc $pkgname-pyc
" "
pkgver=4.2.19 pkgver=4.3.7
pkgrel=0 pkgrel=0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="Common Linux files for Qubes VM." 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 install -m 755 "$builddir"/dracut/full-dmroot/qubes_cow_setup.sh "$subpkgdir"/usr/lib/qubes/qubes_cow_setup.sh
} }
sha512sums=" sha512sums="
6fc8dd61a1263b2ea3a578f9cf791060a1ad5f46b132c9002ecbb44a60c956b110b409a127c25f1753d5a6be0744df752f9dd8a88a164417f5c4980e2fb199fd qubes-vm-utils-v4.2.19.tar.gz 557a3f4d0e95f9e999367f103bfe80d4d5a9734bb841dc24cc67804641d805cfdee99ebef68b47027ae6bf255ca9e1fd15446d0f5aa21a906d10da43eb9a733a qubes-vm-utils-v4.3.7.tar.gz
c29bac0c6b9a0c81ee42e88541d9216549276448a02c3005ea20d85c7eda483cee28bbc159098bd42badc7ed80058734311931ee4ef13e170e49f83cf3f5a9ae qubes-meminfo-writer.openrc c29bac0c6b9a0c81ee42e88541d9216549276448a02c3005ea20d85c7eda483cee28bbc159098bd42badc7ed80058734311931ee4ef13e170e49f83cf3f5a9ae qubes-meminfo-writer.openrc
" "