prepare release

All the packages in the Arch repo have been rebuilt to include the
architecture in their package names so this workaround is no longer
needed.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

Makefile

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

archbuild

@@ -4,12 +4,12 @@ base_packages='base base-devel sudo'
 
 cmd="$(basename "${0%-build}")"
 if [ "${cmd%-*}" == 'multilib' ]; then
-        repo="${cmd}"
+	repo="${cmd}"
-        arch='x86_64'
+	arch='x86_64'
-	base_packages+=' gcc-multilib libtool-multilib'
+	base_packages+=' multilib-devel'
 else
 	repo=${cmd%-*}
-	arch=${cmd#*-}
+	arch=${cmd##*-}
 fi
 chroots='/var/tmp/archbuild'
 clean_first=false
@@ -29,16 +29,39 @@ while getopts 'cr:' arg; do
 	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})..."
-	sudo rm -rf ${chroots}/${repo}-${arch}
+
-	sudo mkdir -p ${chroots}/${repo}-${arch}
+	for copy in ${chroots}/${repo}-${arch}/*; do
-	setarch ${arch} sudo mkarchroot \
+		[[ -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} sudo makechrootpkg -c -u -r ${chroots}/${repo}-${arch}
+setarch ${arch} makechrootpkg -c -r ${chroots}/${repo}-${arch}

archrelease

@@ -13,7 +13,9 @@ if [ ! -f PKGBUILD ]; then
 	abort 'archrelease: PKGBUILD not found'
 fi
 
-if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
+trunk=$(basename $(pwd))
+
+if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
 	abort 'archrelease: Not in a package trunk dir'
 fi
 
@@ -21,13 +23,13 @@ if [ ! -z "$(svn status -q)" ]; then
 	abort 'archrelease: You have not committed your changes yet!'
 fi
 
-echo -n 'releasing package...'
+echo -n "releasing package to ${1}..."
 pushd .. >/dev/null
 if [ -d "repos/${1}" ]; then
 	svn rm --force -q "repos/${1}"
 	svn commit -q -m "archrelease: remove ${1}" || abort
 fi
-svn copy -q -r HEAD trunk "repos/${1}"
+svn copy -q -r HEAD "${trunk}" "repos/${1}"
-svn commit -q -m "archrelease: copy trunk to ${1}" || abort
+svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort
 popd >/dev/null
 echo 'done'

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

@@ -32,17 +32,16 @@ TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
 cd $TEMPDIR
 
 for _pkgname in ${pkgname[@]}; do
-	pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	if [ -z ${epoch} ] ; then
-	oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
+		pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	else
+		pkgfile=${_pkgname}-${epoch}:${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+	fi
 
 	if [ -f "$STARTDIR/$pkgfile" ]; then
 		cp "$STARTDIR/$pkgfile" .
 	elif [ -f "$PKGDEST/$pkgfile" ]; then
 		cp "$PKGDEST/$pkgfile" .
-	elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then
-		cp "$STARTDIR/$oldstylepkgfile" .
-	elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-		cp "$PKGDEST/$oldstylepkgfile" .
 	else
 		echo "File \"$pkgfile\" doesn't exist"
 		exit 1
@@ -69,6 +68,8 @@ for _pkgname in ${pkgname[@]}; do
 			cp `echo $pkgurl | sed 's#^file://##'` .
 		elif [ -f $PKGDEST/$oldpkg ]; then
 			cp $PKGDEST/$oldpkg .
+		elif [ -f $STARTDIR/$oldpkg ]; then
+			cp $STARTDIR/$oldpkg .
 		else
 			wget --quiet $pkgurl
 		fi
@@ -80,16 +81,17 @@ for _pkgname in ${pkgname[@]}; do
 	sort -o filelist-$_pkgname filelist-$_pkgname
 	sort -o filelist-$_pkgname-old filelist-$_pkgname-old
 
-	diff -u filelist-$_pkgname-old filelist-$_pkgname
+	sdiff -s filelist-$_pkgname-old filelist-$_pkgname
 
-	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so\.' > /dev/null 2>&1; then
+	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
+		for i in `diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep \.so | awk '{print $2}'`; do
 			echo -n "${i}: "
 			objdump -p $i | grep SONAME
 		done
+		cd ..
 	else
 		echo "No soname differences for $_pkgname."
 	fi

commitpkg

@@ -17,6 +17,19 @@ getpkgfile() {
 	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'
@@ -38,62 +51,55 @@ fi
 . PKGBUILD
 pkgbase=${pkgbase:-$pkgname}
 
-# set up repo-specific opts depending on how we were called
+case "$cmd" in
-server='gerolde.archlinux.org'
+	commitpkg)
-if [ "$cmd" == 'extrapkg' ]; then
+		if [ $# -eq 0 ]; then
-	repo='extra'
+			abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
-elif [ "$cmd" == 'corepkg' ]; then
+		fi
-	repo='core'
+		repo="$1"
-elif [ "$cmd" == 'testingpkg' ]; then
+		shift
-	repo='testing'
+		;;
-elif [ "$cmd" == 'stagingpkg' ]; then
+	*pkg)
-	repo='staging'
+		repo="${cmd%pkg}"
-elif [ "$cmd" == 'communitypkg' ]; then
+		;;
-	repo='community'
+	*)
-	server='aur.archlinux.org'
-elif [ "$cmd" == 'community-testingpkg' ]; then
-	repo='community-testing'
-	server='aur.archlinux.org'
-elif [ "$cmd" == 'community-stagingpkg' ]; then
-	repo='community-staging'
-	server='aur.archlinux.org'
-elif [ "$cmd" == 'multilibpkg' ]; then
-	repo='multilib'
-	server='aur.archlinux.org'
-elif [ "$cmd" == 'multilib-testingpkg' ]; then
-	repo='multilib-testing'
-	server='aur.archlinux.org'
-else
-	if [ $# -eq 0 ]; then
 		abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
-	fi
+		;;
-	repo="$1"
+esac
-	shift
+
-fi
+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
+for s in ${source[@]}; do
-	echo $s | grep -vq '://' && \
+	echo $s | grep -Fvq '://' && \
-	svn status $s | grep -q '?' && \
+	svn status $s | grep -q '^\?' && \
 	abort "$s is not under version control"
-done) || true
+done
 
 # check if changelog and install files are under version control
-(for i in 'changelog' 'install'; do
+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 ${file} | grep -q '?'; then
+		if svn status ${file} | grep -q '^\?'; then
 			abort "${file} is not under version control"
 		fi
 	done
-done) || true
+done
 
 # see if any limit options were passed, we'll send them to rsync
-unset rsyncopts
+rsyncopts='-e ssh -p --chmod=ug=rw,o=r -c -h -L --progress --partial -y'
 if [ "$1" = '-l' ]; then
-	rsyncopts="--bwlimit=$2"
+	rsyncopts="$rsyncopts --bwlimit=$2"
 	shift 2
 fi
 
@@ -106,24 +112,47 @@ else
 fi
 echo 'done'
 
+declare -a uploads
+
 for _arch in ${arch[@]}; do
 	for _pkgname in ${pkgname[@]}; do
-		pkgfile=$(getpkgfile "$_pkgname-$pkgver-$pkgrel-${_arch}".pkg.tar.* 2>/dev/null)
+		fullver=$(get_full_version ${epoch:-0} $pkgver $pkgrel)
-		pkgdestfile=$(getpkgfile "$PKGDEST/$_pkgname-$pkgver-$pkgrel-${_arch}".pkg.tar.* 2>/dev/null)
+		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" -a -f "$pkgdestfile" ]; then
+		if [ -f "$pkgfile" ]; then
+			pkgfile="./$pkgfile"
+		elif [ -f "$pkgdestfile" ]; then
 			pkgfile="$pkgdestfile"
-		elif [ ! -f "$pkgfile" ]; then
+		else
 			echo "skipping ${_arch}"
 			continue 2
 		fi
+		uploads+=("$pkgfile")
 
-		echo -n 'uploading '
+		if [[ $SIGNPKG == 'y' ]]; then
-		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh "$server:staging/$repo/${pkgfile##*/}" || abort
+			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
@@ -134,4 +163,13 @@ if [ "${arch[*]}" == 'any' ]; then
 		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

