revert eab5aba9b027a7689acaf2382a04ff69b5b8771e - it does not work with sudo-1.8.23-1v20180516.1archlinux32/v20180516.1

1 files changed, 2 insertions, 3 deletions

diff --git a/makechrootpkg.in b/makechrootpkg.in
index fd9511b..85b1b2e 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -207,7 +207,6 @@ EOF
 	{
 		printf '#!/bin/bash\n'
 		declare -f _chrootbuild
-		declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
 		printf '_chrootbuild "$@" || exit\n'
 
 		if [[ $run_namcap = true ]]; then
@@ -234,7 +233,7 @@ _chrootbuild() {
 	# use "$" in arguments to commands with "sudo -i".  ${foo} or
 	# ${1} is OK, but $foo or $1 isn't.
 	# https://bugzilla.sudo.ws/show_bug.cgi?id=765
-	sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+	sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 }
 
 _chrootnamcap() {
@@ -346,7 +345,7 @@ main() {
 	[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
 	makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-	check_root SOURCE_DATE_EPOCH,GNUPGHOME
+	check_root
 
 	# Canonicalize chrootdir, getting rid of trailing /
 	chrootdir=$(readlink -e "$passeddir")