Version 20230105

This enables DEBUG_RUSTFLAGS with the appropriate debuginfo settings.

The empty RUSTFLAGS variable is required workaround to avoid double
compilation during package function call. The issue is that the
behavior of the current implementation of buildenv_debugflags is not
idempotent, so consecutive calls will append the same flags again
leading to cargo consider the build inputs to have changed.

Signed-off-by: Levente Polyak <anthraxx@archlinux.org>

.gitignore

@@ -1,24 +1,3 @@
 *~
 devtools-*.tar.gz*
-archbuild
+build/
-archco
-archrelease
-bash_completion
-checkpkg
-commitpkg
-diffpkg
-export-pkgbuild-keys
-finddeps
-lddd
-makechrootpkg
-makerepropkg
-mkarchroot
-offload-build
-rebuildpkgs
-zsh_completion
-find-libdeps
-crossrepomove
-arch-nspawn
-sogrep
-doc/*.1
-doc/*.7

Makefile

@@ -1,49 +1,16 @@
-V=20220620
+V=20230105
 BUILDTOOLVER ?= $(V)
 
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
+BUILDDIR = build
 
-IN_PROGS = \
+BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
-	archco \
+LIBUTILS = $(wildcard lib/*)
-	arch-nspawn \
+MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
-	archrelease \
+PACMAN_CONFIGS=$(wildcard config/pacman/*)
-	archbuild \
+SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
-	checkpkg \
+MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
-	commitpkg \
-	crossrepomove\
-	diffpkg \
-	export-pkgbuild-keys \
-	finddeps \
-	find-libdeps \
-	lddd \
-	makerepropkg \
-	mkarchroot \
-	makechrootpkg \
-	offload-build \
-	rebuildpkgs \
-	sogrep
-
-BINPROGS = \
-	$(IN_PROGS)
-
-CONFIGFILES = \
-	makepkg-x86_64.conf \
-	makepkg-x86_64_v3.conf \
-	pacman-extra.conf \
-	pacman-extra-x86_64_v3.conf \
-	pacman-testing.conf \
-	pacman-testing-x86_64_v3.conf \
-	pacman-staging.conf \
-	pacman-staging-x86_64_v3.conf \
-	pacman-multilib.conf \
-	pacman-multilib-testing.conf \
-	pacman-multilib-staging.conf \
-	pacman-kde-unstable.conf \
-	pacman-gnome-unstable.conf
-
-SETARCH_ALIASES = \
-	x86_64_v3
 
 COMMITPKG_LINKS = \
 	extrapkg \
@@ -75,71 +42,80 @@ CROSSREPOMOVE_LINKS = \
 	extra2community \
 	community2extra
 
+COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*)))
 BASHCOMPLETION_LINKS = \
 	archco \
 	communityco
 
 
-MANS = \
+all: binprogs completion man
-	doc/archbuild.1 \
+binprogs: $(BINPROGS)
-	doc/arch-nspawn.1 \
+completion: $(COMPLETIONS)
-	doc/export-pkgbuild-keys.1 \
-	doc/makechrootpkg.1 \
-	doc/lddd.1 \
-	doc/checkpkg.1 \
-	doc/diffpkg.1 \
-	doc/offload-build.1 \
-	doc/sogrep.1 \
-	doc/makerepropkg.1 \
-	doc/mkarchroot.1 \
-	doc/find-libdeps.1 \
-	doc/find-libprovides.1 \
-	doc/devtools.7
-
-
-all: $(BINPROGS) bash_completion zsh_completion man
 man: $(MANS)
 
+
+ifneq ($(wildcard *.in),)
+	$(error Legacy in prog file found: $(wildcard *.in) - please migrate to src/*)
+endif
+ifneq ($(wildcard pacman-*.conf),)
+	$(error Legacy pacman config file found: $(wildcard pacman-*.conf) - please migrate to config/pacman/*)
+endif
+ifneq ($(wildcard makepkg-*.conf),)
+	$(error Legacy makepkg config files found: $(wildcard makepkg-*.conf) -  please migrate to config/makepkg/*)
+endif
+ifneq ($(wildcard setarch-aliases.d/*),)
+	$(error Legacy setarch aliase found: $(wildcard setarch-aliases.d/*) - please migrate to config/setarch-aliases.d/*)
+endif
+
+
 edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
+GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
 
-%: %.in Makefile lib/common.sh
+define buildInScript
-	@echo "GEN $@"
+$(1)/%: $(2)%.in $(LIBUTILS)
-	@$(RM) "$@"
+	$$(GEN_MSG)
-	@{ echo -n 'm4_changequote([[[,]]])'; cat $@.in; } | m4 -P --define=m4_devtools_version=$(BUILDTOOLVER) | $(edit) >$@
+	@mkdir -p $$(dir $$@)
-	@chmod a-w "$@"
+	@$(RM) "$$@"
-	@chmod +x "$@"
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $$<; } | m4 -P --define=m4_devtools_version=$$(BUILDTOOLVER) | $(edit) >$$@
-	@bash -O extglob -n "$@"
+	@chmod $(3) "$$@"
+	@bash -n "$$@"
+endef
 
-$(MANS): doc/asciidoc.conf doc/footer.asciidoc
+$(eval $(call buildInScript,build/bin,src/,555))
+$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444)))
 
-doc/%: doc/%.asciidoc
+$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/asciidoc.conf doc/man/include/footer.asciidoc
-	a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage -D doc -a pkgdatadir=$(PREFIX)/share/devtools $<
+	$(GEN_MSG)
+	@mkdir -p $(BUILDDIR)/doc/man
+	@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(PREFIX)/share/devtools $<
 
 clean:
-	rm -f $(IN_PROGS) bash_completion zsh_completion $(MANS)
+	rm -rf $(BUILDDIR)
 
-install:
+install: all
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d
 	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
-	install -m0644 ${CONFIGFILES} $(DESTDIR)$(PREFIX)/share/devtools
+	for conf in ${MAKEPKG_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
-	for a in ${SETARCH_ALIASES}; do install -m0644 setarch-aliases.d/$$a $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
+	for conf in ${PACMAN_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
+	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
 	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${CROSSREPOMOVE_LINKS}; do ln -sf crossrepomove $(DESTDIR)$(PREFIX)/bin/$$l; done
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	install -Dm0644 bash_completion $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
+	install -Dm0644 $(BUILDDIR)/contrib/completion/bash/devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
 	for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
-	install -Dm0644 zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_devtools $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
 	for manfile in $(MANS); do \
 		install -Dm644 $$manfile -t $(DESTDIR)$(MANDIR)/man$${manfile##*.}; \
 	done;
 
 uninstall:
-	for f in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in ${CONFIGFILES}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/$$f; done
+	for conf in ${MAKEPKG_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
-	for f in ${SETARCH_ALIASES}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d/$$f; done
+	for conf in ${PACMAN_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
+	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d/$$f; done
 	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${CROSSREPOMOVE_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
@@ -148,9 +124,8 @@ uninstall:
 	rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	rm -f $(DESTDIR)$(PREFIX)/bin/communityco
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
-	for manfile in $(MANS); do \
+	for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
-		rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile#doc/}; \
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d $(DESTDIR)$(PREFIX)/share/devtools
-	done;
 
 TODAY=$(shell date +"%Y%m%d")
 tag:
@@ -165,8 +140,8 @@ dist:
 upload:
 	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/
 
-check: $(BINPROGS) bash_completion makepkg-x86_64.conf PKGBUILD.proto
+check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
 	shellcheck $^
 
-.PHONY: all clean install uninstall dist upload check tag
+.PHONY: all completion man clean install uninstall dist upload check tag
 .DELETE_ON_ERROR:

README.md

@@ -3,17 +3,6 @@
 This repository contains tools for the Arch Linux distribution for building
 and maintaining official repository packages.
 
-## Patches
-
-Patches can be send to arch-projects@archlinux.org or via a pull request on
-Github. When sending patches to the mailing list make sure to set a valid
-subjectprefix otherwise the email is denied by mailman. Git can be configured
-as following.
-
-```
-git config format.subjectprefix 'devtools] [PATCH'
-```
-
 ## Building
 
 When building official distro packages the `BUILDTOOLVER` needs to be set to the

config/makepkg/x86_64.conf

@@ -46,13 +46,13 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
-#RUSTFLAGS="-C opt-level=2"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -94,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)

config/makepkg/x86_64_v3.conf

@@ -46,13 +46,13 @@ CFLAGS="-march=x86-64-v3 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
-#RUSTFLAGS="-C opt-level=2"
+RUSTFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
-#DEBUG_RUSTFLAGS="-C debuginfo=2"
+DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -94,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)

contrib/completion/zsh/_devtools.in

@@ -6,6 +6,7 @@ m4_include(lib/valid-tags.sh)
 m4_include(lib/valid-repos.sh)
 
 _binary_arch=${_arch[*]:0:-1}
+_colors=(never always auto)
 
 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
@@ -47,6 +48,11 @@ _diffpkg_args=(
 	'(-p --pkginfo)'{-p,--pkginfo}'[.PKGINFO diff mode]'
 	'(-b --buildinfo)'{-b,--buildinfo}'[.BUILDINFO diff mode]'
 	'(-m --makepkg-config)'{-m,--makepkg-config}'[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
+	'(-u -U --unified)'{-u,-U,--unified}'[Output 3 lines of unified context]'
+	'(-y --side-by-side)'{-y,--side-by-side}'[Output in two columns]'
+	'--color=[Color output]:when:($_colors[*])'
+	'(-W --width=)'{-W,--width=}'[Output at most NUM print columns]:num:(auto columns)'
+	'(-P --pool=)'{-P,--pool=}'[pool directory]:dir:_files -/'
 	'(-v --verbose)'{-v,--verbose}'[Provide more detailed/unfiltered output]'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:packages:_devtools_completions_all_packages'

doc/man/arch-nspawn.1.asciidoc

@@ -37,4 +37,4 @@ Options
 *-h*::
 	Show this usage message
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/archbuild.1.asciidoc

@@ -44,4 +44,4 @@ See Also
 
 linkman:devtools[7]
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/checkpkg.1.asciidoc

@@ -40,4 +40,4 @@ See Also
 
 linkman:find-libprovides[1]
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/devtools.7.asciidoc

@@ -25,7 +25,7 @@ linkman:arch-nspawn[1]
 	Run a command or OS in a light-weight namespace container
 
 linkman:checkpkg[1]
-	Compare the current build pakcage with the repository version
+	Compare the current build package with the repository version
 
 linkman:find-libdeps[1]
 	Find soname dependencies for a package
@@ -52,4 +52,4 @@ linkman:offload-build[1]
 linkman:sogrep[1]
 	Find packages using a linked to a given shared library
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/diffpkg.1.asciidoc

@@ -21,7 +21,7 @@ When given one package, use it to diff against the locally built one.
 When given two packages, diff both packages against each other.
 
 In either case, a package name will be converted to a filename from the
-cache, and diffpkg will proceed as though this filename was initially
+cache or pool, and diffpkg will proceed as though this filename was initially
 specified.
 
 Options
@@ -30,12 +30,32 @@ Options
 *-M, --makepkg-config*::
 	Set an alternate makepkg configuration file
 
+
+*-P, --pool*='DIR'::
+	Search diff target in pool dir (default `'/srv/ftp/pool'`)
+
 *-v, --verbose*::
 	Provide more detailed/unfiltered output
 
 *-h, --help*::
 	Show a help text
 
+Output Options
+--------------
+
+*--color*[='WHEN']::
+	Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
+
+*-u, -U, --unified*::
+	Output 3 lines of unified context
+
+*-y, --side-by-side*::
+	Output in two columns
+
+*-W, --width*[='NUM']::
+	Output at most 'NUM' (default `'auto'`) print columns; 'NUM' can be `'auto'`, `'columns'` or a number.
+	`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
+
 Modes
 -----
 
@@ -54,4 +74,4 @@ Modes
 See Also
 --------
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/export-pkgbuild-keys.1.asciidoc

@@ -22,4 +22,4 @@ Options
 *-h, --help*::
 	Show a help text.
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/find-libdeps.1.asciidoc

@@ -21,4 +21,4 @@ Options
 	Ignore internal libraries.
 
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/find-libprovides.1.asciidoc

@@ -21,4 +21,4 @@ Options
 *--ignore-internal*::
 	Ignore internal libraries.
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/include/footer.asciidoc

@@ -1,9 +1,7 @@
 
 Bugs
 ----
-Bugs can be reported on the bug tracker 'https://bugs.archlinux.org' in the Arch
+Bugs can be reported on the project's GitLab bug tracker 'https://gitlab.archlinux.org/archlinux/devtools'
-Linux category and title prefixed with [devtools] or via
-mailto:arch-projects@archlinux.org[].
 
 
 Authors

doc/man/lddd.1.asciidoc

@@ -22,4 +22,4 @@ See Also
 
 linkman:ldd[1]
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/makechrootpkg.1.asciidoc

@@ -73,4 +73,4 @@ Options
 *-U*::
 	Run makepkg as a specified user
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/makerepropkg.1.asciidoc

@@ -56,4 +56,4 @@ Options
 *-h*::
 	Show this usage message
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/mkarchroot.1.asciidoc

@@ -46,4 +46,4 @@ See Also
 
 linkman:pacman[1]
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/offload-build.1.asciidoc

@@ -49,4 +49,4 @@ Example: To use a second `testing-x86_64-build` instance with another copydir:
 
 	`offload-build -r testing -- -- -l <chroot_copy>`
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

doc/man/sogrep.1.asciidoc

@@ -45,4 +45,4 @@ Environment Variables
 	directory set by the **XDG_CACHE_HOME** environment variable or the
 	**HOME** environment variable if **XDG_CACHE_HOME** is not set.
 
-include::footer.asciidoc[]
+include::include/footer.asciidoc[]

lib/common.sh

@@ -19,8 +19,6 @@ export LANG=C
 export BUILDTOOL=devtools
 export BUILDTOOLVER=m4_devtools_version
 
-shopt -s extglob
-
 # check if messages are to be printed using color
 if [[ -t 2 && "$TERM" != dumb ]]; then
 	colorize
@@ -142,12 +140,16 @@ pkgver_equal() {
 find_cached_package() {
 	local searchdirs=("$PWD" "$PKGDEST") results=()
 	local targetname=$1 targetver=$2 targetarch=$3
-	local dir pkg pkgbasename name ver rel arch r results
+	local dir pkg packages pkgbasename name ver rel arch r results
 
 	for dir in "${searchdirs[@]}"; do
 		[[ -d $dir ]] || continue
 
-		for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
+		shopt -s extglob nullglob
+		mapfile -t packages < <(printf "%s\n" "$dir"/"${targetname}"-"${targetver}"-*"${targetarch}".pkg.tar?(.!(sig|*.*)))
+		shopt -u extglob nullglob
+
+		for pkg in "${packages[@]}"; do
 			[[ -f $pkg ]] || continue
 
 			# avoid adding duplicates of the same inode

src/checkpkg.in

@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shopt -s extglob
-
 m4_include(lib/common.sh)
 
 usage() {
@@ -52,7 +50,7 @@ while (( $# )); do
 			shift
 			break
 			;;
-		-*,--*)
+		-*|--*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)
@@ -63,7 +61,7 @@ done
 
 # Source makepkg.conf; fail if it is not found
 if [[ -r "${MAKEPKG_CONF}" ]]; then
-	# shellcheck source=makepkg-x86_64.conf
+	# shellcheck source=config/makepkg/x86_64.conf
 	source "${MAKEPKG_CONF}"
 else
 	die "${MAKEPKG_CONF} not found!"
@@ -82,7 +80,7 @@ if [[ ! -f PKGBUILD ]]; then
 	die 'This must be run in the directory of a built package.'
 fi
 
-# shellcheck source=PKGBUILD.proto
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
 . ./PKGBUILD
 if [[ ${arch[0]} == 'any' ]]; then
 	CARCH='any'

src/commitpkg.in

@@ -6,7 +6,7 @@ m4_include(lib/common.sh)
 
 # Source makepkg.conf; fail if it is not found
 if [[ -r '/etc/makepkg.conf' ]]; then
-	# shellcheck source=makepkg-x86_64.conf
+	# shellcheck source=config/makepkg/x86_64.conf
 	source '/etc/makepkg.conf'
 else
 	die '/etc/makepkg.conf not found!'
@@ -28,7 +28,7 @@ if [[ ! -f PKGBUILD ]]; then
 fi
 
 source=()
-# shellcheck source=PKGBUILD.proto
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
 . ./PKGBUILD
 pkgbase=${pkgbase:-$pkgname}
 

src/crossrepomove.in

@@ -45,7 +45,7 @@ msg "Downloading sources for %s" "${pkgbase}"
 svn -q checkout -N "${target_svn}" target_checkout
 mkdir -p "target_checkout/${pkgbase}/repos"
 svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die
-# shellcheck source=PKGBUILD.proto
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
 . "target_checkout/${pkgbase}/trunk/PKGBUILD"
 
 msg "Downloading packages for %s" "${pkgbase}"
@@ -57,9 +57,14 @@ for _arch in "${arch[@]}"; do
 	fi
 	for _pkgname in "${pkgname[@]}"; do
 		fullver=$(get_full_version "$_pkgname")
-		pkgpath="/srv/ftp/$source_repo/os/$repo_arch/$_pkgname-$fullver-${_arch}.pkg.tar.*"
+		pkgpath="/srv/ftp/${source_repo}/os/${repo_arch}/${_pkgname}-${fullver}-${_arch}.pkg.tar.*"
+		debugpath="/srv/ftp/${source_repo}-debug/os/${repo_arch}/${_pkgname}-debug-${fullver}-${_arch}.pkg.tar.*"
+		# Fail if $pkgpath doesn't match but keep $debugpath optional
 		# shellcheck disable=2029
-		ssh "$server" "cp $pkgpath staging/$target_repo" || die
+		ssh "${server}" "bash -c '
+			install ${pkgpath} -Dt staging/${target_repo} &&
+			(install ${debugpath} -Dt staging/${target_repo} 2>/dev/null || true)
+		'" || die
 	done
 done
 

src/diffpkg.in

@@ -2,8 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-shopt -s extglob
-
 m4_include(lib/common.sh)
 
 usage() {
@@ -24,9 +22,18 @@ usage() {
 
 		OPTIONS
 		    -M, --makepkg-config Set an alternate makepkg configuration file
+		    -P, --pool=DIR       Search diff target in pool dir (default '/srv/ftp/pool')
 		    -v, --verbose        Provide more detailed/unfiltered output
 		    -h, --help           Show this help text
 
+		OUTPUT OPTIONS
+		    --color[=WHEN]       Color output; WHEN is 'never', 'always', or 'auto';
+		                         Plain --color means --color='auto'
+		    -u, -U, --unified    Output 3 lines of unified context
+		    -y, --side-by-side   Output in two columns
+		    -W, --width=NUM      Output at most NUM (default 'auto') print columns
+		                         NUM can be 'auto', 'columns' or a number
+
 		MODES
 		    -l, --list           Activate content list diff mode (default)
 		    -d, --diffoscope     Activate diffoscope diff mode
@@ -36,12 +43,19 @@ _EOF_
 }
 
 MAKEPKG_CONF=/etc/makepkg.conf
+POOLDIR=/srv/ftp/pool
+
 VERBOSE=0
 TARLIST=0
 DIFFOSCOPE=0
 PKGINFO=0
 BUILDINFO=0
 
+DIFFMODE=--side-by-side
+DIFFCOLOR=--color=auto
+DIFFWIDTH=--width=auto
+DIFFOPTIONS=(--expand-tabs)
+
 # option checking
 while (( $# )); do
 	case $1 in
@@ -50,6 +64,7 @@ while (( $# )); do
 			exit 0
 			;;
 		-M|--makepkg-config)
+			(( $# <= 1 )) && die "missing argument for %s" "$1"
 			MAKEPKG_CONF="$2"
 			shift 2
 			;;
@@ -73,11 +88,50 @@ while (( $# )); do
 			VERBOSE=1
 			shift
 			;;
+		-u|-U|--unified)
+			DIFFMODE=--unified
+			shift
+			;;
+		-y|--side-by-side)
+			DIFFMODE=--side-by-side
+			shift
+			;;
+		--color|--color=*)
+			if [[ $2 == never || $2 == always || $2 == auto ]]; then
+				DIFFCOLOR="--color=$2"
+				shift 2
+				continue
+			fi
+			if [[ $1 == --color ]]; then
+				DIFFCOLOR="--color=auto"
+			else
+				DIFFCOLOR="$1"
+			fi
+			shift
+			;;
+		-W|--width)
+			(( $# <= 1 )) && die "missing argument for %s" "$1"
+			DIFFWIDTH="--width=$2"
+			shift 2
+			;;
+		--width=*)
+			DIFFWIDTH="$1"
+			shift
+			;;
+		-P|--pool)
+			(( $# <= 1 )) && die "missing argument for %s" "$1"
+			POOLDIR="$2"
+			shift 2
+			;;
+		--pool=*)
+			POOLDIR="${1#*=}"
+			shift
+			;;
 		--)
 			shift
 			break
 			;;
-		-*,--*)
+		-*|--*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)
@@ -86,13 +140,29 @@ while (( $# )); do
 	esac
 done
 
+# Set options based on flags or magic values
+if (( VERBOSE )); then
+	if [[ $DIFFMODE == --unified ]]; then
+		DIFFMODE="--unified=99999"
+	fi
+else
+	DIFFOPTIONS+=(--suppress-common-lines)
+fi
+if [[ $DIFFWIDTH == --width=columns ]]; then
+	DIFFWIDTH="--width=${COLUMNS:-130}"
+fi
+if [[ $DIFFWIDTH != --width=auto ]]; then
+	DIFFOPTIONS+=("${DIFFWIDTH}")
+fi
+DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
+
 if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
 	TARLIST=1
 fi
 
 # Source makepkg.conf; fail if it is not found
 if [[ -r "${MAKEPKG_CONF}" ]]; then
-	# shellcheck source=makepkg-x86_64.conf
+	# shellcheck source=config/makepkg/x86_64.conf
 	source "${MAKEPKG_CONF}"
 else
 	die "${MAKEPKG_CONF} not found!"
@@ -120,6 +190,19 @@ tar_list() {
 	fi | sort
 }
 
+file_line_length() {
+	path="$1"
+	wc -L "${path}" | tail -n1 | sed -E 's/^ +//g' | cut -d' ' -f1
+}
+
+file_diff_columns() {
+	file1="$1"
+	file2="$2"
+	file1_length=$(file_line_length "$file1")
+	file2_length=$(file_line_length "$file2")
+	echo $(( file1_length + file2_length + 3 ))
+}
+
 diff_pkgs() {
 	local oldpkg newpkg
 	oldpkg=$(readlink -m "$1")
@@ -128,29 +211,40 @@ diff_pkgs() {
 	[[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
 	[[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"
 
-	if (( TARLIST )); then
+	DIFFOPTIONS+=(--label "${oldpkg}" --label "${newpkg}")
-		tar_list "$oldpkg" > "$TMPDIR/filelist-old"
-		tar_list "$newpkg" > "$TMPDIR/filelist"
 
-		sdiff -s "$TMPDIR/filelist-old" "$TMPDIR/filelist"
+	if (( TARLIST )); then
+		tar_list "$oldpkg" > "$TMPDIR/old"
+		tar_list "$newpkg" > "$TMPDIR/new"
 	fi
 
 	if (( PKGINFO )); then
-		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/pkginfo-old"
+		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/pkginfo"
+		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
-
-		sdiff -s "$TMPDIR/pkginfo-old" "$TMPDIR/pkginfo"
 	fi
 
 	if (( BUILDINFO )); then
-		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/buildinfo-old"
+		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/buildinfo"
+		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
+	fi
 
-		sdiff -s "$TMPDIR/buildinfo-old" "$TMPDIR/buildinfo"
+	if (( TARLIST || PKGINFO || BUILDINFO )); then
+		# Resolve dynamic auto width one we know the content to diff
+		if [[ $DIFFWIDTH == --width=auto ]]; then
+			AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
+			DIFFOPTIONS+=("--width=${AUTOLENGTH}")
+		fi
+
+		# Print a header for side-by-side view as it lacks labels
+		if [[ $DIFFMODE == --side-by-side ]]; then
+			printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
+		fi
+
+		diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"
 	fi
 
 	if (( DIFFOSCOPE )); then
-		diffoscope "$oldpkg" "$newpkg"
+		diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
 	fi
 }
 
@@ -169,8 +263,19 @@ fetch_pkg() {
 			pkg=$1 ;;
 	esac
 
-	[[ -n $pkgurl ]] || pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+	if [[ -z ${pkgurl} ]]; then
-		die "Couldn't download previous package for %s." "$pkg"
+		# Try to find latest package in pool dir
+		if [[ -d ${POOLDIR} ]]; then
+			shopt -s extglob nullglob
+			pkgurl=$(printf "%s\n" "${POOLDIR}"/*/"${_pkgname}"-!(*-*)-!(*-*)-!(*-*).pkg.tar!(*.sig)|sort -Vr|head -1)
+			shopt -u extglob nullglob
+		fi
+		# Search via pacman database if no pool file exists
+		if [[ ! -f ${pkgurl} ]]; then
+			pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+				die "Couldn't download previous package for %s." "$pkg"
+		fi
+	fi
 
 	pkg=${pkgurl##*/}
 	pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
@@ -196,7 +301,7 @@ if (( $# < 2 )); then
 		die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
 	fi
 
-	# shellcheck source=PKGBUILD.proto
+	# shellcheck source=contrib/makepkg/PKGBUILD.proto
 	. ./PKGBUILD
 	if [[ ${arch[0]} == 'any' ]]; then
 		CARCH='any'

src/export-pkgbuild-keys.in

@@ -37,7 +37,9 @@ fi
 mapfile -t validpgpkeys < <(
 	# shellcheck source=PKGBUILD.proto
 	. ./PKGBUILD
-	printf "%s\n" "${validpgpkeys[@]}"
+	if (( ${#validpgpkeys[@]} )); then
+		printf "%s\n" "${validpgpkeys[@]}"
+	fi
 )
 
 msg "Exporting ${#validpgpkeys[@]} PGP keys..."

src/find-libdeps.in

@@ -5,7 +5,6 @@
 m4_include(lib/common.sh)
 
 set -e
-shopt -s extglob
 
 IGNORE_INTERNAL=0
 
@@ -43,7 +42,9 @@ fi
 
 process_sofile() {
 	# extract the library name: libfoo.so
+	shopt -s extglob nullglob
 	soname="${sofile%.so?(+(.+([0-9])))}".so
+	shopt -u extglob nullglob
 	# extract the major version: 1
 	soversion="${sofile##*\.so\.}"
 	if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then

src/finddeps.in

@@ -20,7 +20,7 @@ fi
 find . -type d -print0 2>/dev/null| while read -r -d '' d; do
 	if [[ -f "$d/PKGBUILD" ]]; then
 		pkgname=() depends=() makedepends=() optdepends=()
-		# shellcheck source=PKGBUILD.proto
+		# shellcheck source=contrib/makepkg/PKGBUILD.proto
 		. "$d/PKGBUILD"
 		for dep in "${depends[@]}"; do
 			# lose the version comparator, if any

src/makechrootpkg.in

@@ -311,13 +311,14 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")
 
-# See if -R or -e was passed to makepkg
+# See if -R, -e or -A was passed to makepkg
 for arg in "${@:$OPTIND}"; do
 	case ${arg%%=*} in
-		--skip*|--holdver) verifysource_args+=("$arg") ;;
+		--skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
 		--repackage|--noextract) keepbuilddir=1 ;;
 		--*) ;;
-		-*R*|-*e*) keepbuilddir=1 ;;
+		-*A*) verifysource_args+=(-A) ;;&
+		-*R*|-*e*) keepbuilddir=1 ;;&
 	esac
 done
 

src/makerepropkg.in

@@ -86,13 +86,14 @@ get_pkgfile() {
 
 get_makepkg_conf() {
     local fname=${1}
-    local makepkg_conf="${2}"
+    local arch="${2}"
+    local makepkg_conf="${3}"
     if ! buildtool_file=$(get_pkgfile "${fname}"); then
         error "failed to retrieve ${fname}"
         return 1
     fi
     msg2 "using makepkg.conf from ${fname}"
-    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/devtools/makepkg-x86_64.conf > "${makepkg_conf}"
+    bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
     return 0
 }
 
@@ -213,17 +214,17 @@ TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
 makepkg_conf="${TEMPDIR}/makepkg.conf"
 # anything before buildtool support is pinned to the last none buildtool aware release
 if [[ -z "${BUILDTOOL}" ]]; then
-    get_makepkg_conf "devtools-20210202-3-any" "${makepkg_conf}" || exit 1
+    get_makepkg_conf "devtools-20210202-3-any" "${CARCH}" "${makepkg_conf}" || exit 1
 # prefere to assume devtools up until matching makepkg version so repository packages remain reproducible
 elif [[ "${BUILDTOOL}" = makepkg ]] && (( $(vercmp "${BUILDTOOLVER}" 6.0.1) <= 0 )); then
-    get_makepkg_conf "devtools-20210202-3-any" "${makepkg_conf}" || exit 1
+    get_makepkg_conf "devtools-20210202-3-any" "${CARCH}" "${makepkg_conf}" || exit 1
 # all devtools builds
-elif [[ "${BUILDTOOL}" = devtools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
+elif [[ "${BUILDTOOL}" = devtools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${CARCH}" "${makepkg_conf}"; then
     true
 # fallback to current makepkg.conf
 else
     warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback"
-    makepkg_conf=@pkgdatadir@/makepkg-x86_64.conf
+    makepkg_conf=@pkgdatadir@/makepkg-${CARCH}.conf
 fi
 printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M "${makepkg_conf}" -U "${archroot_args[@]}" "${namespace}/root" - || exit 1
 

src/mkarchroot.in

@@ -81,7 +81,7 @@ for file in "${files[@]}"; do
 	cp "$file" "$working_dir$file"
 done
 
-unshare --mount pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
+unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \
 	"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
 
 printf '%s.UTF-8 UTF-8\n' C en_US de_DE > "$working_dir/etc/locale.gen"

src/rebuildpkgs.in

@@ -22,7 +22,7 @@ fi
 
 # Source makepkg.conf; fail if it is not found
 if [[ -r '/etc/makepkg.conf' ]]; then
-	# shellcheck source=makepkg-x86_64.conf
+	# shellcheck source=config/makepkg/x86_64.conf
 	source '/etc/makepkg.conf'
 else
 	die '/etc/makepkg.conf not found!'
@@ -54,7 +54,7 @@ bump_pkgrel() {
 pkg_from_pkgbuild() {
 	# we want the sourcing to be done in a subshell so we don't pollute our current namespace
 	export CARCH PKGEXT
-	# shellcheck source=PKGBUILD.proto
+	# shellcheck source=contrib/makepkg/PKGBUILD.proto
 	(source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
 }