finddeps

@@ -21,19 +21,26 @@ for d in $(find . -type d); do
 		unset pkgname depends makedepends
 		. PKGBUILD
 		for dep in "${depends[@]}"; do
-			# lose the version comaparator, if any
+			# lose the version comparator, if any
 			depname=${dep%%[<>=]*}
 			if [ "$depname" = "$match" ]; then
 				echo "$d (depends)"
 			fi
 		done
 		for dep in "${makedepends[@]}"; do
-			# lose the version comaparator, if any
+			# lose the version comparator, if any
 			depname=${dep%%[<>=]*}
 			if [ "$depname" = "$match" ]; then
 				echo "$d (makedepends)"
 			fi
 		done
+		for dep in "${optdepends[@]/:*}"; do
+			# lose the version comaparator, if any
+			depname=${dep%%[<>=]*}
+			if [ "$depname" = "$match" ]; then
+				echo "$d (optdepends)"
+			fi
+		done
 	fi
 	cd $tld
 done

makechrootpkg

@@ -12,7 +12,6 @@ FORCE='n'
 RUN=''
 MAKEPKG_ARGS='-s --noconfirm'
 REPACK=''
-COPY='copy'
 WORKDIR=$PWD
 
 update_first='0'
@@ -24,6 +23,10 @@ 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'
@@ -50,7 +53,8 @@ usage() {
 	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 maintain multiple copies Default: copy'
+	echo '           Useful for maintaining multiple copies.'
+	echo "           Default: $default_copy"
 	exit 1
 }
 
