prepare release

Generate a message template when omitting the commit message (includes
the same subject line that is used if a commit message is specified).

Also, use two newlines to separate the subject line from the message
body as it looks much clearer that way.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

.gitignore

@@ -0,0 +1,2 @@
+*~
+devtools-*.tar.gz

Makefile

@@ -1,36 +1,79 @@
+V=0.9.26
+
+PREFIX = /usr/local
+
+BINPROGS = \
+	checkpkg \
+	commitpkg \
+	archco \
+	archrelease \
+	archrm \
+	archbuild \
+	lddd \
+	finddeps \
+	rebuildpkgs
+
+SBINPROGS = \
+	mkarchroot \
+	makechrootpkg
+
+CONFIGFILES = \
+	makepkg-i686.conf \
+	makepkg-x86_64.conf \
+	pacman-extra.conf \
+	pacman-testing.conf \
+	pacman-staging.conf \
+	pacman-multilib.conf \
+	pacman-multilib-testing.conf
+
+COMMITPKG_LINKS = \
+	extrapkg \
+	corepkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
+	multilibpkg \
+	multilib-testingpkg
+
+ARCHBUILD_LINKS = \
+	extra-i686-build \
+	extra-x86_64-build \
+	testing-i686-build \
+	testing-x86_64-build \
+	staging-i686-build \
+	staging-x86_64-build \
+	multilib-build \
+	multilib-testing-build
+
 all:
 
 install:
-	# extrapkg/checkpkg and friends
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)/usr/bin
+	install -dm0755 $(DESTDIR)$(PREFIX)/sbin
-	install -m 755 checkpkg $(DESTDIR)/usr/bin
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools
-	install -m 755 extrapkg $(DESTDIR)/usr/bin
+	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
-	ln -sf extrapkg $(DESTDIR)/usr/bin/corepkg
+	install -m0755 ${SBINPROGS} $(DESTDIR)$(PREFIX)/sbin
-	ln -sf extrapkg $(DESTDIR)/usr/bin/testingpkg
+	install -m0644 ${CONFIGFILES} $(DESTDIR)$(PREFIX)/share/devtools
-	ln -sf extrapkg $(DESTDIR)/usr/bin/unstablepkg
+	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
-	# arch{co,release,rm}
+	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
-	install -m 755 archco $(DESTDIR)/usr/bin
+	install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools
-	install -m 755 archrelease $(DESTDIR)/usr/bin
+	ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
-	install -m 755 archrm $(DESTDIR)/usr/bin
-	# new chroot tools, only usable by root
-	mkdir -p $(DESTDIR)/usr/sbin
-	install -m 755 mkarchroot $(DESTDIR)/usr/sbin
-	install -m 755 makechrootpkg $(DESTDIR)/usr/sbin
-	#Additional packaging helper scripts
-	install -m 755 lddd $(DESTDIR)/usr/bin
-	install -m 755 finddeps $(DESTDIR)/usr/bin
 
 uninstall:
-	# remove all files we installed
+	for f in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	rm $(DESTDIR)/usr/bin/checkpkg
+	for f in ${SBINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/sbin/$$f; done
-	rm $(DESTDIR)/usr/bin/extrapkg
+	for f in ${CONFIGFILES}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/$$f; done
-	rm $(DESTDIR)/usr/bin/corepkg
+	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
-	rm $(DESTDIR)/usr/bin/testingpkg
+	for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
-	rm $(DESTDIR)/usr/bin/unstablepkg
+	rm $(DESTDIR)/etc/bash_completion.d/devtools
-	rm $(DESTDIR)/usr/sbin/mkarchroot
+	rm -f $(DESTDIR)$(PREFIX)/bin/communityco
-	rm $(DESTDIR)/usr/sbin/makechrootpkg
+
-	rm $(DESTDIR)/usr/bin/lddd
+dist:
-	rm $(DESTDIR)/usr/bin/finddeps
+	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz
-	rm $(DESTDIR)/usr/bin/archco
+
-	rm $(DESTDIR)/usr/bin/archrelease
+upload:
-	rm $(DESTDIR)/usr/bin/archrm
+	scp devtools-$(V).tar.gz gerolde.archlinux.org:/srv/ftp/other/devtools/
+
+.PHONY: all install uninstall dist upload

archbuild

@@ -0,0 +1,67 @@
+#!/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}

archco

@@ -1,10 +1,23 @@
 #!/bin/bash
 
-if [ "$1" = "" ]; then
+scriptname=${0##*/}
-	echo "Usage: archco <package name> [<package name>]"
+
+if [ "$1" = '' ]; then
+	echo 'Usage: '$scriptname' <package name> [<package name>]'
 	exit 1
 fi
 
+case $scriptname in
+	archco)
+		SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";;
+	communityco)
+		SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";;
+	*)
+		echo "error: couldn't find svn url for $scriptname"
+		exit 1
+		;;
+esac
+
 for i in "$@"; do
-     svn co svn+ssh://svn.archlinux.org/home/svn-packages/$i
+	svn co "$SVNURL/$i"
 done

archrelease

@@ -1,48 +1,56 @@
 #!/bin/bash
 
-if [ "$1" = "" ]; then
+abort() {
-    echo "Usage: archrelease <repo>"
+	echo ${1:-'archrelease: Cancelled'}
-    exit 1
+	exit 1
+}
+
+if [ "$1" = '' ]; then
+	abort 'Usage: archrelease <repo>'
 fi
 
-if [ ! -f "PKGBUILD" ]; then
+# TODO: validate repo is really repo-arch
-    echo "archrelease: PKGBUILD not found"
+
-    exit 1
+if [ ! -f PKGBUILD ]; then
+	abort 'archrelease: PKGBUILD not found'
 fi
 
-if [ "$(basename $(readlink -f .))" != "trunk" ]; then
+trunk=$(basename $(pwd))
-    echo "archrelease: Not in a package trunk dir"
+
-    exit 1
+# 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 [ ! -d ../repos/$1 ]; then
+if [ ! -z "$(svn status -q)" ]; then
-    pushd ..
+	abort 'archrelease: You have not committed your changes yet!'
-    [ -d repos ] || mkdir repos
-    svn copy -r HEAD trunk repos/$1
-    svn commit -m "archrelease: new repo $1"
-    pushd repos/$1
-    svnmerge init
-    svn commit -F svnmerge-commit-message.txt
-    rm svnmerge-commit-message.txt
-    popd
-    popd
-else
-    svnmerge merge ../repos/$1
-    pushd ..
-    if [ -f trunk/svnmerge-commit-message.txt ]; then
-        svn commit -F trunk/svnmerge-commit-message.txt
-        if [ $? -ne 0 ]; then
-            # The user is going to have to clean things up a bit
-            echo "*** ATTENTION: There was a problem merging the package changes ***"
-            echo "To fix it, edit the conflicting files in repos/$1 (the ones that are C in svn status)."
-            echo "Once you have resolved conflicts, execute 'svn resolved <path to file>' to tell svn the error was resolved."
-            echo "Then to finish the merge commit, execute 'svn commit -F trunk/svnmerge-commit-message.txt' and, if there are no problems, delete trunk/svnmerge-commit-message.txt"
-            exit $?
-        fi
-        rm trunk/svnmerge-commit-message.txt
-    else
-        echo "Nothing to commit"
-    fi
-    popd
 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'

