reproducible: use proxy only for apt, but don't set http_proxy environment variable. see #780587 for more info

3 files changed, 11 insertions, 9 deletions

diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index 0e53866f..922ca71f 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -48,11 +48,11 @@ pdebuild_package() {
 	# prepare build
 	#
 	if [ ! -f /var/cache/pbuilder/base.tgz ] ; then
-		sudo pbuilder --create
+		sudo pbuilder --create --http-proxy $http_proxy
 	else
 		ls -la /var/cache/pbuilder/base.tgz
 		file /var/cache/pbuilder/base.tgz
-		sudo pbuilder --update || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create )
+		sudo pbuilder --update --http-proxy $http_proxy || ( sudo rm /var/cache/pbuilder/base.tgz ; sudo pbuilder --create )
 	fi
 	#
 	# 3.0 quilt is not happy without an upstream tarball
@@ -71,7 +71,7 @@ pdebuild_package() {
 	else
 		NUM_CPU=1
 	fi
-	pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU -b"
+	pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU -b" --http-proxy $http_proxy
 	# cleanup
 	echo
 	cat /var/cache/pbuilder/result/${SOURCE}_*changes
diff --git a/bin/d-i_manual.sh b/bin/d-i_manual.sh
index d68491dd..4e80692f 100755
--- a/bin/d-i_manual.sh
+++ b/bin/d-i_manual.sh
@@ -37,9 +37,9 @@ pdebuild_package() {
 	# prepare build
 	#
 	if [ -f /var/cache/pbuilder/base.tgz ] ; then
-		sudo pbuilder --create
+		sudo pbuilder --create --http-proxy $http_proxy
 	else
-		sudo pbuilder --update
+		sudo pbuilder --update --http-proxy $http_proxy
 	fi
 
 	#
@@ -47,7 +47,7 @@ pdebuild_package() {
 	#
 	cd manual
 	NUM_CPU=$(cat /proc/cpuinfo |grep ^processor|wc -l)
-	pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU"
+	pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU" --http-proxy $http_proxy
 	#
 	# publish and cleanup
 	#
diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 189ebeb4..667e4658 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -88,9 +88,11 @@ setup_pbuilder() {
 		echo "echo 'deb $MIRROR experimental main' > /etc/apt/sources.list.d/experimental.list" > ${TMPFILE}
 		echo "echo 'deb-src $MIRROR experimental main' >> /etc/apt/sources.list.d/experimental.list" >> ${TMPFILE}
 	fi
+	# use host apt proxy configuration for pbuilder too
+	echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
 	create_setup_tmpfile ${TMPFILE} "${PACKAGES}"
-	sudo pbuilder --create --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE
-	sudo pbuilder --execute --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG}
+	sudo pbuilder --create --http-proxy $http_proxy --basetgz /var/cache/pbuilder/${NAME}-new.tgz --distribution $SUITE
+	sudo pbuilder --execute --http-proxy $http_proxy --save-after-exec --basetgz /var/cache/pbuilder/${NAME}-new.tgz -- ${TMPFILE} | tee ${LOG}
 	echo
 	echo "Now let's see whether the correct packages where installed..."
 	for PKG in ${PACKAGES} ; do
@@ -109,7 +111,7 @@ setup_pbuilder() {
 #
 update_pbuilder() {
 	NAME=$1
-	sudo pbuilder --update --basetgz /var/cache/pbuilder/${NAME}.tgz
+	sudo pbuilder --update --http-proxy $http_proxy --basetgz /var/cache/pbuilder/${NAME}.tgz
 }
 
 #