Merge branch 'work/fix-pkgctl-version-upgrade' into 'master'

fix(pkgctl): handle pkgver values containing regex metacharacters

See merge request archlinux/devtools!311

contrib/completion/bash/devtools.in

@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search

src/commitpkg.in

@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done

src/lib/license/setup.sh

@@ -191,7 +191,9 @@ path = [
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",
+    "*sysusers.conf",
     "*.tmpfiles",
+    "*tmpfiles.conf",
     "*.logrotate",
     "*.pam",
     "*.service",

src/lib/util/pkgbuild.sh

@@ -14,6 +14,11 @@ source /usr/share/makepkg/util/schema.sh
 
 set -eo pipefail
 
+# escapes regex metacharacters in a given string
+_escape_pkgver() {
+	# shellcheck disable=SC2001
+	sed 's:[\^.\[$()|*+?{\\]:\\&:g' <<<"$1"
+}
 
 # set the pkgver variable in a PKGBUILD
 # assumes that the pkgbuild is sourced to detect the presence of a pkgver function
@@ -21,6 +26,8 @@ pkgbuild_set_pkgver() {
 	local new_pkgver=$1
 	local pkgver=${pkgver}
 
+	pkgver="$(_escape_pkgver "${pkgver}")"
+
 	if [[ $(type -t pkgver) == function ]]; then
 		# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
 		warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'