archrm

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [ "$1" = "" ]; then
+if [ "$1" = '' ]; then
-	echo "Usage: archrm <path to checkout>"
+	echo 'Usage: archrm <path to checkout>'
 	exit 1
 fi
 

bash_completion

@@ -0,0 +1,69 @@
+_devtools_compgen() {
+  local i r
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+    for r in ${!COMPREPLY[@]}; do
+      if [[ ${COMP_WORDS[i]} = ${COMPREPLY[r]} ]]; then
+        unset 'COMPREPLY[r]'; break
+      fi
+    done
+  done
+}
+
+_archco_pkg() {
+  _devtools_compgen "$(
+      \pacman -$1
+  )"
+}
+
+_archco() {
+  local cur prev 
+  COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
+
+  _archco_pkg Slq
+  true
+} &&
+complete -F _archco archco communityco
+
+_makechrootpkg() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-I -c -d -h -l -r -u' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
+complete -F _makechrootpkg makechrootpkg
+
+_mkarchroot() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -f -h -n -r -u' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
+complete -F _mkarchroot mkarchroot
+
+
+# ex:et ts=2 sw=2 ft=sh

checkpkg

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # Source makepkg.conf; fail if it is not found
-if [ -r "/etc/makepkg.conf" ]; then
+if [ -r '/etc/makepkg.conf' ]; then
-	source "/etc/makepkg.conf"
+	source '/etc/makepkg.conf'
 else
-    echo "/etc/makepkg.conf not found!"
+	echo '/etc/makepkg.conf not found!'
-    exit 1
+	exit 1
 fi
 
 # Source user-specific makepkg.conf overrides
@@ -18,70 +18,82 @@ strip_url() {
 }
 
 if [ ! -f PKGBUILD ]; then
-	echo "This must be run in the directory of a built package."
+	echo 'This must be run in the directory of a built package.'
 	exit 1
 fi
 
-source PKGBUILD
+. PKGBUILD
-
+if [ "$arch" == 'any' ]; then
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
+	CARCH='any'
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-
-if [ -f "$(pwd)/$pkgfile" ]; then
-    pkgfile=$(pwd)/$pkgfile
-elif [ -f "$PKGDEST/$pkgfile" ]; then
-    pkgfile=$PKGDEST/$pkgfile
-elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
-    pkgfile=$(pwd)/$oldstylepkgfile
-elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-    pkgfile=$PKGDEST/$oldstylepkgfile
-else
-    echo "File \"$pkgfile\" doesn't exist"
-    exit 1
 fi
 
-tmp=`pacman -Spd --noconfirm $pkgname`
+STARTDIR=$(pwd)
+TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
+cd $TEMPDIR
 
-if [ $? -ne 0 ]; then
+for _pkgname in ${pkgname[@]}; do
-	echo "Couldn't download previous package."
+	if [ -z ${epoch} ] ; then
-	exit 1
+		pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-fi
-
-pkgurl=`echo $tmp | rev | cut -d ' ' -f 1 | rev`
-
-oldpkg=`strip_url $pkgurl`
-
-if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
-	echo "The built package 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
-		cp `echo $pkgurl | sed 's#^file://##'` .
 	else
-		wget $pkgurl
+		pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
 	fi
-fi
 
-tar tzf $oldpkg > filelist-old
+	if [ -f "$STARTDIR/$pkgfile" ]; then
-tar tzf "$pkgfile" > filelist
+		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
 
-sort -o filelist filelist
+	tmp=$(pacman -Spdd --noconfirm $_pkgname)
-sort -o filelist-old filelist-old
 
-diff filelist-old filelist
+	if [ $? -ne 0 ]; then
+		echo "Couldn't download previous package for $_pkgname."
+		exit 1
+	fi
 
-if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
+	pkgurl=$(echo $tmp | rev | cut -d ' ' -f 1 | rev)
-	mkdir -p pkg
-	cd pkg
-	tar xzf "$pkgfile" > /dev/null
-	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do
-		echo -n "${i}: "
-		objdump -p $i | grep SONAME
-	done
-else
-	echo "No filename differences"
-fi
 
-# vim:ft=sh:ts=4:sw=4:et:
+	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"

commitpkg