@@ -62,14 +66,16 @@ while getopts 'hcudr:I:l:' arg; do
 		d) add_to_db=1 ;;
 		r) chrootdir="$OPTARG" ;;
 		I) install_pkg="$OPTARG" ;;
-		l) COPY="$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")
-copydir="$chrootdir/$COPY"
+
+[[ -z $copy ]] && copy=$default_copy
+copydir="$chrootdir/$copy"
 
 # Pass all arguments after -- right to makepkg
 MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
@@ -104,11 +110,44 @@ if [ ! -d "$chrootdir/root" ]; then
 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...'
-	mkdir -p "$copydir"
+	use_rsync=false
-	rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+	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
@@ -117,7 +156,7 @@ if [ -n "$install_pkg" ]; then
 	mkarchroot -r "pacman -U /$pkgname" "$copydir"
 	ret=$?
 	rm "$copydir/$pkgname"
-	#exit early, we've done all we need to
+	# Exit early, we've done all we need to
 	exit $ret
 fi
 
@@ -128,11 +167,11 @@ 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 "$copydir/build/"*
 fi
 
-# read .makpekg.conf even if called via sudo
+# Read .makepkg.conf even if called via sudo
 if [ -n "${SUDO_USER}" ]; then
 	makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf"
 else
@@ -160,9 +199,15 @@ 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)
-[ -n "${MAKEFLAGS}" ] && echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/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)
-[ -n "${PACKAGER}" ] && echo "PACKAGER='${PACKAGER}'" >> "$copydir/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")
@@ -196,11 +241,8 @@ chown -R nobody "$copydir/build"
 chown -R nobody "$copydir/srcdest"
 chown -R nobody "$copydir/pkgdest"
 
-if ! grep "^nobody" "$copydir/etc/sudoers" >/dev/null 2>&1; then
+echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
-	touch "$copydir/etc/sudoers"
+chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
-	echo 'nobody	ALL=(ALL) NOPASSWD: ALL' >> "$copydir/etc/sudoers"
-	chmod 440 "$copydir/etc/sudoers"
-fi
 
 #This is a little gross, but this way the script is recreated every time in the
 #working copy
@@ -235,7 +277,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 		fi
 	done
 
-	for l in "${copydir}"/build/{namcap,*-{build,package}}.log; do
+	for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
 		[ -f "$l" ] && mv "$l" "${WORKDIR}"
 	done
 else
@@ -256,6 +298,4 @@ if [ -e "${copydir}/build/BUILD_FAILED" ]; then
 	echo "Build failed, check $copydir/build"
 	rm "${copydir}/build/BUILD_FAILED"
 	exit 1
