X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-tools.git;a=blobdiff_plain;f=builder.sh;h=53ef564791a62e735978a5709a6aab3dbfc94abe;hp=edd84a1ccd1b1b4562911568d171b2437babe420;hb=09ed613;hpb=acd0d41d0d2244293a5c1bbd7f9624d3dc998581

diff --git a/builder.sh b/builder.sh
index edd84a1..53ef564 100755
--- a/builder.sh
+++ b/builder.sh
@@ -35,13 +35,13 @@
 
 PROGRAM=${0##*/}
 APPDIR=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
-RCSID='$Id: builder,v 1.645 2011/02/13 17:54:10 glen Exp $' r=${RCSID#* * } rev=${r%% *}
-VERSION="v0.35/$rev"
+VERSION="v0.35"
 VERSIONSTRING="\
 Build package utility from PLD Linux Packages repository
-$VERSION (C) 1999-2012 Free Penguins".
+$VERSION (C) 1999-2020 Free Penguins".
 
-CLEAN_PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
+# Clean PATH without /usr/local or user paths
+CLEAN_PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
 
 # required rpm-build-macros
 RPM_MACROS_VER=1.534
@@ -77,13 +77,18 @@ DATE=`date +%Y-%m-%d_%H-%M-%S`
 # target arch, can also be used for log file naming
 TARGET=$(rpm -E %{_target})
 
+# Note the *single* quotes, this allows using shell variables expanded at build time
 # Example: LOGFILE='../log.$PACKAGE_NAME'
 # Example: LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE'
 # Example: LOGFILE='$PACKAGE_NAME/$PACKAGE_NAME.$DATE.log'
 # Example: LOGFILE='$PACKAGE_NAME.$DATE.log'
-# Yes, you can use variable name! Note _single_ quotes!
+# Example: LOGFILE='.log.$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE.$TARGET.$DATE'
 LOGFILE=''
 
+# use teeboth Perl wrapper
+# temporary option to disable if broken
+USE_TEEBOTH=yes
+
 LOGDIR=""
 LOGDIROK=""
 LOGDIRFAIL=""
@@ -107,10 +112,10 @@ PACKAGE_VERSION=""
 PACKAGE_NAME=""
 ASSUMED_NAME=""
 PROTOCOL="http"
+IPOPT=""
 
 # use lftp by default when available
-USE_LFTP=
-lftp --version > /dev/null 2>&1 && USE_LFTP=yes
+test -z "${USE_LFTP+x}" && lftp --version > /dev/null 2>&1 && USE_LFTP=yes
 PARALLEL_DOWNLOADS=10
 
 WGET_RETRIES=${MAX_WGET_RETRIES:-0}
@@ -176,8 +181,9 @@ fi
 #GROUP_BCONDS="yes"
 #LOGFILE='../LOGS/log.$PACKAGE_NAME.$DATE'
 #TITLECHANGE=no
-#
-SU_SUDO=""
+
+SU_SUDO="sudo"
+
 if [ -n "$HOME_ETC" ]; then
 	USER_CFG="$HOME_ETC/.builderrc"
 	BUILDER_MACROS="$HOME_ETC/.builder-rpmmacros"
@@ -197,37 +203,19 @@ if [ "$SCHEDTOOL" = "auto" ]; then
 fi
 
 if [ -n "$USE_PROZILLA" ]; then
-	GETURI="proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS"
-	GETURI2="$GETURI"
-	OUTFILEOPT="-O"
+	GETURI=download_proz
 elif [ -n "$USE_AXEL" ]; then
-	GETURI="axel -a $AXEL_OPTS"
-	GETURI2="$GETURI"
-	OUTFILEOPT="-o"
+	GETURI=download_axel
 elif [ -n "$USE_LFTP" ]; then
 	GETURI=download_lftp
-	GETURI2=$GETURI
-	OUTFILEOPT=""
 else
-	wget --help 2>&1 | grep -q -- ' --no-check-certificate ' && WGET_OPTS="$WGET_OPTS --no-check-certificate"
-	wget --help 2>&1 | grep -q -- ' --inet ' && WGET_OPTS="$WGET_OPTS --inet"
-	wget --help 2>&1 | grep -q -- ' --retry-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
-	WGET_OPTS="$WGET_OPTS --user-agent=$USER_AGENT"
-
-	GETURI="wget --passive-ftp -c -nd -t$WGET_RETRIES $WGET_OPTS"
-	GETURI2="wget -c -nd -t$WGET_RETRIES $WGET_OPTS"
-	OUTFILEOPT="-O"
+	GETURI=download_wget
 fi
 
-GETLOCAL="cp -a"
+GETLOCAL=${GETLOCAL:-cp -a}
 
-if rpm --version 2>&1 | grep -q '4.0.[0-2]'; then
-	RPM="rpm"
-	RPMBUILD="rpm"
-else
-	RPM="rpm"
-	RPMBUILD="rpmbuild"
-fi
+RPM="rpm"
+RPMBUILD="rpmbuild"
 
 #
 # sanity checks
@@ -239,8 +227,10 @@ if [ -d $HOME/rpm/SOURCES ]; then
 fi
 
 POLDEK_INDEX_DIR="$($RPM --eval %_rpmdir)/"
-POLDEK_CMD="$SU_SUDO /usr/bin/poldek --noask"
+POLDEK_CMD="$SU_SUDO /usr/bin/poldek"
 
+# TODO: add teeboth
+# TODO: what this function does?
 run_poldek() {
 	RES_FILE=$(tempfile)
 	if [ -n "$LOGFILE" ]; then
@@ -248,10 +238,11 @@ run_poldek() {
 		if [ -n "$LASTLOG_FILE" ]; then
 			echo "LASTLOG=$LOG" > $LASTLOG_FILE
 		fi
-		(${NICE_COMMAND} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG
+		(${NICE_COMMAND} ${POLDEK_CMD} --noask `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE})|tee -a $LOG
+		# FIXME $exit_pldk undefined
 		return $exit_pldk
 	else
-		(${NICE_COMMAND} ${POLDEK_CMD} `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null
+		(${NICE_COMMAND} ${POLDEK_CMD} --noask `while test $# -gt 0; do echo "$1 ";shift;done` ; echo $? > ${RES_FILE}) 1>&2 >/dev/null
 		return `cat ${RES_FILE}`
 		rm -rf ${RES_FILE}
 	fi
@@ -260,12 +251,53 @@ run_poldek() {
 #---------------------------------------------
 # functions
 
+download_prozilla() {
+	local outfile=$1 url=$2 retval
+
+	proz --no-getch -r -P ./ -t$WGET_RETRIES $PROZILLA_OPTS -O "$outfile" "$url"
+	retval=$?
+
+	return $retval
+}
+
+download_axel() {
+	local outfile=$1 url=$2 retval
+
+	axel -a $AXEL_OPTS -o "$outfile" "$url"
+	retval=$?
+
+	return $retval
+}
+
+download_wget() {
+	local outfile=$1 url=$2 retval wget_help
+	if [ -z "${WGET_OPTS_SET+x}" ]; then
+		wget_help="$(wget --help 2>&1)"
+		echo "$wget_help" | grep -q -- ' --inet ' && WGET_OPTS="$WGET_OPTS --inet"
+		echo "$wget_help" | grep -q -- ' --retry-connrefused ' && WGET_OPTS="$WGET_OPTS --retry-connrefused"
+		echo "$wget_help" | grep -q -- ' --no-iri ' && WGET_OPTS="$WGET_OPTS --no-iri"
+		WGET_OPTS="-c -nd -t$WGET_RETRIES $WGET_OPTS --user-agent=$USER_AGENT $IPOPT --passive-ftp"
+		WGET_OPTS_SET=1
+	fi
+
+	wget $WGET_OPTS -O "$outfile" "$url"
+	retval=$?
+	if [ $retval -ne 0 ]; then
+		if [ "`echo $url | grep -E 'ftp://'`" ]; then
+			${GETURI} -O "$outfile" "$url"
+			retval=$?
+		fi
+	fi
+	return $retval
+}
+
 download_lftp() {
 	local outfile=$1 url=$2 retval tmpfile
-	# TODO: use mktemp
-	tmpfile=$outfile.tmp
+	tmpfile=$(tempfile) || exit 1
 	lftp -c "
 		$([ "$DEBUG" = "yes" ] && echo "debug 5;")
+		$([ "$IPOPT" = "-4" ] && echo "set dns:order \"inet\";")
+		$([ "$IPOPT" = "-6" ] && echo "set dns:order \"inet6\";")
 		set ssl:verify-certificate no;
 		set net:max-retries $WGET_RETRIES;
 		set http:user-agent \"$USER_AGENT\";
@@ -283,6 +315,10 @@ download_lftp() {
 
 usage() {
 	if [ -n "$DEBUG" ]; then set -xv; fi
+# NOTE:
+# to make this output parseable by bash-completion _parse_help()
+# if the line contains short and long option, it will take only the long option
+# but if you want both being completed, put the short option to separate line
 	echo "\
 Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [-a|--add_cvs] [-b|-ba|--build]
 [-bb|--build-binary] [-bs|--build-source] [-bc] [-bi] [-bl] [-u|--try-upgrade]
@@ -295,46 +331,52 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
 [--show-bconds] [--with/--without <feature>] [--define <macro> <value>]
 <package>[.spec][:tag]
 
--4                  - force ipv4 when transferring files
--5, --update-md5    - update md5 comments in spec, implies -nd -ncs
--6                  - force ipv6 when transferring files
--a5, --add-md5      - add md5 comments to URL sources, implies -nc -nd -ncs
+-4                  - force IPv4 when transferring files
+-6                  - force IPv6 when transferring files
+-5,
+--update-md5        - update md5 comments in spec, implies -nd -ncs
+-a5,
+--add-md5           - add md5 comments to URL sources, implies -nc -nd -ncs
 --all-branches      - make shallow fetch of all branches; --depth required
 -n5, --no-md5       - ignore md5 comments in spec
 -D, --debug         - enable builder script debugging mode,
 -debug              - produce rpm debug package (same as --opts -debug)
 -V, --version       - output builder version string
 --short-version     - output builder short version
--a, --add_vcs       - try add new package to PLD repo.
--b, -ba, --build    - get all files from PLD repo or HTTP/FTP and build package
+-a                  - try add new package to PLD repo.
+-b,
+-ba
+                    - get all files from PLD repo or HTTP/FTP and build package
                       from <package>.spec,
--bb, --build-binary - get all files from PLD repo or HTTP/FTP and build binary
+-bb                 - get all files from PLD repo or HTTP/FTP and build binary
                       only package from <package>.spec,
--bp, --build-prep   - execute the %prep phase of <package>.spec,
+-bp                 - execute the %prep phase of <package>.spec,
 -bc                 - execute the %build phase of <package>.spec,
 -bi                 - execute the %install phase of <package>.spec
 -bl                 - execute the %files phase of <package>.spec
--bs, --build-source - get all files from PLD repo or HTTP/FTP and only pack
+-bs                 - get all files from PLD repo or HTTP/FTP and only pack
                       them into src.rpm,
 --short-circuit     - short-circuit build
 -B, --branch        - add branch
--c, --clean         - clean all temporarily created files (in BUILD\$RPM_BUILD_ROOT) after rpmbuild commands.
+-c,
+--clean             - clean all temporarily created files (in BUILD\$RPM_BUILD_ROOT) after rpmbuild commands.
                       may be used with building process.
 -m, --mr-proper     - clean all temporarily created files (in BUILD, SOURCES,
                       SPECS and \$RPM_BUILD_ROOT). Doesn't run any rpm building.
 -cf, --cvs-force    - use -f when tagging
---define <macro> <value>
+--define '<macro> <value>'
                     - define a macro <macro> with value <value>,
 --depth <number>    - make shallow fetch
 --alt_kernel <kernel>
                     - same as --define 'alt_kernel <kernel>'
 --nodeps            - rpm won't check any dependences
--g, --get           - get <package>.spec and all related files from PLD repo
-                      or HTTP/FTP,
+-g
+--get               - get <package>.spec and all related files from PLD repo
 -h, --help          - this message,
--jN, -j N           - set %_smp_mflags to propagate concurrent jobs
---ftp, --http       - use ftp or http protocol to access distfiles server
--l <logfile>, --logtofile <logfile>
+-j N                - set %_smp_mflags to propagate concurrent jobs
+--ftp               - use FTP protocol to access distfiles server
+--http              - use HTTP protocol to access distfiles server
+-l <logfile>, --logtofile=<logfile>
                     - log all to file,
 -ncs, --no-cvs-specs
                     - don't pull from PLD repo
@@ -344,7 +386,7 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
 -ns, --no-srcs      - don't download Sources/Patches
 -ns0, --no-source0  - don't download Source0
 -nn, --no-net       - don't download anything from the net
--pN, -p N           - set PARALLEL_DOWNLOADS to N (default $PARALLEL_DOWNLOADS)
+-p N                - set PARALLEL_DOWNLOADS to N (default $PARALLEL_DOWNLOADS)
 -pm, --prefer-mirrors
                     - prefer mirrors (if any) over distfiles for SOURCES
 --no-init           - don't initialize builder paths (SPECS and SOURCES)
@@ -390,8 +432,8 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
                     - add git tags STABLE and NAME-VERSION-RELEASE for files,
 -Ts, --tag-stable
                     - add git tag STABLE for files,
--Tv, --tag-version
-                    - add git tag NAME-VERSION-RELEASE for files,
+-Tv,
+--tag-version       - add git tag NAME-VERSION-RELEASE for files,
 -Tp, --tag-prefix <prefix>
                     - add <prefix> to NAME-VERSION-RELEASE tags,
 -tt, --test-tag <prefix>
@@ -407,37 +449,65 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
 -U, --update        - refetch sources, don't use distfiles, and update md5 comments
 -Upi, --update-poldek-indexes
                     - refresh or make poldek package index files.
--sp, --skip-patch <patchnumber>
+-sp <patchnumber>,
+--skip-patch <patchnumber>
                     - don't apply <patchnumber>. may be repeated.
--np, --nopatch <patchnumber>
+-np <patchnumber>,
+--nopatch <patchnumber>
                     - abort instead of applying patch <patchnumber>
+--noinit
+                    - do not initialize SPECS_DIR and SOURCES_DIR (set them to .)
 --show-bconds       - show available conditional builds, which can be used
                     - with --with and/or --without switches.
 --show-bcond-args   - show active bconds, from ~/.bcondrc. this is used by ./repackage.sh script.
                       In other words, the output is parseable by scripts.
 --show-avail-bconds - show available bconds
---with/--without <feature>
+--with <feature>,
+--without <feature>
                     - conditional build package depending on %_with_<feature>/
                       %_without_<feature> macro switch.  You may now use
                       --with feat1 feat2 feat3 --without feat4 feat5 --with feat6
                       constructions. Set GROUP_BCONDS to yes to make use of it.
 --target <platform>, --target=<platform>
                     - build for platform <platform>.
---init-rpm-dir      - initialize ~/rpm directory structure
+--init-rpm-dir, --init
+                    - initialize ~/rpm directory structure
 "
 }
 
+is_rpmorg() {
+	local v
+
+	v=$(LC_ALL=C LANG=C rpm --version 2>&1)
+	v=${v#RPM version } # rpm 4
+	v=${v#rpm \(RPM\) } # rpm 5
+
+	case "$v" in
+		4.5|5.*)
+			return 1
+			;;
+		4.*)
+			return 0;
+			;;
+		*)
+			echo "ERROR: unsupported RPM version $v" >&2
+			exit 1
+	esac
+}
+
 # create tempfile. as secure as possible
 tempfile() {
-	mktemp --tmpdir -t builder.$PACKAGE_NAME.XXXXXX || ${TMPDIR:-/tmp}/builder.$RANDOM.$$
+	local prefix=builder.$PACKAGE_NAME${1:+.$1}
+	mktemp --tmpdir -t $prefix.XXXXXX || echo ${TMPDIR:-/tmp}/$prefix.$RANDOM.$$
 }
 
 tempdir() {
-	mktemp --tmpdir -d builder.$PACKAGE_NAME.XXXXXX
+	local prefix=builder.$PACKAGE_NAME${1:+.$1}
+	mktemp --tmpdir -d $prefix.XXXXXX
 }
 
 # inserts git log instead of %changelog
-# outputs name of modified file created by tempfile
+# @output directory containing modified specfile
 insert_gitlog() {
 	local SPECFILE=$1 specdir=$(tempdir) gitlog=$(tempfile) speclog=$(tempfile)
 
@@ -447,15 +517,28 @@ insert_gitlog() {
 	# rpm5.org/rpm.org do not parse any other date format than 'Wed Jan 1 1997'
 	# otherwise i'd use --date=iso here
 	# http://rpm5.org/cvs/fileview?f=rpm/build/parseChangelog.c&v=2.44.2.1
-	# http://rpm.org/gitweb?p=rpm.git;a=blob;f=build/parseChangelog.c#l31
+	# http://rpm.org/gitweb?p=rpm.git;a=blob;f=build/parseChangelog.c;h=56ba69daa41d65ec9fd18c9f371b8ff14118cdca;hb=a113baa510a004476edc44b5ebaaf559238a18b6#l33
 	# NOTE: changelog date is always in UTC for rpmbuild
 	# * 1265749244 +0000 Random Hacker <nikt@pld-linux.org> 9370900
-	git rev-list --date-order -${log_entries:-20} HEAD | while read sha1; do
+	git rev-list --date-order -${log_entries:-20} HEAD 2>/dev/null | while read sha1; do
 		local logfmt='%B%n'
-		git notes list $sha1 > /dev/null 2>&1 && logfmt=%N
-		git log -n 1 $sha1 --format=format:"* %ad %an <%ae> %h%n${logfmt}%n" --date=raw | sed '/^$/q'
+		git notes list $sha1 > /dev/null 2>&1 && logfmt='%N'
+		git log -n 1 $sha1 --format=format:"* %ad %an <%ae> %h%n- ${logfmt}%n" --date=raw | sed -re 's/^- +- */- /'| sed '/^$/q'
 	done > $gitlog
-	LC_ALL=C gawk '/^\* /{printf("* %s %s\n", strftime("%a %b %d %Y", $2), substr($0, length($1)+length($2)+length($3)+4)); next}{print}' $gitlog > $speclog
+
+	# add link to full git logs
+	local giturl="http://git.pld-linux.org/?p=packages/${SPECFILE%.spec}.git;a=log"
+	if [ -n "$CVSTAG" ]; then
+		giturl="$giturl;h=$CVSTAG"
+	fi
+	local gitauthor="PLD Linux Team <feedback@pld-linux.org>"
+	LC_ALL=C gawk -vgiturl="$giturl" -vgitauthor="$gitauthor" -vpackage=$PACKAGE_NAME 'BEGIN{
+		printf("* %s %s\n- For complete changelog see: %s\n", strftime("%a %b %d %Y"), gitauthor, giturl);
+		print;
+		exit
+	}' > $speclog
+
+	LC_ALL=C gawk '/^\* /{printf("* %s %s\n", strftime("%a %b %d %Y", $2), substr($0, length($1)+length($2)+length($3)+4)); next}{print}' $gitlog >> $speclog
 	sed '/^%changelog/,$d' $SPECFILE | sed -e "\${
 			a%changelog
 			r $speclog
@@ -465,18 +548,57 @@ insert_gitlog() {
 	echo $specdir
 }
 
+# @param string logfile
+# @param varargs... commands to execute
+teeboth() {
+	local rc
+	# use teeboth from toys/cleanbuild, if available and enabled
+	if [ "$USE_TEEBOTH" = "yes" ] && [ -x $APPDIR/teeboth ]; then
+		$APPDIR/teeboth "$@"
+		rc=$?
+	else
+		local efile rc logfile=$1; shift
+		if [ "$logfile" ]; then
+			efile=$(tempfile)
+			{ "$@" 2>&1; echo $? > $efile; } | tee -a $logfile
+			rc=$(< $efile)
+			rm -f $efile
+		else
+			"$@"
+			rc=$?
+		fi
+	fi
+	return $rc
+}
+
 # change dependency to specname
 # common changes:
 # - perl(Package::Name) -> perl-Package-Name
 depspecname() {
-	local package="$1"
+	local DEPS
+
+	if [ $# -gt 0 ]; then
+		DEPS="$@"
+	else
+		DEPS=$(cat)
+	fi
+
+	echo "$DEPS" | tr ' ' '\n' | sed -re '
+		# perl virtual deps
+		/perl\(.*\)/{
+			s/perl\((.*)\)/perl-\1/
+			s/::/-/g
+		}
 
-	package=$(echo "$package" | sed -e '/perl(.*)/{s,perl(\(.*\)),perl-\1,;s,::,-,g};' -e 's/-\(devel\|static\)$//' )
-	echo "$package"
+		s/apache\(EAPI\)-devel/apache-devel/
+
+		s/db-devel/db5.3-devel/
+		s/libjpeg-devel/libjpeg-turbo-devel/
+	'
 }
 
 update_shell_title() {
-	[ -t 1 ] || return
+	[ -t 2 ] || return
 	local len=${COLUMNS:-80}
 	local msg="$(echo "$*" | cut -c-$len)"
 
@@ -508,9 +630,9 @@ update_shell_title() {
 # set TARGET from BuildArch: from SPECFILE
 set_spec_target() {
 	if [ -n "$SPECFILE" ] && [ -z "$TARGET" ]; then
-		tmp=$(awk '/^BuildArch:/ { print $NF; exit }' $ASSUMED_NAME/$SPECFILE)
+		local tmp=$(awk '/^BuildArch:/ { print $NF; exit }' $ASSUMED_NAME/$SPECFILE)
 		if [ "$tmp" ]; then
-				target_platform=$(rpm -E '%{_target_vendor}-%{_target_os}%{?_gnu}')
+				local target_platform=$(rpm -E '%{_target_vendor}-%{_target_os}%{?_gnu}')
 				TARGET="$tmp"
 				case "$RPMBUILD" in
 				"rpmbuild")
@@ -524,11 +646,6 @@ set_spec_target() {
 
 # runs rpm with minimal macroset
 minirpm() {
-	# we reset macros not to contain macros.build as all the %() macros are
-	# executed here, while none of them are actually needed.
-	# at the time of this writing macros.build + macros contained 70 "%(...)" macros.
-	safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); gsub(/:.*macros.build:/, ":", $0); print $0 } ')
-
 	# TODO: move these to /usr/lib/rpm/macros
 	cat > $BUILDER_MACROS <<'EOF'
 %x8664 x86_64 amd64 ia32e
@@ -548,6 +665,7 @@ minirpm() {
 %releq_kernel_up(n:) ERROR
 %releq_kernel_smp(n:) ERROR
 %releq_kernel(n:) ERROR
+%py_postclean(x:) ERROR
 %kgcc_package ERROR
 %_fontsdir ERROR
 %ruby_version ERROR
@@ -580,7 +698,7 @@ minirpm() {
 %remove_etc_shells(p) %{p:<lua>}
 %lua_add_etc_shells()  %{nil}
 %lua_remove_etc_shells() %{nil}
-%required_jdk %{nil}
+%required_jdk jdk
 %buildrequires_jdk %{nil}
 %pear_package_print_optionalpackages %{nil}
 EOF
@@ -590,7 +708,13 @@ EOF
 %_sourcedir ./
 EOF
 	fi
-	eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
+	if ! is_rpmorg; then
+		local safe_macrofiles
+		safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); print $0 } ')
+		eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --macros "$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
+	else
+		eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --load "$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
+	fi
 }
 
 cache_rpm_dump() {
@@ -601,7 +725,7 @@ cache_rpm_dump() {
 
 	if [ -x /usr/bin/rpm-specdump ]; then
 		update_shell_title "cache_rpm_dump using rpm-specdump command"
-		rpm_dump_cache=$(rpm-specdump $TARGET_SWITCH $BCOND $SPECFILE)
+		rpm_dump_cache=$(rpm-specdump $TARGET_SWITCH $BCOND --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" $PACKAGE_DIR/$SPECFILE)
 	else
 		update_shell_title "cache_rpm_dump using rpmbuild command"
 		local rpm_dump
@@ -704,6 +828,13 @@ parse_spec() {
 	update_shell_title "parse_spec: OK!"
 }
 
+# aborts program abnormally
+die() {
+	local rc=${2:-1}
+	echo >&2 "$PROGRAM: ERROR: $*"
+	exit $rc
+}
+
 Exit_error() {
 	if [ -n "$DEBUG" ]; then
 		set -x
@@ -722,7 +853,11 @@ Exit_error() {
 			exit 2 ;;
 		"err_no_spec_in_repo" )
 			remove_build_requires
-			echo >&2 "Error: spec file not stored in PLD repo."
+			echo >&2 "Error: spec file not stored in repository."
+			if [ -n "$2" ]; then
+				echo >&2 "Tried: $2"
+			fi
+
 			exit 3 ;;
 		"err_no_source_in_repo" )
 			remove_build_requires
@@ -759,6 +894,9 @@ Exit_error() {
 			remove_build_requires
 			echo >&2 "Error: problem with remote (${2})"
 			exit 13 ;;
+		"err_no_checkut" )
+			echo >&2 "Error: cannot checkout $2"
+			exit 14 ;;
 		"err_not_implemented" )
 			remove_build_requires
 			echo >&2 "Error: functionality not yet imlemented"
@@ -790,8 +928,10 @@ init_builder() {
 			PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
 		fi
 	else
-		REPO_DIR="."
-		PACKAGE_DIR="."
+		TOP_DIR=$(pwd)
+		PACKAGE_DIR=$TOP_DIR
+		REPO_DIR=$PACKAGE_DIR
+		RPMBUILDOPTS="$RPMBUILDOPTS --define '_topdir $TOP_DIR' --define '_builddir %_topdir' --define '_rpmdir %_topdir' --define '_srcrpmdir %_topdir'"
 	fi
 	export GIT_WORK_TREE=$PACKAGE_DIR
 	export GIT_DIR=$PACKAGE_DIR/.git
@@ -830,10 +970,17 @@ create_git_repo() {
 	fi
 	[ -d "$ASSUMED_NAME/.git" ] || NEW_REPO=yes
 	ssh $GIT_PUSH create ${ASSUMED_NAME} || Exit_error err_cvs_add_failed
+	(
+	set -e
 	git init
-	git remote add $REMOTE_PLD ${GIT_SERVER}/${PACKAGES_DIR}/${ASSUMED_NAME}.git && \
-		git remote set-url --push  $REMOTE_PLD ssh://${GIT_PUSH}/${PACKAGES_DIR}/${ASSUMED_NAME} \
-		|| Exit_error err_remote_problem $REMOTE_PLD
+	git remote add $REMOTE_PLD ${GIT_SERVER}/${PACKAGES_DIR}/${ASSUMED_NAME}.git
+	git remote set-url --push $REMOTE_PLD ssh://${GIT_PUSH}/${PACKAGES_DIR}/${ASSUMED_NAME}
+
+	git config --local push.default current
+	git config --local branch.master.remote $REMOTE_PLD
+	git config --local branch.master.merge refs/heads/master
+	)
+	test $? = 0 || Exit_error err_remote_problem $REMOTE_PLD
 }
 
 get_spec() {
@@ -846,42 +993,44 @@ get_spec() {
 	fi
 
 	cd "$REPO_DIR"
-	if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then
-		# XXX: still needed?
-		SPECFILE=$(basename $SPECFILE)
-	fi
-
+	SPECFILE=$(basename $SPECFILE)
 	if [ "$NOCVSSPEC" != "yes" ]; then
 		if [ -z "$DEPTH" ]; then
-			if [ -d "$ASSUMED_NAME/.git" ]; then
-				git fetch $REMOTE_PLD || Exit_error err_no_spec_in_repo
+			if [ -d "$PACKAGE_DIR/.git" ]; then
+				git fetch $IPOPT $REMOTE_PLD || Exit_error err_no_spec_in_repo
 			elif [ "$ADD_PACKAGE_CVS" = "yes" ]; then
-				if [ ! -r "$ASSUMED_NAME/$SPECFILE" ]; then
-					echo "ERROR: No package to add ($ASSUMED_NAME/$SPECFILE)" >&2
+				if [ ! -r "$PACKAGE_DIR/$SPECFILE" ]; then
+					echo "ERROR: No package to add ($PACKAGE_DIR/$SPECFILE)" >&2
 					exit 101
 				fi
 				Exit_error err_not_implemented
 			else
 				(
 					unset GIT_WORK_TREE
-					git clone  -o $REMOTE_PLD ${GIT_SERVER}/${PACKAGES_DIR}/${ASSUMED_NAME}.git || {
+					git clone $IPOPT -o $REMOTE_PLD ${GIT_SERVER}/${PACKAGES_DIR}/${ASSUMED_NAME}.git || {
 						# softfail if new package, i.e not yet added to PLD rep
-						[ ! -f "$ASSUMED_NAME/$SPECFILE" ] && Exit_error err_no_spec_in_repo
-						echo "Warning: package not in CVS - assuming new package"
+						[ ! -f "$PACKAGE_DIR/$SPECFILE" ] && Exit_error err_no_spec_in_repo
+						echo "Warning: package not in Git - assuming new package"
 						NOCVSSPEC="yes"
 					}
-					git config --local --add "remote.$REMOTE_PLD.fetch"  'refs/notes/*:refs/notes/*'
+					git config --local --add "remote.$REMOTE_PLD.fetch" 'refs/notes/*:refs/notes/*'
+					git config --local --add "remote.$REMOTE_PLD.push" 'refs/notes/*:refs/notes/*'
+					git config --local --add "remote.$REMOTE_PLD.push" HEAD
+					git config --local push.default current
 					git remote set-url --push  $REMOTE_PLD ssh://${GIT_PUSH}/${PACKAGES_DIR}/${ASSUMED_NAME}
 				)
 			fi
 		else
-			if [ ! -d "$ASSUMED_NAME/.git" ]; then
-				if [ ! -d "$ASSUMED_NAME" ]; then
-					mkdir $ASSUMED_NAME
+			if [ ! -d "$PACKAGE_DIR/.git" ]; then
+				if [ ! -d "$PACKAGE_DIR" ]; then
+					install -d $PACKAGE_DIR
 				fi
 				git init
 				git remote add $REMOTE_PLD ${GIT_SERVER}/${PACKAGES_DIR}/${ASSUMED_NAME}.git
-				git config --local --add "remote.$REMOTE_PLD.fetch"  'refs/notes/*:refs/notes/*'
+				git config --local --add "remote.$REMOTE_PLD.fetch" 'refs/notes/*:refs/notes/*'
+				git config --local --add "remote.$REMOTE_PLD.push" 'refs/heads/*:refs/remotes/origin/*'
+				git config --local --add "remote.$REMOTE_PLD.push" HEAD
+				git config --local push.default current
 				git remote set-url --push  $REMOTE_PLD ssh://${GIT_PUSH}/${PACKAGES_DIR}/${ASSUMED_NAME}
 				CVSTAG=${CVSTAG:-"master"}
 			fi
@@ -889,68 +1038,86 @@ get_spec() {
 			if [ -z "$ALL_BRANCHES" ]; then
 				refs="${CVSTAG}:remotes/${REMOTE_PLD}/${CVSTAG}"
 			fi
-			git fetch $DEPTH $REMOTE_PLD $refs || {
+			git fetch $IPOPT $DEPTH $REMOTE_PLD $refs || {
 				echo >&2 "Error: branch $CVSTAG does not exist"
 				exit 3
 			}
 		fi
-		git fetch $REMOTE_PLD 'refs/notes/*:refs/notes/*'
+		git fetch $IPOPT $REMOTE_PLD 'refs/notes/*:refs/notes/*'
 
 		cvsignore_df .gitignore
 
 		# add default log format to .gitignore if it is relative to package dir
 		if [ -n "$LOGFILE" -a "$LOGFILE" = "${LOGFILE##*/}" ]; then
 			# substitute known "macros" to glob
-			local logfile=$(echo "$LOGFILE" | sed -e 's,\$\(PACKAGE_NAME\|DATE\),*,g')
+			local logfile=$(echo "$LOGFILE" | sed -r -e 's,\$(PACKAGE_(NAME|VERSION|RELEASE)|DATE|TARGET),*,g')
 			if [ "$logfile" ]; then
 				cvsignore_df "$logfile"
 			fi
 		fi
 
 		# create symlinks for tools
-		if [ "$SYMLINK_TOOLS" != "no" -a -d "$ASSUMED_NAME" ]; then
-			for a in dropin md5 adapter builder {relup,compile,repackage,rsync,pearize}.sh pldnotify.awk; do
+		if [ "$SYMLINK_TOOLS" != "no" -a -d "$PACKAGE_DIR" ]; then
+			for a in dropin md5 builder {relup,compile,repackage,rsync,pearize}.sh; do
 				# skip tools that don't exist in top dir
 				[ -f $a ] || continue
 				# skip tools that already exist
-				[ -f $ASSUMED_NAME/$a ] && continue
-				ln -s ../$a $ASSUMED_NAME
+				[ -f $PACKAGE_DIR/$a ] && continue
+				ln -s ../$a $PACKAGE_DIR
 				cvsignore_df $a
 			done
 		fi
 	fi
 
 	if [ -n "$CVSTAG" ]; then
-		git checkout "$CVSTAG" -- 2>/dev/null || git checkout -t "${REMOTE_PLD}/$CVSTAG" > /dev/null || exit
-		git symbolic-ref -q HEAD > /dev/null &&
-			git merge '@{u}'
+		if git rev-parse --verify -q "$CVSTAG" >/dev/null; then
+			# checkout only if differs, so this will not trash git reflog
+			if [ $(git rev-parse "$CVSTAG") != $(git rev-parse HEAD) ]; then
+				git checkout "$CVSTAG" --
+			fi
+		elif git rev-parse --verify -q "refs/remotes/${REMOTE_PLD}/$CVSTAG"; then
+			git checkout -t "refs/remotes/${REMOTE_PLD}/$CVSTAG" > /dev/null
+		fi
+		if [ $(git rev-parse "$CVSTAG") != $(git rev-parse HEAD) ]; then
+			Exit_error "err_no_checkut" "$CVSTAG"
+		fi
+
+		git merge --ff-only '@{u}'
+		git symbolic-ref -q HEAD > /dev/null && [ "$NOCVSSPEC" != "yes" ] &&
 		if [ -n "$CVSDATE" ]; then
 			git checkout $(git rev-list -n1 --before="'$CVSDATE'" $CVSTAG) || exit 1
 		fi
 	fi
 
-	if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then
-		Exit_error err_no_spec_in_repo
+	if [ ! -f "$PACKAGE_DIR/$SPECFILE" ]; then
+		Exit_error err_no_spec_in_repo "$PACKAGE_DIR/$SPECFILE"
 	fi
 
 	if [ "$CHMOD" = "yes" -a -n "$SPECFILE" ]; then
-		chmod $CHMOD_MODE $ASSUMED_NAME/$SPECFILE
+		chmod $CHMOD_MODE $PACKAGE_DIR/$SPECFILE
 	fi
 	unset OPTIONS
-	[ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $ASSUMED_NAME/$SPECFILE
+	[ -n "$DONT_PRINT_REVISION" ] || grep -E -m 1 "^#.*Revision:.*Date" $PACKAGE_DIR/$SPECFILE
 
 	set_spec_target
 }
 
+# find mirrors in this order. first match wins:
+# - package dir (~/rpm/packages/foo)
+# - repository dir (~/rpm/packages)
+# - tools dir dir (~/rpm/packages/rpm-build-tools)
 find_mirror() {
-	cd "$REPO_DIR"
 	local url="$1"
-	if [ ! -f "mirrors"  ] ; then
-		ln -s rpm-build-tools/mirrors .
-	fi
 
-	IFS="|"
+	update_shell_title "find_mirror[$url][$REPO_DIR]"
+
+	# NOTE: as while loop runs in subshell,
+	# we use exit 2 to indicate  that the match was found
+	# otherwise we end up outputing mirror url and origin url.
+
 	local origin mirror name rest ol prefix
+	IFS="|"
+	cat "$PACKAGE_DIR/mirrors" "$REPO_DIR/mirrors" "$REPO_DIR/../rpm-build-tools/mirrors" /dev/null 2>/dev/null | \
 	while read origin mirror name rest; do
 		# skip comments and empty lines
 		if [ -z "$origin" ] || [ "${origin#\#}" != "$origin" ]; then
@@ -961,10 +1128,9 @@ find_mirror() {
 		if [ "$prefix" = "$origin" ] ; then
 			suffix=$(echo "$url" | cut -b $((ol+1))-)
 			echo -n "$mirror$suffix"
-			return 0
+			exit 2
 		fi
-	done < mirrors
-	echo "$url"
+	done && echo "$url"
 }
 
 # Warning: unpredictable results if same URL used twice
@@ -986,15 +1152,16 @@ src_md5() {
 	cd $PACKAGE_DIR
 	local md5
 
-	if [ -f additional-md5sums ]; then
-		md5=$(grep -s -v '^#' additional-md5sums | \
-		grep -E "[ 	]$(basename "$1")([ 	,]|\$)" | \
+	# use "sources" file from package dir, like vim
+	if [ -f sources ]; then
+		md5=$(grep -s -v '^#' sources | \
+		grep -E "[ 	*]$(basename "$1")([ 	,]|\$)" | \
 		sed -e 's/^\([0-9a-f]\{32\}\).*/\1/' | \
 		grep -E '^[0-9a-f]{32}$')
 
 		if [ "$md5" ]; then
 			if [ $(echo "$md5" | wc -l) != 1 ] ; then
-				echo "$SPECFILE: more then one entry in additional-md5sums for $1" 1>&2
+				echo "$SPECFILE: more then one entry in sources for $1" 1>&2
 			fi
 			echo "$md5" | tail -n 1
 			return
@@ -1046,7 +1213,7 @@ cvsignore_df() {
 	if [ "$CVSIGNORE_DF" != "yes" ]; then
 		return
 	fi
-	cvsignore=${PACKAGE_DIR}/.gitignore
+	local cvsignore=${PACKAGE_DIR}/.git/info/exclude
 
 	# add only if not yet there
 	if ! awk -vf="$1" -vc=1 '$0 == f { c = 0 } END { exit c }' $cvsignore 2>/dev/null; then
@@ -1209,10 +1376,6 @@ get_files() {
 						update_shell_title "${GETLOCAL%% *}: $url"
 						${GETLOCAL} $url $target
 					else
-						if [ -z "$NOMIRRORS" ]; then
-							url=$(find_mirror "$url")
-						fi
-
 						local uri=${url}
 						# make shorter message for distfiles urls
 						if [[ "$uri" = ${PROTOCOL}${DISTFILES_SERVER}* ]] || [[ "$uri" = ${PROTOCOL}${ATTICDISTFILES_SERVER}* ]]; then
@@ -1221,11 +1384,7 @@ get_files() {
 							uri="df: $uri"
 						fi
 						update_shell_title "${GETURI%% *}: $uri"
-						${GETURI} ${OUTFILEOPT} "$target" "$url" || \
-						if [ "`echo $url | grep -E 'ftp://'`" ]; then
-							update_shell_title "${GETURI2%% *}: $url"
-							${GETURI2} ${OUTFILEOPT} "$target" "$url"
-						fi
+						${GETURI} "$target" "$url"
 					fi
 
 					# is it empty file?
@@ -1235,15 +1394,8 @@ get_files() {
 							update_shell_title "${GETLOCAL%% *}: $url_attic"
 							${GETLOCAL} $url_attic $target
 						else
-							if [ -z "$NOMIRRORS" ]; then
-								url_attic=$(find_mirror "$url_attic")
-							fi
 							update_shell_title "${GETURI%% *}: $url_attic"
-							${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
-							if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
-								update_shell_title "${GETURI2%% *}: $url_attic"
-								${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
-							fi
+							${GETURI} "$target" "$url_attic"
 							test -s "$target" || rm -f "$target"
 						fi
 					fi
@@ -1263,11 +1415,7 @@ get_files() {
 						im="$i"
 					fi
 					update_shell_title "${GETURI%% *}: $im"
-					${GETURI} ${OUTFILEOPT} "$target" "$im" || \
-					if [ "`echo $im | grep -E 'ftp://'`" ]; then
-						update_shell_title "${GETURI2%% *}: $im"
-						${GETURI2} ${OUTFILEOPT} "$target" "$im"
-					fi
+					${GETURI} "$target" "$im"
 					test -s "$target" || rm -f "$target"
 				fi
 
@@ -1292,19 +1440,11 @@ get_files() {
 				FROM_DISTFILES=2
 				rm -f $target
 				update_shell_title "${GETURI%% *}: $url"
-				${GETURI} ${OUTFILEOPT} "$target" "$url" || \
-				if [ "`echo $url | grep -E 'ftp://'`" ]; then
-					update_shell_title "${GETURI2%% *}: $url"
-					${GETURI2} ${OUTFILEOPT} "$target" "$url"
-				fi
+				${GETURI} "$target" "$url"
 				if [ ! -s "$target" ]; then
 					rm -f "$target"
 					update_shell_title "${GETURI%% *}: $url_attic"
-					${GETURI} ${OUTFILEOPT} "$target" "$url_attic" || \
-					if [ "`echo $url_attic | grep -E 'ftp://'`" ]; then
-						update_shell_title "${GETURI2%% *}: $url_attic"
-						${GETURI2} ${OUTFILEOPT} "$target" "$url_attic"
-					fi
+					${GETURI} "$target" "$url_attic"
 				fi
 				test -s "$target" || rm -f "$target"
 			fi
@@ -1388,7 +1528,7 @@ tag_files() {
 	if tag_exist $_tag || [ -n "$CVS_FORCE" ]; then
 		update_shell_title "tag sources: $_tag"
 		git $OPTIONS $_tag || exit
-		git push $CVS_FORCE $REMOTE_PLD tag $_tag || Exit_error err_remote_problem $REMOTE_PLD
+		git push $IPOPT $CVS_FORCE $REMOTE_PLD tag $_tag || Exit_error err_remote_problem $REMOTE_PLD
 	else
 		echo "Tag $_tag already exists and points to the same commit"
 	fi
@@ -1453,50 +1593,61 @@ set_version() {
 	" $specfile
 }
 
+# try to upgrade .spec to new version
+# if --upgrade-version is specified, use that as new version, otherwise invoke pldnotify to find new version
+#
+# return 1: if .spec was updated
+# return 0: no changes to .spec
+# exit 1 in case of error
 try_upgrade() {
-	if [ -n "$TRY_UPGRADE" ]; then
-		local TNOTIFY TNEWVER TOLDVER
-		update_shell_title "build_package: try_upgrade"
+	if [ -z "$TRY_UPGRADE" ]; then
+		return 0
+	fi
 
-		cd "$PACKAGE_DIR"
-		
-		if [ "$UPGRADE_VERSION" ]; then
-			TNEWVER=$UPGRADE_VERSION
-		else
-			if [ -n "$FLOAT_VERSION" ]; then
-				TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE -n) || exit 1
-			else
-				TNOTIFY=$($APPDIR/pldnotify.awk ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE) || exit 1
-			fi
+	local TNOTIFY TNEWVER TOLDVER
+	update_shell_title "build_package: try_upgrade"
 
-			# pldnotify.awk does not set exit codes, but it has match for ERROR
-			# in output which means so.
-			if [[ "$TNOTIFY" = *ERROR* ]]; then
-				echo >&2 "$TNOTIFY"
-				exit 1
-			fi
+	cd "$PACKAGE_DIR"
 
-			TNEWVER=$(echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }')
+	if [ "$UPGRADE_VERSION" ]; then
+		TNEWVER=$UPGRADE_VERSION
+		echo "Updating spec file to version $TNEWVER"
+	else
+		if [ -n "$FLOAT_VERSION" ]; then
+			TNOTIFY=$(pldnotify ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE -n) || exit 1
+		else
+			TNOTIFY=$(pldnotify ${BE_VERBOSE:+-vDEBUG=1} $SPECFILE) || exit 1
 		fi
 
-		if [ -n "$TNEWVER" ]; then
-			TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'`
-			echo "New version found, updating spec file from $TOLDVER to version $TNEWVER"
-			if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then
-				cp -f $SPECFILE $SPECFILE.bak
-			fi
-			chmod +w $SPECFILE
-			set_release $SPECFILE $PACKAGE_RELEASE 1
-			set_version $SPECFILE $PACKAGE_VERSION $TNEWVER
-			parse_spec
-			if [ "$PACKAGE_VERSION" != "$TNEWVER" ]; then
-				echo >&2 "Upgrading version failed, you need to update spec yourself"
-				exit 1
-			fi
-			return 1
+		# pldnotify does not set exit codes, but it has match for ERROR
+		# in output which means so.
+		if [[ "$TNOTIFY" = *ERROR* ]]; then
+			echo >&2 "$TNOTIFY"
+			exit 1
 		fi
+
+		TOLDVER=`echo $TNOTIFY | awk '{ print $3; }'`
+		echo "New version found, updating spec file from $TOLDVER to version $TNEWVER"
+
+		TNEWVER=$(echo $TNOTIFY | awk '{ match($4,/\[NEW\]/); print $5 }')
+	fi
+
+	if [ -z "$TNEWVER" ]; then
+		return 0
 	fi
-	return 0
+
+	if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then
+		cp -f $SPECFILE $SPECFILE.bak
+	fi
+	chmod +w $SPECFILE
+	set_version $SPECFILE $PACKAGE_VERSION $TNEWVER
+	set_release $SPECFILE $PACKAGE_RELEASE 1
+	parse_spec
+	if [ "$PACKAGE_VERSION" != "$TNEWVER" ]; then
+		echo >&2 "Upgrading version failed, you need to update spec yourself"
+		exit 1
+	fi
+	return 1
 }
 
 build_package() {
@@ -1527,36 +1678,46 @@ build_package() {
 	esac
 
 	update_shell_title "build_package: $COMMAND"
+	local logfile retval
 	if [ -n "$LOGFILE" ]; then
-		LOG=`eval echo $LOGFILE`
-		if [ -d "$LOG" ]; then
-			echo "Log file $LOG is a directory."
+		logfile=`eval echo $LOGFILE`
+		if [ -d "$logfile" ]; then
+			echo "Log file $logfile is a directory."
 			echo "Parse error in the spec?"
 			Exit_error err_build_fail
 		fi
 		if [ -n "$LASTLOG_FILE" ]; then
-			echo "LASTLOG=$LOG" > $LASTLOG_FILE
+			echo "LASTLOG=$logfile" > $LASTLOG_FILE
 		fi
-		RES_FILE=$(tempfile)
-		local specdir=$(insert_gitlog $SPECFILE)
-
-		(time eval PATH=$CLEAN_PATH ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
-		RETVAL=`cat $RES_FILE`
-		rm -r $RES_FILE $specdir
-		if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
-			if [ "$RETVAL" -eq "0" ]; then
-				mv $LOG $LOGDIROK
-			else
-				mv $LOG $LOGDIRFAIL
-			fi
+	fi
+
+	# unset these, should not be exposed to builder shell!
+	unset GIT_WORK_TREE GIT_DIR
+	# these are set by jenkins
+	unset GIT_PREVIOUS_COMMIT GIT_URL GIT_PREVIOUS_SUCCESSFUL_COMMIT GIT_BRANCH GIT_COMMIT
+	# this may be set by user
+	unset GIT_SSH
+	# may be set by user
+	unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_TESTING_PORCELAIN_COMMAND_LIST
+	# fail if something still set
+	env | grep ^GIT_ && Exit_error err_build_fail
+
+	local specdir=$(insert_gitlog $SPECFILE)
+	ulimit -c unlimited
+	# FIXME: eval here is exactly why?
+	PATH=$CLEAN_PATH eval teeboth "'$logfile'" ${TIME_COMMAND} ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
+	retval=$?
+	rm -r $specdir
+
+	if [ -n "$logfile" ] && [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then
+		if [ "$retval" -eq "0" ]; then
+			mv $logfile $LOGDIROK
+		else
+			mv $logfile $LOGDIRFAIL
 		fi
-	else
-		local specdir=$(insert_gitlog $SPECFILE)
-		eval PATH=$CLEAN_PATH ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE
-		RETVAL=$?
-		rm -r $specdir
 	fi
-	if [ "$RETVAL" -ne "0" ]; then
+
+	if [ "$retval" -ne "0" ]; then
 		if [ -n "$TRY_UPGRADE" ]; then
 			echo "\nUpgrade package to new version failed."
 			if [ "$REVERT_BROKEN_UPGRADE" = "yes" ]; then
@@ -1666,7 +1827,7 @@ set_bconds_values() {
 		without_*)
 			bcond=${opt#without_}
 			case "$BCOND" in
-			*--without?${bcond}*)
+			*--without?${bcond}\ *|*--without?${bcond})
 				AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$bcond>"
 				;;
 			*)
@@ -1677,7 +1838,7 @@ set_bconds_values() {
 		with_*)
 			bcond=${opt#with_}
 			case "$BCOND" in
-			*--with?${bcond}*)
+			*--with?${bcond}\ *|*--with?${bcond})
 				AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$bcond>"
 				;;
 			*)
@@ -1697,13 +1858,13 @@ run_sub_builder() {
 	package_name="${1}"
 	update_shell_title "run_sub_builder $package_name"
 	#
-	# No i tutaj bym chcia³ zrobiæ sztuczn± inteligencjê, która spróbuje tego
-	# pakieta zbudowaæ. Aktualnie niewiele dziala, bo generalnie nie widze do
+	# No i tutaj bym chciał zrobić sztuczną inteligencję, która spróbuje tego
+	# pakieta zbudować. Aktualnie niewiele dziala, bo generalnie nie widze do
 	# konca algorytmu... Ale damy rade. :) Na razie po prostu sie wyjebie tak samo
 	# jakby nie bylo tego kawalka kodu.
 	#
-	# Update: Poprawi³em parê rzeczy i zaczê³o generowaæ pakiety spoza zadanej listy.
-	#         Jednym s³owem budowanie niespoldkowanych zale¿no¶ci dzia³a w paru przypadkach.
+	# Update: Poprawiłem parę rzeczy i zaczęło generować pakiety spoza zadanej listy.
+	#         Jednym słowem budowanie niespoldkowanych zależności działa w paru przypadkach.
 	#
 	#
 	# y0shi.
@@ -1728,6 +1889,46 @@ run_sub_builder() {
 	NOT_INSTALLED_PACKAGES="$NOT_INSTALLED_PACKAGES $package_name"
 }
 
+# install package with poldek
+# @return exit code from poldek
+#
+# this requires following sudo rules:
+# - poldek --noask --caplookup -ug
+poldek_install() {
+	LC_ALL=C LANG=C $POLDEK_CMD --noask --caplookup --uniq -ug "$@"
+}
+
+# install packages
+#
+# this requires following sudo rules:
+# - poldek -q --update --upa
+install_packages() {
+	# sync poldek indexes once per invocation
+	if [ -z "$package_indexes_updated" ]; then
+		update_shell_title "poldek: update indexes"
+		$POLDEK_CMD -q --update --upa --mo=nodesc
+		package_indexes_updated=true
+	fi
+
+	update_shell_title "install packages: $*"
+	poldek_install "$@" && return
+
+	# retry install, install packages one by one
+	# this is slower one
+	local rc=0 package
+	for package in $*; do
+		package=$(depspecname $package)
+		update_shell_title "install package: $package"
+		poldek_install "$package" || rc=$?
+	done
+	return $rc
+}
+
+uninstall_packages() {
+	update_shell_title "uninstall packages: $*"
+	$POLDEK_CMD --noask --nofollow -ev "$@"
+}
+
 spawn_sub_builder() {
 	package_name="${1}"
 	update_shell_title "spawn_sub_builder $package_name"
@@ -1787,28 +1988,28 @@ display_bconds() {
 
 display_branches() {
 	echo -n "Available branches: "
-	git branch -r | grep "^  ${REMOTE_PLD}" | grep -v ${REMOTE_PLD}/HEAD | sed "s#^ *${REMOTE_PLD}/##" | xargs
+	git branch -r 2>/dev/null | grep "^  ${REMOTE_PLD}" | grep -v ${REMOTE_PLD}/HEAD | sed "s#^ *${REMOTE_PLD}/##" | xargs
 }
 
-# checks a given list of packages/files/provides agains current rpmdb.
+# checks a given list of packages/files/provides against current rpmdb.
 # outputs all dependencies which current rpmdb doesn't satisfy.
 # input can be either STDIN or parameters
 _rpm_prov_check() {
-	local DEPS
+	local deps out
 
 	if [ $# -gt 0 ]; then
-		DEPS="$@"
+		deps="$@"
 	else
-		DEPS=$(cat)
+		deps=$(cat)
 	fi
 
-	DEPS=$(LANG=C rpm -q --whatprovides $DEPS 2>&1 | awk '/^(error:|no package provides)/ { print }')
+	out=$(LC_ALL=C rpm -q --whatprovides $deps 2>&1)
 
 	# packages
-	echo "$DEPS" | awk '/^no package provides/ { print $NF }'
+	echo "$out" | awk '/^no package provides/ { print $NF }'
 
 	# other deps (files)
-	echo "$DEPS" | awk -F: '/^error:.*No such file/{o = $2; gsub("^ file ", "", o); print o}'
+	echo "$out" | sed -rne 's/file (.*): No such file or directory/\1/p'
 }
 
 # checks if given package/files/provides exists in rpmdb.
@@ -1823,49 +2024,31 @@ _rpm_cnfl_check() {
 		DEPS=$(cat)
 	fi
 
-	LANG=C rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
+	LC_ALL=C LANG=C rpm -q --whatprovides $DEPS 2>/dev/null | awk '!/no package provides/ { print }'
 }
 
 # install deps via information from 'rpm-getdeps' or 'rpm --specsrpm'
 install_build_requires_rpmdeps() {
+	local DEPS CNFL
 	if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
 		# TODO: Conflicts list doesn't check versions
-		local CNFL=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
-		local DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
+		CNFL=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\-/ { print $3 } ' | _rpm_cnfl_check | xargs)
+		DEPS=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs)
 	fi
 	if [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then
-		local CNFL=$(rpm -q --specsrpm --conflicts $BCOND $SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
-		local DEPS=$(rpm -q --specsrpm --requires $BCOND $SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
+		CNFL=$(eval rpm -q --specsrpm --conflicts $BCOND $RPMOPTS $SPECFILE | awk '{print $1}' | _rpm_cnfl_check | xargs)
+		DEPS=$(eval rpm -q --specsrpm --requires $BCOND $RPMOPTS $SPECFILE | awk '{print $1}' | _rpm_prov_check | xargs)
 	fi
 
-	if [ -n "$CNFL" ] || [ -n "$DEPS" ]; then
-		echo "fetch BuildRequires: install [$DEPS]; remove [$CNFL]"
-		update_shell_title "poldek: install [$DEPS]; remove [$CNFL]"
-		$SU_SUDO /usr/bin/poldek -q --update || $SU_SUDO /usr/bin/poldek -q --upa
-	fi
 	if [ -n "$CNFL" ]; then
-		update_shell_title "uninstall conflicting packages: $CNFL"
-		echo "Trying to uninstall conflicting packages ($CNFL):"
-		$SU_SUDO /usr/bin/poldek --noask --nofollow -ev $CNFL
-	fi
-
-	while [ "$DEPS" ]; do
-			update_shell_title "install deps: $DEPS"
-			echo "Trying to install dependencies ($DEPS):"
-			local log=.${SPECFILE}_poldek.log
-			LANG=C $SU_SUDO /usr/bin/poldek --noask --caplookup -uGqQ $DEPS | tee $log
-			failed=$(awk '/^error:/{a=$2; sub(/^error: /, "", a); sub(/:$/, "", a); print a}' $log)
-			rm -f $log
-			local ok
-			if [ -n "$failed" ]; then
-				for package in $failed; do
-					spawn_sub_builder -bb $(depspecname $package) && ok="$ok $package"
-				done
-				DEPS="$ok"
-			else
-				DEPS=""
-			fi
-	done
+		echo "Uninstall conflicting packages: $CNFL"
+		uninstall_packages $CNFL
+	fi
+
+	if [ -n "$DEPS" ]; then
+		echo "Install dependencies: $DEPS"
+		install_packages $DEPS
+	fi
 }
 
 fetch_build_requires()
@@ -1880,149 +2063,17 @@ fetch_build_requires()
 		return
 	fi
 
-		# XXX is this ugliest code written in human history still needed?
-		echo "All packages installed by fetch_build_requires() are written to:"
-		echo "`pwd`/.${SPECFILE}_INSTALLED_PACKAGES"
-		echo ""
-		echo "If anything fails, you may get rid of them by executing:"
-		echo "poldek -e \`cat `pwd`/.${SPECFILE}_INSTALLED_PACKAGES\`"
-		echo ""
-		echo > `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
-		for package_item in $(cat $SPECFILE | grep -B100000 ^%changelog|grep -v ^#|grep BuildRequires|grep -v ^-|sed -e "s/^.*BuildRequires://g"|awk '{print $1}'|sed -e s,perl\(,perl-,g -e s,::,-,g -e s,\(.*\),,g -e s,%{,,g -e s,},,g|grep -v OpenGL-devel|sed -e s,sh-utils,coreutils,g -e s,fileutils,coreutils,g -e s,textutils,coreutils,g -e s,kgcc_package,gcc,g -e s,\),,g)
-		do
-			package_item=$(echo $package_item|sed -e s,rpmbuild,rpm-build,g |sed -e s,__perl,perl,g |sed -e s,gasp,binutils-gasp,g -e s,binutils-binutils,binutils,g -e s,apxs,apache,g|sed -e s,apache\(EAPI\)-devel,apache-devel,g -e s,kernel-headers\(netfilter\),kernel-headers,g -e s,awk,mawk,g -e s,mmawk,mawk,g -e s,motif,openmotif,g -e s,openopenmotif,openmotif,g)
-			GO="yes"
-			package=$(basename "$package_item"|sed -e "s/}$//g")
-			COND_ARCH_TST=$(cat $SPECFILE|grep -B1 BuildRequires|grep -B1 $package|grep ifarch|sed -e "s/^.*ifarch//g")
-			mach=$(uname -m)
-
-			COND_TST=`cat $SPECFILE|grep BuildRequires|grep "$package"`
-			if `echo $COND_TST|grep -q '^BuildRequires:'`; then
-				if [ "$COND_ARCH_TST" != "" ] && [ "`echo $COND_ARCH_TST|sed -e "s/i.86/ix86/g"`" != "`echo $mach|sed -e "s/i.86/ix86/g"`" ]; then
-					GO="yes"
-				fi
-			# bcond:
-			else
-				COND_NAME=`echo $COND_TST|sed -e s,:BuildRequires:.*$,,g`
-				GO=""
-				# %{without}
-				if `echo $COND_TST|grep -q 'without_'`; then
-					COND_NAME=`echo $COND_NAME|sed -e s,^.*without_,,g`
-					if `echo $COND_TST|grep -q !`; then
-						COND_STATE="with"
-					else
-						COND_STATE="wout"
-					fi
-					COND_WITH=`echo $AVAIL_BCONDS_WITH|grep "<$COND_NAME>"`
-					COND_WITHOUT=`echo $AVAIL_BCONDS_WITHOUT|grep "<$COND_NAME>"`
-					if [ -n "$COND_WITHOUT" ] || [ -z "$COND_WITH" ]; then
-						COND_ARGV="wout"
-					else
-						COND_ARGV="with"
-					fi
-				# %{with}
-				elif `echo $COND_TST|grep -q 'with_'`; then
-					COND_NAME=`echo $COND_NAME|sed -e s,^.*with_,,g`
-					if `echo $COND_TST|grep -q !`; then
-						COND_STATE="wout"
-					else
-						COND_STATE="with"
-					fi
-					COND_WITH=`echo $AVAIL_BCONDS_WITH|grep "<$COND_NAME>"`
-					COND_WITHOUT=`echo $AVAIL_BCONDS_WITHOUT|grep "<$COND_NAME>"`
-					if [ -n "$COND_WITH" ] || [ -z "$COND_WITHOUT" ]; then
-						COND_ARGV="with"
-					else
-						COND_ARGV="wout"
-					fi
-				fi
-				RESULT="${COND_STATE}-${COND_ARGV}"
-				case "$RESULT" in
-					"with-wout" | "wout-with" )
-						GO=""
-						;;
-					"wout-wout" | "with-with" )
-						GO="yes"
-						;;
-					* )
-						echo "Action '$RESULT' was not defined for package '$package_item'"
-						GO="yes"
-						;;
-				esac
-			fi
+	die "need rpm-getdeps tool"
+}
 
-			if [ "$GO" = "yes" ]; then
-				if [ "`rpm -q $package|sed -e "s/$package.*/$package/g"`" != "$package" ]; then
-					echo "Testing if $package has subrequirements..."
-					run_poldek -t -i $package --dumpn=".$package-req.txt"
-					if [ -f ".$package-req.txt" ]; then
-						for package_name in `cat ".$package-req.txt"|grep -v ^#`
-						do
-							if [ "$package_name" = "$package" ]; then
-								echo "Installing BuildRequired package:\t$package_name"
-								update_shell_title "Installing BuildRequired package: ${package_name}"
-								install_required_packages $package
-							else
-								echo "Installing (sub)Required package:\t$package_name"
-								update_shell_title "Installing (sub)Required package: ${package_name}"
-								install_required_packages $package_name
-							fi
-							case $? in
-								0)
-									INSTALLED_PACKAGES="$package_name $INSTALLED_PACKAGES"
-									echo $package_name >> `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
-									;;
-								*)
-									echo "Attempting to run spawn sub - builder..."
-									echo "Package installation failed:\t$package_name"
-									run_sub_builder $package_name
-									if [ $? -eq 0 ]; then
-										install_required_packages $package_name
-										case $? in
-											0)
-												INSTALLED_PACKAGES="$package_name $INSTALLED_PACKAGES"
-												echo $package_name >> `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
-												;;
-											*)
-												NOT_INSTALLED_PACKAGES="$package_name $NOT_INSTALLED_PACKAGES"
-												;;
-										esac
-									fi
-									;;
-							esac
-						done
-						rm -f ".$package-req.txt"
-					else
-						echo "Attempting to run spawn sub - builder..."
-						echo "Package installation failed:\t$package"
-						run_sub_builder $package
-						if [ $? -eq 0 ]; then
-							install_required_packages $package
-							case $? in
-								0)
-									INSTALLED_PACKAGES="$package_name $INSTALLED_PACKAGES"
-									echo $package_name >> `pwd`/.${SPECFILE}_INSTALLED_PACKAGES
-									;;
-								*)
-									NOT_INSTALLED_PACKAGES="$package_name $NOT_INSTALLED_PACKAGES"
-									;;
-							esac
-						fi
-					fi
-				else
-					echo "Package $package is already installed. BuildRequirement satisfied."
-				fi
-			fi
-		done
-		if [ "$NOT_INSTALLED_PACKAGES" != "" ]; then
-			echo >&2 "Unable to install following packages and their dependencies:"
-			for pkg in "$NOT_INSTALLED_PACKAGES"
-			do
-				echo $pkg
-			done
-			remove_build_requires
-			exit 8
-		fi
+init_repository() {
+	local remoterepo=$1
+	local localrepo=$2
+
+	if [ ! -e $localrepo ]; then
+		git clone $IPOPT -o $REMOTE_PLD ${GIT_SERVER}/$remoterepo $localrepo
+		git --git-dir=$localrepo/.git remote set-url --push  $REMOTE_PLD ssh://${GIT_PUSH}/$remoterepo
+	fi
 }
 
 init_rpm_dir() {
@@ -2030,18 +2081,21 @@ init_rpm_dir() {
 	local rpmdir=$(eval $RPM $RPMOPTS --eval '%{_rpmdir}')
 	local buildir=$(eval $RPM $RPMOPTS --eval '%{_builddir}')
 	local srpmdir=$(eval $RPM $RPMOPTS --eval '%{_srcrpmdir}')
+	local TEMPLATES=template-specs
 	local tmp
 
 	echo "Initializing rpm directories to $TOP_DIR from $GIT_SERVER"
 	mkdir -p $TOP_DIR $rpmdir $buildir $srpmdir
 
 	cd "$TOP_DIR"
-	if [ ! -e ../rpm-build-tools ]; then
-		git clone  ${GIT_SERVER}/${PACKAGES_DIR}/rpm-build-tools.git ../rpm-build-tools
-	fi
-	for a in adapter builder fetchsrc_request; do
+	init_repository ${PACKAGES_DIR}/rpm-build-tools.git ../rpm-build-tools
+	init_repository projects/$TEMPLATES ../$TEMPLATES
+	for a in builder fetchsrc_request compile repackage; do
 		ln -sf ../rpm-build-tools/${a}.sh $a
 	done
+	for a in md5; do
+		ln -sf ../rpm-build-tools/${a} $a
+	done
 	ln -sf ../rpm-build-tools/mirrors mirrors
 	init_builder
 }
@@ -2052,7 +2106,7 @@ mr_proper() {
 	DONT_PRINT_REVISION="yes"
 
 	# remove spec and sources
-	PATH=$CLEAN_PATH $RPMBUILD --clean --rmsource --rmspec --nodeps --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" --define "_builddir $builddir" $PACKAGE_DIR/$SPECFILE
+	PATH=$CLEAN_PATH $RPMBUILD --clean --rmsource --rmspec --nodeps --define "__urlgetfile() %nil" --define "_specdir $PACKAGE_DIR" --define "_sourcedir $PACKAGE_DIR" --define "_builddir $builddir" $PACKAGE_DIR/$SPECFILE
 	rm -rf $PACKAGE_DIR/{.git,.gitignore}
 	rmdir --ignore-fail-on-non-empty $PACKAGE_DIR
 }
@@ -2065,12 +2119,15 @@ if [ $# = 0 ]; then
 	exit 1
 fi
 
+# stuff global $BUILDER_OPTS from env as args
+if [ "$BUILDER_OPTS" ]; then
+	set -- "$BUILDER_OPTS" "$@"
+fi
+
 while [ $# -gt 0 ]; do
 	case "${1}" in
 		-4|-6)
-			# NOTE: we should be fetcher specific, like fille WGET_OPTS, but
-			# unfortunately $GETURI is already formed
-			GETURI="$GETURI $1"
+			IPOPT="${1}"
 			shift
 			;;
 		-5 | --update-md5)
@@ -2132,11 +2189,11 @@ while [ $# -gt 0 ]; do
 		--http )
 			PROTOCOL="http"; shift ;;
 		-j)
-			RPMOPTS="${RPMOPTS} --define \"_smp_mflags -j$2\""
+			RPMOPTS="${RPMOPTS} --define \"__jobs $2\""
 			shift 2
 			;;
 		-j[0-9]*)
-			RPMOPTS="${RPMOPTS} --define \"_smp_mflags $1\""
+			RPMOPTS="${RPMOPTS} --define \"__jobs ${1#-j}\""
 			shift
 			;;
 		-p)
@@ -2178,7 +2235,7 @@ while [ $# -gt 0 ]; do
 		-pm | --prefer-mirrors )
 			PREFMIRRORS="yes"
 			shift;;
-		--no-init )
+		--noinit | --no-init )
 			NOINIT="yes"
 			shift;;
 		--opts )
@@ -2298,7 +2355,7 @@ while [ $# -gt 0 ]; do
 		-Upi | --update-poldek-indexes )
 			UPDATE_POLDEK_INDEXES="yes"
 			shift ;;
-		--init-rpm-dir)
+		--init-rpm-dir|--init)
 			COMMAND="init_rpm_dir"
 			shift ;;
 		-u | --try-upgrade )
@@ -2323,7 +2380,7 @@ while [ $# -gt 0 ]; do
 			;;
 		--alt_kernel)
 			shift
-			RPMOPTS="${RPMOPTS} --define \"alt_kernel $1\""
+			RPMOPTS="${RPMOPTS} --define \"alt_kernel $1\" --define \"build_kernels $1\""
 			shift
 			;;
 		--short-circuit)
@@ -2395,6 +2452,9 @@ else
 	NICE_COMMAND="nice -n ${DEF_NICE_LEVEL}"
 fi
 
+# see time(1) for output format that could be used
+TIME_COMMAND="time -p"
+
 update_shell_title "$COMMAND"
 case "$COMMAND" in
 	"show_bconds")
@@ -2477,12 +2537,15 @@ case "$COMMAND" in
 		# ./builder -bs test.spec -r AC-branch -Tp auto-ac- -tt
 		if [ -n "$TEST_TAG" ]; then
 			local TAGVER=`make_tagver`
-			tag_exist $TAGVER
+			tag_exist $TAGVER || [ $TAGVER = $CVSTAG ] || Exit_error err_tag_exists $TAGVER
 			# check also tags created in CVS
-			tag_exist $(echo $TAGVER | tr '[.@]' '[_#]')
+			local TAGVER_CVS=$(echo $TAGVER | tr '[.@]' '[_#]')
+			local CVSTAG_CVS=$(echo $CVSTAG | tr '[.@]' '[_#]')
+			tag_exist $TAGVER_CVS || [ $TAGVER_CVS = $CVSTAG_CVS ] \
+				|| Exit_error err_tag_exists $TAGVER_CVS
 			# - do not allow to build from HEAD when XX-branch exists
 			TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto/\([a-zA-Z]\+\)/.*#\1#g')
-			if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
+			if [ "$TAGVER" != "$CVSTAG" -a "$TAGVER_CVS" != "$CVSTAG" -a  "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
 				TAG_BRANCH="${TREE_PREFIX}-branch"
 				if [ -n "$DEPTH" ]; then
 					cmd_branches="git ls-remote --heads"
@@ -2506,7 +2569,7 @@ case "$COMMAND" in
 		case $? in
 			0)
 				get_files $SOURCES $PATCHES
-				check_md5 $SOURCES
+				check_md5 $SOURCES $PATCHES
 				;;
 			*)
 				NODIST="yes" get_files $SOURCES $PATCHES
@@ -2566,6 +2629,7 @@ case "$COMMAND" in
 		fi
 		get_files $SOURCES $PATCHES
 		check_md5 $SOURCES
+		fetch_build_requires
 		;;
 	"update_md5" )
 		init_builder
@@ -2610,13 +2674,13 @@ case "$COMMAND" in
 		done
 		;;
 	"list-sources-urls" )
-		init_builder
+		init_builder >&2
 		NOCVSSPEC="yes"
 		DONT_PRINT_REVISION="yes"
-		get_spec
-		parse_spec
+		get_spec >&2
+		parse_spec >&2
 		SAPS="$SOURCES $PATCHES"
-		for SAP in $SAPS ; do
+		for SAP in $SAPS; do
 			echo $SAP
 		done
 		;;