Adjust systemd-nspawn flags

* Remove --keep-unit since it causes sometimes errors and does not seem
  to be required
* Increase maximum number of open files (the default of 1000 is too less
  for some packages)
* Use /etc/resolv.conf from host (otherwise systemd-nspawn uses a config
  which does not work on my host setup)

.gitignore

@@ -9,14 +9,10 @@ commitpkg
 finddeps
 lddd
 makechrootpkg
-makerepropkg
 mkarchroot
-offload-build
 rebuildpkgs
 zsh_completion
 find-libdeps
 crossrepomove
 arch-nspawn
-sogrep
 doc/*.1
-doc/*.7

.travis.yml

@@ -4,7 +4,7 @@ sudo: required
 services:
 - docker
 
-archlinux:
+arch:
   packages:
     - openssh
     - subversion

Makefile

@@ -1,28 +1,26 @@
-V=20210202
+V=20190329
 
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
 
 IN_PROGS = \
-	archco \
-	arch-nspawn \
-	archrelease \
-	archbuild \
 	checkpkg \
 	commitpkg \
-	crossrepomove\
-	finddeps \
-	find-libdeps \
+	archco \
+	archrelease \
+	archbuild \
 	lddd \
-	makerepropkg \
-	mkarchroot \
-	makechrootpkg \
-	offload-build \
+	finddeps \
 	rebuildpkgs \
-	sogrep
+	find-libdeps \
+	crossrepomove\
+	arch-nspawn \
+	mkarchroot \
+	makechrootpkg
 
 BINPROGS = \
-	$(IN_PROGS)
+	$(IN_PROGS) \
+	sogrep
 
 CONFIGFILES = \
 	makepkg-x86_64.conf \
@@ -70,19 +68,16 @@ BASHCOMPLETION_LINKS = \
 MANS = \
 	doc/lddd.1 \
 	doc/checkpkg.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
+	doc/find-libprovides.1
 
 
 all: $(BINPROGS) bash_completion zsh_completion man
 man: $(MANS)
 
-edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
+edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g"
 
 %: %.in Makefile lib/common.sh
 	@echo "GEN $@"
@@ -131,12 +126,6 @@ uninstall:
 		rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile#doc/}; \
 	done;
 
-TODAY=$(shell date +"%Y%m%d")
-tag:
-	@sed -E "s|^V=[0-9]{8}|V=$(TODAY)|" -i Makefile
-	@git commit --gpg-sign --message "Version $(TODAY)" Makefile
-	@git tag --sign --message "Version $(TODAY)" $(TODAY)
-
 dist:
 	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz
@@ -147,5 +136,5 @@ upload:
 check: $(BINPROGS) bash_completion makepkg-x86_64.conf PKGBUILD.proto
 	shellcheck $^
 
-.PHONY: all clean install uninstall dist upload check tag
+.PHONY: all clean install uninstall dist upload check
 .DELETE_ON_ERROR:

arch-nspawn.in

@@ -13,14 +13,9 @@
 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
 
-# umask might have been changed in /etc/profile
-# ensure that sane default is set again
-umask 0022
-
 working_dir=''
 
 files=()
-mount_args=()
 
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
@@ -40,7 +35,7 @@ while getopts 'hC:M:c:f:s' arg; do
 	case "$arg" in
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
-		c) cache_dirs+=("$OPTARG") ;;
+		c) cache_dir="$OPTARG" ;;
 		f) files+=("$OPTARG") ;;
 		s) nosetarch=1 ;;
 		h|?) usage ;;
@@ -57,47 +52,38 @@ shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
-if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
+if [[ -z $cache_dir ]]; then
+	cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+else
+	cache_dirs=("$cache_dir")
 fi
 
+pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
 # shellcheck disable=2016
 host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
-
-for host_mirror in "${host_mirrors[@]}"; do
-	if [[ $host_mirror == *file://* ]]; then
-		host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
-		for m in "$host_mirror"/pool/*/; do
-			in_array "$m" "${cache_dirs[@]}" || cache_dirs+=("$m")
-		done
-	fi
-done
-
-while read -r line; do
-	mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \
-		--repo $line Server | sed -r 's#(.*/)[^/]+/os/.+#\1#')
-	for line in "${lines[@]}"; do
-		if [[ $line = file://* ]]; then
-			line=${line#file://}
-			in_array "$line" "${cache_dirs[@]}" || cache_dirs+=("$line")
-		fi
-	done
-done < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
-
-mount_args+=("--bind=${cache_dirs[0]//:/\\:}")
-
-for cache_dir in "${cache_dirs[@]:1}"; do
-	mount_args+=("--bind-ro=${cache_dir//:/\\:}")
-done
+# shellcheck disable=2016
 
 # {{{ functions
-copy_hostconf () {
-	unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
-	pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
+build_mount_args() {
+	declare -g mount_args=()
 
-	printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
+	for host_mirror in "${host_mirrors[@]}"; do
+		if [[ $host_mirror == *file://* ]]; then
+			host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+			mount_args+=("--bind-ro=$host_mirror_path")
+		fi
+	done
+
+	mount_args+=("--bind=${cache_dirs[0]}")
+
+	for cache_dir in "${cache_dirs[@]:1}"; do
+		mount_args+=("--bind-ro=$cache_dir")
+	done
+}
+
+copy_hostconf () {
+	cp -a /etc/pacman.d/gnupg "$working_dir/etc/pacman.d"
+	#printf 'Server = %s\n' "${host_mirrors[@]}" >"$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"
@@ -121,15 +107,19 @@ elif [[ $(cat "$working_dir/.arch-chroot") != "$CHROOT_VERSION" ]]; then
 	die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION"
 fi
 
+build_mount_args
 copy_hostconf
 
 eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
 [[ -z $nosetarch ]] || unset CARCH
 
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+exec systemd-nspawn -q \
 	-D "$working_dir" \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
-	--register=no --keep-unit --as-pid2 \
+	--register=no \
+	--as-pid2 \
+	--rlimit=NOFILE=10000 \
+	--resolv-conf=copy-host \
 	"${mount_args[@]}" \
 	"$@"

archbuild.in

@@ -5,7 +5,7 @@ m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
 
 base_packages=(base-devel)
-makechrootpkg_args=(-c -n -C)
+makechrootpkg_args=(-c -n)
 
 cmd="${0##*/}"
 if [[ "${cmd%%-*}" == 'multilib' ]]; then
@@ -20,15 +20,6 @@ fi
 chroots='/var/lib/archbuild'
 clean_first=false
 
-pacman_config="@pkgdatadir@/pacman-${repo}.conf"
-if [[ -f @pkgdatadir@/pacman-${repo}-${arch}.conf ]]; then
-    pacman_config="@pkgdatadir@/pacman-${repo}-${arch}.conf"
-fi
-makepkg_config="@pkgdatadir@/makepkg-${arch}.conf"
-if [[ -f @pkgdatadir@/makepkg-${repo}-${arch}.conf ]]; then
-    makepkg_config="@pkgdatadir@/makepkg-${repo}-${arch}.conf"
-fi
-
 usage() {
 	echo "Usage: $cmd [options] -- [makechrootpkg args]"
 	echo '    -h         This help'
@@ -68,19 +59,19 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 	lock_close 9
 
 	rm -rf --one-file-system "${chroots}/${repo}-${arch}"
-	(umask 0022; mkdir -p "${chroots}/${repo}-${arch}")
-	setarch "${arch}" mkarchroot \
-		-C "${pacman_config}" \
-		-M "${makepkg_config}" \
+	mkdir -p "${chroots}/${repo}-${arch}"
+	mkarchroot \
+		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}" || abort
 else
 	lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot"
 	arch-nspawn \
-		-C "${pacman_config}" \
-		-M "${makepkg_config}" \
+		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
-		pacman -Syuu --noconfirm || abort
+                pacman -Syu --noconfirm || abort
 fi
 
 # Always build official packages reproducibly

archrelease.in

@@ -48,8 +48,7 @@ if [[ $(svn status -q) ]]; then
 fi
 
 pushd .. >/dev/null
-mapfile -t known_files < <(svn ls -r HEAD "$trunk")
-wait $! || die "failed to discover committed files"
+IFS=$'\n' read -r -d '' -a known_files < <(svn ls -r HEAD "$trunk")
 for file in "${known_files[@]}"; do
 	if [[ ${file:(-1)} = '/' ]]; then
 		die "archrelease: subdirectories are not supported in package directories!"
@@ -66,12 +65,12 @@ for tag in "$@"; do
 	stat_busy "Copying %s to %s" "${trunk}" "${tag}"
 
 	if [[ -d repos/$tag ]]; then
-		mapfile -t trash < <(svn ls "repos/$tag")
-		wait $! || die "failed to discover existing files"
-		if (( ${#trash[@]} )); then
-			trash=("${trash[@]/#/repos/$tag/}")
-			svn rm -q "${trash[@]/%/@}"
-		fi
+		declare -a trash
+		trash=()
+		while read -r file; do
+			trash+=("repos/$tag/$file")
+		done < <(svn ls "repos/$tag")
+		[[ ${#trash[@]} == 0 ]] || svn rm -q "${trash[@]/%/@}"
 	else
 		mkdir -p "repos/$tag"
 		svn add --parents -q "repos/$tag"

checkpkg.in

@@ -22,53 +22,6 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
 	source "$HOME/.makepkg.conf"
 fi
 
-usage() {
-    cat <<- _EOF_
-		Usage: ${BASH_SOURCE[0]##*/} [OPTIONS]
-
-		Searches for a locally built package corresponding to the PKGBUILD, and
-		downloads the last version of that package from the Pacman repositories.
-		It then compares the list of .so files provided by each version of the
-		package and outputs if there are soname differences for the new package.
-		A directory is also created using mktemp with files containing a file
-		list for both packages and a library list for both packages.
-
-		OPTIONS
-		    -r, --rmdir     Remove the temporary directory
-		    -w, --warn      Print a warning in case of differences
-		    -h, --help      Show this help text
-_EOF_
-}
-
-RMDIR=0
-WARN=0
-
-OPT_SHORT='rwh'
-OPT_LONG=('rmdir' 'warn' 'help')
-if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
-    exit 1
-fi
-set  -- "${OPTRET[@]}"
-
-while :; do
-    case $1 in
-        -r|--rmdir)
-            RMDIR=1
-            ;;
-        -w|--warn)
-            WARN=1
-            ;;
-        -h|--help)
-            usage
-            exit 0
-            ;;
-        --)
-            shift; break
-            ;;
-    esac
-    shift
-done
-
 if [[ ! -f PKGBUILD ]]; then
 	die 'This must be run in the directory of a built package.'
 fi
@@ -80,12 +33,9 @@ if [[ ${arch[0]} == 'any' ]]; then
 fi
 
 STARTDIR=$(pwd)
-(( RMDIR )) && trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
 TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
 
 for _pkgname in "${pkgname[@]}"; do
-	comparepkg=$_pkgname
-	pkgurl=
 	target_pkgver=$(get_full_version "$_pkgname")
 	if ! pkgfile=$(find_cached_package "$_pkgname" "$target_pkgver" "$CARCH"); then
 		die 'tarball not found for package: %s' "${_pkgname}-$target_pkgver"
@@ -93,31 +43,16 @@ for _pkgname in "${pkgname[@]}"; do
 
 	ln -s "$pkgfile" "$TEMPDIR"
 
-	if (( $# )); then
-		case $1 in
-			*://*)
-				pkgurl=$1 ;;
-			/*|*/*)
-				pkgurl=$(readlink -m "$1") ;;
-			*.pkg.tar*)
-				pkgurl=$1 ;;
-			'')
-				;;
-			*)
-				comparepkg=$1 ;;
-		esac
-		shift
-	fi
-	[[ -n $pkgurl ]] || pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$comparepkg") ||
-		die "Couldn't download previous package for %s." "$comparepkg"
+	pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$_pkgname") ||
+		die "Couldn't download previous package for %s." "$_pkgname"
 
-	oldpkg=${pkgurl##*/}
+	oldpkg=${pkgurl##*://*/}
 
-	if [[ ${oldpkg} = "${pkgfile##*/}" ]]; then
+	if [[ ${oldpkg##*/} = "${pkgfile##*/}" ]]; then
 		die "The built package (%s) is the one in the repo right now!" "$_pkgname"
 	fi
 
-	if [[ $pkgurl = file://* || ( $pkgurl = /* && -f $pkgurl ) ]]; then
+	if [[ $pkgurl = file://* ]]; then
 		ln -s "${pkgurl#file://}" "$TEMPDIR/$oldpkg"
 	elif [[ -f "$PKGDEST/$oldpkg" ]]; then
 		ln -s "$PKGDEST/$oldpkg" "$TEMPDIR/$oldpkg"
@@ -135,12 +70,11 @@ for _pkgname in "${pkgname[@]}"; do
 	find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
 	find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"
 	if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
-		message="Sonames differ in $_pkgname!"
-		(( WARN )) && warning "$message" || msg "$message"
+		msg "Sonames differ in $_pkgname!"
 		echo "$diff_output"
 	else
 		msg "No soname differences for %s." "$_pkgname"
 	fi
 done
 
-(( RMDIR )) || msg "Files saved to %s" "$TEMPDIR"
+msg "Files saved to %s" "$TEMPDIR"

commitpkg.in

@@ -83,7 +83,7 @@ while getopts ':l:a:s:f' flag; do
 done
 shift $(( OPTIND - 1 ))
 
-# check packages for validity
+# check packages have the packager field set
 for _arch in "${arch[@]}"; do
 	if [[ -n $commit_arch && ${_arch} != "$commit_arch" ]]; then
 		continue
@@ -91,15 +91,10 @@ for _arch in "${arch[@]}"; do
 	for _pkgname in "${pkgname[@]}"; do
 		fullver=$(get_full_version "$_pkgname")
 
-		if pkgfile=$(find_cached_package "$_pkgname" "$fullver" "$_arch"); then
+		if pkgfile=$(find_cached_package "$_pkgname" "$_arch" "$fullver"); then
 			if grep -q "packager = Unknown Packager" <(bsdtar -xOqf "$pkgfile" .PKGINFO); then
 				die "PACKAGER was not set when building package"
 			fi
-			hashsum=sha256sum
-			pkgbuild_hash=$(awk -v"hashsum=$hashsum" -F' = ' '$1 == "pkgbuild_"hashsum {print $2}' <(bsdtar -xOqf "$pkgfile" .BUILDINFO))
-			if [[ "$pkgbuild_hash" != "$($hashsum PKGBUILD|cut -d' ' -f1)" ]]; then
-				die "PKGBUILD $hashsum mismatch: expected $pkgbuild_hash"
-			fi
 		fi
 	done
 done
@@ -109,10 +104,10 @@ if [[ -z $server ]]; then
 fi
 
 if [[ -n $(svn status -q) ]]; then
-	msgtemplate="upgpkg: $pkgbase $(get_full_version)"
+	msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
 	if [[ -n $1 ]]; then
 		stat_busy 'Committing changes to trunk'
-		svn commit -q -m "${msgtemplate}: ${1}" || die
+		svn commit -q -m "${msgtemplate}${1}" || die
 		stat_done
 	else
 		msgfile="$(mktemp)"
@@ -162,8 +157,8 @@ for _arch in "${arch[@]}"; do
 			fi
 			gpg --detach-sign --use-agent --no-armor "${SIGNWITHKEY[@]}" "${pkgfile}" || die
 		fi
-		if ! gpg --verify "$sigfile" "$pkgfile" >/dev/null 2>&1; then
-			die "Signature %s is incorrect!" "$sigfile"
+		if ! gpg --verify "$sigfile" >/dev/null 2>&1; then
+			die "Signature %s.sig is incorrect!" "$pkgfile"
 		fi
 		uploads+=("$sigfile")
 	done

doc/checkpkg.1.asciidoc

@@ -19,19 +19,6 @@ outputs if there are soname differences for the new package. A directory is
 also created using mktemp with files containing a file list for both packages
 and a library list for both packages.
 
-Options
--------
-
-*-r, --rmdir*::
-	Remove the temporary directory created to contain the file and library list
-	of both packages.
-
-*-w, --warn*::
-	Print a warning instead of a regular message in case of soname differences.
-
-*-h, --help*::
-	Show a help text
-
 See Also
 --------
 

doc/devtools.7.asciidoc

@@ -1,46 +0,0 @@
-devtools(7)
-===========
-
-Name
-----
-devtools - Developer tools for the Arch Linux distribution
-
-Description
------------
-
-Devtools contains tools for package maintenance in Arch Linux. The toolset
-varies from tools for building packages in a clean chroot ('mkarchroot',...),
-packaging related tools for sonames ('sogrep', 'lddd') and tools for
-repository management such as ('archco', 'extra2community')
-
-Programs
---------
-The list below gives a short overview; see the respective documentation
-for details.
-
-linkman:checkpkg[1]
-	Compare the current build pakcage with the repository version
-
-linkman:find-libdeps[1]
-	Find soname dependencies for a package
-
-linkman:find-libprovides[1]
-	Find soname's which are provided by a package
-
-linkman:lddd[1]
-	Find broken library links on your system
-
-linkman:makerepropkg[1]
-	Rebuild a package to see if it is reproducible
-
-linkman:mkarchroot[1]
-	Creates an arch chroot in a specified location with a specified set of
-	packages
-
-linkman:offload-build[1]
-	Build a PKGBUILD on a remote server using makechrootpkg
-
-linkman:sogrep[1]
-	Find packages using a linked to a given shared library
-
-include::footer.asciidoc[]

doc/makerepropkg.1.asciidoc

@@ -1,54 +0,0 @@
-makerepropkg(1)
-================
-
-Name
-----
-makerepropkg - Rebuild a package to see if it is reproducible
-
-Synopsis
---------
-makerepropkg [OPTIONS] [<package_file|pkgname>...]
-
-Description
------------
-
-Given the path to a built pacman package(s), attempt to rebuild it using the
-PKGBUILD in the current directory. The package will be built in an environment
-as closely matching the environment of the initial package as possible, by
-building up a chroot to match the information exposed in the package's
-linkman:BUILDINFO[5] manifest. On success, the resulting package will be
-compared to the input package, and makerepropkg will report whether the
-artifacts are identical.
-
-When given multiple packages, additional package files are assumed to be split
-packages and will be treated as additional artifacts to compare during the
-verification step.
-
-A valid target(s) for pacman -S can be specified instead, and makerepropkg will
-download it to the cache if needed. This is mostly useful to specify which
-repository to retrieve from. If no positional arguments are specified, the
-targets will be sourced from the PKGBUILD.
-
-In either case, the package name will be converted to a filename from the
-cache, and makerepropkg will proceed as though this filename was initially
-specified.
-
-This implements a verifier for pacman/libalpm packages in accordance with the
-link:https://reproducible-builds.org/[Reproducible Builds] project.
-
-Options
--------
-
-*-d*::
-	If packages are not reproducible, compare them using diffoscope.
-
-*-c*::
-	Set the pacman cache directory.
-
-*-M* <file>::
-	Location of a makepkg config file.
-
-*-h*::
-	Show this usage message
-
-include::footer.asciidoc[]

doc/mkarchroot.1.asciidoc

@@ -20,9 +20,6 @@ en_US.UTF-8 and de_DE.UTF-8 locale and a generated machine-id.
 Options
 -------
 
-*-U*::
-	Use 'pacman -U' to install packages.
-
 *-C* <file>::
 	Location of a pacman config file.
 

doc/offload-build.1.asciidoc

@@ -1,52 +0,0 @@
-offload-build(1)
-================
-
-Name
-----
-offload-build - Build a PKGBUILD on a remote server using makechrootpkg
-
-Synopsis
---------
-offload-build [OPTIONS] -- [ARCHBUILD_OPTIONS]
-
-Description
------------
-
-Build a PKGBUILD on a remote server using makechrootpkg. Requires a remote user
-that can run archbuild in a non-interactive manner, e.g. must be able to
-elevate permissions using passwordless sudo.
-
-Options
--------
-
-*-r, --repo* <reponame>::
-	Build against a specific repository. The default is `extra`, to build packages using
-	the stable repositories via extra-x86_64-build.
-
-*-a, --arch* <architecture>::
-	Build against a specific architecture. The default is `x86_64`, the only
-	architecture officially supported by Arch Linux.
-
-*-s, --server* <hostname>::
-	Offload to a specific build server. The default is build.archlinux.org
-	which is used as part of the build toolchain for the official Arch Linux
-	repos.
-
-*-h, --help*::
-	Show a help text.
-
-Passing options to archbuild
-----------------------------
-
-Options after a delimiting -- are passed on to archbuild on the remote.
-archbuild in turn supports passing arguments on to makechrootpkg, which in turn
-supports passing options to makepkg. Since each uses -- to delimit options that
-are forwarded, make sure to escape them properly:
-
-	`offload-build offload-args -- archbuild-args -- makechrootpkg-args -- makepkg-args`
-
-Example: To use a second `testing-x86_64-build` instance with another copydir:
-
-	`offload-build -r testing -- -- -l <chroot_copy>`
-
-include::footer.asciidoc[]

find-libdeps.in

@@ -13,7 +13,7 @@ if [[ $1 = "--ignore-internal" ]]; then
 	shift
 fi
 
-script_mode=${BASH_SOURCE[0]##*/find-lib}
+script_mode=${0##*/find-lib}
 
 case $script_mode in
 	deps|provides) true;;
@@ -57,7 +57,7 @@ process_sofile() {
 
 case $script_mode in
 	deps) find_args=(-perm -u+x);;
-	provides) find_args=(-name '*.so*');;
+        provides) find_args=(-name '*.so*');;
 esac
 
 find . -type f "${find_args[@]}" | while read -r filename; do

finddeps.in

@@ -17,7 +17,7 @@ if [[ -z $match ]]; then
 	exit 1
 fi
 
-find . -type d -print0 2>/dev/null| while read -r -d '' d; do
+find . -type d | while read -r d; do
 	if [[ -f "$d/PKGBUILD" ]]; then
 		pkgname=() depends=() makedepends=() optdepends=()
 		# shellcheck source=PKGBUILD.proto

lib/archroot.sh

@@ -8,7 +8,7 @@ CHROOT_VERSION='v4'
 ##
 #  usage : check_root $keepenv
 ##
-orig_argv=("${BASH_SOURCE[0]}" "$@")
+orig_argv=("$0" "$@")
 check_root() {
 	local keepenv=$1
 
@@ -37,6 +37,14 @@ is_subvolume() {
 	[[ -e "$1" && "$(stat -f -c %T "$1")" == btrfs && "$(stat -c %i "$1")" == 256 ]]
 }
 
+##
+#  usage : is_same_fs( $path_a, $path_b )
+# return : whether $path_a and $path_b are on the same filesystem
+##
+is_same_fs() {
+	[[ "$(stat -c %d "$1")" == "$(stat -c %d "$1")" ]]
+}
+
 ##
 #  usage : subvolume_delete_recursive( $path )
 #

lib/common.sh

@@ -17,7 +17,7 @@ export LANG=C
 shopt -s extglob
 
 # check if messages are to be printed using color
-if [[ -t 2 && "$TERM" != dumb ]]; then
+if [[ -t 2 ]]; then
 	colorize
 else
 	# shellcheck disable=2034
@@ -142,7 +142,7 @@ find_cached_package() {
 	for dir in "${searchdirs[@]}"; do
 		[[ -d $dir ]] || continue
 
-		for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
+		for pkg in "$dir"/*.pkg.tar?(.?z); do
 			[[ -f $pkg ]] || continue
 
 			# avoid adding duplicates of the same inode
@@ -152,7 +152,7 @@ find_cached_package() {
 
 			# split apart package filename into parts
 			pkgbasename=${pkg##*/}
-			pkgbasename=${pkgbasename%.pkg.tar*}
+			pkgbasename=${pkgbasename%.pkg.tar?(.?z)}
 
 			arch=${pkgbasename##*-}
 			pkgbasename=${pkgbasename%-"$arch"}

lib/valid-repos.sh

@@ -1,31 +0,0 @@
-#!/hint/bash
-# License: Unspecified
-:
-
-# shellcheck disable=2034
-_repos=(
-	staging
-	testing
-	core
-	extra
-	community-staging
-	community-testing
-	community
-	multilib-staging
-	multilib-testing
-	multilib
-	gnome-unstable
-	kde-unstable
-)
-
-# shellcheck disable=2034
-_build_repos=(
-	staging
-	testing
-	extra
-	multilib-staging
-	multilib-testing
-	multilib
-	gnome-unstable
-	kde-unstable
-)

makechrootpkg.in

@@ -13,34 +13,8 @@
 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
 
-source /usr/share/makepkg/util/config.sh
-
 shopt -s nullglob
 
-default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-makepkg_args=("${default_makepkg_args[@]}")
-verifysource_args=()
-chrootdir=
-passeddir=
-makepkg_user=
-declare -a install_pkgs
-declare -i ret=0
-
-keepbuilddir=0
-update_first=0
-clean_first=0
-run_namcap=0
-run_checkpkg=0
-temp_chroot=0
-
-bindmounts_ro=()
-bindmounts_rw=()
-
-copy=$USER
-[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
-[[ -z "$copy" || $copy = root ]] && copy=copy
-src_owner=${SUDO_USER:-$USER}
-
 usage() {
 	echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
 	echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -64,6 +38,7 @@ usage() {
 	echo 'Flags:'
 	echo '-h         This help'
 	echo '-c         Clean the chroot before building'
+	echo '-C <dir>   Set pacman cache to pass to arch-nspawn'
 	echo '-d <dir>   Bind directory into build chroot as read-write'
 	echo '-D <dir>   Bind directory into build chroot as read-only'
 	echo '-u         Update the working copy of the chroot before building'
@@ -75,38 +50,63 @@ usage() {
 	echo '           Useful for maintaining multiple copies'
 	echo "           Default: $copy"
 	echo '-n         Run namcap on the package'
-	echo '-C         Run checkpkg on the package'
 	echo '-T         Build in a temporary directory'
 	echo '-U         Run makepkg as a specified user'
 	exit 1
 }
 
 # {{{ functions
-# Usage: sync_chroot $chrootdir $copydir [$copy]
+# Usage: load_vars $makepkg_conf
+# Globals:
+#  - SRCDEST
+#  - SRCPKGDEST
+#  - PKGDEST
+#  - LOGDEST
+#  - MAKEFLAGS
+#  - PACKAGER
+load_vars() {
+	local makepkg_conf="$1" var
+
+	[[ -f $makepkg_conf ]] || return 1
+
+	for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do
+		[[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$makepkg_conf")"
+	done
+
+	return 0
+}
+
+# Usage: sync_chroot $rootdir $copydir [$copy]
 sync_chroot() {
-	local chrootdir=$1
+	local rootdir=$1
 	local copydir=$2
 	local copy=${3:-$2}
 
-	if [[ "$chrootdir/root" -ef "$copydir" ]]; then
+	if [[ "$rootdir" -ef "$copydir" ]]; then
 		error 'Cannot sync copy with itself: %s' "$copydir"
 		return 1
 	fi
 
 	# Get a read lock on the root chroot to make
 	# sure we don't clone a half-updated chroot
-	slock 8 "$chrootdir/root.lock" \
-		"Locking clean chroot [%s]" "$chrootdir/root"
+	slock 8 "$rootdir.lock" \
+		"Locking clean chroot [%s]" "$rootdir"
 
-	stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$chrootdir/root" "$copy"
-	if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
-		subvolume_delete_recursive "$copydir" ||
-			die "Unable to delete subvolume %s" "$copydir"
-		btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null ||
+	stat_busy "Synchronizing chroot copy [%s] -> [%s]" "$rootdir" "$copy"
+	if is_subvolume "$rootdir" && is_same_fs "$rootdir" "$(dirname -- "$copydir")" && ! mountpoint -q "$copydir"; then
+		if is_subvolume "$copydir"; then
+			subvolume_delete_recursive "$copydir" ||
+				die "Unable to delete subvolume %s" "$copydir"
+		else
+			# avoid change of filesystem in case of an umount failure
+			rm --recursive --force --one-file-system "$copydir" ||
+				die "Unable to delete %s" "$copydir"
+		fi
+		btrfs subvolume snapshot "$rootdir" "$copydir" >/dev/null ||
 			die "Unable to create subvolume %s" "$copydir"
 	else
 		mkdir -p "$copydir"
-		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+		rsync -a --delete -q -W -x "$rootdir/" "$copydir"
 	fi
 	stat_done
 
@@ -137,7 +137,11 @@ delete_chroot() {
 	stat_done
 }
 
+# Usage: install_packages $copydir $pkgs...
 install_packages() {
+	local copydir=$1
+	local install_pkgs=("${@:2}")
+
 	local -a pkgnames
 	local ret
 
@@ -145,19 +149,28 @@ install_packages() {
 
 	cp -- "${install_pkgs[@]}" "$copydir/root/"
 	arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
-		bash -c 'yes y | pacman -U -- "$@"' -bash "${pkgnames[@]/#//root/}"
+		pacman -U --noconfirm -- "${pkgnames[@]/#//root/}"
 	ret=$?
 	rm -- "${pkgnames[@]/#/$copydir/root/}"
 
 	return $ret
 }
 
+# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap
+# Globals:
+#  - MAKEFLAGS
+#  - PACKAGER
 prepare_chroot() {
-	(( keepbuilddir )) || rm -rf "$copydir/build"
+	local copydir=$1
+	local USER_HOME=$2
+	local keepbuilddir=$3
+	local run_namcap=$4
+
+	[[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
 	local builduser_uid builduser_gid
-	builduser_uid="$(id -u "$makepkg_user")"
-	builduser_gid="$(id -g "$makepkg_user")"
+	builduser_uid="${SUDO_UID:-$UID}"
+	builduser_gid="$(id -g "$builduser_uid")"
 	local install="install -o $builduser_uid -g $builduser_gid"
 	local x
 
@@ -171,9 +184,7 @@ prepare_chroot() {
 
 	$install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest}
 
-	sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
-	for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \
-		"MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'"
+	for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest
 	do
 		grep -q "^$x" "$copydir/etc/makepkg.conf" && continue
 		echo "$x" >>"$copydir/etc/makepkg.conf"
@@ -192,7 +203,7 @@ EOF
 		declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
 		printf '_chrootbuild "$@" || exit\n'
 
-		if (( run_namcap )); then
+		if [[ $run_namcap = true ]]; then
 			declare -f _chrootnamcap
 			printf '_chrootnamcap || exit\n'
 		fi
@@ -213,7 +224,9 @@ _chrootbuild() {
 	# use "$" in arguments to commands with "sudo -i".  ${foo} or
 	# ${1} is OK, but $foo or $1 isn't.
 	# https://bugzilla.sudo.ws/show_bug.cgi?id=765
-	sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+	mkdir /build/.distcc
+	chown builduser /build/.distcc
+	sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser DISTCC_IO_TIMEOUT=1200 DISTCC_DIR='/build/.distcc' bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 	ret=$?
 	case $ret in
 		0|14)
@@ -231,27 +244,32 @@ _chrootnamcap() {
 	done
 }
 
+# Usage: download_sources $copydir $makepkg_user
+# Globals:
+#  - SRCDEST
 download_sources() {
+	local copydir=$1
+	local makepkg_user=$2
+
 	setup_workdir
 	chown "$makepkg_user:" "$WORKDIR"
 
 	# Ensure sources are downloaded
 	sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
 		env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
-		makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+		makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o ||
 		die "Could not download sources."
 }
 
-move_logfiles() {
-	local l
-	for l in "$copydir"/logdest/*; do
-		[[ $l == */logpipe.* ]] && continue
-		chown "$src_owner" "$l"
-		mv "$l" "$LOGDEST"
-	done
-}
-
+# Usage: move_products $copydir $owner
+# Globals:
+#  - PKGDEST
+#  - LOGDEST
+#  - SRCPKGDEST
 move_products() {
+	local copydir=$1
+	local src_owner=$2
+
 	local pkgfile
 	for pkgfile in "$copydir"/pkgdest/*; do
 		chown "$src_owner" "$pkgfile"
@@ -263,7 +281,12 @@ move_products() {
 		fi
 	done
 
-	move_logfiles
+	local l
+	for l in "$copydir"/logdest/*; do
+		[[ $l == */logpipe.* ]] && continue
+		chown "$src_owner" "$l"
+		mv "$l" "$LOGDEST"
+	done
 
 	for s in "$copydir"/srcpkgdest/*; do
 		chown "$src_owner" "$s"
@@ -277,141 +300,145 @@ move_products() {
 }
 # }}}
 
-while getopts 'hcur:I:l:nCTD:d:U:' arg; do
-	case "$arg" in
-		c) clean_first=1 ;;
-		D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
-		d) bindmounts_rw+=("--bind=$OPTARG") ;;
-		u) update_first=1 ;;
-		r) passeddir="$OPTARG" ;;
-		I) install_pkgs+=("$OPTARG") ;;
-		l) copy="$OPTARG" ;;
-		n) run_namcap=1; makepkg_args+=(--install) ;;
-		C) run_checkpkg=1 ;;
-		T) temp_chroot=1; copy+="-$$" ;;
-		U) makepkg_user="$OPTARG" ;;
-		h|*) usage ;;
-	esac
-done
+main() {
+	default_makepkg_args=(--syncdeps --noconfirm --holdver --skipinteg)
+	makepkg_args=("${default_makepkg_args[@]}")
+	keepbuilddir=false
+	update_first=false
+	clean_first=false
+	run_namcap=false
+	temp_chroot=false
+	chrootdir=
+	passeddir=
+	makepkg_user=
+	declare -a install_pkgs
+	declare -i ret=0
 
-[[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
-[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
-makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
+	bindmounts_ro=()
+	bindmounts_rw=()
 
-check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
+	copy=$USER
+	[[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+	[[ -z "$copy" || $copy = root ]] && copy=copy
+	src_owner=${SUDO_USER:-$USER}
 
-# Canonicalize chrootdir, getting rid of trailing /
-chrootdir=$(readlink -e "$passeddir")
-[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
-[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir"
+	while getopts 'hcuC:r:I:l:nTD:d:U:' arg; do
+		case "$arg" in
+			c) clean_first=true ;;
+			D) bindmounts_ro+=("--bind-ro=$OPTARG") ;;
+			d) bindmounts_rw+=("--bind=$OPTARG") ;;
+			u) update_first=true ;;
+			C) cache_dir="$OPTARG" ;;
+			r) passeddir="$OPTARG" ;;
+			I) install_pkgs+=("$OPTARG") ;;
+			l) copy="$OPTARG" ;;
+			n) run_namcap=true; makepkg_args+=(--install) ;;
+			T) temp_chroot=true; copy+="-$$" ;;
+			U) makepkg_user="$OPTARG" ;;
+			h|*) usage ;;
+		esac
+	done
 
-if [[ ${copy:0:1} = / ]]; then
-	copydir=$copy
-else
-	copydir="$chrootdir/$copy"
-fi
+	[[ ! -f PKGBUILD && -z "${install_pkgs[*]}" ]] && die 'This must be run in a directory containing a PKGBUILD.'
+	[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
+	makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-# Pass all arguments after -- right to makepkg
-makepkg_args+=("${@:$OPTIND}")
+	check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER
 
-# See if -R or -e was passed to makepkg
-for arg in "${@:$OPTIND}"; do
-	case ${arg%%=*} in
-		--skip*|--holdver) verifysource_args+=("$arg") ;;
-		--repackage|--noextract) keepbuilddir=1 ;;
-		--*) ;;
-		-*R*|-*e*) keepbuilddir=1 ;;
-	esac
-done
+	# Canonicalize chrootdir, getting rid of trailing /
+	chrootdir=$(readlink -e "$passeddir")
+	[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
+	[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir"
 
-umask 0022
+	if [ -n "$cache_dir" ]; then
+		cache_dir="-c $cache_dir"
+	fi
 
-ORIG_HOME=$HOME
-IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
-load_makepkg_config
-HOME=$ORIG_HOME
-
-# Use PKGBUILD directory if these don't exist
-[[ -d $PKGDEST ]]    || PKGDEST=$PWD
-[[ -d $SRCDEST ]]    || SRCDEST=$PWD
-[[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD
-[[ -d $LOGDEST ]]    || LOGDEST=$PWD
-
-# Lock the chroot we want to use. We'll keep this lock until we exit.
-lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
-
-if [[ ! -d $copydir ]] || (( clean_first )); then
-	sync_chroot "$chrootdir" "$copydir" "$copy"
-fi
-
-(( update_first )) && arch-nspawn "$copydir" \
-		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
-		pacman -Syuu --noconfirm
-
-if [[ -n ${install_pkgs[*]:-} ]]; then
-	install_packages
-	ret=$?
-	# If there is no PKGBUILD we are done
-	[[ -f PKGBUILD ]] || exit $ret
-fi
-
-if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
-	error "Running makepkg as root is not allowed."
-	exit 1
-fi
-
-download_sources
-
-prepare_chroot
-
-if arch-nspawn "$copydir" \
-	--bind="${PWD//:/\\:}:/startdir" \
-	--bind="${SRCDEST//:/\\:}:/srcdest" \
-	"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
-	/chrootbuild "${makepkg_args[@]}"
-then
-	mapfile -t pkgnames < <(sudo -u "$makepkg_user" bash -c 'source PKGBUILD; printf "%s\n" "${pkgname[@]}"')
-	move_products
-else
-	(( ret += 1 ))
-	move_logfiles
-fi
-
-(( temp_chroot )) && delete_chroot "$copydir" "$copy"
-
-if (( ret != 0 )); then
-	if (( temp_chroot )); then
-		die "Build failed"
+	if [[ ${copy:0:1} = / ]]; then
+		copydir=$copy
 	else
-		die "Build failed, check %s/build" "$copydir"
+		copydir="$chrootdir/$copy"
 	fi
-else
-	if (( run_checkpkg )); then
-		msg "Running checkpkg"
 
-		mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
-			--dbpath "$copydir"/var/lib/pacman \
-			-Sddp "${pkgnames[@]}")
+	# Pass all arguments after -- right to makepkg
+	makepkg_args+=("${@:$OPTIND}")
 
-		if ! wait $!; then
-			warning "Skipped checkpkg due to missing repo packages"
-			exit 0
+	# See if -R or -e was passed to makepkg
+	for arg in "${makepkg_args[@]}"; do
+		case ${arg%%=*} in
+			--repackage|--noextract) keepbuilddir=true; break ;;
+			--repackage|--noextract) keepbuilddir=true; break ;;
+			--*) ;;
+			-*R*|-*e*) keepbuilddir=true; break ;;
+		esac
+	done
+
+	if [[ -n $SUDO_USER ]]; then
+		eval "USER_HOME=~$SUDO_USER"
+	else
+		USER_HOME=$HOME
+	fi
+
+	umask 0022
+
+	load_vars "${XDG_CONFIG_HOME:-$USER_HOME/.config}/pacman/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+	load_vars /etc/makepkg.conf
+
+	# Use PKGBUILD directory if these don't exist
+	[[ -d $PKGDEST ]]    || PKGDEST=$PWD
+	[[ -d $SRCDEST ]]    || SRCDEST=$PWD
+	[[ -d $SRCPKGDEST ]] || SRCPKGDEST=$PWD
+	[[ -d $LOGDEST ]]    || LOGDEST=$PWD
+
+	# Lock the chroot we want to use. We'll keep this lock until we exit.
+	lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$copy"
+
+	if [[ ! -d $copydir ]] || $clean_first; then
+		sync_chroot "$chrootdir/root" "$copydir" "$copy"
+	fi
+
+	$update_first && arch-nspawn "$copydir" \
+			"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
+			pacman -Syu --noconfirm
+
+	if [[ -n ${install_pkgs[*]:-} ]]; then
+		install_packages "$copydir" "${install_pkgs[@]}"
+		ret=$?
+		# If there is no PKGBUILD we have done
+		[[ -f PKGBUILD ]] || return $ret
+	fi
+
+	if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
+		error "Running makepkg as root is not allowed."
+		exit 1
+	fi
+
+	download_sources "$copydir" "$makepkg_user"
+
+	prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
+
+	if arch-nspawn $cache_dir "$copydir" \
+		--bind="$PWD:/startdir" \
+		--bind="$SRCDEST:/srcdest" \
+		"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
+		/chrootbuild "${makepkg_args[@]}"
+	then
+		move_products "$copydir" "$src_owner"
+	else
+		(( ret += 1 ))
+	fi
+
+	$temp_chroot && delete_chroot "$copydir" "$copy"
+
+	if (( ret != 0 )); then
+		if $temp_chroot; then
+			die "Build failed"
+		else
+			die "Build failed, check %s/build" "$copydir"
 		fi
-
-		# download package files if any non-local location exists
-		for remotepkg in "${remotepkgs[@]}"; do
-			if [[ $remotepkg != file://* ]]; then
-				msg2 "Downloading current versions"
-				arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}"
-				mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \
-					--dbpath "$copydir"/var/lib/pacman \
-					-Sddp "${pkgnames[@]}")
-				break
-			fi
-		done
-
-		msg2 "Checking packages"
-		sudo -u "$makepkg_user" checkpkg --rmdir --warn "${remotepkgs[@]/#file:\/\//}"
+	else
+		true
 	fi
-	true
-fi
+}
+
+main "$@"

makepkg-x86_64.conf

@@ -15,7 +15,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
           'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
           'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync --no-motd -zz %u %o'
+          'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
@@ -132,18 +132,18 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
-COMPRESSZST=(zstd -c -T0 --ultra -20 -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
-COMPRESSLZ4=(lz4 -q)
-COMPRESSLZ=(lzip -c -f)
 
 #########################################################################
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.zst'
+# WARNING: Do NOT modify these variables unless you know what you are
+#          doing.
+#
+PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
 
 # vim: set ft=sh ts=2 sw=2 et:

makerepropkg.in

@@ -1,239 +0,0 @@
-#!/bin/bash
-#   makerepropkg - rebuild a package to see if it is reproducible
-#
-#   Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-m4_include(lib/common.sh)
-m4_include(lib/archroot.sh)
-
-source /usr/share/makepkg/util/config.sh
-source /usr/share/makepkg/util/message.sh
-
-declare -A buildinfo
-declare -a buildenv buildopts installed installpkgs
-
-archiveurl='https://archive.archlinux.org/packages'
-buildroot=/var/lib/archbuild/reproducible
-chroot=testenv
-diffoscope=0
-
-parse_buildinfo() {
-    local line var val
-
-    while read -r line; do
-        var="${line%% = *}"
-        val="${line#* = }"
-        case ${var} in
-            buildenv)
-                buildenv+=("${val}")
-                ;;
-            options)
-                buildopts+=("${val}")
-                ;;
-            installed)
-                installed+=("${val}")
-                ;;
-            *)
-                buildinfo["${var}"]="${val}"
-                ;;
-        esac
-    done
-}
-
-get_pkgfile() {
-    local cdir=${cache_dirs[0]}
-    local pkgfilebase=${1}
-    local mode=${2}
-    local pkgname=${pkgfilebase%-*-*-*}
-    local pkgfile ext
-
-    # try without downloading
-    if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then
-        return 0
-    fi
-
-    for ext in .zst .xz ''; do
-        pkgfile=${pkgfilebase}.pkg.tar${ext}
-
-        for c in "${cache_dirs[@]}"; do
-            if [[ -f ${c}/${pkgfile} ]]; then
-                cdir=${c}
-                break
-            fi
-        done
-
-        for f in "${pkgfile}" "${pkgfile}.sig"; do
-            if [[ ! -f "${cdir}/${f}" ]]; then
-                if [[ ${mode} = localonly ]]; then
-                    continue 2
-                fi
-                msg2 "retrieving '%s'..." "${f}" >&2
-                curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2
-            fi
-        done
-        printf '%s\n' "file://${cdir}/${pkgfile}"
-        return 0
-    done
-
-    return 1
-}
-
-usage() {
-    cat << __EOF__
-usage: ${BASH_SOURCE[0]##*/} [options] <package_file>
-
-Run this script in a PKGBUILD dir to build a package inside a
-clean chroot while attempting to reproduce it. The package file
-will be used to derive metadata needed for reproducing the
-package, including the .PKGINFO as well as the buildinfo.
-
-For more details see https://reproducible-builds.org/
-
-OPTIONS
-    -d            Run diffoscope if the package is unreproducible
-    -c <dir>      Set pacman cache
-    -M <file>     Location of a makepkg config file
-    -h            Show this usage message
-__EOF__
-}
-
-while getopts 'dM:c:h' arg; do
-    case "$arg" in
-        d) diffoscope=1 ;;
-        M) archroot_args+=(-M "$OPTARG") ;;
-        c) cache_dirs+=("$OPTARG") ;;
-        h) usage; exit 0 ;;
-        *|?) usage; exit 1 ;;
-    esac
-done
-shift $((OPTIND - 1))
-
-check_root
-
-[[ -f PKGBUILD ]] || { error "No PKGBUILD in current directory."; exit 1; }
-
-# without arguments, get list of packages from PKGBUILD
-if [[ -z $1 ]]; then
-    mapfile -t pkgnames < <(source PKGBUILD; pacman -Sddp --print-format '%r/%n' "${pkgname[@]}")
-    wait $! || {
-        error "No package file specified and failed to retrieve package names from './PKGBUILD'."
-        plain "Try '${BASH_SOURCE[0]##*/} -h' for more information." >&2
-        exit 1
-    }
-    msg "Reproducing all pkgnames listed in ./PKGBUILD"
-    set -- "${pkgnames[@]}"
-fi
-
-# check each package to see if it's a file, and if not, try to download it
-# using pacman -Sw, and get the filename from there
-splitpkgs=()
-for p in "$@"; do
-    if [[ -f ${p} ]]; then
-        splitpkgs+=("${p}")
-    else
-        pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null) || { error "package name '%s' not in repos" "${p}"; exit 1; }
-        pkgfile=${pkgfile_remote#file://}
-        if [[ ! -f ${pkgfile} ]]; then
-            msg "Downloading package '%s' into pacman's cache" "${pkgfile}"
-            sudo pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1
-            pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null)
-            pkgfile="${pkgfile_remote#file://}"
-        fi
-        splitpkgs+=("${pkgfile}")
-    fi
-done
-
-for f in "${splitpkgs[@]}"; do
-    if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then
-        error "file is not a valid pacman package: '%s'" "${f}"
-        exit 1
-    fi
-done
-
-if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <(pacman-conf CacheDir)
-fi
-
-ORIG_HOME=${HOME}
-IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}")
-load_makepkg_config
-HOME=${ORIG_HOME}
-[[ -d ${SRCDEST} ]] || SRCDEST=${PWD}
-
-parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO)
-export SOURCE_DATE_EPOCH="${buildinfo[builddate]}"
-PACKAGER="${buildinfo[packager]}"
-BUILDDIR="${buildinfo[builddir]}"
-PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}}
-
-# nuke and restore reproducible testenv
-for copy in "${buildroot}"/*/; do
-    [[ -d ${copy} ]] || continue
-    subvolume_delete_recursive "${copy}"
-done
-rm -rf --one-file-system "${buildroot}"
-(umask 0022; mkdir -p "${buildroot}")
-
-for fname in "${installed[@]}"; do
-    if ! allpkgfiles+=("$(get_pkgfile "${fname}")"); then
-        error "failed to retrieve ${fname}"
-        exit 1
-    fi
-done
-printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M @pkgdatadir@/makepkg-x86_64.conf -U "${archroot_args[@]}" "${buildroot}"/root - || exit 1
-
-# use makechrootpkg to prep the build directory
-makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1
-
-# set detected makepkg.conf options
-{
-    for var in PACKAGER BUILDDIR PKGEXT; do
-        printf '%s=%s\n' "${var}" "${!var@Q}"
-    done
-    printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}"
-    printf 'BUILDENV=(%s)\n' "${buildenv[*]@Q}"
-} >> "${buildroot}/${chroot}"/etc/makepkg.conf >> "${buildroot}/${chroot}"/etc/makepkg.conf
-install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${buildroot}/${chroot}/${BUILDDIR}"
-
-# kick off the build
-arch-nspawn "${buildroot}/${chroot}" \
-    --bind="${PWD}:/startdir" \
-    --bind="${SRCDEST}:/srcdest" \
-    /chrootbuild -C --noconfirm --log --holdver --skipinteg
-ret=$?
-
-if (( ${ret} == 0 )); then
-    msg2 "built succeeded! built packages can be found in ${buildroot}/${chroot}/pkgdest"
-    msg "comparing artifacts..."
-
-    for pkgfile in "${splitpkgs[@]}"; do
-        comparefiles=("${pkgfile}" "${buildroot}/${chroot}/pkgdest/${pkgfile##*/}")
-        if cmp -s "${comparefiles[@]}"; then
-            msg2 "Package '%s' successfully reproduced!" "${pkgfile}"
-        else
-            ret=1
-            warning "Package '%s' is not reproducible. :(" "${pkgfile}"
-            sha256sum "${comparefiles[@]}"
-            if (( diffoscope )); then
-                diffoscope "${comparefiles[@]}"
-            fi
-        fi
-    done
-fi
-
-# return failure from chrootbuild, or the reproducibility status
-exit ${ret}

mkarchroot.in

@@ -13,20 +13,13 @@
 m4_include(lib/common.sh)
 m4_include(lib/archroot.sh)
 
-# umask might have been changed in /etc/profile
-# ensure that sane default is set again
-umask 0022
-
 working_dir=''
-umode=''
 
 files=()
-nspawn_args=()
 
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir package-list..."
 	echo ' options:'
-	echo '    -U            Use pacman -U to install packages'
 	echo '    -C <file>     Location of a pacman config file'
 	echo '    -M <file>     Location of a makepkg config file'
 	echo '    -c <dir>      Set pacman cache'
@@ -36,21 +29,16 @@ usage() {
 	exit 1
 }
 
-while getopts 'hUC:M:c:f:s' arg; do
+while getopts 'hC:M:c:f:s' arg; do
 	case "$arg" in
-		U) umode=U ;;
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
-		c) cache_dirs+=("$OPTARG") ;;
+		c) cache_dir="$OPTARG" ;;
 		f) files+=("$OPTARG") ;;
 		s) nosetarch=1 ;;
 		h|?) usage ;;
 		*) error "invalid argument '%s'" "$arg"; usage ;;
 	esac
-	if [[ $arg != U ]]; then
-		nspawn_args+=("-$arg")
-		[[ -v OPTARG ]] && nspawn_args+=("$OPTARG")
-	fi
 done
 shift $((OPTIND - 1))
 
@@ -63,10 +51,10 @@ shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
-
-if (( ${#cache_dirs[@]} == 0 )); then
-	mapfile -t cache_dirs < <($pacconf_cmd CacheDir)
+if [[ -z $cache_dir ]]; then
+	cache_dirs=($(pacman -v "$cache_conf" 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+else
+	cache_dirs=(${cache_dir})
 fi
 
 umask 0022
@@ -90,8 +78,13 @@ for file in "${files[@]}"; do
 	cp "$file" "$working_dir$file"
 done
 
-pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
-	"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
+_env=()
+while read -r varname; do
+	_env+=("$varname=${!varname}")
+done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
+env -i "${_env[@]}" \
+pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
+  "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
 
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
 echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf"
@@ -100,5 +93,8 @@ echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
 systemd-machine-id-setup --root="$working_dir"
 
 exec arch-nspawn \
-	"${nspawn_args[@]}" \
+	${nosetarch:+-s} \
+	${pac_conf:+-C "$pac_conf"} \
+	${makepkg_conf:+-M "$makepkg_conf"} \
+	${cache_dir:+-c "$cache_dir"} \
 	"$working_dir" locale-gen

offload-build.in

@@ -1,133 +0,0 @@
-#!/bin/bash
-#
-#   offload-build - build a PKGBUILD on a remote server using makechrootpkg.
-#
-#   Copyright (c) 2019 by Eli Schwartz <eschwartz@archlinux.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-source /usr/share/makepkg/util/config.sh
-
-
-# global defaults suitable for use by Arch staff
-repo=extra
-arch=x86_64
-server=build.archlinux.org
-
-die() { printf "error: $1\n" "${@:2}"; exit 1; }
-
-usage() {
-    cat <<- _EOF_
-		Usage: ${BASH_SOURCE[0]##*/} [--repo REPO] [--arch ARCHITECTURE] [--server SERVER] -- [ARCHBUILD_ARGS]
-
-		Build a PKGBUILD on a remote server using makechrootpkg. Requires a remote user
-		that can run archbuild without password auth. Options passed after a -- are
-		passed on to archbuild, and eventually to makechrootpkg.
-
-		OPTIONS
-		    -r, --repo      Build against a specific repository (current: $repo)
-		    -a, --arch      Build against a specific architecture (current: $arch)
-		    -s, --server    Offload to a specific build server (current: $server)
-		    -h, --help      Show this help text
-_EOF_
-}
-
-# option checking
-while (( $# )); do
-    case $1 in
-        -h|--help)
-            usage
-            exit 0
-            ;;
-        -r|--repo)
-            repo=$2
-            shift 2
-            ;;
-        -a|--arch)
-            arch=$2
-            shift 2
-            ;;
-        -s|--server)
-            server=$2
-            shift 2
-            ;;
-        --)
-            shift
-            break
-            ;;
-        *)
-            die "invalid argument: %s" "$1"
-            ;;
-    esac
-done
-
-# multilib must be handled specially
-archbuild_arch="${arch}"
-if [[ $repo = multilib* ]]; then
-    archbuild_arch=
-fi
-
-archbuild_cmd=("${repo}${archbuild_arch:+-$archbuild_arch}-build" "$@")
-
-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-
-# Load makepkg.conf variables to be available
-load_makepkg_config
-
-# Use a source-only tarball as an intermediate to transfer files. This
-# guarantees the checksums are okay, and guarantees that all needed files are
-# transferred, including local sources, install scripts, and changelogs.
-export TEMPDIR=$(mktemp -d --tmpdir offload-build.XXXXXXXXXX)
-export SRCPKGDEST=${TEMPDIR}
-makepkg --source || die "unable to make source package"
-
-# Temporary cosmetic workaround makepkg if SRCDEST is set somewhere else
-# but an empty src dir is created in PWD. Remove once fixed in makepkg.
-rmdir --ignore-fail-on-non-empty src 2>/dev/null || true
-
-mapfile -t files < <(
-    # This is sort of bash golfing but it allows running a mildly complex
-    # command over ssh with a single connection.
-    # shellcheck disable=SC2145
-    cat "$SRCPKGDEST"/*"$SRCEXT" |
-        ssh $server '
-            temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" &&
-            mkdir -p "$temp" &&
-            temp=$(mktemp -d -p "$temp") &&
-            cd "$temp" &&
-            {
-                bsdtar --strip-components 1 -xvf - &&
-                script -qefc "'"${archbuild_cmd[@]@Q}"'" /dev/null &&
-                printf "%s\n" "" "-> build complete" &&
-                printf "\t%s\n" "$temp"/*
-            } >&2 &&
-            makepkg_user_config="${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" &&
-            makepkg_config="/usr/share/devtools/makepkg-'"${arch}"'.conf" &&
-            if [[ -f /usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf ]]; then
-                makepkg_config="/usr/share/devtools/makepkg-'"${repo}"'-'"${arch}"'.conf"
-            fi &&
-            makepkg --config <(cat "${makepkg_user_config}" "${makepkg_config}" 2>/dev/null) --packagelist &&
-            printf "%s\n" "${temp}/PKGBUILD"
-')
-
-
-if (( ${#files[@]} )); then
-    printf '%s\n' '' '-> copying files...'
-    scp "${files[@]/#/$server:}" "${TEMPDIR}/"
-    mv "${TEMPDIR}"/*.pkg.tar* "${PKGDEST:-${PWD}}/"
-    mv "${TEMPDIR}/PKGBUILD" "${PWD}/"
-else
-    exit 1
-fi

pacman-extra.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -89,3 +90,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-gnome-unstable.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -98,3 +99,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-kde-unstable.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -92,3 +93,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-multilib-staging.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -106,3 +107,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-multilib-testing.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -97,3 +98,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-multilib.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -98,3 +99,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-staging.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -95,3 +96,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

pacman-testing.conf

@@ -16,9 +16,10 @@
 #GPGDir      = /etc/pacman.d/gnupg/
 #HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -89,3 +90,4 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+

rebuildpkgs.in

@@ -3,7 +3,7 @@
 #
 # This script rebuilds a list of packages in order
 # and reports anything that fails
-#
+# 
 # Due to sudo usage, it is recommended to allow makechrootpkg
 # to be run with NOPASSWD in your sudoers file
 #
@@ -14,8 +14,8 @@
 m4_include(lib/common.sh)
 
 if (( $# < 1 )); then
-	printf 'Usage: %s <chrootdir> <packages to rebuild>\n' "$(basename "${BASH_SOURCE[0]}")"
-	printf '  example: %s ~/chroot readline bash foo bar baz\n' "$(basename "${BASH_SOURCE[0]}")"
+	printf 'Usage: %s <chrootdir> <packages to rebuild>\n' "$(basename "$0")"
+	printf '  example: %s ~/chroot readline bash foo bar baz\n' "$(basename "$0")"
 	exit 1
 fi
 

sogrep

@@ -21,8 +21,10 @@
 # globals
 : ${SOLINKS_MIRROR:="https://mirror.pkgbuild.com"}
 : ${SOCACHE_DIR:="${XDG_CACHE_HOME:-${HOME}/.cache}/sogrep"}
-
-m4_include(lib/valid-repos.sh)
+repos=('staging' 'testing' 'core' 'extra'
+       'community-staging' 'community-testing' 'community'
+       'multilib-staging' 'multilib-testing' 'multilib'
+       'gnome-unstable' 'kde-unstable')
 arches=('x86_64')
 
 # options
@@ -37,20 +39,20 @@ recache() {
 
     (( VERBOSE )) && verbosity=--progress-bar
 
-    for repo in "${_repos[@]}"; do
+    for repo in "${repos[@]}"; do
         for arch in "${arches[@]}"; do
             rm -rf "${SOCACHE_DIR}/${arch}/${repo}"
             mkdir -p "${SOCACHE_DIR}/${arch}/${repo}"
-            curl -L "$verbosity" "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}"
+            curl "$verbosity" "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz" | bsdtar -xf - -C "${SOCACHE_DIR}/${arch}/${repo}"
         done
     done
 }
 
 search() {
-    local repo=$1 arch lib=$2 srepos=("${_repos[@]}")
+    local repo=$1 arch lib=$2 srepos=("${repos[@]}")
 
     if [[ $repo != all ]]; then
-        if ! in_array "${repo}" "${_repos[@]}"; then
+        if ! in_array "${repo}" "${repos[@]}"; then
             echo "${BASH_SOURCE[0]##*/}: unrecognized repo '$repo'"
             echo "Try '${BASH_SOURCE[0]##*/} --help' for more information."
             exit 1

zsh_completion.in

@@ -1,15 +1,11 @@
-#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
+#compdef archbuild archco arch-nspawn archrelease commitpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco
 # License: Unspecified
 
 m4_include(lib/valid-tags.sh)
-m4_include(lib/valid-repos.sh)
-
-_binary_arch=${_arch[*]:0:-1}
 
 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
 	'-r[Create chroots in this directory]:base_dir:_files -/'
-	'-h[Display usage]'
 )
 
 _archco_args=(
@@ -17,25 +13,19 @@ _archco_args=(
 )
 
 _arch_nspawn_args=(
-	'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
-	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
+	'-C[Location of a pacman config file]:pacman_config:_files'
+	'-M[Location of a makepkg config file]:makepkg_config:_files'
 	'-c[Set pacman cache]:pacman_cache:_files -/'
-	'-f[Copy file from the host to the chroot]:copy_file:_files'
-	'-s[Do not run setarch]'
 	'-h[Display usage]'
-	'1:chroot_dir:_files -/'
 )
 
 _archrelease_args=(
-	'-f[Force release without checks]'
 	"*:arch:($_tags[*])"
 )
 
 _commitpkg_args=(
-	'-f[Force release without checks]'
-	'-s[Target repo server]'
-	'-l[Set bandwidth limit]:limit'
 	"-a[Release to a specific architecture only]:arch:($_arch[*])"
+	'-l[Set bandwidth limit]:limit'
 	'1:commit_msg'
 )
 
@@ -44,27 +34,19 @@ _finddeps_args=(
 )
 
 _makechrootpkg_args=(
-	'-h[Display usage]'
-	'-c[Clean the chroot before building]'
-	'-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
-	'-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
-	'-u[Update the working copy of the chroot before building]'
-	'-r[The chroot dir to use]:chroot_dir:_files -/'
 	'-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
+	'-c[Clean the chroot before building]'
+	'-h[Display usage]'
 	'-l[The directory to use as the working copy]:copy_dir:_files -/'
-	'-n[Run namcap on the package]'
-	'-T[Build in a temporary directory]'
-	'-U[Run makepkg as a specified user]:makepkg_user'
+	'-r[The chroot dir to use]:chroot_dir:_files -/'
+	'-u[Update the working copy of the chroot before building]'
 )
 
 _mkarchroot_args=(
-	'-U[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
-	'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
-	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
+	'-C[Location of a pacman config file]:pacman_config:_files'
+	'-M[Location of a makepkg config file]:makepkg_config:_files'
 	'-c[Set pacman cache]:pacman_cache:_files -/'
 	'-h[Display usage]'
-	'1:working_dir:_files -/'
-	'*:packages:_devtools_completions_all_packages'
 )
 
 _rebuildpkgs_args=(
@@ -72,35 +54,6 @@ _rebuildpkgs_args=(
 	'*:packages:_devtools_completions_all_packages'
 )
 
-_checkpkg_args=(
-	'(-r --rmdir)'{-r,--rmdir}'[Remove the temporary directory]'
-	'(-w --warn)'{-w,--warn}'[Print a warning in case of differences]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_sogrep_args=(
-	'(-v --verbose)'{-v,--verbose}'[Show matched links in addition to pkgname]'
-	'(-r --refresh)'{-r,--refresh}'[Refresh the links databases]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:repo:(all $_repos[*])'
-	'2:libname'
-)
-
-_offload_build_args=(
-	'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($_build_repos[*])'
-	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${_binary_arch[*]})'
-	'(-s --server)'{-s,--server}'[Offload to a specific Build server]:server:'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_makerepropkg_args=(
-	'-d[Run diffoscope if the package is unreproducible]'
-	'-c[Set pacman cache]:pacman_cache:_files -/'
-	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
-	'-h[Display usage]'
-	'*:working_dir:_files -g "*.pkg.tar.*(.)"'
-)
-
 _devtools_completions_all_packages() {
 	typeset -U packages
 	packages=($(_call_program packages pacman -Sql))