prepare release

See https://bugs.archlinux.org/task/21315

Makefile

@@ -1,4 +1,4 @@
-V=0.9.11
+V=0.9.14
 
 all:
 

archbuild

@@ -3,17 +3,13 @@
 base_packages='base base-devel sudo'
 
 cmd="$(basename "${0%-build}")"
-if [ "${cmd}" == 'multilib' ]; then
-	repo='multilib'
-	arch='x86_64'
-	base_packages+=' gcc-multilib'
-elif [ "${cmd}" == 'multilib-testing' ]; then
-        repo='multilib-testing'
+if [ "${cmd%-*}" == 'multilib' ]; then
+        repo="${cmd}"
         arch='x86_64'
-	base_packages+=' gcc-multilib'
+	base_packages+=' gcc-multilib libtool-multilib'
 else
 	repo=${cmd%-*}
-	arch=${cmd#*-}
+	arch=${cmd##*-}
 fi
 chroots='/var/tmp/archbuild'
 clean_first=false
@@ -33,11 +29,6 @@ while getopts 'cr:' arg; do
 	esac
 done
 
-if [ "$(uname -m)" == 'i686' -a "${arch}" != 'i686' ]; then
-	echo 'You can only build i686 packages on this system'
-	exit 1
-fi
-
 if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
 	echo "Creating chroot for [${repo}] (${arch})..."
 	sudo rm -rf ${chroots}/${repo}-${arch}
@@ -47,7 +38,11 @@ if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
 		-M /usr/share/devtools/makepkg-${arch}.conf \
 		${chroots}/${repo}-${arch}/root \
 		${base_packages}
+else
+	setarch ${arch} sudo 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} sudo makechrootpkg -c -r ${chroots}/${repo}-${arch}

checkpkg

@@ -82,11 +82,11 @@ for _pkgname in ${pkgname[@]}; do
 
 	diff -u 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

commitpkg

@@ -119,7 +119,7 @@ for _arch in ${arch[@]}; do
 		fi
 
 		echo -n 'uploading '
-		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh "$server:staging/$repo/$pkgfile" || abort
+		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh "$server:staging/$repo/${pkgfile##*/}" || abort
 	done
 	archrelease $repo-${_arch} || abort
 done

mkarchroot

@@ -92,13 +92,24 @@ 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
+	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 +121,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 () {
@@ -153,7 +164,7 @@ if [ "$RUN" != "" ]; then
 		exit 1
 	fi
 
-	mkdir -p "${working_dir}/var/lib/pacman/"
+	mkdir -p "${working_dir}/var/lib/pacman/sync"
 	mkdir -p "${working_dir}/etc/"
 
 	chroot_mount