-else
-	rm -rf "${copydir}"/build/*
 fi

makepkg-i686.conf

@@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+# 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)
+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.
@@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache)
 # 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 in STRIP_DIRS
+#-- 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
@@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug"
 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})
-#-- Directories to be searched for the strip option (if strip is specified)
-STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 

makepkg-x86_64.conf

@@ -39,15 +39,16 @@ LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+# 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)
+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.
@@ -61,7 +62,7 @@ BUILDENV=(fakeroot !distcc color !ccache)
 # 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 in STRIP_DIRS
+#-- 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
@@ -82,8 +83,6 @@ STRIP_STATIC="--strip-debug"
 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})
-#-- Directories to be searched for the strip option (if strip is specified)
-STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
 #-- Files to be removed from all packages (if purge is specified)
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 

mkarchroot

@@ -26,7 +26,7 @@ usage() {
 	echo '    -C <file>     Location of a pacman config file'
 	echo '    -M <file>     Location of a makepkg config file'
 	echo '    -n            Do not copy config files into the chroot'
-	echo "    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg"
+	echo '    -c <dir>      Set pacman cache. Default: /var/cache/pacman/pkg'
 	echo '    -h            This message'
 	exit $1
 }
@@ -34,7 +34,7 @@ usage() {
 while getopts 'r:ufnhC:M:c:' arg; do
 	case "${arg}" in
 		r) RUN="$OPTARG" ;;
-		u) RUN='pacman -Syu --noconfirm' ;;
+		u) RUN='/bin/sh -c "pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)"' ;;
 		f) FORCE='y' ;;
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
@@ -68,7 +68,7 @@ shift 1
 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*//')
+	cache_dir=$( (grep -m 1 '^CacheDir' $cache_conf || echo 'CacheDir = /var/cache/pacman/pkg') | sed 's/CacheDir\s*=\s*//')
 	unset cache_conf
 fi
 
@@ -82,8 +82,7 @@ if echo "${host_mirror}" | grep -q 'file://'; then
 	host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g')
 fi
 
-# {{{ functions 
+# {{{ functions
-
 chroot_mount() {
 	[ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
 	mount -t sysfs sysfs "${working_dir}/sys"
@@ -92,13 +91,27 @@ chroot_mount() {
 	mount -t proc proc "${working_dir}/proc"
 
 	[ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
-	mount -o bind /dev "${working_dir}/dev"
+	mount -t tmpfs dev "${working_dir}/dev" -o mode=0755,size=10M,nosuid
+	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"
 
 	[ -e "${working_dir}/dev/shm" ] || mkdir "${working_dir}/dev/shm"
-	mount -t tmpfs shm "${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"
+	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}"
@@ -110,7 +123,7 @@ chroot_mount() {
 		mount -o remount,ro,bind "${host_mirror_path}" "${working_dir}/${host_mirror_path}"
 	fi
 
-	trap 'chroot_umount' 0 1 2 15
+	trap 'chroot_umount' EXIT INT QUIT TERM HUP
 }
 
 copy_hostconf () {
@@ -128,6 +141,20 @@ chroot_umount () {
 	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
@@ -140,22 +167,28 @@ if [ "$RUN" != "" ]; then
 		exit 1
 	fi
 
+	chroot_lock
 	chroot_mount
 	copy_hostconf
 
-	chroot "${working_dir}" ${RUN}
+	eval chroot "${working_dir}" ${RUN}
 
 	# }}}
-	else
+else
 	# {{{ build chroot
 	if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
 		echo "error: working dir '${working_dir}' already exists - try using -f"
 		exit 1
 	fi
 
+	if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
+		chmod 0755 "${working_dir}"
+	fi
+
 	mkdir -p "${working_dir}/var/lib/pacman/sync"
 	mkdir -p "${working_dir}/etc/"
 
+	chroot_lock
 	chroot_mount
 
 	pacargs="--noconfirm --root=${working_dir} --cachedir=${cache_dir}"

pacman-extra.conf

@@ -17,7 +17,7 @@ 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 - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -33,6 +33,7 @@ Architecture = auto
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES

pacman-multilib-testing.conf

@@ -17,7 +17,7 @@ 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 - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -33,6 +33,7 @@ Architecture = auto
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES

pacman-multilib.conf

@@ -17,7 +17,7 @@ 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 - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -33,6 +33,7 @@ Architecture = auto
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES

pacman-staging.conf

@@ -17,7 +17,7 @@ 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 - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -33,6 +33,7 @@ Architecture = auto
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES

pacman-testing.conf

@@ -17,7 +17,7 @@ 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 - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -33,6 +33,7 @@ Architecture = auto
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES