tagging 0.9.8

implements FS#20246

Makefile

@@ -1,3 +1,5 @@
+V=0.9.8
+
 all:
 
 install:
@@ -8,6 +10,7 @@ install:
 	ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg
 	ln -sf commitpkg $(DESTDIR)/usr/bin/corepkg
 	ln -sf commitpkg $(DESTDIR)/usr/bin/testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/stagingpkg
 	ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg
 	ln -sf commitpkg $(DESTDIR)/usr/bin/community-testingpkg
 	# arch{co,release,rm}
@@ -31,6 +34,7 @@ uninstall:
 	rm $(DESTDIR)/usr/bin/extrapkg
 	rm $(DESTDIR)/usr/bin/corepkg
 	rm $(DESTDIR)/usr/bin/testingpkg
+	rm $(DESTDIR)/usr/bin/stagingpkg
 	rm $(DESTDIR)/usr/bin/communitypkg
 	rm $(DESTDIR)/usr/bin/community-testingpkg
 	rm $(DESTDIR)/usr/sbin/mkarchroot

archco

@@ -8,6 +8,3 @@ fi
 for i in "$@"; do
 	svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i
 done
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

archrelease

@@ -1,44 +1,33 @@
 #!/bin/bash
 
-if [ "$1" = '' ]; then
+abort() {
-	echo 'Usage: archrelease <repo>'
+	echo ${1:-'archrelease: Cancelled'}
 	exit 1
+}
+
+if [ "$1" = '' ]; then
+	abort 'Usage: archrelease <repo>'
 fi
 
 if [ ! -f PKGBUILD ]; then
-	echo 'archrelease: PKGBUILD not found'
+	abort 'archrelease: PKGBUILD not found'
-	exit 1
 fi
 
 if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
-	echo 'archrelease: Not in a package trunk dir'
+	abort 'archrelease: Not in a package trunk dir'
-	exit 1
 fi
 
 if [ ! -z "$(svn status -q)" ]; then
-	echo 'archrelease: You have not committed your changes yet!'
+	abort 'archrelease: You have not committed your changes yet!'
-	echo '             Please run "svn commit" first'
-	exit 1
 fi
 
 echo -n 'releasing package...'
 pushd .. >/dev/null
-
-trunk=$(svnversion -cn trunk | cut -f1 -d:)
-repo=$(svnversion -cn "repos/${1}" 2>/dev/null | cut -f1 -d:)
-if [[ ${trunk} -le ${repo} ]]; then
-	echo 'already done'
-	exit 1
-fi
-
 if [ -d "repos/${1}" ]; then
 	svn rm --force -q "repos/${1}"
-	svn commit -q -m "archrelease: remove ${1}"
+	svn commit -q -m "archrelease: remove ${1}" || abort
 fi
 svn copy -q -r HEAD trunk "repos/${1}"
-svn commit -q -m "archrelease: copy trunk to ${1}"
+svn commit -q -m "archrelease: copy trunk to ${1}" || abort
 popd >/dev/null
 echo 'done'
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

archrm

@@ -11,6 +11,3 @@ fi
 #popd
 
 rm -rf $1
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

checkpkg

@@ -27,6 +27,9 @@ if [ "$arch" == 'any' ]; then
 	CARCH='any'
 fi
 
+TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
+cd $TEMPDIR
+
 for _pkgname in ${pkgname[@]}; do
 	pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
 	oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
@@ -87,9 +90,8 @@ for _pkgname in ${pkgname[@]}; do
 			objdump -p $i | grep SONAME
 		done
 	else
-		echo "No filename differences for $_pkgname."
+		echo "No soname differences for $_pkgname."
 	fi
 done
 
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
+echo "Files saved to $TEMPDIR"
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

commitpkg

@@ -5,6 +5,17 @@ abort() {
 	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}
+}
 
 # Source makepkg.conf; fail if it is not found
 if [ -r '/etc/makepkg.conf' ]; then
@@ -35,6 +46,8 @@ elif [ "$cmd" == 'corepkg' ]; then
 	repo='core'
 elif [ "$cmd" == 'testingpkg' ]; then
 	repo='testing'
+elif [ "$cmd" == 'stagingpkg' ]; then
+	repo='staging'
 elif [ "$cmd" == 'communitypkg' ]; then
 	repo='community'
 	server='aur.archlinux.org'