@@ -0,0 +1,202 @@
+#!/bin/bash
+
+abort() {
+	echo ${1:-'Cancelled'}
+	exit 1
+}
+
+getpkgfile() {
+	if [[ ${#} -ne 1 ]]; then
+		echo 'ERROR: No canonical package found!' >&2
+		exit 1
+	elif [ ! -f "${1}" ]; then
+		echo "ERROR: Package ${1} not found!" >&2
+		exit 1
+	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!'
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+	. ~/.makepkg.conf
+fi
+
+cmd=$(basename "$0")
+
+if [ ! -f PKGBUILD ]; then
+	abort 'No PKGBUILD file'
+fi
+
+. PKGBUILD
+pkgbase=${pkgbase:-$pkgname}
+
+case "$cmd" in
+	commitpkg)
+		if [ $# -eq 0 ]; then
+			abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
+		fi
+		repo="$1"
+		shift
+		;;
+	*pkg)
+		repo="${cmd%pkg}"
+		;;
+	*)
+		abort 'usage: commitpkg <reponame> [-l limit] [-a arch] [commit message]'
+		;;
+esac
+
+case "$repo" in
+	core|extra|testing|staging)
+		server='gerolde.archlinux.org' ;;
+	community*|multilib*)
+		server='aur.archlinux.org' ;;
+	*)
+		server='gerolde.archlinux.org'
+		echo "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"
+	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
+		# evaluate any bash variables used
+		eval file=${file}
+		if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then
+			abort "${file} is not under version control"
+		fi
+	done
+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
+
+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
+	else
+		msgfile="$(mktemp)"
+		echo "$msgtemplate" > "$msgfile"
+		if [ -n "$SVN_EDITOR" ]; then
+			$SVN_EDITOR "$msgfile"
+		elif [ -n "$VISUAL" ]; then
+			$VISUAL "$msgfile"
+		elif [ -n "$EDITOR" ]; then
+			$EDITOR "$msgfile"
+		else
+			vi "$msgfile"
+		fi
+		[ -s "$msgfile" ] || abort
+		svn commit -q -F "$msgfile" || abort
+		unlink "$msgfile"
+	fi
+	echo 'done'
+fi
+
+declare -a uploads
+
+for _arch in ${arch[@]}; do
+	if [ -n "$commit_arch" ] && [ "${_arch}" != "$commit_arch" ]; then
+		echo "skipping ${_arch}"
+		continue
+	fi
+
+	for _pkgname in ${pkgname[@]}; do
+		fullver=$(get_full_version ${epoch:-0} $pkgver $pkgrel)
+		pkgfile=$(getpkgfile "$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null)
+		pkgdestfile=$(getpkgfile "$PKGDEST/$_pkgname-$fullver-${_arch}".pkg.tar.?z 2>/dev/null)
+
+		if [ -f "$pkgfile" ]; then
+			pkgfile="./$pkgfile"
+		elif [ -f "$pkgdestfile" ]; then
+			pkgfile="$pkgdestfile"
+		else
+			echo "skipping ${_arch}"
+			continue 2
+		fi
+		uploads+=("$pkgfile")
+
+		if [[ $SIGNPKG == 'y' ]]; then
+			echo "Signing package ${pkgfile}..."
+			if [[ -n $GPGKEY ]]; then
+				SIGNWITHKEY="-u ${GPGKEY}"
+			fi
+			gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || abort
+		fi
+
+		sigfile="${pkgfile}.sig"
+		if [ -f "${sigfile}" ]; then
+			uploads+=("$sigfile")
+		elif [[ $SIGNPKG == 'y' ]]; then
+			abort "Signature ${pkgfile}.sig was not found"
+		fi
+	done
+	archrelease $repo-${_arch} || abort
+done
+
+if [[ ${#uploads[*]} -gt 0 ]]; then
+	echo 'uploading all package and signature files'
+	rsync $rsyncopts "${uploads[@]}" "$server:staging/$repo/" || abort
+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..."
+		svn rm $repo-i686
+		svn rm $repo-x86_64
+		svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+		echo 'done'
+		popd >/dev/null
+	fi
+else
+	if [ -d ../repos/$repo-any ]; then
+		pushd ../repos/ >/dev/null
+		echo "removing $repo-any..."
+		svn rm $repo-any
+		svn commit -q -m "removed $repo-any for $pkgname"
+		echo 'done'
+		popd >/dev/null
+	fi
+fi

extrapkg

@@ -1,118 +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
-
-cmd=`basename $0`
-
-if [ ! -f PKGBUILD ]; then
-    echo "No PKGBUILD file"
-    exit 1
-fi
-
-if [ -z "$CARCH" ]; then
-    echo "CARCH must be set to a recognized value!"
-    exit 1
-fi
-
-source PKGBUILD
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-
-if [ ! -f $pkgfile ]; then
-    if [ -f $PKGDEST/$pkgfile ]; then
-        pkgfile=$PKGDEST/$pkgfile
-        oldstylepkgfile=$PKGDEST/$oldstylepkgfile
-    elif [ -f $oldstylepkgfile ]; then
-        pkgfile=$oldstylepkgfile
-    elif [ -f $PKGDEST/$oldstylepkgfile ]; then
-        pkgfile=$PKGDEST/$oldstylepkgfile
-    else
-        echo "File $pkgfile doesn't exist"
-        exit 1
-    fi
-fi
-
-if [ "$cmd" == "extrapkg" ]; then
-    repo="extra"
-elif [ "$cmd" == "corepkg" ]; then
-    repo="core"
-elif [ "$cmd" == "testingpkg" ]; then
-    repo="testing"
-elif [ "$cmd" == "unstablepkg" ]; then
-    repo="unstable"
-elif [ "$cmd" == "communitypkg" ]; then
-    repo="community"
-fi
-
-# see if any limit options were passed, we'll send them to SCP
-unset scpopts
-if [ "$1" = "-l" ]; then
-    scpopts="$1 $2"
-    shift 2
-fi
-
-if [ "$repo" != "community" ]; then
-    # combine what we know into a variable
-    uploadto="staging/${repo}/add/$(basename ${pkgfile})"
-    scp ${scpopts} "${pkgfile}" "archlinux.org:${uploadto}"
-    if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
-        echo "File got corrupted during upload, cancelled."
-        exit 1
-    else
-        echo "File integrity okay."
-    fi
-else
-    if [ ! -f ~/.tupkg ]; then
-        echo "Must configure tupkg via ~/.tupkg, cancelled"
-        exit 1
-    fi
-    if [ "$(basename $pkgfile)" != "$(basename $oldstylepkgfile)" ]; then
-        echo "Renaming makepkg3 package for compatibility"
-        mv $pkgfile $oldstylepkgfile
-        pkgfile=$oldstylepkgfile
-    fi
-    tupkg $pkgfile
-fi
-if [ $? -ne 0 ]; then
-    echo "Cancelled"
-    exit 1
-fi
-echo "===> Uploaded $pkgfile"
-
-if [ "$1" != "" ]; then
-    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel
-    $1" > /dev/null
-    if [ $? -ne 0 ]; then
-        echo "Cancelled"
-        exit 1
-    fi
-    echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel
-    $1\" message"
-else
-    svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel" > /dev/null
-    if [ $? -ne 0 ]; then
-        echo "Cancelled"
-        exit 1
-    fi
-    echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message"
-fi
-
-archrelease $repo-$CARCH
-if [ $? -ne 0 ]; then
-    echo "Cancelled"
-    exit 1
-fi
-echo "===> Tagged for $repo-$CARCH"
-
-# vim:ft=sh:ts=4:sw=4:et:

finddeps

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

lddd

@@ -4,44 +4,43 @@
 #
 
 ifs=$IFS
-IFS=':'
+IFS="${IFS}:"
 
-libdirs="/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib"
+libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
 extras=
 
-TEMPDIR=$(mktemp /tmp/lddd-script.XXXX)
+TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX)
-rm $TEMPDIR
-mkdir -p $TEMPDIR
 
-echo " Go out and drink some tea, this will take a while :) ..."
+echo '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
+for tree in $PATH $libdirs $extras; do
-do
+	echo DIR $tree
-    echo DIR $tree
 
-    #  Get list of files in tree.
+	#  Get list of files in tree.
-    files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! -name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name '*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' ! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' ! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! -name '*.mcopclass' ! -name '*.mcoptype')
+	files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
-    IFS=$ifs
+	-name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
-    for i in $files
+	'*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
-    do
+	! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
-        if [ `file $i | grep -c 'ELF'` -ne 0 ]; then
+	! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! \
-            #  Is an ELF binary.
+	-name '*.mcopclass' ! -name '*.mcoptype')
-            if [ `ldd $i 2>/dev/null | grep -c 'not found'` -ne 0 ]; then
+	IFS=$ifs
-                #  Missing lib.
+	for i in $files; do
-                echo "$i:" >> $TEMPDIR/raw.txt
+		if [ $(file $i | grep -c 'ELF') -ne 0 ]; then
-                ldd $i 2>/dev/null | grep 'not found' >> $TEMPDIR/raw.txt
+			#  Is an ELF binary.
-            fi
+			if [ $(ldd $i 2>/dev/null | grep -c 'not found') -ne 0 ]; then
-        fi
+				#  Missing lib.
-    done
+				echo "$i:" >> $TEMPDIR/raw.txt
+				ldd $i 2>/dev/null | grep 'not found' >> $TEMPDIR/raw.txt
+			fi
+		fi
+	done
 done
 grep '^/' $TEMPDIR/raw.txt | sed -e 's/://g' >> $TEMPDIR/affected-files.txt
 # invoke pacman
 for i in $(cat $TEMPDIR/affected-files.txt); do
-    pacman -Qo $i | awk '{print $4,$5}' >> $TEMPDIR/pacman.txt
+	pacman -Qo $i | awk '{print $4,$5}' >> $TEMPDIR/pacman.txt
 done
 # clean list
 sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
 
 echo "Files saved to $TEMPDIR"
-
-# vim:ft=sh:ts=4:sw=4:et:

makechrootpkg

@@ -8,221 +8,298 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-FORCE="n"
+FORCE='n'
-RUN=""
+RUN=''
-MAKEPKG_ARGS="-sr"
+MAKEPKG_ARGS='-s --noconfirm'
-REPACK=""
+REPACK=''
 WORKDIR=$PWD
-clean_first="0"
-install_pkg=""
 
-chrootdir="$CHROOT_SHELL"
+update_first='0'
+clean_first='0'
+install_pkg=''
+add_to_db=0
+
+chrootdir=''
 
 APPNAME=$(basename "${0}")
 
-usage ()
+default_copy=$USER
-{
+[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
-    echo "usage ${APPNAME} [-h] [-c] [-r CHROOT_SHELL] [--] [makepkg args]"
+[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
-    echo " Run this script in a PKGBUILD dir to build a package inside a"
+
-    echo " clean chroot. All unrecognized arguments passed to this script"
+usage() {
-    echo " will be passed to makepkg."
+	echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
-    echo ""
+	echo ' Run this script in a PKGBUILD dir to build a package inside a'
-    echo "The \$CHROOT_SHELL environment variable is used to determine where"
+	echo ' clean chroot. All unrecognized arguments passed to this script'
-    echo " your chroot shell is. The shell consists of the following"
+	echo ' will be passed to makepkg.'
-    echo " directories: \$CHROOT_SHELL/{root, rw, union} but only 'root' is"
+	echo ''
-    echo " required by default. The rest will be created as needed"
+	echo ' The chroot dir consists of the following directories:'
-    echo ""
+	echo ' <chrootdir>/{root, copy} but only "root" is required'
-    echo "The -c flag, if specified, will remove all files created by previous"
+	echo ' by default. The working copy will be created as needed'
-    echo "builds using makechrootpkg.  This will ensure a clean chroot is used."
+	echo ''
-    echo ""
+	echo 'The chroot "root" directory must be created via the following'
-    echo "The chroot shell 'root' directory must be created via the following"
+	echo 'command:'
-    echo "command:"
+	echo '    mkarchroot <chrootdir>/root base base-devel sudo'
-    echo "    mkarchroot \$CHROOT_SHELL/root base base-devel sudo"
+	echo ''
-    echo ""
+	echo "Default makepkg args: $MAKEPKG_ARGS"
-    echo "If you have problems passing params to makepkg or need to pass long"
+	echo ''
-    echo "options, put -- between the makechrootpkg args and the makepkg args"
+	echo 'Flags:'
-    echo ""
+	echo '-h         This help'
-    echo "Default makepkg args: $MAKEPKG_ARGS"
+	echo '-c         Clean the chroot before building'
-    exit 1
+	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 ':r:i:h:c' arg; do
+while getopts 'hcudr:I:l:' arg; do
-    case "${arg}" in
+	case "${arg}" in
-        r) chrootdir="$OPTARG" ;;
+		h) usage ;;
-        i) install_pkg="$OPTARG" ;;
+		c) clean_first=1 ;;
-        c) clean_first=1 ;;
+		u) update_first=1 ;;
-        h|?) usage ;;
+		d) add_to_db=1 ;;
-        *) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
+		r) chrootdir="$OPTARG" ;;
-    esac
+		I) install_pkg="$OPTARG" ;;
+		l) copy="$OPTARG" ;;
+		*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
+	esac
 done
 
