building repository pakete distr0-0.4.4_1 riseup-vpn-0.4.4_1

.drone.yml

@@ -16,9 +16,8 @@ steps:
   privileged: true
   commands:
     - 'sh /files/bin/init.sh'
-    - 'bash /files/bin/build.sh'
+    - 'bash /files/bin/autobuild.sh'
     - 'bash /files/bin/cleanup.sh'
-    - 'bash /files/bin/sign.sh'
   volumes:
   - name: dronecache
     path: /files

.github/issue_template.md

@@ -1,4 +1,4 @@
-<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt . However, a quality pull request may help. -->
+<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt. However, a quality pull request may help. -->
 ### System
 
 * xuname:  

.github/pull_request_template.md

@@ -8,7 +8,8 @@
 - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
 -->
 
-<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
+<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
+https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
 and test at least one native build and, if supported, at least one cross build.
 Ignore this section if this PR is not skipping CI.
 -->

.github/workflows/build.yaml

@@ -1,12 +1,24 @@
-name: Check PR
+name: Check build
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - 'srcpkgs/**'
+  push:
+    branches:
+      - 'ci-**'
+    paths:
+      - 'srcpkgs/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   # Lint changed templates.
   xlint:
     name: Lint templates
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     env:
       PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
@@ -26,7 +38,7 @@ jobs:
   # Build changed packages.
   build:
     name: Build packages
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
 
     container:
@@ -86,6 +98,22 @@ jobs:
           "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
           )
 