@@ -50,12 +63,24 @@ else
 fi
 
 # check if all local source files are under version control
-(for s in ${source[@]} $install; do
+(for s in ${source[@]}; do
 	echo $s | grep -vq '://' && \
 	svn status $s | grep -q '?' && \
 	abort "$s is not under version control"
 done) || true
 
+# 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 ${file} | grep -q '?'; then
+			abort "${file} is not under version control"
+		fi
+	done
+done) || true
+
 # see if any limit options were passed, we'll send them to rsync
 unset rsyncopts
 if [ "$1" = '-l' ]; then
@@ -74,17 +99,18 @@ echo 'done'
 
 for _arch in ${arch[@]}; do
 	for _pkgname in ${pkgname[@]}; do
-		pkgfile=$_pkgname-$pkgver-$pkgrel-${_arch}$PKGEXT
+		pkgfile=$(getpkgfile "$_pkgname-$pkgver-$pkgrel-${_arch}".pkg.tar.* 2>/dev/null)
+		pkgdestfile=$(getpkgfile "$PKGDEST/$_pkgname-$pkgver-$pkgrel-${_arch}".pkg.tar.* 2>/dev/null)
 
-		if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
+		if [ ! -f "$pkgfile" -a -f "$pkgdestfile" ]; then
-			pkgfile="$PKGDEST/$pkgfile"
+			pkgfile="$pkgdestfile"
-		elif [ ! -f $pkgfile ]; then
+		elif [ ! -f "$pkgfile" ]; then
 			echo "skipping ${_arch}"
 			continue 2
 		fi
 
 		echo -n 'uploading '
-		rsync -c -h -L --progress $rsyncopts "${pkgfile}" -e ssh $server:staging/$repo || abort
+		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh $server:staging/$repo || abort
 	done
 	archrelease $repo-${_arch} || abort
 done
@@ -92,7 +118,7 @@ done
 if [ "${arch[*]}" == 'any' ]; then
 	if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
 		pushd ../repos/ >/dev/null
-		echo -n "removing $repo-i686 and $repo-x86_64..."
+		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"
@@ -100,6 +126,3 @@ if [ "${arch[*]}" == 'any' ]; then
 		popd >/dev/null
 	fi
 fi
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

communityco

@@ -8,6 +8,3 @@ fi
 for i in "$@"; do
 	svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i
 done
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

finddeps

@@ -37,6 +37,3 @@ for d in $(find . -type d); do
 	fi
 	cd $tld
 done
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

lddd

@@ -9,9 +9,7 @@ IFS=':'
 libdirs='/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib'
 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 :) ...'
 #  Check ELF binaries in the PATH and specified dir trees.
@@ -46,6 +44,3 @@ done
 sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
 
 echo "Files saved to $TEMPDIR"
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

makechrootpkg

@@ -91,7 +91,6 @@ if [ ! -f PKGBUILD ]; then
 	echo 'This must be run in a directory containing a PKGBUILD.'
 	exit 1
 fi
-source PKGBUILD
 
 if [ ! -d "$chrootdir" ]; then
 	echo "No chroot dir defined, or invalid path '$chrootdir'"
@@ -134,8 +133,12 @@ if [ "$REPACK" != "1" ]; then
 fi
 
 # Get SRC/PKGDEST from makepkg.conf
-SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
+if [ -f ~/.makepkg.conf ]; then
-PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
+	SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2)
+	PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2)
+fi
+[ -z ${SRCDEST} ] && SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
+[ -z ${PKGDEST} ] && PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
 
 [ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
 if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
@@ -147,6 +150,8 @@ if ! grep 'SRCDEST=/srcdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
 	echo 'SRCDEST=/srcdest' >> "$copydir/etc/makepkg.conf"
 fi
 
+# Set target CARCH as it might be used within the PKGBUILD to select correct sources
+CARCH=$(eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf"))
 # Copy PKGBUILD and sources
 source PKGBUILD
 cp PKGBUILD "$copydir/build/"
@@ -159,24 +164,17 @@ for f in ${source[@]}; do
 	fi
 done
 
-install_files=$(grep 'install=' PKGBUILD)
+for i in 'changelog' 'install'; do
-for pkg in ${pkgname[@]}; do
+	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
-	install_files+=' '
+	for file in $filelist; do
-	install_files+=$(echo $install_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/")
+		# evaluate any bash variables used
-	install_files=$(eval echo $install_files |tr '[:blank:]' '\n'|sort |uniq)
+		eval file=${file}
+		if [[ -f "$file" ]]; then
+			cp "$file" "$copydir/build/"
+		fi
+	done
 done
 
-for f in $install_files;do
-	install="${f#"install="}"
-	if [ "$install" != "" -a -f "$install" ]; then
-		cp "$install" "$copydir/build/"
-	fi
-done
-
-if [ -f 'ChangeLog' ]; then
-	cp ChangeLog "$copydir/build/"
-fi
-
 chown -R nobody "$copydir/build"
 chown -R nobody "$copydir/srcdest"
 chown -R nobody "$copydir/pkgdest"
@@ -196,21 +194,20 @@ 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/*${PKGEXT} > /pkgdest/namcap.log
+which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
 exit 0
 EOF
 ) > "$copydir/chrootbuild"
 chmod +x "$copydir/chrootbuild"
 
 if mkarchroot -r "/chrootbuild" "$copydir"; then
-	for pkgfile in "${copydir}"/pkgdest/*${PKGEXT}; do
+	for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do
 		[ -e "$pkgfile" ] || continue
-		_pkgname=$(basename "$pkgfile")
 		if [ "$add_to_db" -eq "1" ]; then
-			[ -d "${copydir}/repo" ] || mkdir -p "${copydir}/repo"
+			mkdir -p "${copydir}/repo"
 			pushd "${copydir}/repo" >/dev/null
 			cp "$pkgfile" .
-			repo-add repo.db.tar.gz "$_pkgname"
+			repo-add repo.db.tar.gz "$(basename "$pkgfile")"
 			popd >/dev/null
 		fi
 
@@ -221,16 +218,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 		fi
 	done
 
-	for f in "${copydir}"/srcdest/*; do
+	for l in "${copydir}"/build/{namcap,*-{build,package}}.log; do
-		[ -e "$f" ] || continue
-		if [ -d "$SRCDEST" ]; then
-			mv "$f" "${SRCDEST}"
-		else
-			mv "$f" "${WORKDIR}"
-		fi
-	done
-
-	for l in "${copydir}"/build/*-{build,package}.log; do
 		[ -f "$l" ] && mv "$l" "${WORKDIR}"
 	done
 else
@@ -238,12 +226,19 @@ else
 	touch "${copydir}/build/BUILD_FAILED"
 fi
 
+for f in "${copydir}"/srcdest/*; do
+	[ -e "$f" ] || continue
+	if [ -d "$SRCDEST" ]; then
+		mv "$f" "${SRCDEST}"
+	else
+		mv "$f" "${WORKDIR}"
+	fi
+done
+
 if [ -e "${copydir}/build/BUILD_FAILED" ]; then
 	echo "Build failed, check $copydir/build"
 	rm "${copydir}/build/BUILD_FAILED"
+	exit 1
 else
 	rm -rf "${copydir}"/build/*
 fi
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

mkarchroot

@@ -84,6 +84,12 @@ chroot_mount() {
 	[ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
 	mount -o bind /dev "${working_dir}/dev"
 
+	[ -e "${working_dir}/dev/shm" ] || mkdir "${working_dir}/dev/shm"
+	mount -t tmpfs shm "${working_dir}/dev/shm"
+
+	[ -e "${working_dir}/dev/pts" ] || mkdir "${working_dir}/dev/pts"
+	mount -t devpts devpts "${working_dir}/dev/pts"
+
 	[ -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}"
@@ -99,6 +105,8 @@ copy_hostconf () {
 chroot_umount () {
 	umount "${working_dir}/proc"
 	umount "${working_dir}/sys"
+	umount "${working_dir}/dev/pts"
+	umount "${working_dir}/dev/shm"
 	umount "${working_dir}/dev"
 	umount "${working_dir}/${cache_dir}"
 }
@@ -173,6 +181,3 @@ if [ "$RUN" != "" ]; then
 	fi
 	# }}}
 fi
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132

rebuildpkgs

@@ -99,6 +99,3 @@ if [ "$FAILED" != "" ]; then
 fi
 
 echo 'SVN pkgbumps in svn-packages/ - commit when ready'
-
-# vim: set noexpandtab tabstop=8 shiftwidth=8 wrap:textwidth=132 autoindent
-# kate: indent-mode normal; indent-width 8; tab-indents on; tab-width 8; word-wrap on; word-wrap-column 132