-#Get rid of trailing / in chrootdir
+# Canonicalize chrootdir, getting rid of trailing /
-[ "$chrootdir" != "/" ] && chrootdir=$(echo $chrootdir | sed 's#/$##')
+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
+	if [ "$arg" = '-R' ]; then
-        REPACK=1
+		REPACK=1
-        break;
+		break;
-    fi
+	fi
 done
 
-if [ "$EUID" != "0" ]; then
+if [ "$EUID" != '0' ]; then
-    echo "This script must be run as root."
+	echo 'This script must be run as root.'
-    exit 1
+	exit 1
 fi
 
-if [ ! -f PKGBUILD ]; then
+if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then
-    echo "This must be run in a directory containing a PKGBUILD."
+	echo 'This must be run in a directory containing a PKGBUILD.'
-    exit 1
+	exit 1
 fi
-source PKGBUILD
 
 if [ ! -d "$chrootdir" ]; then
-    echo "No \$CHROOT_SHELL defined, or invalid path ($chrootdir)"
+	echo "No chroot dir defined, or invalid path '$chrootdir'"
-    exit 1
+	exit 1
 fi
 
 if [ ! -d "$chrootdir/root" ]; then
-    echo "Missing \$CHROOT_SHELL root directory."
+	echo 'Missing chroot dir root directory.'
-    echo "Try using: mkarchroot \$CHROOT_SHELL base base-devel sudo"
+	echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
-    usage
+	usage
 fi
 
