Change version to date

* common.sh is included on build time
* most functions are copied from makepkg

.gitignore

@@ -1,2 +1,16 @@
 *~
 devtools-*.tar.gz
+archbuild
+archco
+archrelease
+archrm
+bash_completion
+checkpkg
+commitpkg
+finddeps
+lddd
+makechrootpkg
+mkarchroot
+rebuildpkgs
+zsh_completion
+find-libdeps

Makefile

@@ -1,4 +1,4 @@
-V=0.9.26
+V=20111101
 
 PREFIX = /usr/local
 
@@ -11,7 +11,8 @@ BINPROGS = \
 	archbuild \
 	lddd \
 	finddeps \
-	rebuildpkgs
+	rebuildpkgs \
+	find-libdeps
 
 SBINPROGS = \
 	mkarchroot \
@@ -47,7 +48,18 @@ ARCHBUILD_LINKS = \
 	multilib-build \
 	multilib-testing-build
 
-all:
+all: $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion
+
+edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g"
+
+%: %.in
+	@echo "GEN $@"
+	@m4 -P $@.in | $(edit) >$@
+	@chmod a-w "$@"
+	@chmod +x "$@"
+
+clean:
+	rm -f $(BINPROGS) $(SBINPROGS) bash_completion zsh_completion
 
 install:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
@@ -58,7 +70,9 @@ install:
 	install -m0644 ${CONFIGFILES} $(DESTDIR)$(PREFIX)/share/devtools
 	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
+	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools
+	install -Dm0644 zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
 
 uninstall:
@@ -68,12 +82,15 @@ uninstall:
 	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
 	rm $(DESTDIR)/etc/bash_completion.d/devtools
+	rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
 	rm -f $(DESTDIR)$(PREFIX)/bin/communityco
+	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 
 dist:
 	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz
+	gpg --detach-sign --use-agent devtools-$(V).tar.gz
 
 upload:
-	scp devtools-$(V).tar.gz gerolde.archlinux.org:/srv/ftp/other/devtools/
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/
 
-.PHONY: all install uninstall dist upload
+.PHONY: all clean install uninstall dist upload

archbuild

@@ -1,67 +0,0 @@
-#!/bin/bash
-
-base_packages='base base-devel sudo'
-
-cmd="$(basename "${0%-build}")"
-if [ "${cmd%-*}" == 'multilib' ]; then
-	repo="${cmd}"
-	arch='x86_64'
-	base_packages+=' multilib-devel'
-else
-	repo=${cmd%-*}
-	arch=${cmd##*-}
-fi
-chroots='/var/tmp/archbuild'
-clean_first=false
-
-usage() {
-	echo "usage $(basename "$0")"
-	echo '    -c         Recreate the chroot before building'
-	echo '    -r <dir>   Create chroots in this directory'
-	exit 1
-}
-
-while getopts 'cr:' arg; do
-	case "${arg}" in
-		c) clean_first=true ;;
-		r) chroots="$OPTARG" ;;
-		*) usage ;;
-	esac
-done
-
-if [ "$EUID" != '0' ]; then
-	echo 'This script must be run as root.'
-	exit 1
-fi
-
-if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
-	echo "Creating chroot for [${repo}] (${arch})..."
-
-	for copy in ${chroots}/${repo}-${arch}/*; do
-		[[ -d $copy ]] || continue
-		echo "Deleting chroot copy '$(basename "${copy}")'..."
-
-		# Lock the copy
-		exec 9>${copy}.lock
-		flock 9
-
-		{ type -P btrfs && btrfs subvolume delete ${copy}; } &>/dev/null
-		rm -rf ${copy}
-	done
-	exec 9>&-
-
-	rm -rf ${chroots}/${repo}-${arch}
-	mkdir -p ${chroots}/${repo}-${arch}
-	setarch ${arch} mkarchroot \
-		-C /usr/share/devtools/pacman-${repo}.conf \
-		-M /usr/share/devtools/makepkg-${arch}.conf \
-		${chroots}/${repo}-${arch}/root \
-		${base_packages}
-else
-	setarch ${arch} mkarchroot \
-		-u \
-		${chroots}/${repo}-${arch}/root
-fi
-
-echo "Building in chroot for [${repo}] (${arch})..."
-setarch ${arch} makechrootpkg -c -r ${chroots}/${repo}-${arch}

archbuild.in

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+m4_include(lib/common.sh)
+
+# FIXME: temporary added curl until pacman 4.0 moves to [core]
+base_packages=(base base-devel sudo curl)
+
+cmd="${0##*/}"
+if [[ "${cmd%%-*}" == 'multilib' ]]; then
+	repo="${cmd%-build}"
+	arch='x86_64'
+	base_packages+=(multilib-devel)
+else
+	tag="${cmd%-build}"
+	repo=${tag%-*}
+	arch=${tag##*-}
+fi
+chroots='/var/tmp/archbuild'
+clean_first=false
+
+usage() {
+	echo "usage $cmd"
+	echo '    -c         Recreate the chroot before building'
+	echo '    -r <dir>   Create chroots in this directory'
+	exit 1
+}
+
+while getopts 'cr:' arg; do
+	case "${arg}" in
+		c) clean_first=true ;;
+		r) chroots="$OPTARG" ;;
+		*) usage ;;
+	esac
+done
+
+if [[ "$EUID" != '0' ]]; then
+	die 'This script must be run as root.'
+fi
+
+if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
+	msg "Creating chroot for [${repo}] (${arch})..."
+
+	for copy in "${chroots}/${repo}-${arch}"/*; do
+		[[ -d $copy ]] || continue
+		msg2 "Deleting chroot copy '$(basename "${copy}")'..."
+
+		# Lock the copy
+		exec 9>"${copy}.lock"
+		flock 9
+
+		{ type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null
+		rm -rf "${copy}"
+	done
+	exec 9>&-
+
+	rm -rf "${chroots}/${repo}-${arch}"
+	mkdir -p "${chroots}/${repo}-${arch}"
+	setarch "${arch}" mkarchroot \
+		-C "@pkgdatadir@/pacman-${repo}.conf" \
+		-M "@pkgdatadir@/makepkg-${arch}.conf" \
+		"${chroots}/${repo}-${arch}/root" \
+		"${base_packages[@]}"
+
+	# FIXME: temporary workaround until pacman 4.0 moves to [core]
+	case $repo in
+		core|extra|community|multilib)
+			sed -r '/^SigLevel.*/d' -i "${chroots}/${repo}-${arch}/root/etc/pacman.conf"
+		;;
+	esac
+else
+	setarch ${arch} mkarchroot \
+		-u \
+		"${chroots}/${repo}-${arch}/root"
+fi
+
+msg "Building in chroot for [${repo}] (${arch})..."
+setarch "${arch}" makechrootpkg -c -r "${chroots}/${repo}-${arch}"

archco.in

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+m4_include(lib/common.sh)
+
 scriptname=${0##*/}
 
 if [ "$1" = '' ]; then
-	echo 'Usage: '$scriptname' <package name> [<package name>]'
+	echo 'Usage: '$scriptname' <package name>...'
 	exit 1
 fi
 
@@ -13,8 +15,7 @@ case $scriptname in
 	communityco)
 		SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";;
 	*)
-		echo "error: couldn't find svn url for $scriptname"
-		exit 1
+		die "error: couldn't find svn url for $scriptname"
 		;;
 esac
 

archrelease

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-abort() {
-	echo ${1:-'archrelease: Cancelled'}
-	exit 1
-}
-
-if [ "$1" = '' ]; then
-	abort 'Usage: archrelease <repo>'
-fi
-
-# TODO: validate repo is really repo-arch
-
-if [ ! -f PKGBUILD ]; then
-	abort 'archrelease: PKGBUILD not found'
-fi
-
-trunk=$(basename $(pwd))
-
-# Normally this should be trunk, but it may be something
-# such as 'gnome-unstable'
-if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
-	abort 'archrelease: Should not be in repos dir (try from trunk/)'
-fi
-
-if [ ! -z "$(svn status -q)" ]; then
-	abort 'archrelease: You have not committed your changes yet!'
-fi
-
-echo -n "releasing package to ${1}..."
-pushd .. >/dev/null
-if [ -d "repos/${1}" ]; then
-	for file in $(svn ls "repos/${1}"); do
-		svn rm -q "repos/${1}/$file"
-	done
-fi
-if [ ! -d repos ]; then
-	mkdir repos
-	svn add -q repos
-fi
-if [ ! -d "repos/${1}" ]; then
-	mkdir "repos/${1}"
-	svn add -q "repos/${1}"
-fi
-known_files=$(svn ls "trunk")
-for file in $known_files; do
-	if [ "$file" != "${file%/}" ]; then
-		abort "archrelease: subdirectories are not supported in package directories!"
-	fi
-done
-for file in $known_files; do
-	svn copy -q -r HEAD "trunk/$file" "repos/${1}/"
-done
-svn commit -q -m "archrelease: copy trunk to ${1}" || abort
-popd >/dev/null
-echo 'done'

