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

diff --git a/builder.sh b/builder.sh
index 7612557..53ef564 100755
--- a/builder.sh
+++ b/builder.sh
@@ -38,9 +38,10 @@ APPDIR=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
 VERSION="v0.35"
 VERSIONSTRING="\
 Build package utility from PLD Linux Packages repository
-$VERSION (C) 1999-2016 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
@@ -114,8 +115,7 @@ 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}
@@ -214,13 +214,8 @@ fi
 
 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
@@ -275,16 +270,17 @@ download_axel() {
 }
 
 download_wget() {
-	local outfile=$1 url=$2 retval
-	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 --help 2>&1 | grep -q -- ' --no-iri ' && WGET_OPTS="$WGET_OPTS --no-iri"
-	WGET_OPTS="$WGET_OPTS --user-agent=$USER_AGENT"
-
-	GETURI="wget -c -nd -t$WGET_RETRIES $WGET_OPTS $IPOPT"
+	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
 
-	${GETURI} --passive-ftp -O "$outfile" "$url"
+	wget $WGET_OPTS -O "$outfile" "$url"
 	retval=$?
 	if [ $retval -ne 0 ]; then
 		if [ "`echo $url | grep -E 'ftp://'`" ]; then
@@ -479,6 +475,26 @@ Usage: builder [--all-branches] [-D|--debug] [-V|--version] [--short-version]  [
 "
 }
 
+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() {
 	local prefix=builder.$PACKAGE_NAME${1:+.$1}
@@ -630,8 +646,6 @@ set_spec_target() {
 
 # runs rpm with minimal macroset
 minirpm() {
-	safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: '/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); print $0 } ')
-
 	# TODO: move these to /usr/lib/rpm/macros
 	cat > $BUILDER_MACROS <<'EOF'
 %x8664 x86_64 amd64 ia32e
@@ -694,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() {
@@ -1051,7 +1071,10 @@ get_spec() {
 
 	if [ -n "$CVSTAG" ]; then
 		if git rev-parse --verify -q "$CVSTAG" >/dev/null; then
-			git checkout "$CVSTAG" --
+			# 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
@@ -1680,6 +1703,7 @@ build_package() {
 	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=$?
@@ -1803,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>"
 				;;
 			*)
@@ -1814,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>"
 				;;
 			*)
@@ -1869,9 +1893,9 @@ run_sub_builder() {
 # @return exit code from poldek
 #
 # this requires following sudo rules:
-# - poldek --noask --caplookup -uG
+# - poldek --noask --caplookup -ug
 poldek_install() {
-	LANG=C $POLDEK_CMD --noask --caplookup --uniq -uG "$@"
+	LC_ALL=C LANG=C $POLDEK_CMD --noask --caplookup --uniq -ug "$@"
 }
 
 # install packages
@@ -2000,7 +2024,7 @@ _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'
@@ -2165,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)