-[ -d "$chrootdir/rw" -a "$clean_first" -eq "1" ] && rm -rf "$chrootdir/rw/" 
+umask 0022
-[ -d "$chrootdir/rw" ] || mkdir "$chrootdir/rw"
-[ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
 
-cleanup ()
+# 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
-    echo "cleaning up unioned mounts"
+exec 9>"$copydir.lock"
-    umount "$chrootdir/union/pkgdest" 2>/dev/null
+if ! flock -n 9; then
-    umount "$chrootdir/union/srcdest" 2>/dev/null
+	echo -n "locking chroot copy '$copy'..."
-    umount "$chrootdir/union"
+	flock 9
-}
+	echo "done"
-
+fi
-uniondir="$chrootdir/union"
+
-echo "building union chroot"
+if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
-grep -Fq unionfs /proc/filesystems
+	# Get a read lock on the root chroot to make
-if [ $? -ne 0 ]; then
+	# sure we don't clone a half-updated chroot
-    modprobe -q unionfs
+	exec 8>"$chrootdir/root.lock"
-    if [ $? -ne 0 ]; then
+
-        echo "ERROR: No unionfs available. Abandon ship!" && exit 1
+	if ! flock -sn 8; then
-    fi
+		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
-mount -t unionfs none -o "dirs=$chrootdir/rw=rw:$chrootdir/root=ro" "$uniondir"
-trap 'cleanup' 0 1 2 15
 
 if [ -n "$install_pkg" ]; then
-    pkgname="$(basename "$install_pkg")"
+	pkgname="$(basename "$install_pkg")"
-    echo "installing '$pkgname' in chroot"
+	cp "$install_pkg" "$copydir/$pkgname"
-    cp "$install_pkg" "$uniondir/$pkgname"
+	mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
-    mkarchroot -r "pacman -U /$pkgname" "$uniondir"
+	ret=$?
-    ret=$?
+	rm "$copydir/$pkgname"
-    rm "$uniondir/$pkgname"
+	# Exit early, we've done all we need to
-    #exit early, we've done all we need to
+	exit $ret
-    exit $ret
 fi
 
-echo "moving build files to chroot"
+if [ $update_first -eq 1 ]; then
-[ -d "$uniondir/build" ] || mkdir "$uniondir/build"
+	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
+	# Remove anything in there UNLESS -R (repack) was passed to makepkg
-    rm -rf "$uniondir/build/"*
+	rm -rf "$copydir/build/"*
 fi
 
-# Copy makepkg.conf and ~/.makepkg.conf into the chroot so packager has
+# Read .makepkg.conf even if called via sudo
-# all their custom variables set.
+if [ -n "${SUDO_USER}" ]; then
-if [ -r "/etc/makepkg.conf" ]; then
+	makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf"
-  rm $uniondir/etc/makepkg.conf
+else
-  cp /etc/makepkg.conf $uniondir/etc/makepkg.conf
+	makepkg_conf="~/.makepkg.conf"
-fi
-if [ -r ~/.makepkg.conf ]; then
-  cat ~/.makepkg.conf >> $uniondir/etc/makepkg.conf
 fi
 
-source $uniondir/etc/makepkg.conf
+# Get SRC/PKGDEST from makepkg.conf
+if [ -f "${makepkg_conf}" ]; then
+	eval $(grep '^SRCDEST=' "${makepkg_conf}")
+	eval $(grep '^PKGDEST=' "${makepkg_conf}")
 