+      - name: Compare to previous
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
+      - name: Check file conflicts
+        if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
+        run: |
+          if [ -s /tmp/templates ]; then
+              xlocate -S &&
+              common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+          fi
+
       - name: Verify repository state
         run: |
           (

.github/workflows/cycles.yml

@@ -1,18 +1,10 @@
-name: 'Scheduled tasks'
+name: 'Cycle Check'
 
 on:
   schedule:
     - cron: '0 18 * * *'
 
 jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          pr-lock-inactive-days: '90'
-          process-only: 'prs'
   cycles:
     runs-on: ubuntu-latest
     container:
@@ -36,6 +28,13 @@ jobs:
          common/travis/prepare.sh
       - name: Find cycles and open issues
         run: |
+         if command -v chroot-git >/dev/null 2>&1; then
+             GIT_CMD=$(command -v chroot-git)
+         elif command -v git >/dev/null 2>&1; then
+            GIT_CMD=$(command -v git)
+         fi
+         # required by git 2.35.2+
+         $GIT_CMD config --global --add safe.directory "$PWD"
          common/scripts/xbps-cycles.py | tee cycles
          grep 'Cycle:' cycles | while read -r line; do
              if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then

.github/workflows/stale.yml

@@ -0,0 +1,22 @@
+---
+name: Stale Cleanup
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 14 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.'
+          days-before-stale: 90
+          days-before-close: 14
+          exempt-all-assignees: true
+          ascending: true
+          operations-per-run: 250
+          exempt-issue-labels: request

Manual.md

@@ -62,6 +62,7 @@ packages for XBPS, the `Void Linux` native packaging system.
 		* [kernel-hooks](#triggers_kernel_hooks)
 		* [mimedb](#triggers_mimedb)
 		* [mkdirs](#triggers_mkdirs)
+		* [openjdk-profile](#triggers_openjdk_profile)
 		* [pango-modules](#triggers_pango_module)
 		* [pycompile](#triggers_pycompile)
 		* [register-shell](#triggers_register_shell)
@@ -600,6 +601,9 @@ path of the Python wheel produced by the build phase that will be installed; whe
 `python-pep517` build style will look for a wheel matching the package name and version in the
 current directory with respect to the install.
 
+- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
+or for setting environment variables for the check command. By default empty.
+
 - `patch_args` The arguments to be passed in to the `patch(1)` command when applying
 patches to the package sources during `do_patch()`. Patches are stored in
 `srcpkgs/<pkgname>/patches` and must be in `-p1` format. By default set to `-Np1`.
@@ -1101,7 +1105,13 @@ still be passed in if it's a GNU configure script.
 
 - `post_build()` Actions to execute after `do_build()`.
 
-- `pre_install()` Actions to execute after `post_build()`.
+- `pre_check()` Actions to execute after `post_build()`.
+
+- `do_check()` Actions to execute to run checks for the package.
+
+- `post_check()` Actions to execute after `do_check()`.
+
+- `pre_install()` Actions to execute after `post_check()`.
 
 - `do_install()` Actions to execute to install the package files into the `fake destdir`.
 
@@ -1991,6 +2001,13 @@ During removal it will delete the directory using `rmdir`.
 To include this trigger use the `make_dirs` variable, as the trigger won't do anything
 unless it is defined.
 
+<a id="triggers_openjdk_profile"></a>
+#### openjdk-profile
+
+The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that
+sets the `JAVA_HOME` environment variable to the currently-selected alternative for
+`/usr/bin/java` on installation. This trigger must be manually requested.
+
 <a id="triggers_pango_module"></a>
 #### pango-modules
 

common/build-style/cargo.sh

@@ -11,7 +11,7 @@ do_build() {
 do_check() {
 	: ${make_cmd:=cargo}
 
-	${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
+	${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
 		${make_check_args}
 }
 

common/build-style/cmake.sh

@@ -116,7 +116,7 @@ do_check() {
 
 	: ${make_check_target:=test}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {

common/build-style/configure.sh

@@ -29,7 +29,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {

common/build-style/gnu-configure.sh

@@ -30,7 +30,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {

common/build-style/gnu-makefile.sh

@@ -30,7 +30,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {

common/build-style/meson.sh

@@ -138,7 +138,7 @@ do_check() {
 	: ${make_check_target:=test}
 	: ${meson_builddir:=build}
 
-	${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
 }
 
 do_install() {

common/build-style/perl-ModuleBuild.sh

@@ -41,7 +41,7 @@ do_check() {
 	if [ ! -x ./Build ]; then
 		msg_error "$pkgver: cannot find ./Build script!\n"
 	fi
-	./Build test
+	${make_check_pre} ./Build test
 }
 
 do_install() {

common/build-style/perl-module.sh

@@ -79,7 +79,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=test}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {

common/build-style/python-module.sh

@@ -49,7 +49,7 @@ do_check() {
 			fi
 		fi
 
-		python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
+		${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
 		rm build
 	done
 }

common/build-style/python3-module.sh

@@ -26,6 +26,7 @@ do_build() {
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
 		PYTHONPATH="$(cd build/lib* && pwd)" \
+			${make_check_pre} \
 			python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
@@ -37,7 +38,7 @@ do_check() {
 		fi
 
 		: ${make_check_target:=test}
-		python3 setup.py ${make_check_target} ${make_check_args}
+		${make_check_pre} python3 setup.py ${make_check_target} ${make_check_args}
 	fi
 }
 

common/build-style/python3-pep517.sh

@@ -14,7 +14,7 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		python3 -m pytest ${make_check_args} ${make_check_target}
+		${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		msg_warn "Unable to determine tests for PEP517 Python templates"
 		return 0
@@ -23,7 +23,11 @@ do_check() {
 
 do_install() {
 	# As with do_build, no need to accommodate cross compilation here
-	: ${make_install_target:=${pkgname#python3-}-${version}-*-*-*.whl}
+	if [ -z "${make_install_target}" ]; then
+		# Default wheel name normalizes hyphens to underscores
+		local wheelbase="${pkgname#python3-}"
+		make_install_target="${wheelbase//-/_}-${version}-*-*-*.whl"
+	fi
 
 	# If do_build was overridden, make sure the TMPDIR exists
 	mkdir -p build

common/build-style/raku-dist.sh

@@ -3,7 +3,7 @@
 #
 
 do_check() {
-	RAKULIB=lib prove -r -e raku t/
+	RAKULIB=lib ${make_check_pre} prove -r -e raku t/
 }
 
 do_install() {

common/environment/setup/sourcepkg.sh

@@ -7,7 +7,7 @@ unset -v archs distfiles checksum build_style build_helper nocross broken
 unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
 unset -v make_build_args make_check_args make_install_args
 unset -v make_build_target make_check_target make_install_target
-unset -v make_cmd meson_cmd gem_cmd fetch_cmd
+unset -v make_cmd meson_cmd gem_cmd fetch_cmd make_check_pre
 unset -v python_version stackage
 unset -v cmake_builddir meson_builddir
 unset -v meson_crossfile

common/environment/setup/vsed.sh

@@ -57,8 +57,13 @@ vsed() {
 			newdigest="$($XBPS_DIGEST_CMD "$f")"
 			newdigest="${newdigest%% *}"
 
+			msgfunc=msg_warn
+			if [ -n "$XBPS_STRICT" ]; then
+				msgfunc=msg_error
+			fi
+
 			if [ "$olddigest" = "$newdigest" ]; then
-				msg_warn "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
+				$msgfunc "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
 			fi
 			olddigest="${newdigest}"
 		done

common/hooks/do-patch/00-patches.sh

@@ -6,23 +6,23 @@ _process_patch() {
 	_args="-Np1"
 	_patch=${i##*/}
 
-	if [ -f $PATCHESDIR/${_patch}.args ]; then
+	if [ -f "$PATCHESDIR/${_patch}.args" ]; then
-		_args=$(<$PATCHESDIR/${_patch}.args)
+		_args=$(<"$PATCHESDIR/${_patch}.args")
 	elif [ -n "$patch_args" ]; then
 		_args=$patch_args
 	fi
-	cp -f $i "$wrksrc"
+	cp -f "$i" "$wrksrc"
 
 	# Try to guess if its a compressed patch.
-	if [[ $f =~ .gz$ ]]; then
+	if [[ $i =~ .gz$ ]]; then
 		gunzip "$wrksrc/${_patch}"
 		_patch=${_patch%%.gz}
-	elif [[ $f =~ .bz2$ ]]; then
+	elif [[ $i =~ .bz2$ ]]; then
 		bunzip2 "$wrksrc/${_patch}"
 		_patch=${_patch%%.bz2}
-	elif [[ $f =~ .diff$ ]]; then
+	elif [[ $i =~ .diff$ ]]; then
 		:
-	elif [[ $f =~ .patch$ ]]; then
+	elif [[ $i =~ .patch$ ]]; then
 		:
 	else
 		msg_warn "$pkgver: unknown patch type: $i.\n"
@@ -31,7 +31,7 @@ _process_patch() {
 
 	cd "$wrksrc"
 	msg_normal "$pkgver: patching: ${_patch}.\n"
-	patch -s ${_args} -i ${_patch} 2>/dev/null
+	patch -s ${_args} <"${_patch}" 2>/dev/null
 }
 
 hook() {
@@ -44,11 +44,11 @@ hook() {
 		done < $PATCHESDIR/series
 	else
 		for f in $PATCHESDIR/*; do
-			[ ! -f $f ] && continue
+			[ ! -f "$f" ] && continue
 			if [[ $f =~ ^.*.args$ ]]; then
 				continue
 			fi
-			_process_patch $f
+			_process_patch "$f"
 		done
 	fi
 }

common/hooks/pre-pkg/04-generate-runtime-deps.sh

@@ -34,15 +34,14 @@ add_rundep() {
 
 store_pkgdestdir_rundeps() {
         if [ -n "$run_depends" ]; then
-            : > ${PKGDESTDIR}/rdeps
             for f in ${run_depends}; do
                 _curdep="$(echo "$f" | sed -e 's,\(.*\)?.*,\1,')"
                 if [ -z "$($XBPS_UHELPER_CMD getpkgdepname ${_curdep} 2>/dev/null)" -a \
                      -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then
                     _curdep="${_curdep}>=0"
                 fi
-                printf -- "${_curdep} " >> ${PKGDESTDIR}/rdeps
+                printf -- "${_curdep}\n"
-            done
+            done | sort | xargs > ${PKGDESTDIR}/rdeps
         fi
 }
 
@@ -166,6 +165,6 @@ hook() {
         sorequires+="${f} "
     done
     if [ -n "${sorequires}" ]; then
-        echo "${sorequires}" > ${PKGDESTDIR}/shlib-requires
+        echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi
 }

common/hooks/pre-pkg/99-pkglint.sh

@@ -182,7 +182,7 @@ hook() {
 			if [ -z "$found" ]; then
 				_myshlib="${libname}.so"
 				[ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
-				msg_warn "${pkgver}: ${_myshlib} not found in common/shlibs!\n"
+				msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
 			fi;
 		}
 	done

common/scripts/lint-commits

@@ -35,18 +35,18 @@ do
 	/^$/ && !msg { msg = 1; next }
 	!msg { next }
 	# 3: long-line-is-banned-except-footnote-like-this-for-url
-	(NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 }
+	(NF > 2) && (length > 80) { print "::error title=Commit Lint::" C ": long line: " $0; exit 1 }
 	!subject {
-		if (length > 50) { print C ": subject is a bit long" }
+		if (length > 50) { print "::warning title=Commit Lint::" C ": subject is a bit long" }
-		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
+		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print "::error title=Commit Lint::" C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
 		# Below check is too noisy?
 		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
-		# 	print C ": not new package/update/removal?"
+		# 	print "::warning title=Commit Lint::" C ": not new package/update/removal?"
 		# }
 		subject = 1; next
 	}
 	/^$/ { body = 1; next }
-	!body { print C ": second line must be blank"; exit 1 }
+	!body { print "::error title=Commit Lint::" C ": second line must be blank"; exit 1 }
 	' || status=1
 done
 exit $status

common/scripts/lint-conflicts

@@ -0,0 +1,198 @@
+#!/usr/bin/env bash
+
+# Report packages installing same file and not marked with
+# conflicts or replaces.
+# Without argument, find conflicts between packages in local
+# repository at hostdir/binpkgs and packages indexed in xlocate.
+# With single path as argument, read that local repository.
+# With -a flag, find conflicts between packages indexed in xlocate.
+
+if [ "$#" = 0 ]; then
+	binpkgs="$PWD/hostdir/binpkgs"
+elif [ "$1" = -a ]; then
+	all=1
+elif [ -d "$1" ]; then
+	binpkgs="$1"
+else
+	echo "Usage:"
+	echo "$0"
+	echo "  check packages in ./hostdir/binpkgs"
+	echo "$0 path/to/hostdir/binpkgs"
+	echo "  check packages there"
+	echo "$0 -a"
+	echo "  check all packages indexed in xlocate"
+	exit 1
+fi
+
+declare -A newly_built conflicts_cache providers_cache pairs owners
+repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+rv=0
+
+template_exists() {
+	[ -f "srcpkgs/$1/template" ]
+}
+
+partial_check() {
+	[ -z "$all" ]
+}
+
+providers_of() {
+	# print the pkgname and packages that `provides` it
+	local pkgname=$1
+	if [ "${providers_cache[$pkgname]}" = '' ]; then
+		local line provider_pkgver provided_pkgver provider_pkgname provided_pkgname
+		local -A providers
+		providers[$pkgname]=$pkgname
+		while read -r line; do
+			line=${line%%'('*}
+			provider_pkgver=${line%': '*}
+			provided_pkgver=${line#*': '}
+			provider_pkgname=${provider_pkgver%-*}
+			provided_pkgname=${provided_pkgver%-*}
+			# comes from $(xbps-query -s $pkgname), so $pkgname can be substring
+			if [ "$provided_pkgname" = "$pkgname" ]; then
+				providers[$provider_pkgname]=$provider_pkgname
+			fi
+		done < <(xbps-query "${repositories[@]}" -p provides -R -s "$pkgname")
+		# leading space ensures ${[]} != ''
+		providers_cache[$pkgname]=" ${providers[*]}"
+	fi
+	echo ${providers_cache[$pkgname]}
+}
+
+conflicts_of() {
+	# print list of packages that are _marked_ as conflicting with given one
+	local pkgname=$1
+	if [ "${conflicts_cache[$pkgname]}" = '' ]; then
+		local in_conflict provider
+		local -A all
+		while read -r in_conflict; do
+			in_conflict=${in_conflict%'<'*}
+			in_conflict=${in_conflict%'>'*}
+			providers_of "$in_conflict" > /dev/null # executing in same process to fill cache
+			for provider in $(providers_of "$in_conflict"); do
+				all[$provider]=$provider
+			done
+		done < <(xbps-query "${repositories[@]}" -p conflicts,replaces -R "$pkgname")
+		# leading space ensures ${[]} != ''
+		conflicts_cache[$pkgname]=" ${all[*]}"
+	fi
+	echo ${conflicts_cache[$pkgname]}
+}
+
+conflict_between() {
+	# exit successfully if packages are _marked_ as conflicting
+	conflicts_of "$1" > /dev/null # executing in same process to fill cache
+	case " $(conflicts_of "$1") " in
+		*" $2 "*) return 0
+	esac
+	conflicts_of "$2" > /dev/null # executing in same process to fill cache
+	case " $(conflicts_of "$2") " in
+		*" $1 "*) return 0
+	esac
+	return 1
+}
+
+list_newly_built_files() {
+	# print one line per file in newly built packages
+	# each line contains pkgname and file path
+	local pkgver pkgname
+	while read -r pkgver; do
+		pkgname=${pkgver%-*}
+		xbps-query "${repositories[@]}" -i -f "$pkgname" | sed s'/ -> .*//;'" s/^/$pkgname /"
+	done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2)
+}
+
+list_interesting_files() {
+	# list files potentially contained in more than one package
+	# each line contains pkgver/pkgname and file path
+	if partial_check; then
+		list_newly_built_files
+	else
+		xlocate / | sed s'/ -> .*//' | grep -F -f <(xlocate / | cut -f 2- | sed s'/ -> .*//' | sort | uniq -d)
+	fi
+}
+
+group_by_file_full() {
+	# create associative array `owners` mapping file to list of packages
+	# for packages potentially conflicting with newly built ones
+	local pkgver file pkgname
+	while read -r pkgver file; do
+		pkgname=${pkgver%-*}
+		if template_exists "$pkgname"; then
+			owners[$file]+=" $pkgname"
+		fi
+	done < <(list_interesting_files)
+}
+
+group_by_file_partial() {
+	# create associative array `owners` mapping file to list of packages
+	# for all packages in xlocate
+	local pkgname file
+	## newly built packages
+	while read -r pkgver; do
+		pkgname=${pkgver%-*}
+		newly_built[$pkgname]=$pkgname
+	done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2)
+	while read -r pkgname file; do
+		owners[$file]+=" $pkgname"
+	done < <(list_newly_built_files)
+	## rest of repository
+	while read -r pkgver file; do
+		pkgname=${pkgver%-*}
+		if [ -z "${newly_built[$pkgname]}" ] && template_exists "$pkgname"; then
+			owners[$file]+=" $pkgname"
+		fi
+	done < <(xlocate / | sed s'/ -> .*//' | grep -F -f <(list_newly_built_files | cut -d ' ' -f 2-))
+}
+
+group_by_pair() {
+	# find package pairs owning same file and not marked as conflicting
+	local pkg file a b
+	while read -r pkg file; do
+		for a in ${owners[$file]}; do
+			for b in ${owners[$file]}; do
+				if ! [ "$a" "<" "$b" ]; then
+					continue
+				fi
+				if partial_check && [ -z "${newly_built[$a]}" ] && [ -z "${newly_built[$b]}" ]; then
+					continue
+				fi
+				if ! conflict_between "$a" "$b"; then
+					unset pair_files
+					local -A pair_files
+					eval "${pairs["$a $b"]}"
+					pair_files[$file]="$file"
+					pairs["$a $b"]="${pair_files[@]@A}"
+				fi
+			done
+		done
+	done < <(list_interesting_files)
+}
+
+print_out() {
+	local pair file
+	if [ "${#pairs[@]}" = 0 ]; then
+		echo 1>&2 "No conflicts found in" "${repositories[@]#*=}"
+		exit 0
+	fi
+	while read -r pair; do
+		rv=1
+		echo "${pair% *} and ${pair#* } conflict for"
+		unset pair_files
+		eval "${pairs[$pair]}"
+		for file in "${pair_files[@]}"; do
+			echo "  $file"
+		done | sort
+	done < <(printf '%s\n' "${!pairs[@]}" | sort)
+}
+
+if partial_check; then
+	group_by_file_partial
+else
+	group_by_file_full
+fi
+group_by_pair
+print_out
+
+exit $rv

common/scripts/lint2annotations.awk

@@ -0,0 +1,11 @@
+# Converts xlint/etc format lints into GH Actions annotations
+# The original line is printed alongside the annotation command
+{
+	split($0, a, ": ")
+	split(a[1], b, ":")
+	msg = substr($0, index($0, ": ") + 2)
+	if (b[2]) {
+		line = ",line=" b[2]
+	}
+	printf "::error title=Template Lint,file=%s%s::%s\n", b[1], line, msg
+}

common/shlibs

@@ -59,6 +59,7 @@ libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.16 libgo-10.2.0_1
+libgccjit.so.0 libgccjit-10.2.1pre1_1
 libperl.so.5.34 perl-5.34.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
@@ -84,11 +85,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.70.0_1
+libgthread-2.0.so.0 glib-2.72.0_1
-libglib-2.0.so.0 glib-2.70.0_1
+libglib-2.0.so.0 glib-2.72.0_1
-libgmodule-2.0.so.0 glib-2.70.0_1
+libgmodule-2.0.so.0 glib-2.72.0_1
-libgio-2.0.so.0 glib-2.70.0_1
+libgio-2.0.so.0 glib-2.72.0_1
-libgobject-2.0.so.0 glib-2.70.0_1
+libgobject-2.0.so.0 glib-2.72.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
@@ -224,7 +225,7 @@ libgpg-error.so.0 libgpg-error-1.6_1
 liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.20 libgcrypt-1.6.1_1
 libgnutls.so.30 gnutls-3.4.13_1
-libgnutlsxx.so.28 gnutls-3.2.13_1
+libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
@@ -421,7 +422,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.6.2 mtxclient-0.6.2_1
+libmatrix_client.so.0.7.0 mtxclient-0.7.0_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
@@ -511,7 +512,6 @@ libKF5CalendarSupport.so.5 calendarsupport-17.12.3_1
 libKF5AkonadiNotes.so.5 akonadi-notes-17.12.3_1
 libKPimKDAV.so.5 kdav-5.72.0_1
 libKF5DAV.so.5 kdav-5.72.0_1
-libKF5AlarmCalendar.so.5 kalarmcal-17.12.3_1
 libakonadi-singlefileresource.so.5 kdepim-runtime-17.12.3_1
 libkmindexreader.so.5 kdepim-runtime-17.12.3_1
 libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
@@ -744,7 +744,6 @@ libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
-libgmime-2.6.so.0 gmime-2.6.4_1
 libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
 libgladeui-2.so.13 libgladeui3-3.38.0_1
@@ -818,10 +817,11 @@ libchamplain-0.12.so.0 libchamplain-0.12.5_2
 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
 libvpx.so.5 libvpx5-1.7.0_1
 libvpx.so.6 libvpx6-1.8.0_1
+libvpx.so.7 libvpx7-1.11.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
-libvte-2.91.so.0 vte3-0.52.2_1
+libvte-2.91.so.0 vte3-0.68.0_1
 libpipeline.so.1 libpipeline-1.2.0_1
 libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1
@@ -990,6 +990,7 @@ libmdbsql.so.0 libmdb-0.5_1
 libkmod.so.2 libkmod-5_1
 libestr.so.0 libestr-0.1.2_1
 libee.so.0 libee-0.3.2_1
+libopendht.so.2 opendht-2.3.1_1
 libobt.so.2 libopenbox-3.5.2_1
 libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
@@ -1133,6 +1134,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1
@@ -1190,7 +1192,7 @@ libconfig.so.11 libconfig-1.7.1_1
 libopusfile.so.0 opusfile-0.12_2
 libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
-libgranite.so.5 granite-0.5.0_1
+libgranite.so.6 granite-6.2.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
 librlog.so.5 librlog-1.4_1
 libtinyxml.so.0 tinyxml-2.6.2_1
@@ -1435,7 +1437,7 @@ libgfrpc.so.0 libglusterfs-8.3_2
 libgfxdr.so.0 libglusterfs-8.3_2
 libgfapi.so.0 libglusterfs-8.3_2
 libglusterd.so.0 libglusterfs-8.3_2
-libsnapper.so.5 libsnapper-0.4.1_1
+libsnapper.so.6 libsnapper-0.10.2_1
 libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
 libjbig2dec.so.0 libjbig2dec-0.11_1
@@ -1572,9 +1574,9 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libwiretap.so.11 libwireshark-3.4.0_1
+libwiretap.so.12 libwireshark-3.6.3_1
-libwireshark.so.14 libwireshark-3.4.0_1
+libwireshark.so.15 libwireshark-3.6.3_1
-libwsutil.so.12 libwireshark-3.4.0_1
+libwsutil.so.13 libwireshark-3.6.3_1
 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
 libKF5Prison.so.5 prison-5.43.0_1
@@ -1775,7 +1777,7 @@ libspiro.so.1 libspiro-20190731_1
 libopenjp2.so.7 libopenjpeg2-2.1.0_1
 libcln.so.6 cln-1.3.3_1
 libchm.so.0 libchmlib-0.40_1
-libOkular5Core.so.9 libokular-18.04.1_1
+libOkular5Core.so.10 libokular-22.04.1_1
 libmnl.so.0 libmnl-1.0.3_1
 libnftnl.so.11 libnftnl-1.1.2_1
 libfcgi.so.0 fcgi-2.4.0_2
@@ -1808,12 +1810,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
@@ -1980,7 +1982,7 @@ libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
-libqwt.so.6 qwt-6.1.3_1
+libqwt.so.6.2 qwt-6.2.0_1
 liblxqt-qt5.so.0 liblxqt-0.8.0_1
 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1
 liblxqt-globalkeys-ui-qt5.so.0 lxqt-globalkeys-0.8.0_1
@@ -1988,7 +1990,7 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1
 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
-libfm-qt.so.10 libfm-qt-1.0.0_1
+libfm-qt.so.11 libfm-qt-1.1.0_1
 libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libQt6Core.so.6 qt6-core-6.0.0_1
 libQt6OpenGL.so.6 qt6-gui-6.0.0_1
@@ -2034,6 +2036,8 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
+libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
+libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
@@ -2618,7 +2622,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.24 libfilezilla-0.36.0_1
+libfilezilla.so.25 libfilezilla-0.37.2_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
@@ -2676,21 +2680,21 @@ libvidstab.so.1.1 libvidstab-1.1.0_1
 libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
-libKDevCMakeCommon.so.35 kdevelop-21.12.2_1
+libKDevCMakeCommon.so.36 kdevelop-22.04.1_1
-libKDevClangPrivate.so.35 kdevelop-21.12.2_1
+libKDevClangPrivate.so.36 kdevelop-22.04.1_1
-libKDevCompileAnalyzerCommon.so.35 kdevelop-21.12.2_1
+libKDevCompileAnalyzerCommon.so.36 kdevelop-22.04.1_1
-libKDevPlatformDebugger.so.57 kdevelop-21.12.2_1
+libKDevPlatformDebugger.so.58 kdevelop-22.04.1_1
-libKDevPlatformDocumentation.so.57 kdevelop-21.12.2_1
+libKDevPlatformDocumentation.so.58 kdevelop-22.04.1_1
-libKDevPlatformInterfaces.so.57 kdevelop-21.12.2_1
+libKDevPlatformInterfaces.so.58 kdevelop-22.04.1_1
-libKDevPlatformLanguage.so.57 kdevelop-21.12.2_1
+libKDevPlatformLanguage.so.58 kdevelop-22.04.1_1
-libKDevPlatformOutputView.so.57 kdevelop-21.12.2_1
+libKDevPlatformOutputView.so.58 kdevelop-22.04.1_1
-libKDevPlatformProject.so.57 kdevelop-21.12.2_1
+libKDevPlatformProject.so.58 kdevelop-22.04.1_1
-libKDevPlatformSerialization.so.57 kdevelop-21.12.2_1
+libKDevPlatformSerialization.so.58 kdevelop-22.04.1_1
-libKDevPlatformShell.so.57 kdevelop-21.12.2_1
+libKDevPlatformShell.so.58 kdevelop-22.04.1_1
-libKDevPlatformSublime.so.57 kdevelop-21.12.2_1
+libKDevPlatformSublime.so.58 kdevelop-22.04.1_1
-libKDevPlatformTests.so.57 kdevelop-21.12.2_1
+libKDevPlatformTests.so.58 kdevelop-22.04.1_1
-libKDevPlatformUtil.so.57 kdevelop-21.12.2_1
+libKDevPlatformUtil.so.58 kdevelop-22.04.1_1
-libKDevPlatformVcs.so.57 kdevelop-21.12.2_1
+libKDevPlatformVcs.so.58 kdevelop-22.04.1_1
 libts.so.0 tslib-1.6_1
 libobs.so.0 obs-0.14.1_2
 libobsglad.so.0 obs-0.14.1_2
@@ -2896,7 +2900,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_3
+libbotan-2.so.19 botan-2.19.1_1
 libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
@@ -2956,6 +2960,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.36_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
@@ -2983,7 +2988,7 @@ libmutter-cogl-9.so.0 mutter-41.0_1
 libmutter-cogl-pango-9.so.0 mutter-41.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
-libslopy.so.7.5 slop-7.5_1
+libslopy.so.7.6 slop-7.6_1
 libbcunit.so.1 bcunit-3.0_1
 libzbar.so.0 libzbar-0.10_1
 libzbargtk.so.0 libzbar-0.10_1
@@ -3044,7 +3049,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.8 libyara-4.1.0_1
+libyara.so.9 libyara-4.2.0_1
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
@@ -3097,9 +3102,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.30 libprotobuf-lite-3.19.4_1
+libprotobuf-lite.so.31 libprotobuf-lite-3.20.1_1
-libprotoc.so.30 libprotoc-3.19.4_1
+libprotoc.so.31 libprotoc-3.20.1_1
-libprotobuf.so.30 libprotobuf-3.19.4_1
+libprotobuf.so.31 libprotobuf-3.20.1_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
@@ -3125,8 +3130,8 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
@@ -3174,32 +3179,33 @@ libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
 libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
-libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1
+libkdeconnectinterfaces.so.22 kdeconnect-22.04.1_1
-libkdeconnectcore.so.21 kdeconnect-21.03.80_1
+libkdeconnectcore.so.22 kdeconnect-22.04.1_1
-libkpmcore.so.11 kpmcore-21.03.80_1
+libkpmcore.so.12 kpmcore-22.04.1_1
 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
-libr_core.so.5.0.0 radare2-5.0.0_1
+libr_core.so.5.6.8 radare2-5.6.8_1
-libr_config.so.5.0.0 radare2-5.0.0_1
+libr_config.so.5.6.8 radare2-5.6.8_1
-libr_cons.so.5.0.0 radare2-5.0.0_1
+libr_cons.so.5.6.8 radare2-5.6.8_1
-libr_util.so.5.0.0 radare2-5.0.0_1
+libr_util.so.5.6.8 radare2-5.6.8_1
-libr_flag.so.5.0.0 radare2-5.0.0_1
+libr_flag.so.5.6.8 radare2-5.6.8_1
-libr_asm.so.5.0.0 radare2-5.0.0_1
+libr_asm.so.5.6.8 radare2-5.6.8_1
-libr_bin.so.5.0.0 radare2-5.0.0_1
+libr_bin.so.5.6.8 radare2-5.6.8_1
-libr_anal.so.5.0.0 radare2-5.0.0_1
+libr_anal.so.5.6.8 radare2-5.6.8_1
-libr_lang.so.5.0.0 radare2-5.0.0_1
+libr_lang.so.5.6.8 radare2-5.6.8_1
-libr_debug.so.5.0.0 radare2-5.0.0_1
+libr_debug.so.5.6.8 radare2-5.6.8_1
-libr_egg.so.5.0.0 radare2-5.0.0_1
+libr_egg.so.5.6.8 radare2-5.6.8_1
-libr_bp.so.5.0.0 radare2-5.0.0_1
+libr_bp.so.5.6.8 radare2-5.6.8_1
-libr_search.so.5.0.0 radare2-5.0.0_1
+libr_search.so.5.6.8 radare2-5.6.8_1
-libr_io.so.5.0.0 radare2-5.0.0_1
+libr_io.so.5.6.8 radare2-5.6.8_1
-libr_hash.so.5.0.0 radare2-5.0.0_1
+libr_hash.so.5.6.8 radare2-5.6.8_1
-libr_socket.so.5.0.0 radare2-5.0.0_1
+libr_socket.so.5.6.8 radare2-5.6.8_1
-libr_parse.so.5.0.0 radare2-5.0.0_1
+libr_parse.so.5.6.8 radare2-5.6.8_1
-libr_syscall.so.5.0.0 radare2-5.0.0_1
+libr_syscall.so.5.6.8 radare2-5.6.8_1
-libr_crypto.so.5.0.0 radare2-5.0.0_1
+libr_crypto.so.5.6.8 radare2-5.6.8_1
-libr_fs.so.5.0.0 radare2-5.0.0_1
+libr_fs.so.5.6.8 radare2-5.6.8_1
-libr_magic.so.5.0.0 radare2-5.0.0_1
+libr_magic.so.5.6.8 radare2-5.6.8_1
-libr_reg.so.5.0.0 radare2-5.0.0_1
+libr_reg.so.5.6.8 radare2-5.6.8_1
+libr_main.so.5.6.8 radare2-5.6.8_1
 libykpiv.so.1 libykpiv-2.1.1_2
 libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
@@ -3224,6 +3230,7 @@ libKF5AkonadiWidgets.so.5 akonadi5-17.12.0_1
 libKF5AkonadiXml.so.5 akonadi5-17.12.0_1
 libKF5PimTextEdit.so.5 kpimtextedit-17.12.0_1
 libKF5IdentityManagement.so.5 kidentitymanagement-17.12.0_1
+libKF5IdentityManagementWidgets.so.5 kidentitymanagement-22.04.0_1
 libKChart.so.2 kdiagram-2.6.0_1
 libKGantt.so.2 kdiagram-2.6.0_1
 libscrypt.so.0 libscrypt-1.21_1
@@ -3524,8 +3531,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
-libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
-libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
 libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots-0.15.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
@@ -3536,7 +3543,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1
 libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
-libtls.so.22 libtls-3.4.1_1
+libtls.so.25 libtls-3.5.2_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
 libfstrcmp.so.0 libfstrcmp-0.7.D001_1
@@ -3567,7 +3574,7 @@ libcloudproviders.so.0 libcloudproviders-0.2.5_2
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
 libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
-libgmime-3.0.so.0 gmime3-3.2.3_1
+libgmime-3.0.so.0 gmime-3.2.3_1
 libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
@@ -3595,6 +3602,8 @@ libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
 libvkd3d-utils.so.1 vkd3d-1.1_1
 libvkd3d-shader.so.1 vkd3d-1.3_1
 libvkd3d.so.1 vkd3d-1.1_1
+libgamemode.so.0 libgamemode-1.6.1_1
+libgamemodeauto.so.0 libgamemode-1.6.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
@@ -3629,7 +3638,6 @@ libibverbs.so.1 rdma-core-22.1_1
 librdmacm.so.1 rdma-core-22.1_1
 libdvdcss.so.2 libdvdcss-1.4.2_1
 libvalapanel.so.0 vala-panel-0.4.87_1
-libappmenu-gtk2-parser.so.0 appmenu-gtk-module-0.7.1_1
 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1
 libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
@@ -3715,7 +3723,7 @@ libdrumstick-rt.so.1 drumstick-1.1.2_1
 libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
-libarmadillo.so.9 armadillo-9.700.2_1
+libarmadillo.so.11 armadillo-11.0.1_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.10.0_2
@@ -3897,7 +3905,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.20 janet-1.20.0_1
+libjanet.so.1.22 janet-1.22.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
@@ -4038,7 +4046,7 @@ libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
-liblrcalc.so.1 lrcalc-1.2_1
+liblrcalc.so.2 lrcalc-2.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
@@ -4066,7 +4074,7 @@ libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libprimecount.so.7 primecount-7.2_1
 libprimesieve.so.9 primesieve-7.7_1
-libavif.so.13 libavif-0.9.3_1
+libavif.so.14 libavif-0.10.1_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
@@ -4116,7 +4124,7 @@ libjvm.so openjdk17-jre-17.0.1+12_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
-libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
+libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
 librz_bp.so.0.3.4 rizin-0.3.4_1
 librz_reg.so.0.3.4 rizin-0.3.4_1
@@ -4142,3 +4150,23 @@ librz_util.so.0.3.4 rizin-0.3.4_1
 librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
+libaravis-0.8.so.0 libaravis-0.8.21_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libnvme.so.1 libnvme-1.0_1
+libRInside.so R-cran-RInside-0.2.16_1
+libXrdUtils.so.3 xrootd-5.4.0_1
+libXrdCl.so.3 xrootd-5.4.0_1
+libXrdServer.so.3 xrootd-5.4.0_1
+libXrdCrypto.so.2 xrootd-5.4.0_1
+libXrdPosix.so.3 xrootd-5.4.0_1
+libXrdHttpUtils.so.2 xrootd-5.4.0_1
+libXrdSsiLib.so.2 xrootd-5.4.0_1
+libXrdCryptoLite.so.2 xrootd-5.4.0_1
+libCore.so root-6.24.06_1
+libTree.so root-6.24.06_1
+libRIO.so root-6.24.06_1
+libMatrix.so root-6.24.06_1
+libThread.so root-6.24.06_1
+libTMVA.so root-6.24.06_1
+libMathCore.so root-6.24.06_1
+liblowdown.so lowdown-0.11.2_1

common/travis/build.sh

@@ -13,7 +13,7 @@ fi
 PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
 
 for pkg in ${PKGS}; do
-	/hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg"
+	/hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg"
 	[ $? -eq 1 ] && exit 1
 done
 

common/travis/fetch_upstream.sh

@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory "$PWD"
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

common/travis/xlint.sh

@@ -11,7 +11,8 @@ common/scripts/lint-commits $base $tip || EXITCODE=$?
 
 for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do
 	/bin/echo -e "\x1b[32mLinting $t...\x1b[0m"
-	xlint "$t" || EXITCODE=$?
+	xlint "$t" > /tmp/xlint_out || EXITCODE=$?
-	common/scripts/lint-version-change "$t" $base $tip || EXITCODE=$?
+	common/scripts/lint-version-change "$t" $base $tip > /tmp/vlint_out || EXITCODE=$?
+	awk -f common/scripts/lint2annotations.awk /tmp/xlint_out /tmp/vlint_out
 done
 exit $EXITCODE

common/travis/xpkgdiff.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
+export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines
+ --color=always --label REPO --label BUILT'
+
+while read -r pkg; do
+	for subpkg in $(xsubpkg $pkg); do
+		if xbps-query --repository=$HOME/hostdir/binpkgs \
+					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  -i "$subpkg" >&/dev/null; then
+			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/bin/echo -e "\x1b[34mDependency Diff of $subpkg:\x1b[0m"
+			xpkgdiff -x $subpkg
+		else
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

common/xbps-src/shutils/bulk.sh

@@ -68,7 +68,7 @@ bulk_build() {
 
     # Compare installed pkg versions vs srcpkgs
     if [[ $sys ]]; then
-        xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR
+        bulk_sortdeps $(xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR)
         return $?
     fi
     # compare repo pkg versions vs srcpkgs

common/xbps-src/shutils/common.sh

@@ -147,6 +147,23 @@ msg_normal() {
     fi
 }
 
+report_broken() {
+    if [ "$show_problems" = "ignore-problems" ]; then
+        return
+    fi
+    if [ -z "$XBPS_IGNORE_BROKENNESS" ]; then
+        for line in "$@"; do
+            msg_red "$line"
+        done
+        exit 2
+    elif [ "$XBPS_IGNORE_BROKENNESS" != reported ]; then
+        for line in "$@"; do
+            msg_warn "$line"
+        done
+        XBPS_IGNORE_BROKENNESS=reported
+    fi
+}
+
 msg_normal_append() {
     [ -n "$NOCOLORS" ] || printf "\033[1m"
     printf "$@"
@@ -472,7 +489,15 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
+            extraflags="-i"
+            # filter out remote repositories
+            for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do
+                extraflags+=" --repository=$repo"
+            done
+        fi
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
@@ -636,14 +661,14 @@ setup_pkg() {
         wrksrc="$XBPS_BUILDDIR/$wrksrc"
     fi
 
-    if [ "$cross" -a "$nocross" -a "$show_problems" != "ignore-problems" ]; then
+    if [ "$cross" -a "$nocross" ]; then
-        msg_red "$pkgver: cannot be cross compiled, exiting...\n"
+        report_broken \
-        msg_red "$pkgver: $nocross\n"
+            "$pkgver: cannot be cross compiled...\n" \
-        exit 2
+            "$pkgver: $nocross\n"
-    elif [ "$broken" -a "$show_problems" != "ignore-problems" ]; then
+    elif [ "$broken" ]; then
-        msg_red "$pkgver: cannot be built, it's currently broken; see the build log:\n"
+        report_broken \
-        msg_red "$pkgver: $broken\n"
+            "$pkgver: cannot be built, it's currently broken; see the build log:\n" \
-        exit 2
+            "$pkgver: $broken\n"
     fi
 
     if [ -n "$restricted" -a -z "$XBPS_ALLOW_RESTRICTED" -a "$show_problems" != "ignore-problems" ]; then

common/xbps-src/shutils/pkgtarget.sh

@@ -34,8 +34,7 @@ check_pkg_arch() {
             esac
         done
         if [ -z "$nonegation" -a -n "$match" ] || [ -n "$nonegation" -a -z "$match" ]; then
-            msg_red "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
+            report_broken "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
-            exit 2
         fi
     fi
 }

common/xbps-src/shutils/update_check.sh

@@ -123,7 +123,10 @@ update_check() {
                 url="https://github.com/$pkgurlname/tags"
                 rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
-                pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
+                case "$url" in
+                    */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";;
+                    *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";;
+                esac
                 url="$pkgurlname/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)

srcpkgs/Amass/template

@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.1
+version=3.19.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,8 +9,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.owasp.org/index.php/OWASP_Amass_Project"
 distfiles="https://github.com/OWASP/Amass/archive/v${version}.tar.gz"
-checksum=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
+checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491
-
-post_install() {
-	rm ${DESTDIR}/usr/bin/examples
-}

srcpkgs/AppStream/template

@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.14.6
+version=0.15.3
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -8,16 +8,16 @@ build_helper="gir qemu"
 configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
  -Dstemming=false -Dapidocs=false -Dqt=true"
 hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
- qt5-host-tools $(vopt_if vala vala)"
+ qt5-host-tools $(vopt_if vala vala) itstool"
-makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel
+makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel
  libsoup-devel libcurl-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=fd71649aeefe1cb561f1921193b253033d21566bdcce849c93e37fdb21113560
+checksum=349b4753c5e6d8118c8ea3883547b1fde11a8217ffd61248a181f18bdfc1670c
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

srcpkgs/Bear/template

@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.18
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

srcpkgs/CLion/template

@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.3.3
+version=2021.3.4
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d
+checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78
 repository=nonfree
 restricted=yes
 nopie=yes

srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch

@@ -1,15 +0,0 @@
---- a/src/tui_ncurses.c	2021-10-07 14:38:03.886862860 -0400
-+++ b/src/tui_ncurses.c	2021-10-07 14:49:43.258142532 -0400
-@@ -262,6 +262,12 @@
- /* Convert keys when an alternative mapping is used */
- #define ALT_CODE 27
- #define ALT(x)   (x & ALT_CODE)
-+
-+/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */
-+#ifndef CTRL
-+#define CTRL(x)	(x&037)
-+#endif
-+
- static int convert_char(int ch)
- {
- 	int i = 0;

srcpkgs/CPU-X/template

@@ -1,30 +1,32 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.2.0
+version=4.3.0
 revision=1
 archs="x86_64* i686*"
 build_style=cmake
-hostmakedepends="nasm pkg-config gettext"
+hostmakedepends="pkg-config nasm"
-makedepends="libcpuid-devel ncurses-devel pciutils-devel
+makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')"
+ glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
+ $(vopt_if gtk3 gtk+3-devel)"
+checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://x0rg.github.io/CPU-X/"
 changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
+checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
-# tests depend on:
-# having mawk and nawk installed which breaks chroot-gawk
-# grep -P, which `chroot-grep` is compiled without
-make_check=no
-
 build_options="gtk3"
 build_options_default="gtk3"
 
-case "$XBPS_TARGET_MACHINE" in
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	*-musl)
 	makedepends+=" libexecinfo-devel"
 	LDFLAGS="-lexecinfo"
-	;;
+fi
-esac
+
+# Tests depend on the -P flag of grep, which is not available in chroot-grep
+# and installing grep as checkdepends breaks base-chroot.
+# So, only run tests in CI, where the masterdir is ephemeral anyway.
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+	make_check=no	# breaks base-chroot
+fi

srcpkgs/Carla/template

@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.4.2
+version=2.4.3
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -14,9 +14,9 @@ depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
 short_desc="Audio plugin host"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
+homepage="https://kx.studio/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39
+checksum=0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3
 python_version=3
 
 case $XBPS_TARGET_MACHINE in
@@ -29,15 +29,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" Carla-devel"
 fi
 
-pre_build() {
+post_patch() {
-	vsed -e '1,1i#include <unistd.h>' \
-		-i source/modules/water/text/CharacterFunctions.h
-
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
 			source/plugin/Makefile
 	fi
+}
 
+pre_build() {
 	make ${make_build_args} features
 }
 

srcpkgs/Chipmunk2D/patches/backport-zero-division.patch

@@ -1,35 +0,0 @@
-From 6a5767cc5a6c8f88f8cc689c0916ddc0111308fe Mon Sep 17 00:00:00 2001
-From: Bram Stolk <b.stolk@gmail.com>
-Date: Fri, 30 Mar 2018 19:21:26 -0700
-Subject: [PATCH] Fix issue #144 of division by zero when setting zero mass,
- zero moment.
-
----
- src/cpBody.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/cpBody.c src/cpBody.c
-index a8e0797..8ad2bc9 100644
---- a/src/cpBody.c
-+++ b/src/cpBody.c
-@@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass)
- 	
- 	cpBodyActivate(body);
- 	body->m = mass;
--	body->m_inv = 1.0f/mass;
-+	body->m_inv = mass == 0.0f ? INFINITY : 1.0f/mass;
- 	cpAssertSaneBody(body);
- }
- 
-@@ -275,7 +275,7 @@ cpBodySetMoment(cpBody *body, cpFloat moment)
- 	
- 	cpBodyActivate(body);
- 	body->i = moment;
--	body->i_inv = 1.0f/moment;
-+	body->i_inv = moment == 0.0f ? INFINITY : 1.0f/moment;
- 	cpAssertSaneBody(body);
- }
- 
--- 
-2.21.0
-

srcpkgs/Chipmunk2D/template

@@ -1,6 +1,6 @@
 # Template file for 'Chipmunk2D'
 pkgname=Chipmunk2D
-version=7.0.2
+version=7.0.3
 revision=1
 wrksrc="Chipmunk2D-Chipmunk-${version}"
 build_style=cmake
@@ -8,9 +8,9 @@ configure_args="-DBUILD_DEMOS=NO"
 short_desc="Fast and lightweight 2D game physics library"
 maintainer="Ekaterina Vaartis <vaartis@cock.li>"
 license="MIT"
-homepage="http://chipmunk-physics.net/"
+homepage="https://chipmunk-physics.net/"
 distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz"
-checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca
+checksum=1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a
 
 post_install() {
 	vlicense LICENSE.txt

srcpkgs/CopyQ/template

@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.0.1
+version=6.1.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=8d0b0fa840993fa100e888a5a1098e2769e3c234cd44236d75039e5c6e517645
+checksum=d235b31224264e7fa463020f1a934143aa287a4d9cb9bbb6883563ad66e84099

srcpkgs/EternalTerminal/template

@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
 version=6.0.13
-revision=5
+revision=6
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"

srcpkgs/FeatherPad/template

@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=1.1.1
+version=1.2.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 changelog="https://github.com/tsujan/FeatherPad/raw/master/ChangeLog"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=8f2943224f04a1ee4b30b5b7f5b60f34d10d6fe9000e786e1b3a38369d293f8f
+checksum=3926f496ff3a3e65d9d3ebf9f76cfa43a0a225580cbd3d1c362f37e3b13a60e8

srcpkgs/Ice/template

@@ -1,7 +1,7 @@
 # Template file for 'Ice'
 pkgname=Ice
-version=3.7.5
+version=3.7.7
-revision=2
+revision=1
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
-checksum=36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9
+checksum=3aef143a44a664f3101cfe02fd13356c739c922e353ef0c186895b5843a312ae
 
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp

srcpkgs/LimeSuite-devel

@@ -0,0 +1 @@
+LimeSuite

srcpkgs/LimeSuite-doc

@@ -0,0 +1 @@
+LimeSuite

srcpkgs/LimeSuite/template

@@ -0,0 +1,87 @@
+# Template file for 'LimeSuite'
+pkgname=LimeSuite
+version=20.10.0
+revision=1
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+configure_args="
+ -DENABLE_SIMD_FLAGS=none
+ -DENABLE_UTILITIES=True
+ -DENABLE_LIME_UTIL=True
+ -DCMAKE_SKIP_RPATH=True
+ -DENABLE_DESKTOP=False
+ -DENABLE_SOAPY_LMS7=True
+ -DENABLE_PCIE_XILLYBUS=True
+ -DENABLE_QUICKTEST=True
+ -DENABLE_MCU_TESTBENCH=True
+ -DENABLE_FTDI=True
+ -DENABLE_FX3=True
+ -DENABLE_STREAM_UNITE=True
+ -DENABLE_EXAMPLES=True
+ -DENABLE_HEADERS=True
+ -DENABLE_GUI=True
+ -DENABLE_API_DOXYGEN=True
+ $(vopt_bool octave ENABLE_OCTAVE)
+ -DLIME_SUITE_EXTVER=${version}_${revision}"
+hostmakedepends="doxygen"
+makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglut-devel
+ fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
+depends="wget"
+short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="Apache-2.0"
+homepage="https://myriadrf.org/projects/lime-suite/"
+distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"
+checksum=f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467
+shlib_provides="libLimeSuite.so.20.10-1"
+
+build_options="octave"
+desc_option_octave="Enable the LimeSuite Octave plugin"
+
+# Octave is not built on arm, so don't enable the build option by default on those archs
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch64*) build_options_default="" ;;
+	*) build_options_default="octave" ;;
+esac
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_install() {
+	vinstall udev-rules/64-limesuite.rules 644 usr/lib/udev/rules.d
+
+	for res in 16 22 32 48 64 128; do
+		_icon_dir="usr/share/icons/hicolor/${res}x${res}/apps"
+		vmkdir $_icon_dir
+		vinstall Desktop/lime-suite-$res.png 644 $_icon_dir lime-suite.png
+	done
+	vinstall Desktop/lime-suite.desktop 755 usr/share/applications
+}
+
+LimeSuite-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+LimeSuite-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vdoc docs/lms7_api_quick_start_guide.pdf
+		vdoc docs/StreamProtocol.pdf
+		vcopy docs/LMS_API_Documentation usr/share/doc/$pkgname
+	}
+}
+
+SoapyLMS7_package() {
+	short_desc="SoapySDR module for LimeSDR/LMS7002M"
+	pkg_install() {
+		vmove usr/lib/SoapySDR/modules0.7/libLMS7Support.so
+	}
+}

srcpkgs/MangoHud/template

@@ -1,19 +1,21 @@
 # Template file for 'MangoHud'
 pkgname=MangoHud
-version=0.6.5
+version=0.6.7.1
+_version="${version%.*}-${version##*.}"
 revision=1
-wrksrc="MangoHud-v${version}"
+wrksrc="MangoHud-v${_version}"
 build_style=meson
 configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
- -Dwith_nvml=disabled"
+ -Dwith_nvml=disabled -Duse_system_spdlog=enabled"
 hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config"
-makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers"
+makedepends="libglvnd-devel dbus-devel vulkan-loader Vulkan-Headers
+ spdlog"
 short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://github.com/flightlessmango/MangoHud"
-distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${version}/MangoHud-v${version}-Source-DFSG.tar.xz"
+distfiles="https://github.com/flightlessmango/MangoHud/releases/download/v${_version}/MangoHud-v${_version}-Source-DFSG.tar.xz"
-checksum=e4aff5f6e58140c1a818d3127076e703141aac50fa908e01d03268b2d3b65a0b
+checksum=220abdc563e39727527b63ace9f7b8b1de0a53d4cf79b8bbed5794dbbf8db77a
 
 post_patch() {
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

srcpkgs/Marker/template

@@ -4,7 +4,7 @@ version=2020.04.04
 revision=1
 wrksrc=marker
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
  webkit2gtk-devel"
 depends="iso-codes"

srcpkgs/Minder/template

@@ -1,9 +1,9 @@
 # Template file for 'Minder'
 pkgname=Minder
 version=1.14.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config gettext glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
  libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"

srcpkgs/MoarVM/template

@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2022.02
+version=2022.04
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -15,6 +15,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
+checksum=ae06f50ba5562721a4e5eb6457e2fea2d07eda63e2abaa8c939c9daf70774804
 nocross=yes
 shlib_provides="libmoar.so"

srcpkgs/Mousai/template

@@ -0,0 +1,13 @@
+# Template file for 'Mousai'
+pkgname=Mousai
+version=0.6.6
+revision=1
+build_style=meson
+hostmakedepends="python3 gettext glib-devel pkg-config"
+depends="python3-gobject python3-requests libadwaita"
+short_desc="Identify any songs in seconds"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/SeaDve/Mousai"
+distfiles="https://github.com/SeaDve/Mousai/archive/refs/tags/v$version.tar.gz"
+checksum=a1e5cb29ad16405abcab8b5e1eec82fc170e5f535f8c55b57f18c80acb18a0ae

srcpkgs/MultiMC/files/MultiMC.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc

srcpkgs/MultiMC/template

@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-revision=1
-wrksrc="Launcher-${version}"
-_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.6.1"
-_quazipversion="multimc-3"
-build_style=cmake
-configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
-hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
-makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
-depends="virtual?java-environment qt5-svg"
-short_desc="Instanced Minecraft client"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="http://multimc.org"
-distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
- https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
- https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164
- 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
- ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
-skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
-
-# Restricted since we don't have permissions to ship builds with the
-# MultiMC name, artwork or the API endpoints.
-restricted=yes
-
-case "$XBPS_TARGET_MACHINE" in
-	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
-esac
-
-pre_configure() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-	export PATH=$PATH:$JAVA_HOME/bin
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1
-}
-
-post_install() {
-	vmkdir usr/libexec/multimc
-	mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc"
-	vbin "${FILESDIR}/MultiMC.sh" MultiMC
-	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
-	vinstall build/libMultiMC_quazip.so 755 /usr/lib
-	vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications
-	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
-	vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
-}

srcpkgs/NetAuth-ldap/template

@@ -6,7 +6,6 @@ wrksrc=ldap-$version
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
-hostmakedepends="git"
 short_desc="LDAP Proxy for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

srcpkgs/NetAuth-localizer/template

@@ -6,7 +6,6 @@ wrksrc=localizer-$version
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize
-hostmakedepends="git"
 depends="snooze"
 short_desc="Make NetAuth accounts local in Linux"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

srcpkgs/NetAuth-nsscache/template

@@ -5,7 +5,6 @@ revision=1
 wrksrc="nsscache-$version"
 build_style=go
 go_import_path="github.com/netauth/nsscache"
-hostmakedepends="git"
 short_desc="NetAuth nsscache implementation"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

srcpkgs/NetAuth-pam-helper/template

@@ -5,7 +5,6 @@ revision=1
 wrksrc=pam-helper-$version
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
-hostmakedepends="git"
 short_desc="Helper executable to use with pam_exec"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

srcpkgs/NetAuth-sftpgo-hook/template

@@ -5,7 +5,6 @@ revision=2
 wrksrc=sftpgo-hook-$version
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
-hostmakedepends="git"
 depends="sftpgo"
 short_desc="External authorization hook for SFTPGo using NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

srcpkgs/NetAuth/template

@@ -7,7 +7,6 @@ build_style="go"
 go_import_path="github.com/netauth/netauth"
 go_package="${go_import_path}/cmd/netauth
  ${go_import_path}/cmd/netauthd"
-hostmakedepends="git"
 short_desc="Network authentication and identity system"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

srcpkgs/NetKeys/template

@@ -5,7 +5,6 @@ revision=1
 wrksrc=netkeys-$version
 build_style=go
 go_import_path="github.com/netauth/netkeys"
-hostmakedepends="git"
 short_desc="Key retrieval daemon for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

srcpkgs/NetworkManager/template

@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.36.2
+version=1.38.0
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -35,7 +35,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
+checksum=82a4cf07ddfeb0816787b67c0f5058ae6c50d6259c0b0541a24e35156062b2ef
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes

srcpkgs/PolyMC/files/README.voidlinux

@@ -0,0 +1,6 @@
+Void-specific instructions:
+============================
+
+You may not have the correct version of java installed for running specific
+versions of Minecraft. For Minecraft version 1.17 and up install openjdk17-jre
+and for older ones openjdk8-jre.

srcpkgs/PolyMC/template

@@ -0,0 +1,34 @@
+# Template file for 'PolyMC'
+pkgname=PolyMC
+version=1.2.2
+revision=1
+build_style=cmake
+configure_args="-DLauncher_BUILD_PLATFORM=Void
+ -DLauncher_VERSION_BUILD=${revision}"
+hostmakedepends="openjdk8 qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="virtual?java-runtime qt5-imageformats xrandr"
+short_desc="Custom launcher for Minecraft"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-only"
+homepage="https://polymc.org/"
+distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
+checksum=4ce46406040b5315a598e412feecb70e5248cfc07fac9e3086597af12c102137
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=0"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
+esac
+
+post_patch() {
+	vsed -i buildconfig/BuildConfig.cpp.in \
+		-e 's/"-" + QString/"_" + QString/'
+	rm -rf .git
+}
+
+post_install() {
+	vdoc ${FILESDIR}/README.voidlinux
+}

srcpkgs/PolyMC/update

@@ -0,0 +1,2 @@
+site=https://github.com/PolyMC/PolyMC/tags
+pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?'

srcpkgs/QMPlay2/template

@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=21.12.24
+version=22.03.19
 revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=92e5fa7f7df43a83f72bf9e87366ebae71148bc683db0556447981f0dd8e5f2d
+checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

srcpkgs/R-cran-RInside/template

@@ -0,0 +1,12 @@
+# Template file for 'R-cran-RInside'
+pkgname=R-cran-RInside
+version=0.2.17
+revision=1
+build_style=R-cran
+makedepends="R-cran-Rcpp"
+short_desc="C++ classes to embed R in C++ (and C) applications"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://CRAN.R-project.org/package=RInside"
+checksum=0be28c44ee34cba669a7264d2b99c289230645598ca78e21682559dc31824348
+shlib_provides="libRInside.so"

srcpkgs/SDL2/template

@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.20
+version=2.0.22
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -10,12 +10,12 @@ hostmakedepends="pkg-config nasm"
 makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
  libsamplerate-devel"
 short_desc="Simple DirectMedia Layer (version 2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>"
 license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
+checksum=fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

srcpkgs/SPIRV-Headers/template

@@ -1,11 +1,17 @@
 # Template file for 'SPIRV-Headers'
 pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
 revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
-license="GPL-3.0-or-later"
+license="MIT"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
-distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
+distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz"
-checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
+checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c
+
+post_install() {
+	vlicense LICENSE
+}

srcpkgs/SPIRV-Headers/update

@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

srcpkgs/SPIRV-Tools/template

@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
 revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -8,11 +8,12 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
 hostmakedepends="python3"
 makedepends="SPIRV-Headers"
 short_desc="API and commands for processing SPIR-V modules"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
+changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
+checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
 
 SPIRV-Tools-devel_package() {
 	depends="SPIRV-Tools-${version}_${revision}"

srcpkgs/Signal-Desktop/template

@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.35.0
+version=5.43.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -10,11 +10,11 @@ archs="x86_64"
 hostmakedepends="git git-lfs nodejs python3 tar yarn"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="akierig <anelki@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
+checksum=9239dfc0356cec3c0aaea93e09d0ac44030037f24c1dcc3725e1e417c74af419
 nostrip_files="signal-desktop"
 
 post_extract() {

srcpkgs/SoapyLMS7

@@ -0,0 +1 @@
+LimeSuite

srcpkgs/StyLua/template

@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.12.4
+version=0.13.1
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ce6b4a6767b17f8d609e8c9d666c5f6f5c2863edd0638e70392bfe55f99b4fd0
+checksum=21158028569158ec7c1ad71352f3cb1906a005eb797508aa2b0b4a861162cf72
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

srcpkgs/SuiteSparse/patches/ppc32.patch

@@ -0,0 +1,22 @@
+commit e483b8506640797a09ea30c126c081ea4070b2e2
+Author: q66 <daniel@octaforge.org>
+Date:   Mon Feb 28 19:15:39 2022 +0100
+
+    prevent cpu_features from shitting itself on ppc32
+
+diff --git a/GraphBLAS/cpu_features/src/impl_ppc_linux.c b/GraphBLAS/cpu_features/src/impl_ppc_linux.c
+index 13a381a..fa72eee 100644
+--- a/GraphBLAS/cpu_features/src/impl_ppc_linux.c
++++ b/GraphBLAS/cpu_features/src/impl_ppc_linux.c
+@@ -69,6 +69,11 @@
+   LINE(PPC_SCV, scv, "scv", 0, PPC_FEATURE2_SCV)                               \
+   LINE(PPC_HTM_NO_SUSPEND, htm_no_suspend, "htm-no-suspend", 0,                \
+        PPC_FEATURE2_HTM_NO_SUSPEND)
++
++#ifdef PPC
++#undef PPC
++#endif
++
+ #define INTROSPECTION_PREFIX PPC
+ #define INTROSPECTION_ENUM_PREFIX PPC
+ #include "define_introspection_and_hwcaps.inl"

srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch

@@ -0,0 +1,22 @@
+This is to avoid running demos on `make install`, which break cross compile
+
+--- a/Makefile
++++ b/Makefile
+@@ -294,7 +294,7 @@ endif
+ # just compile GraphBLAS
+ gb:
+ 	echo $(CMAKE_OPTIONS)
+-	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 
+ # compile and install GraphBLAS libgraphblas_renamed, for MATLAB
+ gbrenamed:
+@@ -309,7 +309,7 @@ gbrenamed:
+ 
+ # just compile Mongoose
+ mon:
+-	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 
+ # compile and install Mongoose
+ moninstall: mon

srcpkgs/SuiteSparse/template

@@ -1,7 +1,7 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=5.10.1
+version=5.12.0
-revision=2
+revision=1
 # XXX: re-enable TBB=-ltbb -DSPQR_CONFIG=-DHAVE_TBB when updating, if possible
 make_build_args="BLAS=-lblas LAPACK=-llapack"
 hostmakedepends="cmake chrpath"
@@ -10,8 +10,9 @@ short_desc="Suite of sparse matrix software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
+changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee
+checksum=5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de
 
 do_build() {
 	make config library $make_build_args JOBS=$XBPS_MAKEJOBS

srcpkgs/SweetHome3D/template

@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.5.2
+version=6.6
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8
+checksum=0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries

srcpkgs/TerraState/template

@@ -7,7 +7,6 @@ make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"
 go_package="${go_import_path}/cmd/terrastate"
-hostmakedepends="git"
 short_desc="Remote state for Terraform"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"

srcpkgs/Thunar/template

@@ -1,7 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 reverts="4.17.0_1"
-version=4.16.10
+version=4.16.11
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -16,9 +16,9 @@ short_desc="Thunar File Manager"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
-changelog="https://raw.githubusercontent.com/xfce-mirror/thunar/master/NEWS"
+changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=f105c8f5abc50c411f6218f913561ae3a485826bd0cd09503a4772d015899c92
+checksum=f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

srcpkgs/Uranium/template

@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

srcpkgs/Venom/template

@@ -1,16 +0,0 @@
-# Template file for 'Venom'
-pkgname=Venom
-version=0.5.5
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee08-devel gspell-devel
- libcanberra-devel sqlcipher-devel json-glib-devel
- libsoup-devel toxcore-devel libsodium-devel
- opus-devel libvpx-devel gstreamer1-devel"
-short_desc="Modern Tox client for the desktop"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/naxuroqa/Venom/"
-distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz"
-checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562

srcpkgs/VirtualGL/update

@@ -0,0 +1 @@
+ignore="2.6.[9][0-9]"

srcpkgs/Vulkan-Headers/template

@@ -1,11 +1,12 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
 revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
+distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz"
-checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8
+checksum=9c4d33f71467c915749fbf48c0c3a8ee7833f15babf398e3463cd88791fb592e

srcpkgs/Vulkan-Headers/update

@@ -1,2 +1 @@
-pkgname=sdk
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"
-pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)"

srcpkgs/Vulkan-Tools/template

@@ -1,20 +1,20 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
 revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
 build_style=cmake
 configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
  -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
 hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
 makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
 short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz"
+distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz"
-checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
+checksum=3242f9ad158d02af9cc44186cbd415982387356a2dd8c0492af2fdace8c22f49
 
 build_options="cube"
 desc_option_cube="Build cube vulkan demo"

srcpkgs/Vulkan-Tools/update

@@ -1,2 +1 @@
-site=https://github.com/KhronosGroup/Vulkan-Tools/releases
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"
-pkgname=sdk

srcpkgs/Vulkan-ValidationLayers/template

@@ -1,16 +1,16 @@
 # Template file for 'Vulkan-ValidationLayers'
 pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
 revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
 build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
 hostmakedepends="pkg-config"
 makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
 short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz"
-checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917
+checksum=a5e658a4c1f504ae38488acdbe2ab2799e2ae4b626104d76776f1c24b079f341

srcpkgs/Vulkan-ValidationLayers/update

@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

srcpkgs/Waybar/template

@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.9
+version=0.9.12
 revision=1
 _date_version=3.0.0
 build_style=meson
@@ -29,7 +29,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
  https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
  https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="23a94538538f43a6db4c1c5f7e09e75ab743ded1ccfc737e1f3e0971fe4cdd87
+checksum="1f3f6692de99567c43939e7ad2e96f8c6a5ef83f760ad6f77865e46a3c6811d6
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

srcpkgs/accountsservice/patches/meson-0.61.patch

@@ -0,0 +1,29 @@
+From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: Fix build with meson 0.60
+
+Positional parameters to merge_file() were never allowed and always
+ignored, so just drop it.
+See: https://github.com/mesonbuild/meson/issues/9441
+
+Fixes #97
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 70edf89..9e80299 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -33,7 +33,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: policy,
+   po_dir: po_dir,
+-- 
+cgit v1.2.1
+

srcpkgs/accountsservice/template

@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dsystemdsystemunitdir=no
  $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
 makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"

srcpkgs/acfgfs/template

@@ -1,7 +1,7 @@
 # Template file for 'acfgfs'
 # !! keep synced with arcan
 pkgname=acfgfs
-version=0.6.0.1
+version=0.6.1
 revision=1
 wrksrc=arcan-${version}
 build_wrksrc=src/tools/acfgfs
@@ -13,7 +13,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
 
 case "${XBPS_TARGET_MACHINE}" in
 	i686|armv6l|armv7l|ppc)

srcpkgs/acme-client/files/acme-client.conf

@@ -0,0 +1,31 @@
+#
+# $OpenBSD: acme-client.conf,v 1.4 2020/09/17 09:13:06 florian Exp $
+#
+authority letsencrypt {
+	api url "https://acme-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-privkey.pem"
+}
+
+authority letsencrypt-staging {
+	api url "https://acme-staging-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-staging-privkey.pem"
+}
+
+authority buypass {
+	api url "https://api.buypass.com/acme/directory"
+	account key "/etc/acme/buypass-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+authority buypass-test {
+	api url "https://api.test4.buypass.no/acme/directory"
+	account key "/etc/acme/buypass-test-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+domain example.com {
+	alternative names { secure.example.com }
+	domain key "/etc/ssl/private/example.com.key"
+	domain full chain certificate "/etc/ssl/example.com.fullchain.pem"
+	sign with letsencrypt
+}

srcpkgs/acme-client/template

@@ -0,0 +1,23 @@
+# Template file for 'acme-client'
+pkgname=acme-client
+version=1.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config sed"
+makedepends="openssl-devel"
+checkdepends="nginx curl"
+short_desc="Portable version of OpenBSD's acme-client"
+maintainer="Lauri Tirkkonen <lauri@hacktheplanet.fi>"
+license="GPL-2.0-only"
+homepage="https://git.sr.ht/~graywolf/acme-client-portable/"
+distfiles="https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz"
+checksum=ac8796652393fa73f32dfda60ed3a437fc260867df1b81fa3c241bd95c5bc719
+make_check=no # requires https://github.com/letsencrypt/pebble which isn't packaged
+
+pre_install() {
+	sed -i 's,/etc/examples/,/usr/share/examples/acme-client/,g' usr.sbin/acme-client/acme-client.conf.5
+}
+
+post_install() {
+	vsconf ${FILESDIR}/acme-client.conf
+}