archrelease.in

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+m4_include(lib/common.sh)
+
+if [[ -z $1 ]]; then
+	echo 'Usage: archrelease <repo>...'
+	exit 1
+fi
+
+# TODO: validate repo is really repo-arch
+
+if [[ ! -f PKGBUILD ]]; then
+	die 'archrelease: PKGBUILD not found'
+fi
+
+trunk=${PWD##*/}
+
+# Normally this should be trunk, but it may be something
+# such as 'gnome-unstable'
+IFS='/' read -r -d '' -a parts <<< "$PWD"
+if [[ "${parts[@]:(-2):1}" == "repos" ]]; then
+	die 'archrelease: Should not be in repos dir (try from trunk/)'
+fi
+unset parts
+
+if [[ $(svn status -q) ]]; then
+	die 'archrelease: You have not committed your changes yet!'
+fi
+
+pushd .. >/dev/null
+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!"
+	fi
+done
+
+for tag in "$@"; do
+	stat_busy "copying ${trunk} to ${tag}"
+
+	if [[ -d repos/$tag ]]; then
+		declare -a trash
+		trash=()
+		while read -r file; do
+			trash+=("repos/$tag/$file")
+		done < <(svn ls "repos/$tag")
+		[[ $trash ]] && svn rm -q "${trash[@]}"
+	else
+		mkdir -p "repos/$tag"
+		svn add --parents -q "repos/$tag"
+	fi
+
+	# copy all files at once from trunk to the subdirectory in repos/
+	svn copy -q -r HEAD ${known_files[@]/#/$trunk/} "repos/$tag/"
+
+	stat_done
+done
+
+stat_busy "releasing package"
+printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }"
+svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort
+stat_done
+
+popd >/dev/null

archrm.in

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+m4_include(lib/common.sh)
+
 if [ "$1" = '' ]; then
 	echo 'Usage: archrm <path to checkout>'
 	exit 1

checkpkg

@@ -1,99 +0,0 @@
-#!/bin/bash
-
-# Source makepkg.conf; fail if it is not found
-if [ -r '/etc/makepkg.conf' ]; then
-	source '/etc/makepkg.conf'
-else
-	echo '/etc/makepkg.conf not found!'
-	exit 1
-fi
-
-# Source user-specific makepkg.conf overrides
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
-strip_url() {
-	echo $1 | sed 's|^.*://.*/||g'
-}
-
-if [ ! -f PKGBUILD ]; then
-	echo 'This must be run in the directory of a built package.'
-	exit 1
-fi
-
-. PKGBUILD
-if [ "$arch" == 'any' ]; then
-	CARCH='any'
-fi
-
-STARTDIR=$(pwd)
-TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
-cd $TEMPDIR
-
-for _pkgname in ${pkgname[@]}; do
-	if [ -z ${epoch} ] ; then
-		pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	else
-		pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	fi
-
-	if [ -f "$STARTDIR/$pkgfile" ]; then
-		ln -s "$STARTDIR/$pkgfile" "$pkgfile"
-	elif [ -f "$PKGDEST/$pkgfile" ]; then
-		ln -s "$PKGDEST/$pkgfile" "$pkgfile"
-	else
-		echo "File \"$pkgfile\" doesn't exist"
-		exit 1
-	fi
-
-	tmp=$(pacman -Spdd --noconfirm $_pkgname)
-
-	if [ $? -ne 0 ]; then
-		echo "Couldn't download previous package for $_pkgname."
-		exit 1
-	fi
-
-	pkgurl=$(echo $tmp | rev | cut -d ' ' -f 1 | rev)
-
-	oldpkg=$(strip_url $pkgurl)
-
-	if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
-		echo "The built package ($_pkgname) is the one in the repo right now!"
-		exit 1
-	fi
-
-	if [ ! -f $oldpkg ]; then
-		if echo $pkgurl | grep '^file:///' > /dev/null 2>&1; then
-			ln -s "${pkgurl#file://}" $(basename "${pkgurl#file://}")
-		elif [ -f "$PKGDEST/$oldpkg" ]; then
-			ln -s "$PKGDEST/$oldpkg" "$oldpkg"
-		elif [ -f "$STARTDIR/$oldpkg" ]; then
-			ln -s "$STARTDIR/$oldpkg" "$oldpkg"
-		else
-			wget --quiet $pkgurl
-		fi
-	fi
-
-	bsdtar tf $oldpkg > filelist-$_pkgname-old
-	bsdtar tf "$pkgfile" > filelist-$_pkgname
-
-	sort -o filelist-$_pkgname filelist-$_pkgname
-	sort -o filelist-$_pkgname-old filelist-$_pkgname-old
-
-	sdiff -s filelist-$_pkgname-old filelist-$_pkgname
-
-	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so' > /dev/null 2>&1; then
-		mkdir -p pkg
-		cd pkg
-		bsdtar xf ../"$pkgfile" > /dev/null
-		for i in $(diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep '\.so' | awk '{print $2}'); do
-			echo "${i}: " "$(objdump -p $i | grep SONAME)"
-		done
-		cd ..
-	else
-		echo "No soname differences for $_pkgname."
-	fi
-done
-
-echo "Files saved to $TEMPDIR"

checkpkg.in

@@ -0,0 +1,83 @@
+#!/bin/bash
+
+m4_include(lib/common.sh)
+
+# Source makepkg.conf; fail if it is not found
+if [[ -r '/etc/makepkg.conf' ]]; then
+	source '/etc/makepkg.conf'
+else
+	die '/etc/makepkg.conf not found!'
+fi
+
+# Source user-specific makepkg.conf overrides
+if [[ -r ~/.makepkg.conf ]]; then
+	source ~/.makepkg.conf
+fi
+
+if [[ ! -f PKGBUILD ]]; then
+	die 'This must be run in the directory of a built package.'
+fi
+
+. PKGBUILD
+if [[ $arch == 'any' ]]; then
+	CARCH='any'
+fi
+
+STARTDIR=$(pwd)
+TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)
+cd "$TEMPDIR"
+
+for _pkgname in "${pkgname[@]}"; do
+	pkgfile=${_pkgname}-$(get_full_version $_pkgname)-${CARCH}${PKGEXT}
+
+	if [[ -f "$STARTDIR/$pkgfile" ]]; then
+		ln -s "$STARTDIR/$pkgfile" "$pkgfile"
+	elif [[ -f "$PKGDEST/$pkgfile" ]]; then
+		ln -s "$PKGDEST/$pkgfile" "$pkgfile"
+	else
+		die "File \"$pkgfile\" doesn't exist"
+	fi
+
+	pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$_pkgname")
+
+	if [[ $? -ne 0 ]]; then
+		die "Couldn't download previous package for $_pkgname."
+	fi
+
+	oldpkg=${pkgurl##*://*/}
+
+	if [[ ${oldpkg##*/} = ${pkgfile##*/} ]]; then
+		die "The built package ($_pkgname) is the one in the repo right now!"
+	fi
+
+	if [[ ! -f $oldpkg ]]; then
+		if [[ $pkgurl = file://* ]]; then
+			ln -s "${pkgurl#file://}" "${pkgurl##file://*/}"
+		elif [[ -f "$PKGDEST/$oldpkg" ]]; then
+			ln -s "$PKGDEST/$oldpkg" "$oldpkg"
+		elif [[ -f "$STARTDIR/$oldpkg" ]]; then
+			ln -s "$STARTDIR/$oldpkg" "$oldpkg"
+		else
+			wget --quiet "$pkgurl"
+		fi
+	fi
+
+	bsdtar tf "$oldpkg" | sort > "filelist-$_pkgname-old"
+	bsdtar tf "$pkgfile" | sort > "filelist-$_pkgname"
+
+	sdiff -s "filelist-$_pkgname-old" "filelist-$_pkgname"
+
+	if diff "filelist-$_pkgname-old" "filelist-$_pkgname" | grep '\.so' > /dev/null 2>&1; then
+		mkdir -p pkg
+		cd pkg
+		bsdtar xf ../"$pkgfile" > /dev/null
+		diff "../filelist-$_pkgname-old" "../filelist-$_pkgname" | awk '/>.*\.so/{$1 = ""; print $0}' | while read i; do
+			echo "${i}: " "$(objdump -p "$i" | grep SONAME)"
+		done
+		cd ..
+	else
+		msg "No soname differences for $_pkgname."
+	fi
+done
+
+msg "Files saved to $TEMPDIR"

commitpkg.in

@@ -1,40 +1,22 @@
 #!/bin/bash
 
-abort() {
-	echo ${1:-'Cancelled'}
-	exit 1
-}
+m4_include(lib/common.sh)
 
 getpkgfile() {
 	if [[ ${#} -ne 1 ]]; then
-		echo 'ERROR: No canonical package found!' >&2
-		exit 1
+		die 'ERROR: No canonical package found!'
 	elif [ ! -f "${1}" ]; then
-		echo "ERROR: Package ${1} not found!" >&2
-		exit 1
+		die "ERROR: Package ${1} not found!"
 	fi
 
 	echo ${1}
 }
 
-##
-#  usage : get_full_version( $epoch, $pkgver, $pkgrel )
-# return : full version spec, including epoch (if necessary), pkgver, pkgrel
-##
-get_full_version() {
-	if [[ $1 -eq 0 ]]; then
-		# zero epoch case, don't include it in version
-		echo $2-$3
-	else
-		echo $1:$2-$3
-	fi
-}
-
 # Source makepkg.conf; fail if it is not found
 if [ -r '/etc/makepkg.conf' ]; then
 	source '/etc/makepkg.conf'
 else
-	abort '/etc/makepkg.conf not found!'
+	die '/etc/makepkg.conf not found!'
 fi
 
 # Source user-specific makepkg.conf overrides
@@ -42,10 +24,10 @@ if [ -r ~/.makepkg.conf ]; then
 	. ~/.makepkg.conf
 fi
 
-cmd=$(basename "$0")
+cmd=${0##*/}
 
 if [ ! -f PKGBUILD ]; then
-	abort 'No PKGBUILD file'
+	die 'No PKGBUILD file'
 fi
 
 . PKGBUILD
@@ -54,7 +36,7 @@ pkgbase=${pkgbase:-$pkgname}
 case "$cmd" in
 	commitpkg)
 		if [ $# -eq 0 ]; then
-			abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
+			die 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
 		fi
 		repo="$1"
 		shift
@@ -63,7 +45,7 @@ case "$cmd" in
 		repo="${cmd%pkg}"
 		;;
 	*)
-		abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
+		die 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
 		;;
 esac
 
@@ -74,48 +56,46 @@ case "$repo" in
 		server='aur.archlinux.org' ;;
 	*)
 		server='gerolde.archlinux.org'
-		echo "Non-standard repository $repo in use, defaulting to server $server" ;;
+		msg "Non-standard repository $repo in use, defaulting to server $server" ;;
 esac
 
 # check if all local source files are under version control
 for s in "${source[@]}"; do
 	if [[ $s != *://* ]] && ! svn status -v "$s" | grep -q '^[ AMRX~]'; then
-		abort "$s is not under version control"
+		die "$s is not under version control"
 	fi
 done
 
 # check if changelog and install files are under version control
 for i in 'changelog' 'install'; do
-	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
-	for file in $filelist; do
+	while read -r file; do
 		# evaluate any bash variables used
-		eval file=${file}
+		eval file=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$file")\"
 		if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then
-			abort "${file} is not under version control"
+			die "${file} is not under version control"
 		fi
-	done
+	done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
 done
 
 # see if any limit options were passed, we'll send them to rsync
-rsyncopts='-e ssh -p --chmod=ug=rw,o=r -c -h -L --progress --partial -y'
-if [ "$1" = '-l' ]; then
-	rsyncopts="$rsyncopts --bwlimit=$2"
-	shift 2
-fi
-
-if [ "$1" = "-a" ]; then
-	commit_arch=$2
-	shift 2
-fi
+rsyncopts=(-e ssh -p --chmod=ug=rw,o=r -c -h -L --progress --partial -y)
+while getopts ':l:a:' flag; do
+	case $flag in
+		l) rsyncopts+=("--bwlimit=$2") ;;
+		a) commit_arch=$2 ;;
+		:) die "option requires an argument -- '$OPTARG'" ;;
+		\?) die "invalid option -- '$OPTARG'" ;;
+	esac
+done
+shift $(( OPTIND - 1 ))
 
 if [ -n "$(svn status -q)" ]; then
-	echo -n 'committing changes to trunk...'
-	msgtemplate="upgpkg: $pkgbase $(get_full_version ${epoch:-0} $pkgver $pkgrel)
-
-	"
 	if [ -n "$1" ]; then
-		svn commit -q -m "${msgtemplate}${1}" || abort
+		stat_busy 'committing changes to trunk'
+		svn commit -q -m "${msgtemplate}${1}" || die
+		stat_done
 	else
+		msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
 		msgfile="$(mktemp)"
 		echo "$msgtemplate" > "$msgfile"
 		if [ -n "$SVN_EDITOR" ]; then
@@ -127,23 +107,24 @@ if [ -n "$(svn status -q)" ]; then
 		else
 			vi "$msgfile"
 		fi
-		[ -s "$msgfile" ] || abort
-		svn commit -q -F "$msgfile" || abort
+		[ -s "$msgfile" ] || die
+		stat_busy 'committing changes to trunk'
+		svn commit -q -F "$msgfile" || die
 		unlink "$msgfile"
+		stat_done
 	fi
-	echo 'done'
 fi
 
 declare -a uploads
 
 for _arch in ${arch[@]}; do
 	if [ -n "$commit_arch" ] && [ "${_arch}" != "$commit_arch" ]; then
-		echo "skipping ${_arch}"
+		warning "skipping ${_arch}"
 		continue
 	fi
 
 	for _pkgname in ${pkgname[@]}; do
-		fullver=$(get_full_version ${epoch:-0} $pkgver $pkgrel)
+		fullver=$(get_full_version $_pkgname)
 		pkgfile=$(getpkgfile "$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null)
 		pkgdestfile=$(getpkgfile "$PKGDEST/$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null)
 
@@ -152,51 +133,58 @@ for _arch in ${arch[@]}; do
 		elif [ -f "$pkgdestfile" ]; then
 			pkgfile="$pkgdestfile"
 		else
-			echo "skipping ${_arch}"
+			warning "skipping ${_arch}"
 			continue 2
 		fi
 		uploads+=("$pkgfile")
 
-		if [[ $SIGNPKG == 'y' ]]; then
-			echo "Signing package ${pkgfile}..."
+		sigfile="${pkgfile}.sig"
+		if [[ $SIGNPKG == 'y' ]] && [ ! -f "${sigfile}" ]; then
+			msg "Signing package ${pkgfile}..."
 			if [[ -n $GPGKEY ]]; then
 				SIGNWITHKEY="-u ${GPGKEY}"
 			fi
-			gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || abort
+			gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || die
 		fi
-
-		sigfile="${pkgfile}.sig"
 		if [ -f "${sigfile}" ]; then
+			if ! gpg --verify "$sigfile" >/dev/null 2>&1; then
+				die "Signature ${pkgfile}.sig is incorrect!"
+			fi
 			uploads+=("$sigfile")
-		elif [[ $SIGNPKG == 'y' ]]; then
-			abort "Signature ${pkgfile}.sig was not found"
+		else
+			die "Signature ${pkgfile}.sig was not found"
 		fi
 	done
-	archrelease $repo-${_arch} || abort
 done
 
+if [[ -n $commit_arch ]]; then
+	archrelease "$repo-$commit_arch" || die
+else
+	archrelease "${arch[@]/#/$repo-}" || die
+fi
+
 if [[ ${#uploads[*]} -gt 0 ]]; then
-	echo 'uploading all package and signature files'
-	rsync $rsyncopts "${uploads[@]}" "$server:staging/$repo/" || abort
+	msg 'uploading all package and signature files'
+	rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
 fi
 
 if [ "${arch[*]}" == 'any' ]; then
 	if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
 		pushd ../repos/ >/dev/null
-		echo "removing $repo-i686 and $repo-x86_64..."
+		stat_busy "removing $repo-i686 and $repo-x86_64"
 		svn rm $repo-i686
 		svn rm $repo-x86_64
 		svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
-		echo 'done'
+		stat_done
 		popd >/dev/null
 	fi
 else
 	if [ -d ../repos/$repo-any ]; then
 		pushd ../repos/ >/dev/null
-		echo "removing $repo-any..."
+		stat_busy "removing $repo-any"
 		svn rm $repo-any
 		svn commit -q -m "removed $repo-any for $pkgname"
-		echo 'done'
+		stat_done
 		popd >/dev/null
 	fi
 fi

find-libdeps.in

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+m4_include(lib/common.sh)
+
+set -e
+
+IGNORE_INTERNAL=0
+
+if [[ $1 = "--ignore-internal" ]]; then
+	IGNORE_INTERNAL=1
+	shift
+fi
+
+script_mode=${0##*/find-lib}
+
+case $script_mode in
+	deps|provides) true;;
+	*) die "unknown mode $script_mode" ;;
+esac
+
+if [[ -z $1 ]]; then
+	echo "${0##*/} [options] <package file|extracted package dir>"
+	echo "Options:"
+	echo "    --ignore-internal      ignore internal libraries"
+	exit 1
+fi
+
+if [[ -d $1 ]]; then
+	pushd $1 >/dev/null
+else
+	setup_workdir
+
+	case ${script_mode} in
+		deps) bsdtar -C $WORKDIR -xf "$1";;
+		provides) bsdtar -C $WORKDIR -xf "$1" --include="*.so*";;
+	esac
+
+	pushd $WORKDIR >/dev/null
+fi
+
+process_sofile() {
+	# extract the library name: libfoo.so
+	soname="${sofile%%\.so\.*}.so"
+	# extract the major version: 1
+	soversion="${sofile##*\.so\.}"
+	if [[ "$soversion" = "$sofile" ]] && (($IGNORE_INTERNAL)); then
+		continue
+	fi
+	if ! in_array "${soname}=${soversion}-${soarch}" ${soobjects[@]}; then
+		# libfoo.so=1-64
+		echo "${soname}=${soversion}-${soarch}"
+		soobjects=(${soobjects[@]} "${soname}=${soversion}-${soarch}")
+	fi
+}
+
+case $script_mode in
+	deps) find_args="-perm -u+x";;
+	provides) find_args="-name *.so*";;
+esac
+
+find . -type f $find_args | while read filename; do
+	if [[ $script_mode = "provides" ]]; then
+		# ignore if we don't have a shared object
+		if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then
+			continue
+		fi
+	fi
+
+	# get architecture of the file; if soarch is empty it's not an ELF binary
+	soarch=$(LC_ALL=C readelf -h "$filename" 2>/dev/null | sed -n 's/.*Class.*ELF\(32\|64\)/\1/p')
+	[ -n "$soarch" ] || continue
+
+	if [[ $script_mode = "provides" ]]; then
+		# get the string binaries link to: libfoo.so.1.2 -> libfoo.so.1
+		sofile=$(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p')
+		[ -z "$sofile" ] && sofile="${filename##*/}"
+		process_sofile
+	elif [[ $script_mode = "deps" ]]; then
+		# process all libraries needed by the binary
+		for sofile in $(LC_ALL=C readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p'); do
+			process_sofile
+		done
+	fi
+done
+
+popd >/dev/null

finddeps.in

@@ -3,44 +3,37 @@
 # finddeps - find packages that depend on a given depname
 #
 
-if [ "$1" = '' ]; then
+m4_include(lib/common.sh)
+
+match=$1
+
+if [[ -z $match ]]; then
 	echo 'usage: finddeps <depname>'
 	echo ''
 	echo 'Find packages that depend on a given depname.'
 	echo 'Run this script from the top-level directory of your ABS tree.'
 	echo ''
-	exit 0
+	exit 1
 fi
 
-match=$1
-tld=$(pwd)
-
-for d in $(find . -type d); do
-	cd $d
-	if [ -f PKGBUILD ]; then
-		unset pkgname depends makedepends
-		. PKGBUILD
+find . -type d | while read d; do
+	if [[ -f "$d/PKGBUILD" ]]; then
+		unset pkgname depends makedepends optdepends
+		. "$d/PKGBUILD"
 		for dep in "${depends[@]}"; do
 			# lose the version comparator, if any
 			depname=${dep%%[<>=]*}
-			if [ "$depname" = "$match" ]; then
-				echo "$d (depends)"
-			fi
+			[[ $depname = $match ]] && echo "$d (depends)"
 		done
 		for dep in "${makedepends[@]}"; do
 			# lose the version comparator, if any
 			depname=${dep%%[<>=]*}
-			if [ "$depname" = "$match" ]; then
-				echo "$d (makedepends)"
-			fi
+			[[ $depname = $match ]] && echo "$d (makedepends)"
 		done
 		for dep in "${optdepends[@]/:*}"; do
 			# lose the version comaparator, if any
 			depname=${dep%%[<>=]*}
-			if [ "$depname" = "$match" ]; then
-				echo "$d (optdepends)"
-			fi
+			[[ $depname = $match ]] && echo "$d (optdepends)"
 		done
 	fi
-	cd $tld
 done

lddd.in

@@ -3,18 +3,20 @@
 # lddd - find broken library links on your machine
 #
 
+m4_include(lib/common.sh)
+
 ifs=$IFS
 IFS="${IFS}:"
 
 libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
 extras=
 
-TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX)
+TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
 
-echo 'Go out and drink some tea, this will take a while :) ...'
+msg 'Go out and drink some tea, this will take a while :) ...'
 #  Check ELF binaries in the PATH and specified dir trees.
 for tree in $PATH $libdirs $extras; do
-	echo DIR $tree
+	msg2 "DIR $tree"
 
 	#  Get list of files in tree.
 	files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
@@ -43,4 +45,4 @@ done
 # clean list
 sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
 
-echo "Files saved to $TEMPDIR"
+msg "Files saved to $TEMPDIR"

lib/common.sh

@@ -0,0 +1,124 @@
+# Avoid any encoding problems
+export LANG=C
+
+# check if messages are to be printed using color
+unset ALL_OFF BOLD BLUE GREEN RED YELLOW
+if [[ -t 2 ]]; then
+	# prefer terminal safe colored and bold text when tput is supported
+	if tput setaf 0 &>/dev/null; then
+		ALL_OFF="$(tput sgr0)"
+		BOLD="$(tput bold)"
+		BLUE="${BOLD}$(tput setaf 4)"
+		GREEN="${BOLD}$(tput setaf 2)"
+		RED="${BOLD}$(tput setaf 1)"
+		YELLOW="${BOLD}$(tput setaf 3)"
+	else
+		ALL_OFF="\e[1;0m"
+		BOLD="\e[1;1m"
+		BLUE="${BOLD}\e[1;34m"
+		GREEN="${BOLD}\e[1;32m"
+		RED="${BOLD}\e[1;31m"
+		YELLOW="${BOLD}\e[1;33m"
+	fi
+fi
+readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
+
+plain() {
+	local mesg=$1; shift
+	printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg() {
+	local mesg=$1; shift
+	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg2() {
+	local mesg=$1; shift
+	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+warning() {
+	local mesg=$1; shift
+	printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+error() {
+	local mesg=$1; shift
+	printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+stat_busy() {
+	local mesg=$1; shift
+	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" >&2
+}
+
+stat_done() {
+	printf "${BOLD}done${ALL_OFF}\n" >&2
+}
+
+setup_workdir() {
+	[ -z "$WORKDIR" ] && WORKDIR=$(mktemp -d /tmp/$(basename $0).XXXXXXXXXX)
+}
+
+cleanup() {
+	trap - EXIT INT QUIT TERM
+
+	[ -n "$WORKDIR" ] && rm -rf "$WORKDIR"
+	[ "$1" ] && exit $1
+}
+
+abort() {
+	msg 'Aborting...'
+	cleanup 0
+}
+
+die() {
+	error "$*"
+	cleanup 1
+}
+
+trap abort INT QUIT TERM HUP
+trap 'cleanup 0' EXIT
+
+##
+#  usage : in_array( $needle, $haystack )
+# return : 0 - found
+#          1 - not found
+##
+in_array() {
+	local needle=$1; shift
+	local item
+	for item in "$@"; do
+		[[ $item = $needle ]] && return 0 # Found
+	done
+	return 1 # Not Found
+}
+
+##
+#  usage : get_full_version( [$pkgname] )
+# return : full version spec, including epoch (if necessary), pkgver, pkgrel
+##
+get_full_version() {
+	# set defaults if they weren't specified in buildfile
+	pkgbase=${pkgbase:-${pkgname[0]}}
+	epoch=${epoch:-0}
+	if [[ -z $1 ]]; then
+		if [[ $epoch ]] && (( ! $epoch )); then
+			echo $pkgver-$pkgrel
+		else
+			echo $epoch:$pkgver-$pkgrel
+		fi
+	else
+		for i in pkgver pkgrel epoch; do
+			local indirect="${i}_override"
+			eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
+			[[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
+		done
+		if (( ! $epoch_override )); then
+			echo $pkgver_override-$pkgrel_override
+		else
+			echo $epoch_override:$pkgver_override-$pkgrel_override
+		fi
+	fi
+}

makechrootpkg

@@ -1,305 +0,0 @@
-#!/bin/bash
-# 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; version 2 of the License.
-#
-# 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.
-
-FORCE='n'
-RUN=''
-MAKEPKG_ARGS='-s --noconfirm'
-REPACK=''
-WORKDIR=$PWD
-
-update_first='0'
-clean_first='0'
-install_pkg=''
-add_to_db=0
-
-chrootdir=''
-
-APPNAME=$(basename "${0}")
-
-default_copy=$USER
-[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
-[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
-
-usage() {
-	echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
-	echo ' Run this script in a PKGBUILD dir to build a package inside a'
-	echo ' clean chroot. All unrecognized arguments passed to this script'
-	echo ' will be passed to makepkg.'
-	echo ''
-	echo ' The chroot dir consists of the following directories:'
-	echo ' <chrootdir>/{root, copy} but only "root" is required'
-	echo ' by default. The working copy will be created as needed'
-	echo ''
-	echo 'The chroot "root" directory must be created via the following'
-	echo 'command:'
-	echo '    mkarchroot <chrootdir>/root base base-devel sudo'
-	echo ''
-	echo "Default makepkg args: $MAKEPKG_ARGS"
-	echo ''
-	echo 'Flags:'
-	echo '-h         This help'
-	echo '-c         Clean the chroot before building'
-	echo '-u         Update the working copy of the chroot before building'
-	echo '           This is useful for rebuilds without dirtying the pristine'
-	echo '           chroot'
-	echo '-d         Add the package to a local db at /repo after building'
-	echo '-r <dir>   The chroot dir to use'
-	echo '-I <pkg>   Install a package into the working copy of the chroot'
-	echo '-l <copy>  The directory to use as the working copy of the chroot'
-	echo '           Useful for maintaining multiple copies.'
-	echo "           Default: $default_copy"
-	exit 1
-}
-
-while getopts 'hcudr:I:l:' arg; do
-	case "${arg}" in
-		h) usage ;;
-		c) clean_first=1 ;;
-		u) update_first=1 ;;
-		d) add_to_db=1 ;;
-		r) chrootdir="$OPTARG" ;;
-		I) install_pkg="$OPTARG" ;;
-		l) copy="$OPTARG" ;;
-		*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
-	esac
-done
-
-# Canonicalize chrootdir, getting rid of trailing /
-chrootdir=$(readlink -e "$chrootdir")
-
-if [[ ${copy:0:1} = "/" ]]; then
-	copydir=$copy
-else
-	[[ -z $copy ]] && copy=$default_copy
-	copydir="$chrootdir/$copy"
-fi
-
-# Pass all arguments after -- right to makepkg
-MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
-
-# See if -R was passed to makepkg
-for arg in ${*:$OPTIND}; do
-	if [ "$arg" = '-R' ]; then
-		REPACK=1
-		break;
-	fi
-done
-
-if [ "$EUID" != '0' ]; then
-	echo 'This script must be run as root.'
-	exit 1
-fi
-
-if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then
-	echo 'This must be run in a directory containing a PKGBUILD.'
-	exit 1
-fi
-
-if [ ! -d "$chrootdir" ]; then
-	echo "No chroot dir defined, or invalid path '$chrootdir'"
-	exit 1
-fi
-
-if [ ! -d "$chrootdir/root" ]; then
-	echo 'Missing chroot dir root directory.'
-	echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
-	usage
-fi
-
-umask 0022
-
-# Lock the chroot we want to use. We'll keep this lock until we exit.
-# Note this is the same FD number as in mkarchroot
-exec 9>"$copydir.lock"
-if ! flock -n 9; then
-	echo -n "locking chroot copy '$copy'..."
-	flock 9
-	echo "done"
-fi
-
-if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
-	# Get a read lock on the root chroot to make
-	# sure we don't clone a half-updated chroot
-	exec 8>"$chrootdir/root.lock"
-
-	if ! flock -sn 8; then
-		echo -n "locking clean chroot..."
-		flock -s 8
-		echo "done"
-	fi
-
-	echo -n 'creating clean working copy...'
-	use_rsync=false
-	if type -P btrfs >/dev/null; then
-		[ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null
-		btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true
-	else
-		use_rsync=true
-	fi
-
-	if $use_rsync; then
-		mkdir -p "$copydir"
-		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
-	fi
-	echo 'done'
-
-	# Drop the read lock again
-	exec 8>&-
-fi
-
-if [ -n "$install_pkg" ]; then
-	pkgname="$(basename "$install_pkg")"
-	cp "$install_pkg" "$copydir/$pkgname"
-	mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
-	ret=$?
-	rm "$copydir/$pkgname"
-	# Exit early, we've done all we need to
-	exit $ret
-fi
-
-if [ $update_first -eq 1 ]; then
-	mkarchroot -u "$copydir"
-fi
-
-[ -d "$copydir/build" ] || mkdir "$copydir/build"
-
-if [ "$REPACK" != "1" ]; then
-	# Remove anything in there UNLESS -R (repack) was passed to makepkg
-	rm -rf "$copydir/build/"*
-fi
-
-# Read .makepkg.conf even if called via sudo
-if [ -n "${SUDO_USER}" ]; then
-	makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf"
-else
-	makepkg_conf="~/.makepkg.conf"
-fi
-
-# Get SRC/PKGDEST from makepkg.conf
-if [ -f "${makepkg_conf}" ]; then
-	eval $(grep '^SRCDEST=' "${makepkg_conf}")
-	eval $(grep '^PKGDEST=' "${makepkg_conf}")
-
-	eval $(grep '^MAKEFLAGS=' "${makepkg_conf}")
-	eval $(grep '^PACKAGER=' "${makepkg_conf}")
-fi
-[ -z "${SRCDEST}" ] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
-[ -z "${PKGDEST}" ] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
-
-[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
-if ! grep 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-	echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
-fi
-
-[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest"
-if ! grep 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-	echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
-fi
-[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
-if [ -n "${MAKEFLAGS}" ]; then 
-  sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
-  echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
-fi
-[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
-if [ -n "${PACKAGER}" ]; then 
-  sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
-  echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
-fi
-
-# Set target CARCH as it might be used within the PKGBUILD to select correct sources
-eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
-export CARCH
-# Copy PKGBUILD and sources
-source=($(. PKGBUILD; echo ${source[@]}))
-cp PKGBUILD "$copydir/build/"
-for f in ${source[@]}; do
-	basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
-	if [ -f "$basef" ]; then
-		cp "$basef" "$copydir/srcdest/"
-	elif [ -f "$SRCDEST/$basef" ]; then
-		cp "$SRCDEST/$basef" "$copydir/srcdest/"
-	fi
-done
-
-( . PKGBUILD
-for i in 'changelog' 'install'; do
-	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
-	for file in $filelist; do
-		# evaluate any bash variables used
-		eval file=${file}
-		if [[ -f "$file" ]]; then
-			cp "$file" "$copydir/build/"
-		fi
-	done
-done
-)
-
-chown -R nobody "$copydir/build"
-chown -R nobody "$copydir/srcdest"
-chown -R nobody "$copydir/pkgdest"
-
-echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
-chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
-
-#This is a little gross, but this way the script is recreated every time in the
-#working copy
-(cat <<EOF
-#!/bin/bash
-export LANG=C
-cd /build
-export HOME=/build
-sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
-[ -f BUILD_FAILED ] && exit 1
-which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
-exit 0
-EOF
-) > "$copydir/chrootbuild"
-chmod +x "$copydir/chrootbuild"
-
-if mkarchroot -r "/chrootbuild" "$copydir"; then
-	for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do
-		[ -e "$pkgfile" ] || continue
-		if [ "$add_to_db" -eq "1" ]; then
-			mkdir -p "${copydir}/repo"
-			pushd "${copydir}/repo" >/dev/null
-			cp "$pkgfile" .
-			repo-add repo.db.tar.gz "$(basename "$pkgfile")"
-			popd >/dev/null
-		fi
-
-		if [ -d "$PKGDEST" ]; then
-			mv "$pkgfile" "${PKGDEST}"
-		else
-			mv "$pkgfile" "${WORKDIR}"
-		fi
-	done
-
-	for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
-		[ -f "$l" ] && mv "$l" "${WORKDIR}"
-	done
-else
-	#just in case. We returned 1, make sure we fail
-	touch "${copydir}/build/BUILD_FAILED"
-fi
-
-for f in "${copydir}"/srcdest/*; do
-	[ -e "$f" ] || continue
-	if [ -d "$SRCDEST" ]; then
-		mv "$f" "${SRCDEST}"
-	else
-		mv "$f" "${WORKDIR}"
-	fi
-done
-
-if [ -e "${copydir}/build/BUILD_FAILED" ]; then
-	echo "Build failed, check $copydir/build"
-	rm "${copydir}/build/BUILD_FAILED"
-	exit 1
-fi

makechrootpkg.in

@@ -0,0 +1,312 @@
+#!/bin/bash
+# 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; version 2 of the License.
+#
+# 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.
+
+m4_include(lib/common.sh)
+
+shopt -s nullglob
+
+makepkg_args='-s --noconfirm -L'
+repack=false
+update_first=false
+clean_first=false
+install_pkg=
+add_to_db=false
+run_namcap=false
+chrootdir=
+
+default_copy=$USER
+[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
+[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
+
+usage() {
+	echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
+	echo ' Run this script in a PKGBUILD dir to build a package inside a'
+	echo ' clean chroot. All unrecognized arguments passed to this script'
+	echo ' will be passed to makepkg.'
+	echo ''
+	echo ' The chroot dir consists of the following directories:'
+	echo ' <chrootdir>/{root, copy} but only "root" is required'
+	echo ' by default. The working copy will be created as needed'
+	echo ''
+	echo 'The chroot "root" directory must be created via the following'
+	echo 'command:'
+	echo '    mkarchroot <chrootdir>/root base base-devel sudo'
+	echo ''
+	echo "Default makepkg args: $makepkg_args"
+	echo ''
+	echo 'Flags:'
+	echo '-h         This help'
+	echo '-c         Clean the chroot before building'
+	echo '-u         Update the working copy of the chroot before building'
+	echo '           This is useful for rebuilds without dirtying the pristine'
+	echo '           chroot'
+	echo '-d         Add the package to a local db at /repo after building'
+	echo '-r <dir>   The chroot dir to use'
+	echo '-I <pkg>   Install a package into the working copy of the chroot'
+	echo '-l <copy>  The directory to use as the working copy of the chroot'
+	echo '           Useful for maintaining multiple copies.'
+	echo '-n         Run namcap on the package'
+	echo "           Default: $default_copy"
+	exit 1
+}
+
+while getopts 'hcudr:I:l:n' arg; do
+	case "$arg" in
+		h) usage ;;
+		c) clean_first=true ;;
+		u) update_first=true ;;
+		d) add_to_db=true ;;
+		r) chrootdir="$OPTARG" ;;
+		I) install_pkg="$OPTARG" ;;
+		l) copy="$OPTARG" ;;
+		n) run_namcap=true ;;
+		*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
+	esac
+done
+
+# Canonicalize chrootdir, getting rid of trailing /
+chrootdir=$(readlink -e "$chrootdir")
+
+if [[ ${copy:0:1} = / ]]; then
+	copydir=$copy
+else
+	[[ -z $copy ]] && copy=$default_copy
+	copydir="$chrootdir/$copy"
+fi
+
+# Pass all arguments after -- right to makepkg
+makepkg_args="$makepkg_args ${*:$OPTIND}"
+
+# See if -R was passed to makepkg
+for arg in ${*:$OPTIND}; do
+	if [[ $arg = -R ]]; then
+		repack=1
+		break
+	fi
+done
+
+if (( EUID )); then
+	die 'This script must be run as root.'
+fi
+
+if [[ ! -f PKGBUILD && -z $install_pkg ]]; then
+	die 'This must be run in a directory containing a PKGBUILD.'
+fi
+
+if [[ ! -d $chrootdir ]]; then
+	die "No chroot dir defined, or invalid path '$chrootdir'"
+fi
+
+if [[ ! -d $chrootdir/root ]]; then
+	die "Missing chroot dir root directory. Try using: mkarchroot $chrootdir/root base base-devel sudo"
+fi
+
+umask 0022
+
+# Lock the chroot we want to use. We'll keep this lock until we exit.
+# Note this is the same FD number as in mkarchroot
+exec 9>"$copydir.lock"
+if ! flock -n 9; then
+	stat_busy "locking chroot copy '$copy'"
+	flock 9
+	stat_done
+fi
+
+if [[ ! -d $copydir ]] || $clean_first; then
+	# Get a read lock on the root chroot to make
+	# sure we don't clone a half-updated chroot
+	exec 8>"$chrootdir/root.lock"
+
+	if ! flock -sn 8; then
+		stat_busy "locking clean chroot"
+		flock -s 8
+		stat_done
+	fi
+
+	stat_busy 'creating clean working copy'
+	use_rsync=false
+	if type -P btrfs >/dev/null; then
+		[[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null
+		btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null ||
+			use_rsync=true
+	else
+		use_rsync=true
+	fi
+
+	if $use_rsync; then
+		mkdir -p "$copydir"
+		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+	fi
+	stat_done
+
+	# Drop the read lock again
+	exec 8>&-
+fi
+
+if [[ -n $install_pkg ]]; then
+	pkgname="${install_pkg##*/}"
+	cp "$install_pkg" "$copydir/$pkgname"
+
+	mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
+	ret=$?
+
+	rm "$copydir/$pkgname"
+
+	# Exit early, we've done all we need to
+	exit $ret
+fi
+
+$update_first && mkarchroot -u "$copydir"
+
+mkdir -p "$copydir/build"
+
+# Remove anything in there UNLESS -R (repack) was passed to makepkg
+$repack || rm -rf "$copydir"/build/*
+
+# Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo
+if [[ -n $SUDO_USER ]]; then
+	SUDO_HOME="$(eval echo ~$SUDO_USER)"
+	makepkg_conf="$SUDO_HOME/.makepkg.conf"
+	if [[ -r "$SUDO_HOME/.gnupg/pubring.gpg" ]]; then
+		install -D "$SUDO_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
+	fi
+else
+	makepkg_conf="$HOME/.makepkg.conf"
+	if [[ -r "$HOME/.gnupg/pubring.gpg" ]]; then
+		install -D "$HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
+	fi
+fi
+
+# Get SRC/PKGDEST from makepkg.conf
+if [[ -f $makepkg_conf ]]; then
+	eval $(grep '^SRCDEST=' "$makepkg_conf")
+	eval $(grep '^PKGDEST=' "$makepkg_conf")
+	eval $(grep '^MAKEFLAGS=' "$makepkg_conf")
+	eval $(grep '^PACKAGER=' "$makepkg_conf")
+fi
+
+[[ -z $SRCDEST ]] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
+[[ -z $PKGDEST ]] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
+[[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
+[[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
+
+# Use PKGBUILD directory if PKGDEST or SRCDEST don't exist
+[[ -d $PKGDEST ]] || PKGDEST=.
+[[ -d $SRCDEST ]] || SRCDEST=.
+
+mkdir -p "$copydir/pkgdest"
+if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then
+	echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
+fi
+
+mkdir -p "$copydir/srcdest"
+if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
+	echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
+fi
+
+if [[ -n $MAKEFLAGS ]]; then 
+	sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
+	echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
+fi
+
+if [[ -n $PACKAGER ]]; then 
+	sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
+	echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
+fi
+
+# Set target CARCH as it might be used within the PKGBUILD to select correct sources
+eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
+export CARCH
+
+# Copy PKGBUILD and sources
+cp PKGBUILD "$copydir/build/"
+(
+	source PKGBUILD
+	for file in "${source[@]}"; do
+		file="${file%%::*}"
+		file="${file##*://*/}"
+		if [[ -f $file ]]; then
+			cp "$file" "$copydir/srcdest/"
+		elif [[ -f $SRCDEST/$file ]]; then
+			cp "$SRCDEST/$file" "$copydir/srcdest/"
+		fi
+	done
+
+	# Find all changelog and install files, even inside functions
+	for i in 'changelog' 'install'; do
+		while read -r file; do
+			# evaluate any bash variables used
+			eval file=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$file")\"
+			[[ -f $file ]] && cp "$file" "$copydir/build/"
+		done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
+	done
+)
+
+chown -R nobody "$copydir"/{build,pkgdest,srcdest}
+
+cat > "$copydir/etc/sudoers.d/nobody-pacman" <<EOF
+Defaults env_keep += "HOME"
+nobody ALL = NOPASSWD: /usr/bin/pacman
+EOF
+chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
+
+# Set this system wide as makepkg will source /etc/profile before calling build()
+echo 'LANG=C' > "$copydir/etc/locale.conf"
+
+# This is a little gross, but this way the script is recreated every time in the
+# working copy
+cat >"$copydir/chrootbuild" <<EOF
+#!/bin/bash
+export LANG=C
+export HOME=/build
+
+cd /build
+sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
+
+[[ -f BUILD_FAILED ]] && exit 1
+
+if $run_namcap; then
+	pacman -S --needed --noconfirm namcap
+	namcap /build/PKGBUILD /pkgdest/*.pkg.tar.?z > /build/namcap.log
+fi
+
+exit 0
+EOF
+chmod +x "$copydir/chrootbuild"
+
+if mkarchroot -r "/chrootbuild" "$copydir"; then
+	for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do
+		if $add_to_db; then
+			mkdir -p "$copydir/repo"
+			pushd "$copydir/repo" >/dev/null
+			cp "$pkgfile" .
+			repo-add repo.db.tar.gz "${pkgfile##*/}"
+			popd >/dev/null
+		fi
+
+		mv "$pkgfile" "$PKGDEST"
+	done
+
+	for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
+		[[ -f $l ]] && mv "$l" .
+	done
+else
+	# Just in case. We returned 1, make sure we fail
+	touch "$copydir/build/BUILD_FAILED"
+fi
+
+for f in "$copydir"/srcdest/*; do
+	mv "$f" "$SRCDEST"
+done
+
+if [[ -e $copydir/build/BUILD_FAILED ]]; then
+	rm "$copydir/build/BUILD_FAILED"
+	die "Build failed, check $copydir/build"
+fi

makepkg-i686.conf

@@ -8,16 +8,16 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
 # /usr/bin/snarf
 # /usr/bin/lftpget -c
-# /usr/bin/curl
+# /usr/bin/wget
 
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
@@ -26,7 +26,7 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
 CARCH="i686"
 CHOST="i686-pc-linux-gnu"
 
-#-- Exclusive: will only run on i686
+#-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
 CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
@@ -39,7 +39,7 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- fakeroot: Allow building packages as a non-root user
@@ -47,19 +47,23 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
 #-- check:    Run the check() function if present in the PKGBUILD
+#-- sign:     Generate PGP signature file
 #
-BUILDENV=(fakeroot !distcc color !ccache check)
+BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.
 #DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
 
 #########################################################################
 # GLOBAL PACKAGE OPTIONS
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:     Strip symbols from binaries/libraries
@@ -68,8 +72,9 @@ BUILDENV=(fakeroot !distcc color !ccache check)
 #-- emptydirs: Leave empty directories in packages
 #-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:     Remove files specified by PURGE_TARGETS
+#-- upx:       Compress binary executable files using UPX
 #
-OPTIONS=(strip docs libtool emptydirs zipman purge)
+OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -100,6 +105,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #SRCPKGDEST=/home/srcpackages
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
 
 #########################################################################
 # EXTENSION DEFAULTS

makepkg-x86_64.conf

@@ -8,16 +8,16 @@
 #
 #-- The download utilities that makepkg should use to acquire sources
 #  Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
-          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
-          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
+          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
+          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'rsync::/usr/bin/rsync -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
 # /usr/bin/snarf
 # /usr/bin/lftpget -c
-# /usr/bin/curl
+# /usr/bin/wget
 
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
@@ -26,7 +26,7 @@ DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
 CARCH="x86_64"
 CHOST="x86_64-unknown-linux-gnu"
 
-#-- Exclusive: will only run on x86_64
+#-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
@@ -39,7 +39,7 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
 #-- fakeroot: Allow building packages as a non-root user
@@ -47,19 +47,23 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
 #-- check:    Run the check() function if present in the PKGBUILD
+#-- sign:     Generate PGP signature file
 #
-BUILDENV=(fakeroot !distcc color !ccache check)
+BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #
 #-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
 #-- specify a space-delimited list of hosts running in the DistCC cluster.
 #DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
 
 #########################################################################
 # GLOBAL PACKAGE OPTIONS
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:     Strip symbols from binaries/libraries
@@ -68,8 +72,9 @@ BUILDENV=(fakeroot !distcc color !ccache check)
 #-- emptydirs: Leave empty directories in packages
 #-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:     Remove files specified by PURGE_TARGETS
+#-- upx:       Compress binary executable files using UPX
 #
-OPTIONS=(strip docs libtool emptydirs zipman purge)
+OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -100,6 +105,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #SRCPKGDEST=/home/srcpackages
 #-- Packager: name/email of the person or organization building packages
 #PACKAGER="John Doe <john@doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
 
 #########################################################################
 # EXTENSION DEFAULTS

mkarchroot.in

@@ -8,6 +8,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+m4_include(lib/common.sh)
+
 FORCE='n'
 RUN=''
 NOCOPY='n'
@@ -28,7 +30,7 @@ usage() {
 	echo '    -n            Do not copy config files into the chroot'
 	echo '    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg'
 	echo '    -h            This message'
-	exit $1
+	exit 1
 }
 
 while getopts 'r:ufnhC:M:c:' arg; do
@@ -41,29 +43,26 @@ while getopts 'r:ufnhC:M:c:' arg; do
 		n) NOCOPY='y' ;;
 		c) cache_dir="$OPTARG" ;;
 		h|?) usage 0 ;;
-		*) echo "invalid argument '${arg}'"; usage 1 ;;
+		*) error "invalid argument '${arg}'"; usage ;;
 	esac
 done
 
 if [ "$EUID" != '0' ]; then
-	echo 'error: this script must be run as root.'
-	exit 1
+	die 'this script must be run as root.'
 fi
 
 shift $(($OPTIND - 1))
 
 if [ "$RUN" = '' -a $# -lt 2 ]; then
-	echo 'you must specify a directory and one or more packages'
-	usage 1
+	die 'you must specify a directory and one or more packages'
 elif [ $# -lt 1 ]; then
-	echo 'you must specify a directory'
-	usage 1
+	die 'you must specify a directory'
 fi
 
 working_dir="$(readlink -f ${1})"
 shift 1
 
-[ "${working_dir}" = '' ] && echo 'error: please specify a working directory' && usage 1
+[ "${working_dir}" = '' ] && die 'please specify a working directory'
 
 if [ -z "$cache_dir" ]; then
 	cache_conf=${working_dir}/etc/pacman.conf
@@ -150,9 +149,9 @@ chroot_lock () {
 
 	# Lock the chroot. Take note of the FD number.
 	if ! flock -n 9; then
-		echo -n "locking chroot..."
+		stat_busy "locking chroot"
 		flock 9
-		echo "done"
+		stat_done
 	fi
 }
 # }}}
@@ -162,9 +161,7 @@ if [ "$RUN" != "" ]; then
 	# run chroot {{{
 	#Sanity check
 	if [ ! -f "${working_dir}/.arch-chroot" ]; then
-		echo "error: '${working_dir}' does not appear to be a Arch chroot"
-		echo '       please build the image using mkarchroot'
-		exit 1
+		die "'${working_dir}' does not appear to be a Arch chroot"
 	fi
 
 	chroot_lock
@@ -177,8 +174,7 @@ if [ "$RUN" != "" ]; then
 else
 	# {{{ build chroot
 	if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
-		echo "error: working dir '${working_dir}' already exists - try using -f"
-		exit 1
+		die "working dir '${working_dir}' already exists - try using -f"
 	fi
 
 	if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
@@ -202,8 +198,7 @@ else
 			op="${op}f"
 		fi
 		if ! pacman ${op} ${pacargs} $@; then
-			echo 'error: failed to install all packages'
-			exit 1
+			die 'failed to install all packages'
 		fi
 	fi
 
@@ -221,7 +216,7 @@ else
 
 	if [ -e "${working_dir}/etc/locale.gen" ]; then
 		sed -i 's@^#\(en_US\|de_DE\)\(\.UTF-8\)@\1\2@' "${working_dir}/etc/locale.gen"
-		chroot "${working_dir}" locale-gen
+		chroot "${working_dir}" /usr/sbin/locale-gen
 	fi
 
 	if [ ! -e "${working_dir}/.arch-chroot" ]; then

pacman-extra.conf

@@ -13,11 +13,12 @@
 #DBPath      = /var/lib/pacman/
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -28,12 +29,26 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
+# We cannot check disk space from within a chroot environment
 #CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# Disable signature checks for now
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -76,5 +91,6 @@ Include = /etc/pacman.d/mirrorlist
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
+#SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 

pacman-multilib-testing.conf

@@ -13,11 +13,12 @@
 #DBPath      = /var/lib/pacman/
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -28,12 +29,26 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
+# We cannot check disk space from within a chroot environment
 #CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# Disable signature checks for now
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -76,6 +91,7 @@ Include = /etc/pacman.d/mirrorlist
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repository here.
 [multilib-testing]
+#SigLevel = Optional TrustAll
 Include = /etc/pacman.d/mirrorlist
 
 [multilib]

pacman-multilib.conf

@@ -13,11 +13,12 @@
 #DBPath      = /var/lib/pacman/
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -28,12 +29,26 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
+# We cannot check disk space from within a chroot environment
 #CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# Disable signature checks for now
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -76,6 +91,7 @@ Include = /etc/pacman.d/mirrorlist
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repository here.
 [multilib]
+#SigLevel = Optional TrustAll
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

pacman-staging.conf

@@ -13,11 +13,12 @@
 #DBPath      = /var/lib/pacman/
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -28,12 +29,26 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
+# We cannot check disk space from within a chroot environment
 #CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# Disable signature checks for now
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -76,6 +91,7 @@ Include = /etc/pacman.d/mirrorlist
 [community-testing]
 Include = /etc/pacman.d/mirrorlist
 
+#SigLevel = Optional TrustAll
 [community]
 Include = /etc/pacman.d/mirrorlist
 

pacman-testing.conf

@@ -13,11 +13,12 @@
 #DBPath      = /var/lib/pacman/
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -28,12 +29,26 @@ Architecture = auto
 #NoUpgrade   =
 #NoExtract   =
 
-# Misc options (all disabled by default)
+# Misc options
 #UseSyslog
-#ShowSize
 #UseDelta
 #TotalDownload
+# We cannot check disk space from within a chroot environment
 #CheckSpace
+#VerbosePkgLists
+
+# PGP signature checking
+# NOTE: None of this will work without running `pacman-key --init` first.
+# The compiled in default is equivalent to the following line. This requires
+# you to locally sign and trust packager keys using `pacman-key` for them to be
+# considered valid.
+#SigLevel = Optional TrustedOnly
+# If you wish to check signatures but avoid local sign and trust issues, use
+# the following line. This will treat any key imported into pacman's keyring as
+# trusted.
+#SigLevel = Optional TrustAll
+# Disable signature checks for now
+SigLevel = Never
 
 #
 # REPOSITORIES
@@ -76,5 +91,6 @@ Include = /etc/pacman.d/mirrorlist
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
+#SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 

rebuildpkgs.in

@@ -9,6 +9,8 @@
 # Currently uses $(pwd)/rebuilds as the directory for rebuilding...
 # TODO make this work for community too
 
+m4_include(lib/common.sh)
+
 if [ $# -le 1 ]; then
 	echo "usage: $(basename $0) <chrootdir> <packages to rebuild>"
 	echo "  example: $(basename $0) ~/chroot readline bash foo bar baz"
@@ -19,15 +21,9 @@ fi
 if [ -r '/etc/makepkg.conf' ]; then
 	source '/etc/makepkg.conf'
 else
-	echo '/etc/makepkg.conf not found!'
-	exit 1
+	die '/etc/makepkg.conf not found!'
 fi
 
-die () {
-	echo $@ >&2
-	exit 1
-}
-
 bump_pkgrel() {
 	# Get the current pkgrel from SVN and update the working copy with it
 	# This prevents us from incrementing out of control :)
@@ -53,7 +49,7 @@ pkgs="$@"
 
 SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
 
-echo ":: Work will be done in $(pwd)/rebuilds"
+msg "Work will be done in $(pwd)/rebuilds"
 
 REBUILD_ROOT="$(pwd)/rebuilds"
 mkdir -p "$REBUILD_ROOT"
@@ -65,11 +61,11 @@ FAILED=""
 for pkg in $pkgs; do
 	cd "$REBUILD_ROOT/svn-packages"
 
-	echo ":: Building '$pkg'"
+	msg2 "Building '$pkg'"
 	/usr/bin/svn update "$pkg"
 	if [ ! -d "$pkg/trunk" ]; then
 		FAILED="$FAILED $pkg"
-		echo ":: $pkg does not exist in SVN"
+		warning "$pkg does not exist in SVN"
 		continue
 	fi
 	cd "$pkg/trunk/"
@@ -78,24 +74,24 @@ for pkg in $pkgs; do
 
 	if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
 		FAILED="$FAILED $pkg"
-		echo ":: $pkg Failed!"
+		error "$pkg Failed!"
 	else
 		pkgfile=$(pkg_from_pkgbuild)
 		if [ -e "$pkgfile" ]; then
-			echo ":: $pkg Complete"
+			msg2 "$pkg Complete"
 		else
 			FAILED="$FAILED $pkg"
-			echo ":: $pkg Failed, no package built!"
+			error "$pkg Failed, no package built!"
 		fi
 	fi
 done
 
 cd "$REBUILD_ROOT"
 if [ "$FAILED" != "" ]; then
-	echo 'Packages failed:'
+	msg 'Packages failed:'
 	for pkg in $FAILED; do
-		echo -e "\t$pkg"
+		msg2 "$pkg"
 	done
 fi
 
-echo 'SVN pkgbumps in svn-packages/ - commit when ready'
+msg 'SVN pkgbumps in svn-packages/ - commit when ready'

zsh_completion.in

@@ -0,0 +1,81 @@
+#compdef archbuild archco archrelease archrm 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-i686-build=archbuild extra-x86_64-build=archbuild testing-i686-build=archbuild testing-x86_64-build=archbuild staging-i686-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild communityco=archco
+
+_arch=(i686 x86_64 any)
+
+_tags=(
+	core-i686 core-x86_64 core-any
+	extra-i686 extra-x86_64 extra-any
+	multilib-i686 multilib-x86_64 multilib-any
+	staging-i686 staging-x86_64 staging-any
+	testing-i686 testing-x86_64 testing-any
+	multilib-testing-i686 multilib-testing-x86_64 multilib-testing-any
+	community-i686 community-x86_64 community-any
+	community-staging-i686 community-staging-x86_64 community-staging-any
+	community-testing-i686 community-testing-x86_64 community-testing-any
+)
+
+_archbuild_args=(
+	'-c[Recreate the chroot before building]'
+	'-r[Create chroots in this directory]:base_dir:_files -/'
+)
+
+_archco_args=(
+	'*:packages:_devtools_completions_all_packages'
+)
+
+_archrelease_args=(
+	"*:arch:($_tags[*])"
+)
+
+_archrm_args=(
+	'1:path:_files -/'
+)
+
+_commitpkg_args=(
+	"-a[Release to a specific architecture only]:arch:($_arch[*])"
+	'-l[Set bandwidth limit]:limit'
+	'1:commit_msg'
+)
+
+_finddeps_args=(
+	'1:packages:_devtools_completions_all_packages'
+)
+
+_makechrootpkg_args=(
+	'-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
+	'-c[Clean the chroot before building]'
+	'-d[Add the package to a local db at /repo after building]'
+	'-h[Display usage]'
+	'-l[The directory to use as the working copy]:copy_dir:_files -/'
+	'-r[The chroot dir to use]:chroot_dir:_files -/'
+	'-u[Update the working copy of the chroot before building]'
+)
+
+_mkarchroot_args=(
+	'-r[Run a program within the context of the chroot]:app'
+	'-u[Update the chroot via pacman]'
+	'-f[Force overwrite of files in the working-dir]'
+	'-C[Location of a pacman config file]:pacman_config:_files'
+	'-M[Location of a makepkg config file]:makepkg_config:_files'
+	'-n[Do not copy config files into the chroot]'
+	'-c[Set pacman cache]:pacman_cache:_files -/'
+	'-h[Display usage]'
+)
+
+_rebuildpkgs_args=(
+	'1:chroot_dir:_files -/'
+	'*:packages:_devtools_completions_all_packages'
+)
+
+_devtools_completions_all_packages() {
+	typeset -U packages
+	packages=($(_call_program packages pacman -Sql))
+	compadd - "${(@)packages}"
+}
+
+_devtools() {
+	local argname="_${service}_args[@]"
+	_arguments -s "${(P)argname}"
+}
+
+_devtools