-# Magic trickery with PKGDEST and SRCDEST, so that the built
+	eval $(grep '^MAKEFLAGS=' "${makepkg_conf}")
-# files end up where they're expected in the _real_ filesystem
+	eval $(grep '^PACKAGER=' "${makepkg_conf}")
-[ -d "$uniondir/srcdest" ] || mkdir "$uniondir/srcdest"
+fi
-[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
+[ -z "${SRCDEST}" ] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
-[ ! -z "$PKGDEST" ] && mount --bind "$PKGDEST" "$uniondir/pkgdest"
+[ -z "${PKGDEST}" ] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
-[ ! -z "$SRCDEST" ] && mount --bind "$SRCDEST" "$uniondir/srcdest"
 
-if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
+[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
-    echo "Setting PKGDEST in makepkg.conf"
+if ! grep 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-    echo "PKGDEST=/pkgdest" >> "$uniondir/etc/makepkg.conf"
+	echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
 fi
 
-if ! grep "SRCDEST=/srcdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
+[ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest"
-    echo "Setting SRCDEST in makepkg.conf"
+if ! grep 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-    echo "SRCDEST=/srcdest" >> "$uniondir/etc/makepkg.conf"
+	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
 
-chown -R nobody "$uniondir/build"
+# Set target CARCH as it might be used within the PKGBUILD to select correct sources
-chown -R nobody "$uniondir/srcdest"
+eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
-chown -R nobody "$uniondir/pkgdest"
+export CARCH
-
 # Copy PKGBUILD and sources
-source PKGBUILD
+source=($(. PKGBUILD; echo ${source[@]}))
-cp PKGBUILD "$uniondir/build/"
+cp PKGBUILD "$copydir/build/"
 for f in ${source[@]}; do
-    basef=$(basename $f)
+	basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
-    if [ -f "$basef" ]; then
+	if [ -f "$basef" ]; then
-        cp "$basef" "$uniondir/srcdest/"
+		cp "$basef" "$copydir/srcdest/"
-    fi
+	elif [ -f "$SRCDEST/$basef" ]; then
+		cp "$SRCDEST/$basef" "$copydir/srcdest/"
+	fi
 done
-if [ "$install" != "" -a -f "$install" ]; then
-    cp "$install" "$uniondir/build/"
-fi
 
-if [ -f "ChangeLog" ]; then
+( . PKGBUILD
-    cp ChangeLog "$uniondir/build/"
+for i in 'changelog' 'install'; do
-fi
+	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
+)
 
-if ! grep "^nobody" "$uniondir/etc/sudoers" >/dev/null 2>&1; then
+chown -R nobody "$copydir/build"
-    echo "allowing 'nobody' sudo rights in the chroot"
+chown -R nobody "$copydir/srcdest"
-    touch "$uniondir/etc/sudoers"
+chown -R nobody "$copydir/pkgdest"
-    echo "nobody	ALL=(ALL) NOPASSWD: ALL" >> "$uniondir/etc/sudoers"
+
-    chmod 440 "$uniondir/etc/sudoers"
+echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
-fi
+chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
 
 #This is a little gross, but this way the script is recreated every time in the
-#rw portion of the union
+#working copy
 (cat <<EOF
 #!/bin/bash
-export LANG=$LOCALE
+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
-) > "$uniondir/chrootbuild"
+) > "$copydir/chrootbuild"
-chmod +x "$uniondir/chrootbuild"
+chmod +x "$copydir/chrootbuild"
 
-mkarchroot -r "/chrootbuild" "$uniondir"
+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
 
-source ${WORKDIR}/PKGBUILD
+		if [ -d "$PKGDEST" ]; then
-if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then
+			mv "$pkgfile" "${PKGDEST}"
-    echo "Moving completed package file to ${WORKDIR}"
+		else
-    mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz ${WORKDIR}
+			mv "$pkgfile" "${WORKDIR}"
-fi
+		fi
-if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
+	done
-    echo "Moving downloaded source files to ${WORKDIR}"
-    mv ${chrootdir}/union/srcdest/* ${WORKDIR}
-fi
 
-if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then
+	for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
-    echo "Build failed, check \$CHROOT_DIR/rw/build"
+		[ -f "$l" ] && mv "$l" "${WORKDIR}"
-    rm ${chrootdir}/rw/build/BUILD_FAILED
+	done
 else
-    rm -rf ${chrootdir}/rw/build/*
+	#just in case. We returned 1, make sure we fail
-    echo "Build complete"
+	touch "${copydir}/build/BUILD_FAILED"
-fi	
+fi
 
+for f in "${copydir}"/srcdest/*; do
+	[ -e "$f" ] || continue
+	if [ -d "$SRCDEST" ]; then
+		mv "$f" "${SRCDEST}"
+	else
+		mv "$f" "${WORKDIR}"
+	fi
+done
 
-# vim:ft=sh:ts=4:sw=4:et:
+if [ -e "${copydir}/build/BUILD_FAILED" ]; then
+	echo "Build failed, check $copydir/build"
+	rm "${copydir}/build/BUILD_FAILED"
+	exit 1
+fi

makepkg-i686.conf

@@ -0,0 +1,114 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- 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'
+          '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
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="i686"
+CHOST="i686-pc-linux-gnu"
+
+#-- Exclusive: will only run on i686
+# -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"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- fakeroot: Allow building packages as a non-root user
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#-- check:    Run the check() function if present in the PKGBUILD
+#
+BUILDENV=(fakeroot !distcc color !ccache check)
+#
+#-- 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=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) files in packages
+#-- 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
+#
+OPTIONS=(strip docs libtool emptydirs zipman purge)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john@doe.com>"
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+# 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:

makepkg-x86_64.conf

@@ -0,0 +1,114 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- 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'
+          '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
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="x86_64"
+CHOST="x86_64-unknown-linux-gnu"
+
+#-- Exclusive: will only run on x86_64
+# -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"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
+#  A negated environment option will do the opposite of the comments below.
+#
+#-- fakeroot: Allow building packages as a non-root user
+#-- distcc:   Use the Distributed C/C++/ObjC compiler
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#-- check:    Run the check() function if present in the PKGBUILD
+#
+BUILDENV=(fakeroot !distcc color !ccache check)
+#
+#-- 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=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) files in packages
+#-- 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
+#
+OPTIONS=(strip docs libtool emptydirs zipman purge)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- Options to be used when stripping binaries. See `man strip' for details.
+STRIP_BINARIES="--strip-all"
+#-- Options to be used when stripping shared libraries. See `man strip' for details.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john@doe.com>"
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+# 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:

mkarchroot

@@ -8,177 +8,224 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-FORCE="n"
+FORCE='n'
-RUN=""
+RUN=''
+NOCOPY='n'
 
-working_dir=""
+working_dir=''
 
 APPNAME=$(basename "${0}")
 
 # usage: usage <exitvalue>
-usage ()
+usage() {
-{
+	echo "usage ${APPNAME} [options] working-dir [package-list | app]"
-    echo "usage ${APPNAME} [options] working-dir [package-list | app]"
+	echo ' options:'
-    echo " options:"
+	echo '    -r <app>      Run "app" within the context of the chroot'
-    echo "    -r <app>      Run 'app' within the context of the chroot"
+	echo '    -u            Update the chroot via pacman'
-    echo "    -u            Update the chroot via pacman"
+	echo '    -f            Force overwrite of files in the working-dir'
-    echo "    -f            Force overwrite of files in the working-dir"
+	echo '    -C <file>     Location of a pacman config file'
-    echo "    -C <file>     location of a pacman config file"
+	echo '    -M <file>     Location of a makepkg config file'
-    echo "    -M <file>     location of a makepkg config file"
+	echo '    -n            Do not copy config files into the chroot'
-    echo "    -h            This message"
+	echo '    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg'
-    exit $1
+	echo '    -h            This message'
+	exit $1
 }
 
-while getopts 'r:ufhC:M:' arg; do
+while getopts 'r:ufnhC:M:c:' arg; do
-    case "${arg}" in
+	case "${arg}" in
-        r) RUN="$OPTARG" ;;
+		r) RUN="$OPTARG" ;;
-        u) RUN="pacman -Syu" ;;
+		u) RUN='/bin/sh -c "pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)"' ;;
-        f) FORCE="y" ;;
+		f) FORCE='y' ;;
-        C) pac_conf="$OPTARG" ;;
+		C) pac_conf="$OPTARG" ;;
-        M) makepkg_conf="$OPTARG" ;;
+		M) makepkg_conf="$OPTARG" ;;
-        h|?) usage 0 ;;
+		n) NOCOPY='y' ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
+		c) cache_dir="$OPTARG" ;;
-    esac
+		h|?) usage 0 ;;
+		*) echo "invalid argument '${arg}'"; usage 1 ;;
+	esac
 done
 
-if [ "$EUID" != "0" ]; then
+if [ "$EUID" != '0' ]; then
-    echo "error: this script must be run as root."
+	echo 'error: this script must be run as root.'
-    exit 1
+	exit 1
 fi
 
 shift $(($OPTIND - 1))
 
-if [ "$RUN" = "" -a $# -lt 2 ]; then
+if [ "$RUN" = '' -a $# -lt 2 ]; then
-    echo "you must specify a directory and one or more packages"
+	echo 'you must specify a directory and one or more packages'
-    usage 1
+	usage 1
 elif [ $# -lt 1 ]; then
-    echo "you must specify a directory"
+	echo 'you must specify a directory'
-    usage 1
+	usage 1
 fi
 
 working_dir="$(readlink -f ${1})"
 shift 1
 
-[ "${working_dir}" = "" ] && echo "error: please specify a working directory" && usage 1
+[ "${working_dir}" = '' ] && echo 'error: please specify a working directory' && usage 1
 
-# {{{ functions 
+if [ -z "$cache_dir" ]; then
+	cache_conf=${working_dir}/etc/pacman.conf
+	[ ! -f $cache_conf ] && cache_conf=${pac_conf:-/etc/pacman.conf}
+	cache_dir=$( (grep -m 1 '^CacheDir' $cache_conf || echo 'CacheDir = /var/cache/pacman/pkg') | sed 's/CacheDir\s*=\s*//')
+	unset cache_conf
+fi
 
-chroot_mount ()
+if [ -f /etc/pacman.d/mirrorlist ]; then
-{
+	host_mirror=$(pacman -Sddp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
-    echo "mounting sysfs : /sys"
+fi
-    [ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
+if [ -z "${host_mirror}" ]; then
-    mount -t sysfs sysfs "${working_dir}/sys"
+	host_mirror='http://mirrors.kernel.org/archlinux/$repo/os/$arch'
+fi
+if echo "${host_mirror}" | grep -q 'file://'; then
+	host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+fi
 
-    echo "mounting procfs : /proc"
+# {{{ functions
-    [ -e "${working_dir}/proc" ] || mkdir "${working_dir}/proc"
+chroot_mount() {
-    mount -t proc proc "${working_dir}/proc"
+	[ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
+	mount -t sysfs sysfs "${working_dir}/sys"
 
-    echo "binding device nodes : /dev"
+	[ -e "${working_dir}/proc" ] || mkdir "${working_dir}/proc"
-    [ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
+	mount -t proc proc "${working_dir}/proc"
-    mount -o bind /dev "${working_dir}/dev"
 
-    echo "binding pacman cache : /var/cache/pacman"
+	[ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
-    [ -e "${working_dir}/var/cache/pacman" ] || mkdir -p "${working_dir}/var/cache/pacman"
+	mount -t tmpfs dev "${working_dir}/dev" -o mode=0755,size=10M,nosuid
-    mount -o bind /var/cache/pacman "${working_dir}/var/cache/pacman"
+	mknod -m 666 "${working_dir}/dev/null" c 1 3
+	mknod -m 666 "${working_dir}/dev/zero" c 1 5
+	mknod -m 600 "${working_dir}/dev/console" c 5 1
+	mknod -m 644 "${working_dir}/dev/random" c 1 8
+	mknod -m 644 "${working_dir}/dev/urandom" c 1 9
+	mknod -m 666 "${working_dir}/dev/tty" c 5 0
+	mknod -m 666 "${working_dir}/dev/tty0" c 4 0
+	mknod -m 666 "${working_dir}/dev/full" c 1 7
+	ln -s /proc/kcore "${working_dir}/dev/core"
+	ln -s /proc/self/fd "${working_dir}/dev/fd"
+	ln -s /proc/self/fd/0 "${working_dir}/dev/stdin"
+	ln -s /proc/self/fd/1 "${working_dir}/dev/stdout"
+	ln -s /proc/self/fd/2 "${working_dir}/dev/stderr"
 
-    trap 'chroot_umount' 0 1 2 15
+	[ -e "${working_dir}/dev/shm" ] || mkdir "${working_dir}/dev/shm"
+	mount -t tmpfs shm "${working_dir}/dev/shm" -o nodev,nosuid,size=128M
+
+	[ -e "${working_dir}/dev/pts" ] || mkdir "${working_dir}/dev/pts"
+	mount -t devpts devpts "${working_dir}/dev/pts" -o newinstance,ptmxmode=666
+	ln -s pts/ptmx "${working_dir}/dev/ptmx"
+
+	[ -e "${cache_dir}" ] || mkdir -p "${cache_dir}"
+	[ -e "${working_dir}/${cache_dir}" ] || mkdir -p "${working_dir}/${cache_dir}"
+	mount -o bind "${cache_dir}" "${working_dir}/${cache_dir}"
+
+	if [ -n "${host_mirror_path}" ]; then
+		[ -e "${working_dir}/${host_mirror_path}" ] || mkdir -p "${working_dir}/${host_mirror_path}"
+		mount -o bind "${host_mirror_path}" "${working_dir}/${host_mirror_path}"
+		mount -o remount,ro,bind "${host_mirror_path}" "${working_dir}/${host_mirror_path}"
+	fi
+
+	trap 'chroot_umount' EXIT INT QUIT TERM HUP
 }
 
-copy_hostconf ()
+copy_hostconf () {
-{
+	chroot "${working_dir}" /bin/findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS > "${working_dir}/etc/mtab"
-    echo "copying mtab : /etc/mtab"
+	cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
-    cp /etc/mtab "${working_dir}/etc/mtab"
+	echo "Server = ${host_mirror}" > ${working_dir}/etc/pacman.d/mirrorlist
-
-    echo "copying resolv.conf : /etc/resolv.conf"
-    cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
-
 }
 
-chroot_umount ()
+chroot_umount () {
-{
+	umount "${working_dir}/proc"
-    echo "cleaning up mounts"
+	umount "${working_dir}/sys"
-    umount "${working_dir}/proc"
+	umount "${working_dir}/dev/pts"
-    umount "${working_dir}/sys"
+	umount "${working_dir}/dev/shm"
-    umount "${working_dir}/dev"
+	umount "${working_dir}/dev"
-    umount "${working_dir}/var/cache/pacman"
+	umount "${working_dir}/${cache_dir}"
+	[ -n "${host_mirror_path}" ] && umount "${working_dir}/${host_mirror_path}"
+}
+
+chroot_lock () {
+	# Only reopen the FD if it wasn't handed to us
+	if [ "$(readlink -f /dev/fd/9)" != "${working_dir}.lock" ]; then
+	  exec 9>"${working_dir}.lock"
+	fi
+
+	# Lock the chroot. Take note of the FD number.
+	if ! flock -n 9; then
+		echo -n "locking chroot..."
+		flock 9
+		echo "done"
+	fi
 }
 # }}}
 
+umask 0022
 if [ "$RUN" != "" ]; then
-    # run chroot {{{
+	# run chroot {{{
-    #Sanity check
+	#Sanity check
-    if [ ! -f "${working_dir}/.arch-chroot" ]; then
+	if [ ! -f "${working_dir}/.arch-chroot" ]; then
-        echo "error: '${working_dir}' does not appear to be a Arch chroot"
+		echo "error: '${working_dir}' does not appear to be a Arch chroot"
-        echo "  please build the image using mkarchroot"
+		echo '       please build the image using mkarchroot'
-        exit 1
+		exit 1
-    fi
+	fi
 
-    chroot_mount
+	chroot_lock
-    copy_hostconf
+	chroot_mount
+	copy_hostconf
 
-    echo "starting chroot ($RUN)"
+	eval chroot "${working_dir}" ${RUN}
-    chroot "${working_dir}" ${RUN}
 
-    # }}}
+	# }}}
 else
-    # {{{ build chroot
+	# {{{ build chroot
-    if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
+	if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
-        echo "error: working dir '${working_dir}' already exists - try using -f"
+		echo "error: working dir '${working_dir}' already exists - try using -f"
-        exit 1
+		exit 1
-    fi
+	fi
 
-    mkdir -p "${working_dir}/var/lib/pacman/"
+	if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
-    mkdir -p "${working_dir}/etc/"
+		chmod 0755 "${working_dir}"
+	fi
 
-    chroot_mount
+	mkdir -p "${working_dir}/var/lib/pacman/sync"
+	mkdir -p "${working_dir}/etc/"
 
-    pacargs="--noconfirm -v " #--noprogressbar -v
+	chroot_lock
-    pacargs="$pacargs --root=${working_dir}"
+	chroot_mount
-    # pacman takes these as relative to the given root
-    pacargs="$pacargs --cachedir=/var/cache/pacman/pkg"
-    if [ "$pac_conf" != "" ]; then
-        pacargs="$pacargs --config=${pac_conf}"
-    fi
 
-    if [ $# -eq 0 ]; then
+	pacargs="--noconfirm --root=${working_dir} --cachedir=${cache_dir}"
-        echo "no packages to install"
+	if [ "$pac_conf" != "" ]; then
-    else
+		pacargs="$pacargs --config=${pac_conf}"
-        echo "installing packages:"
+	fi
-        for i in $@; do echo -e "\t$i"; done
 
-        op="-Sy"
+	if [ $# -ne 0 ]; then
-        if [ "$FORCE" = "y" ]; then
+		op='-Sy'
-            op="${op}f"
+		if [ "$FORCE" = "y" ]; then
-        fi
+			op="${op}f"
-        if ! pacman ${op} ${pacargs} $@; then
+		fi
-            echo "error: failed to install all packages"
+		if ! pacman ${op} ${pacargs} $@; then
-            exit 1
+			echo 'error: failed to install all packages'
-        fi
+			exit 1
-    fi
+		fi
+	fi
 
-    if [ -d "${working_dir}/lib/modules" ]; then
+	if [ -d "${working_dir}/lib/modules" ]; then
-        echo "running ldconfig"
+		ldconfig -r "${working_dir}"
-        ldconfig -r "${working_dir}"
+	fi
-    fi
 
-    if [ "$pac_conf" != "" ]; then
+	if [ "$pac_conf" != "" -a "$NOCOPY" = "n" ]; then
-        echo "installing custom pacman.conf"
+		cp ${pac_conf} ${working_dir}/etc/pacman.conf
-        cp ${pac_conf} ${working_dir}/etc/pacman.conf
+	fi
-    fi
 
-    if [ "$makepkg_conf" != "" ]; then
+	if [ "$makepkg_conf" != "" -a "$NOCOPY" = "n" ]; then
-        echo "installing custom makepkg.conf"
+		cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
-        cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
+	fi
-    fi
 
-    echo "generating default locales"
+	if [ -e "${working_dir}/etc/locale.gen" ]; then
-    cp /etc/locale.gen "${working_dir}/etc/locale.gen"
+		sed -i 's@^#\(en_US\|de_DE\)\(\.UTF-8\)@\1\2@' "${working_dir}/etc/locale.gen"
-    chroot "${working_dir}" locale-gen
+		chroot "${working_dir}" locale-gen
+	fi
 
-    if [ ! -e "${working_dir}/.arch-chroot" ]; then
+	if [ ! -e "${working_dir}/.arch-chroot" ]; then
-        date +%s > "${working_dir}/.arch-chroot"
+		date +%s > "${working_dir}/.arch-chroot"
-    fi
+	fi
-    # }}}
+	# }}}
 fi
-
-# vim:ft=sh:ts=4:sw=4:et:

pacman-extra.conf

@@ -0,0 +1,80 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+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
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

pacman-multilib-testing.conf

@@ -0,0 +1,88 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+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
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+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]
+Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

pacman-multilib.conf

@@ -0,0 +1,85 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+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
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repository here.
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

pacman-staging.conf

@@ -0,0 +1,86 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+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
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[staging]
+Include = /etc/pacman.d/mirrorlist
+
+[testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

pacman-testing.conf

@@ -0,0 +1,80 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+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
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+#CheckSpace
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

rebuildpkgs

@@ -0,0 +1,101 @@
+#!/bin/bash
+# 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
+#
+# FIXME
+# Currently uses $(pwd)/rebuilds as the directory for rebuilding...
+# TODO make this work for community too
+
+if [ $# -le 1 ]; then
+	echo "usage: $(basename $0) <chrootdir> <packages to rebuild>"
+	echo "  example: $(basename $0) ~/chroot readline bash foo bar baz"
+	exit 1
+fi
+
+# 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
+
+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 :)
+	pbuild='.svn/text-base/PKGBUILD.svn-base'
+	oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
+
+	#remove decimals
+	rel=$(echo $oldrel | cut -d. -f1)
+
+	newrel=$(($rel + 1))
+
+	sed -i "s/pkgrel=$oldrel/pkgrel=$newrel/" PKGBUILD
+}
+
+pkg_from_pkgbuild() {
+	# we want the sourcing to be done in a subshell so we don't pollute our current namespace
+	export CARCH PKGEXT
+	(source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
+}
+
+chrootdir="$1"; shift
+pkgs="$@"
+
+SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages'
+
+echo ":: Work will be done in $(pwd)/rebuilds"
+
+REBUILD_ROOT="$(pwd)/rebuilds"
+mkdir -p "$REBUILD_ROOT"
+cd "$REBUILD_ROOT"
+
+/usr/bin/svn co -N $SVNPATH
+
+FAILED=""
+for pkg in $pkgs; do
+	cd "$REBUILD_ROOT/svn-packages"
+
+	echo ":: Building '$pkg'"
+	/usr/bin/svn update "$pkg"
+	if [ ! -d "$pkg/trunk" ]; then
+		FAILED="$FAILED $pkg"
+		echo ":: $pkg does not exist in SVN"
+		continue
+	fi
+	cd "$pkg/trunk/"
+
+	bump_pkgrel
+
+	if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
+		FAILED="$FAILED $pkg"
+		echo ":: $pkg Failed!"
+	else
+		pkgfile=$(pkg_from_pkgbuild)
+		if [ -e "$pkgfile" ]; then
+			echo ":: $pkg Complete"
+		else
+			FAILED="$FAILED $pkg"
+			echo ":: $pkg Failed, no package built!"
+		fi
+	fi
+done
+
+cd "$REBUILD_ROOT"
+if [ "$FAILED" != "" ]; then
+	echo 'Packages failed:'
+	for pkg in $FAILED; do
+		echo -e "\t$pkg"
+	done
+fi
+
+echo 'SVN pkgbumps in svn-packages/ - commit when ready'