Merge branch 'gl-261-confirm-move' into 'master'

[GL#261] add db move confirmation prompt

Closes #261

See merge request archlinux/devtools!304

Makefile

@@ -1,6 +1,6 @@
 SHELL=/bin/bash -o pipefail
 
-V=1.3.0
+V=1.4.0
 BUILDTOOLVER ?= $(V)
 
 PREFIX = /usr/local
@@ -19,6 +19,7 @@ PACMAN_CONFIGS=$(wildcard config/pacman/*)
 GIT_CONFIGS = $(wildcard config/git/*)
 SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
+DATA_FILES = $(wildcard data/*)
 
 COMMITPKG_LINKS = \
 	core-testingpkg \
@@ -59,7 +60,7 @@ BATS_ARGS ?= --jobs $(JOBS) $(BATS_EXTRA_ARGS) --verbose-run
 COVERAGE_DIR ?= $(BUILDDIR)/coverage
 
 
-all: binprogs library conf completion man
+all: binprogs library conf completion man data
 binprogs: $(BINPROGS)
 library: $(LIBRARY)
 completion: $(COMPLETIONS)
@@ -106,12 +107,16 @@ $(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/man/include/footer.asciidoc
 
 conf:
 	@install -d $(BUILDDIR)/makepkg.conf.d
-	@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
+	@cp -ra $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
 	@install -d $(BUILDDIR)/pacman.conf.d
 	@cp -a $(PACMAN_CONFIGS) $(BUILDDIR)/pacman.conf.d
 	@install -d $(BUILDDIR)/git.conf.d
 	@cp -a $(GIT_CONFIGS) $(BUILDDIR)/git.conf.d
 
+data:
+	@install -d $(BUILDDIR)/data
+	@cp -ra $(DATA_FILES) $(BUILDDIR)/data
+
 clean:
 	rm -rf $(BUILDDIR)
 
@@ -122,9 +127,11 @@ install: all
 	install -dm0755 $(DESTDIR)$(DATADIR)/pacman.conf.d
 	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
 	install -dm0755 $(DESTDIR)$(DATADIR)/lib
+	install -dm0755 $(DESTDIR)$(DATADIR)/data
 	cp -ra $(BUILDDIR)/lib/* $(DESTDIR)$(DATADIR)/lib
 	cp -a $(BUILDDIR)/git.conf.d -t $(DESTDIR)$(DATADIR)
-	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
+	cp -ra $(BUILDDIR)/makepkg.conf.d -t $(DESTDIR)$(DATADIR)
+	cp -ra $(BUILDDIR)/data -t $(DESTDIR)$(DATADIR)
 	for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
 	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done
 	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
@@ -142,7 +149,8 @@ uninstall:
 	for f in $(notdir $(LIBRARY)); do rm -f $(DESTDIR)$(DATADIR)/lib/$$f; done
 	rm -rf $(DESTDIR)$(DATADIR)/lib
 	rm -rf $(DESTDIR)$(DATADIR)/git.conf.d
-	for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
+	rm -rf $(DESTDIR)$(DATADIR)/makepkg.conf.d
+	rm -rf $(DESTDIR)$(DATADIR)/data
 	for conf in $(notdir $(PACMAN_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
 	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(DATADIR)/setarch-aliases.d/$$f; done
 	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
@@ -154,7 +162,6 @@ uninstall:
 	for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
 	rmdir --ignore-fail-on-non-empty \
 		$(DESTDIR)$(DATADIR)/setarch-aliases.d \
-		$(DESTDIR)$(DATADIR)/makepkg.conf.d \
 		$(DESTDIR)$(DATADIR)/pacman.conf.d \
 		$(DESTDIR)$(DATADIR)
 
@@ -187,5 +194,5 @@ coverage: binprogs library conf completion man
 check: $(BINPROGS_SRC) $(LIBRARY_SRC) contrib/completion/bash/devtools.in config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
 	shellcheck $^
 
-.PHONY: all binprogs library completion conf man clean install uninstall tag dist upload test coverage check
+.PHONY: all binprogs library completion conf man data clean install uninstall tag dist upload test coverage check
 .DELETE_ON_ERROR:

README.md

@@ -94,6 +94,7 @@ Component: pkgctl db remove
 
 - bat (pretty printing)
 - nvchecker (version checking)
+- reuse (license compliance)
 
 ### Development Dependencies
 

config/git/template/info/exclude

@@ -2,6 +2,7 @@
 /src
 /*/
 !/keys/
+!/LICENSES/
 
 /*.log
 /*.tar.*

config/makepkg/conf.d/fortran.conf

@@ -0,0 +1,22 @@
+#!/hint/bash
+# shellcheck disable=2034
+
+#
+# /etc/makepkg.conf.d/fortran.conf
+#
+
+#########################################################################
+# FORTRAN LANGUAGE SUPPORT
+#########################################################################
+
+# Flags used for the Fortran compiler, similar in spirit to CFLAGS. Read
+# linkman:gfortran[1] for more details on the available flags.
+FFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt \
+        -Wp,-D_FORTIFY_SOURCE=3 -fstack-clash-protection -fcf-protection \
+        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
+FCFLAGS="$FFLAGS"
+
+# Additional compiler flags appended to `FFLAGS` and `FCFLAGS` for use in debugging. Usually
+# this would include: ``-g''. Read linkman:gfortran[1] for more details on the wide
+# variety of compiler flags available.
+DEBUG_FFLAGS="-g"

config/makepkg/conf.d/rust.conf

@@ -0,0 +1,19 @@
+#!/hint/bash
+# shellcheck disable=2034
+
+#
+# /etc/makepkg.conf.d/rust.conf
+#
+
+#########################################################################
+# RUST LANGUAGE SUPPORT
+#########################################################################
+
+# Flags used for the Rust compiler, similar in spirit to CFLAGS. Read
+# linkman:rustc[1] for more details on the available flags.
+RUSTFLAGS="-C force-frame-pointers=yes"
+
+# Additional compiler flags appended to `RUSTFLAGS` for use in debugging.
+# Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for
+# more details on the available flags.
+DEBUG_RUSTFLAGS="-C debuginfo=2"

config/makepkg/x86_64.conf.d/fortran.conf

@@ -0,0 +1 @@
+../conf.d/fortran.conf

config/makepkg/x86_64.conf.d/rust.conf

@@ -0,0 +1 @@
+../conf.d/rust.conf

config/makepkg/x86_64_v3.conf.d/fortran.conf

@@ -0,0 +1 @@
+../conf.d/fortran.conf

config/makepkg/x86_64_v3.conf.d/rust.conf

@@ -0,0 +1 @@
+../conf.d/rust.conf

contrib/completion/bash/devtools.in

@@ -150,6 +150,7 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
+	license
 	release
 	repo
 	search
@@ -367,6 +368,25 @@ _pkgctl_repo_switch_opts() {
 	fi
 }
 
+_pkgctl_license_cmds=(
+	check
+	setup
+)
+
+_pkgctl_license_check_args=(
+	-h --help
+)
+
+_pkgctl_license_check_opts() { _filedir -d; }
+
+_pkgctl_license_setup_args=(
+	--no-check
+	-f --force
+	-h --help
+)
+
+_pkgctl_license_setup_opts() { _filedir -d; }
+
 _pkgctl_version_cmds=(
 	check
 	setup

contrib/completion/zsh/_devtools.in

@@ -61,7 +61,7 @@ _pkgctl_build_args=(
 	'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
 	'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
 	'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
-	'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
+	'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"
 	'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database as last action]'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:git_dir:_files -/'
@@ -201,8 +201,8 @@ _pkgctl_issue_view_args=(
 )
 
 _pkgctl_release_args=(
-	'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
+	'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"
-	'(-r --repo=)'{-r,--repo=}"[Specify a target repository for new packages]:repo:($DEVTOOLS_VALID_REPOS[*])"
+	'(-r --repo)'{-r,--repo}"[Specify a target repository for new packages]:repo:($DEVTOOLS_VALID_REPOS[*])"
 	'(-s --staging)'{-s,--staging}'[Release to the staging counterpart of the auto-detected repo]'
 	'(-t --testing)'{-t,--testing}'[Release to the testing counterpart of the auto-detected repo]'
 	'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database after uploading]'
@@ -399,6 +399,7 @@ _pkgctl_cmds=(
 	"db[Pacman database modification for package update, move etc]"
 	"diff[Compare package files using different modes]"
 	"issue[Work with GitLab packaging issues]"
+	"license[Check and manage package license compliance]"
 	"release[Release step to commit, tag and upload build artifacts]"
 	"repo[Manage Git packaging repositories and their configuration]"
 	"search[Search for an expression across the GitLab packaging group]"
@@ -410,6 +411,24 @@ _pkgctl_args=(
 	'(-h --help)'{-h,--help}'[Display usage]'
 )
 
+_pkgctl_license_cmds=(
+	"pkgctl license command"
+	"check[Checks package licensing compliance using REUSE]"
+	"setup[Automatically detect and setup a basic REUSE config]"
+)
+
+_pkgctl_license_check_args=(
+	'(-h --help)'{-h,--help}'[Display usage]'
+	'*:git_dir:_files -/'
+)
+
+_pkgctl_license_setup_args=(
+	'(-f --force)'{-f,--force}'[Overwrite existing REUSE config]'
+	'--no-check[Do not run license check after setup]'
+	'(-h --help)'{-h,--help}'[Display usage]'
+	'*:git_dir:_files -/'
+)
+
 _pkgctl_version_cmds=(
 	"pkgctl version command"
 	"check[Compares local package versions against upstream versions]"

data/LICENSE

@@ -0,0 +1,12 @@
+Copyright Arch Linux Contributors
+
+Permission to use, copy, modify, and/or distribute this software for
+any purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

doc/man/arch-nspawn.1.asciidoc

@@ -23,7 +23,8 @@ Options
 	Location of a pacman config file
 
 *-M* <file>::
-	Location of a makepkg config file
+	Location of a makepkg config file. Specific additions (e.g. build flags for
+	additional languages) can be placed in '<file>.d/*.conf'.
 
 *-c* <dir>::
 	Set pacman cache, if no directory is specified the passed pacman.conf's cachedir is used with a fallback to '/etc/pacman.conf'

doc/man/makerepropkg.1.asciidoc

@@ -49,7 +49,8 @@ Options
 	Set the pacman cache directory.
 
 *-M* <file>::
-	Location of a makepkg config file.
+	Location of a makepkg config file. Specific additions (e.g. build flags for
+	additional languages) can be placed in '<file>.d/*.conf'.
 
 *-l* <chroot>::
 	The directory name to use as the chroot namespace

doc/man/pkgctl-license-check.1.asciidoc

@@ -0,0 +1,54 @@
+pkgctl-license-check(1)
+=======================
+
+Name
+----
+pkgctl-license-check - Checks package licensing compliance using REUSE
+
+Synopsis
+--------
+pkgctl license check [OPTIONS] [PKGBASE...]
+
+Description
+-----------
+
+Checks package licensing compliance using REUSE and also verifies whether
+a LICENSE file with the expected Arch Linux-specific 0BSD license text exists.
+
+Configuration
+-------------
+
+Uses reuse(1) and a `REUSE.toml` file located alongside the PKGBUILD(5). Refer
+to the configuration section in pkgctl-license(1).
+
+If no `PKGBASE` is specified, the command defaults to using the current working
+directory.
+
+Options
+-------
+
+*-h, --help*::
+	Show a help text
+
+Exit Codes
+----------
+
+On exit, return one of the following codes:
+
+*0*::
+	Normal exit condition, all checked packages are compliant
+
+*1*::
+	Unknown cause of failure
+
+*2*::
+	Normal exit condition, but some packages are not compliant
+
+See Also
+--------
+
+pkgctl-license(1)
+reuse(1)
+PKGBUILD(5)
+
+include::include/footer.asciidoc[]

doc/man/pkgctl-license-setup.1.asciidoc

@@ -0,0 +1,55 @@
+pkgctl-license-setup(1)
+=======================
+
+Name
+----
+pkgctl-license-setup - Automatically detect and setup a basic REUSE
+configuration
+
+Synopsis
+--------
+pkgctl license setup [OPTIONS] [PKGBASE...]
+
+Description
+-----------
+
+This subcommand automates the creation of the Arch Linux 0BSD package license
+file as well as a basic reuse(1) configuration by applying simple heuristics.
+It comes in especially handy when initially setting up licensing for a package
+without the need to manually write a `REUSE.toml` file.
+
+If any `.patch` files are detected and the PKGBUILD(5) has only a single entry
+in the `license=()` array, this subcommand assumes the patches are licensed
+under that license and generates annotations for them.
+
+In case there are no patches, no additional annotations are generated.
+
+Manual annotations are necessary in case the subcommand can't generate a
+configuration that accounts for all files. In this case, `reuse lint` will fail
+with a descriptive error of which files are missing an annotation.
+
+If no `PKGBASE` is specified, the command defaults to using the current working
+directory.
+
+Options
+-------
+
+*-f, --force*::
+	Overwrite existing reuse(1) configuration
+
+*--no-check*::
+	Do not run pkgctl-license-check(1) after setup
+
+*-h, --help*::
+	Show a help text
+
+
+See Also
+--------
+
+pkgctl-license(1)
+pkgctl-license-check(1)
+reuse(1)
+PKGBUILD(5)
+
+include::include/footer.asciidoc[]

doc/man/pkgctl-license.1.asciidoc

@@ -0,0 +1,54 @@
+pkgctl-license(1)
+=================
+
+Name
+----
+pkgctl-license - Check and manage package license compliance
+
+Synopsis
+--------
+pkgctl license [OPTIONS] [SUBCOMMAND]
+
+Description
+-----------
+
+Commands related to package licenses, including checks for compliance.
+
+Uses reuse(1) and a `REUSE.toml` file located alongside the PKGBUILD(5).
+
+Configuration
+-------------
+
+The `REUSE.toml` file must contain annotations for all regular files expected
+to be present in an Arch Linux package repository.
+
+Use pkgctl-license-setup(1) to automatically detect and setup a basic REUSE
+config file based on the files in the package repository.
+
+For detailed information on the various configuration options available for the
+`REUSE.toml` file, refer to the REUSE Specification (https://reuse.software/spec).
+
+Options
+-------
+
+*-h, --help*::
+	Show a help text
+
+Subcommands
+-----------
+
+pkgctl license check::
+	Checks package licensing compliance using REUSE
+
+pkgctl license setup::
+	Automatically detect and setup a basic REUSE config
+
+See Also
+--------
+
+pkgctl-license-check(1)
+pkgctl-license-setup(1)
+reuse(1)
+PKGBUILD(5)
+
+include::include/footer.asciidoc[]

src/arch-nspawn.in

@@ -112,7 +112,13 @@ copy_hostconf () {
 	[[ -n $host_cachemirrors ]] && printf 'CacheServer = %s\n' "${host_cachemirrors[@]}" >>"$working_dir/etc/pacman.d/mirrorlist"
 
 	[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
-	[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
+	if [[ -n $makepkg_conf ]]; then
+		cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
+		if [[ -d "${makepkg_conf}.d" ]] && is_globfile "${makepkg_conf}.d"/*.conf; then
+			mkdir --parents "$working_dir/etc/makepkg.conf.d/"
+			cp "${makepkg_conf}.d/"*.conf "$working_dir/etc/makepkg.conf.d/"
+		fi
+	fi
 
 	local file
 	for file in "${files[@]}"; do

src/archbuild.in

@@ -79,6 +79,13 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
 # Pass all arguments after -- right to makepkg
 makechrootpkg_args+=("${@:$OPTIND}")
 
+# Automatically recreate the root chroot if a version mismatch is detected
+CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
+if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
+	warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
+	clean_first=true
+fi
+
 if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	msg "Creating chroot for [%s] (%s)..." "${repo}" "${arch}"
 

src/checkpkg.in

@@ -140,7 +140,7 @@ for _pkgname in "${pkgname[@]}"; do
 	bsdtar tf "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/filelist-$_pkgname-old"
 	bsdtar tf "$pkgfile" | sort > "$TEMPDIR/filelist-$_pkgname"
 
-	diff --side-by-side --suppress-common-lines --width="$COLUMNS" --color=auto "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname"
+	diff --side-by-side --suppress-common-lines --width="${COLUMNS:-130}" --color=auto "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname"
 
 	find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
 	find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"

src/commitpkg.in

@@ -120,8 +120,20 @@ if (( ${#validpgpkeys[@]} != 0 )); then
 	git add --force -- keys/pgp/*
 fi
 
+needsversioning=()
+
+if [[ ! -e REUSE.toml || ! -e LICENSE || ! -d LICENSES ]]; then
+	# TODO: Make this a hard failure in the future after packagers have had
+	# some time to add licenses to all packages.
+	warning "package doesn't have proper licensing information, set it up using:"
+	msg2 'pkgctl license setup'
+else
+	pkgctl license check
+	needsversioning+=(REUSE.toml LICENSE LICENSES/*)
+fi
+
 # find files which should be under source control
-needsversioning=(PKGBUILD)
+needsversioning+=(PKGBUILD)
 for s in "${source[@]}"; do
 	[[ $s != *://* ]] && needsversioning+=("$s")
 done
@@ -143,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/api/archweb.sh

@@ -14,6 +14,8 @@ set -o pipefail
 
 
 archweb_query_all_packages() {
+	local -a pkgbases
+
 	[[ -z ${WORKDIR:-} ]] && setup_workdir
 
 	stat_busy "Query all released packages"
@@ -36,6 +38,7 @@ archweb_query_all_packages() {
 
 archweb_query_maintainer_packages() {
 	local maintainer=$1
+	local -a pkgbases
 
 	[[ -z ${WORKDIR:-} ]] && setup_workdir
 

src/lib/api/gitlab.sh

@@ -119,11 +119,13 @@ gitlab_api_call_paged() {
 
 	local next_page=1
 	local total_pages=1
+	local known_total_pages=1
+	local percentage=100
 
 	while [[ -n "${next_page}" ]]; do
 		percentage=$(( 100 * next_page / total_pages ))
 		printf "📡 Querying GitLab: %s/%s [%s] %%spinner%%" \
-			"${BOLD}${next_page}" "${total_pages}" "${percentage}%${ALL_OFF}"  \
+			"${BOLD}${next_page}" "${known_total_pages}" "${percentage}%${ALL_OFF}"  \
 			> "${tmp_file}"
 		mv "${tmp_file}" "${status_file}"
 
@@ -148,6 +150,15 @@ gitlab_api_call_paged() {
 
 		next_page=$(grep "x-next-page" "${header}" | tr -d '\r' | awk '{ print $2 }')
 		total_pages=$(grep "x-total-pages" "${header}" | tr -d '\r' | awk '{ print $2 }')
+		# The api is not guaranteed to return x-total-pages for larger query results
+		# https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23931
+		# https://gitlab.com/gitlab-org/gitlab/-/issues/436373
+		if (( total_pages == 0 )); then
+			total_pages=${next_page}
+			known_total_pages="?"
+		else
+			known_total_pages=${total_pages}
+		fi
 	done
 
 	jq --slurp add "${api_workdir}"/result.* > "${outfile}"

src/lib/archroot.sh

@@ -4,7 +4,7 @@
 :
 
 # shellcheck disable=2034
-CHROOT_VERSION='v5'
+CHROOT_VERSION='v6'
 
 ##
 #  usage : check_root $keepenv

src/lib/build/build.sh

@@ -42,10 +42,10 @@ pkgctl_build_usage() {
 
 		Build packages inside a clean chroot
 
-		When a new pkgver is set using the appropriate PKGBUILD options the
+		Build packages in clean chroot environment, offering various options
-		checksums are automatically updated.
+		and functionalities to customize the package building process.
 
-		TODO
+		By default, chroot environments are located in /var/lib/archbuild/.
 
 		BUILD OPTIONS
 		    --arch ARCH          Specify architectures to build for (disables auto-detection)

src/lib/common.sh

@@ -18,6 +18,9 @@ export LANG=C.UTF-8
 # Avoid systemd trying to color the terminal on systemd-nspawn
 export SYSTEMD_TINT_BACKGROUND=no
 
+# Avoid diffoscope looking at remote debug info through readelf
+unset DEBUGINFOD_URLS
+
 # Set buildtool properties
 export BUILDTOOL=devtools
 export BUILDTOOLVER=@buildtoolver@

src/lib/db/move.sh

@@ -8,6 +8,8 @@ DEVTOOLS_INCLUDE_DB_MOVE_SH=1
 _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 # shellcheck source=src/lib/common.sh
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+# shellcheck source=src/lib/valid-repos.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
 
 set -e
 
@@ -20,6 +22,7 @@ pkgctl_db_move_usage() {
 		Move packages between binary repositories.
 
 		OPTIONS
+		    --noconfirm      Bypass any confirmation messages, should only be used with caution
 		    -h, --help         Show this help text
 
 		EXAMPLES
@@ -29,9 +32,12 @@ _EOF_
 }
 
 pkgctl_db_move() {
-	local SOURCE_REPO=""
+	if (( $# < 3 )); then
-	local TARGET_REPO=""
+		pkgctl_db_move_usage
-	local PKGBASES=()
+		exit 1
+	fi
+
+	local CONFIRM=1
 
 	# option checking
 	while (( $# )); do
@@ -40,6 +46,10 @@ pkgctl_db_move() {
 				pkgctl_db_move_usage
 				exit 0
 				;;
+			--noconfirm)
+				CONFIRM=0
+				shift
+				;;
 			-*)
 				die "invalid argument: %s" "$1"
 				;;
@@ -49,16 +59,35 @@ pkgctl_db_move() {
 		esac
 	done
 
-	if (( $# < 3 )); then
+	local source_repo=$1
-		pkgctl_db_move_usage
+	local target_repo=$2
-		exit 1
+	shift 2
+
+	if ! in_array "${source_repo}" "${DEVTOOLS_VALID_REPOS[@]}"; then
+		die "Invalid source repository: %s" "${source_repo}"
+	fi
+	if ! in_array "${target_repo}" "${DEVTOOLS_VALID_REPOS[@]}"; then
+		die "Invalid target repository: %s" "${target_repo}"
 	fi
 
-	SOURCE_REPO=$1
+	if (( CONFIRM )); then
-	TARGET_REPO=$2
+		local pkglist
-	shift 2
+		pkglist=$(printf '%s\n' "$@" | paste -sd ' ')
-	PKGBASES+=("$@")
+		read -r -p "Move packages from [${source_repo}] to [${target_repo}]: ${pkglist}? [Y/n] " response
+		case ${response} in
+			[Yy][Ee][Ss]|[Yy]|'')
+				: # continue
+				;;
+			*)
+				exit 0
+				;;
+		esac
+	fi
 
-	# shellcheck disable=SC2029
+	local pkgbase
-	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-move "${SOURCE_REPO}" "${TARGET_REPO}" "${PKGBASES[@]}"
+	for pkgbase in "$@"; do
+		msg "Moving [%s] from [%s] to [%s]" "${pkgbase}" "${source_repo}" "${target_repo}"
+		# shellcheck disable=SC2046
+		db-move "${source_repo}" "${target_repo}" $(pacman -Sql "${source_repo}" | grep "^${pkgbase}" || echo "${pkgbase}")
+	done
 }

src/lib/issue/view.sh

@@ -181,7 +181,7 @@ pkgctl_issue_view() {
 		status_dir=$(mktemp --tmpdir="${WORKDIR}" --directory pkgctl-gitlab-api.XXXXXXXXXX)
 		printf "📡 Querying GitLab issue notes API..." > "${status_dir}/status"
 		term_spinner_start "${status_dir}"
-		if ! output=$(gitlab_project_issue_notes "${project_path}" "${iid}" "${status_dir}/status"); then
+		if ! output=$(gitlab_project_issue_notes "${project_path}" "${iid}" "${status_dir}/status" "sort=asc&order_by=created_at"); then
 			term_spinner_stop "${status_dir}"
 			msg_error "Failed to fetch comments"
 			exit 1

src/lib/license.sh

@@ -0,0 +1,66 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[[ -z ${DEVTOOLS_INCLUDE_LICENSE_SH:-} ]] || return 0
+DEVTOOLS_INCLUDE_LICENSE_SH=1
+
+_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+
+set -e
+
+
+pkgctl_license_usage() {
+	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+    cat <<- _EOF_
+		Usage: ${COMMAND} [COMMAND] [OPTIONS]
+
+		Check and manage package license compliance.
+
+		COMMANDS
+		    check      Check package license compliance
+		    setup      Automatically detect and setup a basic REUSE config
+
+		OPTIONS
+		    -h, --help    Show this help text
+
+		EXAMPLES
+		    $ ${COMMAND} check libfoo linux libbar
+		    $ ${COMMAND} setup libfoo
+_EOF_
+}
+
+pkgctl_license() {
+	if (( $# < 1 )); then
+		pkgctl_license_usage
+		exit 0
+	fi
+
+	while (( $# )); do
+		case $1 in
+			-h|--help)
+				pkgctl_license_usage
+				exit 0
+				;;
+			check)
+				_DEVTOOLS_COMMAND+=" $1"
+				shift
+				# shellcheck source=src/lib/license/check.sh
+				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/license/check.sh
+				pkgctl_license_check "$@"
+				exit $?
+				;;
+			setup)
+				_DEVTOOLS_COMMAND+=" $1"
+				shift
+				# shellcheck source=src/lib/license/setup.sh
+				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/license/setup.sh
+				pkgctl_license_setup "$@"
+				exit 0
+				;;
+			*)
+				die "invalid argument: %s" "$1"
+				;;
+		esac
+	done
+}

src/lib/license/check.sh

@@ -0,0 +1,147 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+[[ -z ${DEVTOOLS_INCLUDE_LICENSE_CHECK_SH:-} ]] || return 0
+DEVTOOLS_INCLUDE_LICENSE_CHECK_SH=1
+
+_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+# shellcheck source=src/lib/common.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+
+source /usr/share/makepkg/util/message.sh
+
+set -eo pipefail
+
+readonly PKGCTL_LICENSE_CHECK_EXIT_COMPLIANT=0
+export PKGCTL_LICENSE_CHECK_EXIT_COMPLIANT
+readonly PKGCTL_LICENSE_CHECK_EXIT_FAILURE=2
+export PKGCTL_LICENSE_CHECK_EXIT_FAILURE
+
+
+pkgctl_license_check_usage() {
+	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+	cat <<- _EOF_
+		Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+		Checks package licensing compliance using REUSE and also verifies
+		whether a LICENSE file with the expected Arch Linux-specific 0BSD
+		license text exists.
+
+		Upon execution, it runs 'reuse lint'.
+
+		OPTIONS
+		    -h, --help   Show this help text
+
+		EXAMPLES
+		    $ ${COMMAND} neovim vim
+_EOF_
+}
+
+pkgctl_license_check() {
+	local pkgbases=()
+	local verbose=0
+
+	local license_text
+	license_text=$(< "${_DEVTOOLS_LIBRARY_DIR}"/data/LICENSE)
+
+	local exit_code=${PKGCTL_LICENSE_CHECK_EXIT_COMPLIANT}
+
+	while (( $# )); do
+		case $1 in
+			-h|--help)
+				pkgctl_license_check_usage
+				exit 0
+				;;
+			--)
+				shift
+				break
+				;;
+			-*)
+				die "invalid argument: %s" "$1"
+				;;
+			*)
+				pkgbases=("$@")
+				break
+				;;
+		esac
+	done
+
+	if ! command -v reuse &>/dev/null; then
+		die "The \"$_DEVTOOLS_COMMAND\" command requires the 'reuse' CLI tool"
+	fi
+
+	# Check if used without pkgbases in a packaging directory
+	if (( ${#pkgbases[@]} == 0 )); then
+		if [[ -f PKGBUILD ]]; then
+			pkgbases=(".")
+		else
+			pkgctl_license_check_usage
+			exit 1
+		fi
+	fi
+
+	# enable verbose mode when we only have a single item to check
+	if (( ${#pkgbases[@]} == 1 )); then
+		verbose=1
+	fi
+
+	for path in "${pkgbases[@]}"; do
+		# skip paths that are not directories
+		if [[ ! -d "${path}" ]]; then
+			continue
+		fi
+		pushd "${path}" >/dev/null
+
+		if [[ ! -f PKGBUILD ]]; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} no PKGBUILD found"
+			return 1
+		fi
+
+		# reset common PKGBUILD variables
+		unset pkgbase
+
+		# shellcheck source=contrib/makepkg/PKGBUILD.proto
+		if ! . ./PKGBUILD; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} failed to source PKGBUILD"
+			return 1
+		fi
+		pkgbase=${pkgbase:-$pkgname}
+
+		if [[ ! -e LICENSE ]]; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} is missing the LICENSE file"
+			return "${PKGCTL_LICENSE_CHECK_EXIT_FAILURE}"
+		fi
+
+		if [[ ! -L LICENSES/0BSD.txt ]]; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} LICENSES/0BSD should be a symlink to LICENSE but it isn't"
+			return "${PKGCTL_LICENSE_CHECK_EXIT_FAILURE}"
+		fi
+
+		# Check if the local LICENSE file mismatches our expectations
+		if [[ $license_text != $(< LICENSE) ]]; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} LICENSE file doesn't have the expected Arch Linux-specific license text"
+			return "${PKGCTL_LICENSE_CHECK_EXIT_FAILURE}"
+		fi
+
+		# Check for REUSE compliance
+		if ! reuse lint --json | jq --exit-status '.summary.compliant' &>/dev/null; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} repository is not REUSE compliant"
+			exit_code=${PKGCTL_LICENSE_CHECK_EXIT_FAILURE}
+
+			# re-execute reuse lint for human readable output
+			if (( verbose )); then
+				reuse lint
+			fi
+
+			popd >/dev/null
+			continue
+		fi
+
+		msg_success "${BOLD}${pkgbase}:${ALL_OFF} repository is REUSE compliant"
+		popd >/dev/null
+	done
+
+	# return status based on results
+	return "${exit_code}"
+}

src/lib/license/setup.sh

@@ -0,0 +1,272 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+[[ -z ${DEVTOOLS_INCLUDE_LICENSE_SETUP_SH:-} ]] || return 0
+DEVTOOLS_INCLUDE_LICENSE_SETUP_SH=1
+
+_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
+# shellcheck source=src/lib/common.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
+# shellcheck source=src/lib/license/check.sh
+source "${_DEVTOOLS_LIBRARY_DIR}"/lib/license/check.sh
+
+source /usr/share/makepkg/util/message.sh
+
+set -eo pipefail
+shopt -s nullglob
+
+
+pkgctl_license_setup_usage() {
+	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
+	cat <<- _EOF_
+		Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
+
+		Automate the creation of a basic REUSE configuration by analyzing the
+		license array specified in the PKGBUILD file of a package.
+
+		If no PKGBASE is specified, the command defaults to using the current
+		working directory.
+
+		OPTIONS
+		    -f, --force   Overwrite existing REUSE configuration
+		    -h, --help    Show this help text
+		    --no-check    Do not run license check after setup
+
+		EXAMPLES
+		    $ ${COMMAND} neovim vim
+_EOF_
+}
+
+pkgctl_license_setup() {
+	local pkgbases=()
+	local force=0
+	local run_check=1
+
+	local path exit_code
+	local checks=()
+
+	while (( $# )); do
+		case $1 in
+			-h|--help)
+				pkgctl_license_setup_usage
+				exit 0
+				;;
+			-f|--force)
+				force=1
+				shift
+				;;
+			--no-check)
+				run_check=0
+				shift
+				;;
+			--)
+				shift
+				break
+				;;
+			-*)
+				die "invalid argument: %s" "$1"
+				;;
+			*)
+				pkgbases=("$@")
+				break
+				;;
+		esac
+	done
+
+	if ! command -v reuse &>/dev/null; then
+		die "The \"$_DEVTOOLS_COMMAND\" command requires the 'reuse' CLI tool"
+	fi
+
+	# Check if used without pkgbases in a packaging directory
+	if (( ${#pkgbases[@]} == 0 )); then
+		if [[ -f PKGBUILD ]]; then
+			pkgbases=(".")
+		else
+			pkgctl_license_setup_usage
+			exit 1
+		fi
+	fi
+
+	exit_code=0
+	for path in "${pkgbases[@]}"; do
+		# skip paths that are not directories
+		if [[ ! -d "${path}" ]]; then
+			continue
+		fi
+
+		pushd "${path}" >/dev/null
+		if license_setup "${path}" "${force}"; then
+			checks+=("${path}")
+		else
+			exit_code=1
+		fi
+		popd >/dev/null
+	done
+
+	# run checks on the setup targets
+	if (( run_check )) && (( ${#checks[@]} >= 1 )); then
+		echo
+		echo 📡 Running checks...
+		pkgctl_license_check "${checks[@]}" || true
+	fi
+
+	return "$exit_code"
+}
+
+license_setup() {
+	local path=$1
+	local force=$2
+	local pkgbase pkgname license
+
+	if [[ ! -f PKGBUILD ]]; then
+		msg_error "${BOLD}${path}:${ALL_OFF} no PKGBUILD found"
+		return 1
+	fi
+
+	# shellcheck source=contrib/makepkg/PKGBUILD.proto
+	if ! . ./PKGBUILD; then
+		msg_error "${BOLD}${path}:${ALL_OFF} failed to source PKGBUILD"
+		return 1
+	fi
+	pkgbase=${pkgbase:-$pkgname}
+
+	# setup LICENSE file
+	if ! license_file_setup "${pkgbase}" "${force}"; then
+		return 1
+	fi
+
+	# setup REUSE.toml
+	if ! reuse_setup "${pkgbase}" "${force}" "${license[@]}"; then
+		return 1
+	fi
+}
+
+is_valid_license() {
+	local license_name=$1
+	local supported_licenses
+	supported_licenses=$(reuse supported-licenses | awk '{print $1}')
+	if grep --quiet "^${license_name}$" <<< "$supported_licenses"; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+license_file_setup() {
+	local pkgbase=$1
+	local force=$2
+
+	local license_text
+	license_text=$(< "${_DEVTOOLS_LIBRARY_DIR}"/data/LICENSE)
+
+	# Write LICENSE file, or check if it mismatches
+	if (( force )) || [[ ! -f LICENSE ]]; then
+		printf "%s\n" "${license_text}" > LICENSE
+		msg_success "${BOLD}${pkgbase}:${ALL_OFF} successfully configured LICENSE"
+	elif [[ -f LICENSE ]]; then
+		# if there is a license file, check whether it has the text we expect
+		existing_license="$(< LICENSE)"
+		if [[ "${license_text}" != "${existing_license}" ]]; then
+			msg_error "${BOLD}${pkgbase}:${ALL_OFF} existing LICENSE file doesn't have expected content, use --force to overwrite"
+			return 1
+		fi
+	fi
+
+	# make sure the LICENSE file is found by REUSE
+	mkdir --parents LICENSES
+	ln --symbolic --force ../LICENSE LICENSES/0BSD.txt
+}
+
+reuse_default_annotations() {
+	cat << EOF
+version = 1
+
+[[annotations]]
+path = [
+    "PKGBUILD",
+    "README.md",
+    "keys/**",
+    ".SRCINFO",
+    ".gitignore",
+    ".nvchecker.toml",
+    "*.install",
+    "*.sysusers",
+    "*sysusers.conf",
+    "*.tmpfiles",
+    "*tmpfiles.conf",
+    "*.logrotate",
+    "*.pam",
+    "*.service",
+    "*.socket",
+    "*.timer",
+    "*.desktop",
+    "*.hook",
+]
+SPDX-FileCopyrightText = "Arch Linux contributors"
+SPDX-License-Identifier = "0BSD"
+EOF
+}
+
+reuse_setup() {
+	local pkgbase=$1
+	local force=$2
+	shift 2
+	local license=("$@")
+
+	# Check if REUSE.toml already exists
+	if (( ! force )) && [[ -f REUSE.toml ]]; then
+		msg_error "${BOLD}${pkgbase}:${ALL_OFF} REUSE.toml already exists, use --force to overwrite"
+		return 1
+	fi
+
+	reuse_default_annotations > REUSE.toml
+
+	local warning_occurred=0
+	local patches=(*.patch)
+	# If there are patches and there's only a single well-known license listed in the package,
+	# we can generate the annotations for the patches, otherwise we will fail to do so and warn
+	# the user.
+	if (( ${#patches} )); then
+		# If there are multiple licenses, we can't make a good guess about which license the
+		# patches should have. In case the first element contains a space, we are dealing with
+		# a complex SPDX license identifier.
+		if (( ${#license[@]} > 1 )) || [[ ${license[0]} =~ [[:space:]] ]]; then
+			msg_warn "${BOLD}${pkgbase}:${ALL_OFF} .patch files were found but couldn't automatically guess a suitable license because PKGBUILD has multiple licenses"
+			patch_annotations "${pkgbase}" "TODO-Choose-a-license" "${patches[@]}" >> REUSE.toml
+			warning_occurred=1
+		elif ! is_valid_license "${license[0]}"; then
+			msg_warn "${BOLD}${pkgbase}:${ALL_OFF} .patch files were found but couldn't automatically guess a suitable license because the PKGBUILD license '${license[0]}' is not a recognized SPDX license"
+			patch_annotations "${pkgbase}" "TODO-Choose-a-license" "${patches[@]}" >> REUSE.toml
+			warning_occurred=1
+		else
+			patch_annotations "${pkgbase}" "${license[0]}" "${patches[@]}" >> REUSE.toml
+		fi
+	fi
+
+	if (( warning_occurred )); then
+		msg_warn "${BOLD}${pkgbase}:${ALL_OFF} configured REUSE but a warning occurred, manually edit and fix REUSE.toml"
+		return 1
+	else
+		reuse download --all
+		msg_success "${BOLD}${pkgbase}:${ALL_OFF} successfully configured REUSE.toml"
+	fi
+}
+
+patch_annotations() {
+	local pkgbase=$1
+	local license_identifier=$2
+	shift 2
+	local patches=("$@")
+
+	local annotations
+	annotations+="\n[[annotations]]\n"
+	annotations+="path = [\n"
+	for patch in "${patches[@]}"; do
+		annotations+="    \"$(basename "${patch}")\",\n"
+	done
+	annotations+="]\n"
+	annotations+="SPDX-FileCopyrightText = \"${pkgbase} contributors\"\n"
+	annotations+="SPDX-License-Identifier = \"${license_identifier}\""
+	echo -e "${annotations}"
+}

src/lib/repo/clone.sh

@@ -65,6 +65,7 @@ pkgctl_repo_clone() {
 	local CONFIGURE_OPTIONS=()
 	local jobs=
 	jobs=$(nproc)
+	local -a pkgbases
 
 	# variables
 	local command=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}

src/lib/util/pacman.sh

@@ -33,6 +33,7 @@ update_pacman_repo_cache() {
 get_pacman_repo_from_pkgbuild() {
 	local path=${1:-PKGBUILD}
 	local repo=${2:-multilib}
+	local -a pkgnames
 
 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
 	mapfile -t pkgnames < <(source "${path}"; printf "%s\n" "${pkgname[@]}")
@@ -67,6 +68,7 @@ get_pkgnames_from_repo_pkgbase() {
 	local repo=$1
 	shift
 	local pkgbases=("$@")
+	local -a pkgnames
 
 	# update the pacman repo cache if it doesn't exist yet
 	if [[ ! -d "${_DEVTOOLS_PACMAN_CACHE_DIR}" ]]; then

src/lib/version/check.sh

@@ -292,7 +292,8 @@ get_upstream_version() {
 		opts+=(--keyfile "${keyfile}")
 	fi
 
-	if ! output=$(GIT_TERMINAL_PROMPT=0 nvchecker --file "${config}" --logger json "${opts[@]}" 2>&1 | \
+	if ! output=$(GIT_TERMINAL_PROMPT=0 GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=/dev/null \
+			nvchecker --file "${config}" --logger json "${opts[@]}" 2>&1 | \
 			jq --raw-output 'select((.level != "debug") and (.event != "ignoring invalid version"))'); then
 		printf "failed to run nvchecker: %s" "${output}"
 		return 1

src/makerepropkg.in

@@ -93,14 +93,36 @@ get_makepkg_conf() {
     local fname=${1}
     local arch="${2}"
     local makepkg_conf="${3}"
+
     if ! buildtool_file=$(get_pkgfile "${fname}"); then
-        error "failed to retrieve ${fname}"
+       error "failed to retrieve ${fname}"
+       return 1
+    fi
+    buildtool_file="${buildtool_file/file:\/\//}"
+    msg "using makepkg.conf from ${fname}"
+
+    # try to handle config of legacy devtools
+    if bsdtar --list --file "${buildtool_file}" "usr/share/devtools/makepkg-${arch}.conf" &>/dev/null; then
+        bsdtar --extract --to-stdout --fast-read --file "${buildtool_file}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
+        return $?
+    fi
+
+    msg2 "extracting ${arch}.conf from devtools archive"
+    if ! bsdtar --extract --to-stdout --fast-read --file "${buildtool_file}" "usr/share/devtools/makepkg.conf.d/${arch}.conf" > "${makepkg_conf}"; then
+        error "failed to extract 'usr/share/devtools/makepkg.conf.d/${arch}.conf' from devtools archive"
         return 1
     fi
-    msg2 "using makepkg.conf from ${fname}"
+
-	if ! bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg.conf.d/${arch}.conf" > "${makepkg_conf}"; then
+    mkdir --parents "${makepkg_conf}.d"
-		bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
+    if bsdtar --list --file "${buildtool_file}" "usr/share/devtools/makepkg.conf.d/conf.d" &>/dev/null; then
-	fi
+        msg2 "extracting conf.d from devtools archive"
+        bsdtar --extract --file "${buildtool_file}" --cd "${makepkg_conf}.d" --strip-components 4 "usr/share/devtools/makepkg.conf.d/conf.d"
+    fi
+    if bsdtar --list --file "${buildtool_file}" "usr/share/devtools/makepkg.conf.d/${arch}.conf.d" &>/dev/null; then
+        msg2 "extracting ${arch}.conf.d from devtools archive"
+        bsdtar --extract --file "${buildtool_file}" --cd "${makepkg_conf}.d" --strip-components 4 "usr/share/devtools/makepkg.conf.d/${arch}.conf.d"
+    fi
+
     return 0
 }
 
@@ -186,7 +208,7 @@ for f in "${splitpkgs[@]}"; do
 done
 
 if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
+    mapfile -t cache_dirs < <(pacman-conf CacheDir)
 fi
 
 ORIG_HOME=${HOME}

src/offload-build.in

@@ -114,25 +114,32 @@ ssh "${SSH_OPTS[@]}" -- "$server" "cd ${remote_temp@Q} && bsdtar --strip-compone
 # Run the build command on the server
 msg "Running archbuild"
 # shellcheck disable=SC2145
-ssh "${SSH_OPTS[@]}" -t -- "$server" "cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}" || die
+if ssh "${SSH_OPTS[@]}" -t -- "$server" "cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}"; then
-msg "Build complete"
+    msg "Build complete"
 
-# Get an array of files that should be downloaded from the server
+    # Get an array of files that should be downloaded from the server
-mapfile -t files < <(
+    mapfile -t files < <(
-    ssh "${SSH_OPTS[@]}" -- "$server" "
+        ssh "${SSH_OPTS[@]}" -- "$server" "
-        cd ${remote_temp@Q}"' &&
+            cd ${remote_temp@Q}"' &&
-        makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
+            makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
-        makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${arch}"'.conf" &&
+            makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${arch}"'.conf" &&
-        if [[ -f /usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf ]]; then
+            if [[ -f /usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf ]]; then
-            makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf"
+                makepkg_config="/usr/share/devtools/makepkg.conf.d/'"${repo}"'-'"${arch}"'.conf"
-        fi &&
+            fi &&
-        while read -r file; do
+            while read -r file; do
-            [[ -f "${file}" ]] && printf "%s\n" "${file}" ||:
+                [[ -f "${file}" ]] && printf "%s\n" "${file}" ||:
-        done < <(makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist) &&
+            done < <(makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist) &&
-        printf "%s\n" '"${remote_temp@Q}/PKGBUILD"'
+            printf "%s\n" '"${remote_temp@Q}/PKGBUILD"'
 
-        find '"${remote_temp@Q}"' -name "*.log"
+            find '"${remote_temp@Q}"' -name "*.log"
-')
+    ')
+else
+    # Build failed, only the logs should be downloaded from the server
+    mapfile -t files < <(
+        ssh "${SSH_OPTS[@]}" -- "$server" '
+            find '"${remote_temp@Q}"' -name "*.log"
+    ')
+fi
 
 
 if (( ${#files[@]} )); then
@@ -142,13 +149,14 @@ if (( ${#files[@]} )); then
     if is_globfile "${TEMPDIR}"/*.log; then
         mv "${TEMPDIR}"/*.log "${LOGDEST:-${PWD}}/"
     fi
-    # missing PKGBUILD download means the build failed
+    if is_globfile "${TEMPDIR}"/*.pkg.tar*; then
-    if [[ ! -f "${TEMPDIR}/PKGBUILD" ]]; then
+        # Building a package may change the PKGBUILD during update_pkgver
+        mv "${TEMPDIR}/PKGBUILD" "${PWD}/"
+        mv "${TEMPDIR}"/*.pkg.tar* "${PKGDEST:-${PWD}}/"
+    else
         error "Build failed, check logs in ${LOGDEST:-${PWD}}"
         exit 1
     fi
-    mv "${TEMPDIR}/PKGBUILD" "${PWD}/"
-    mv "${TEMPDIR}"/*.pkg.tar* "${PKGDEST:-${PWD}}/"
 else
     exit 1
 fi

src/pkgctl.in

@@ -25,6 +25,7 @@ usage() {
 		    db      Pacman database modification for package update, move etc
 		    diff    Compare package files using different modes
 		    issue   Work with GitLab packaging issues
+		    license Check and manage package licenses
 		    release Release step to commit, tag and upload build artifacts
 		    repo    Manage Git packaging repositories and their configuration
 		    search  Search for an expression across the GitLab packaging group
@@ -113,6 +114,14 @@ while (( $# )); do
 			pkgctl_issue "$@"
 			exit 0
 			;;
+		license)
+			_DEVTOOLS_COMMAND+=" $1"
+			shift
+			# shellcheck source=src/lib/license.sh
+			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/license.sh
+			pkgctl_license "$@"
+			exit 0
+			;;
 		release)
 			_DEVTOOLS_COMMAND+=" $1"
 			shift