summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-05-16 15:52:04 +0200
committerErich Eckner <git@eckner.net>2018-05-16 15:52:04 +0200
commitb1d319355e7189391baf890cc4a0900a458ee151 (patch)
treeb6522dd46dcefb7ffd69198a0f99d66d07f03392
parente8deeede0860ae49dc1455e27a2fe5d588a2f249 (diff)
revert eab5aba9b027a7689acaf2382a04ff69b5b8771e - it does not work with sudo-1.8.23-1archlinux32/v20180516
-rw-r--r--archbuild.in7
-rw-r--r--lib/archroot.sh6
-rw-r--r--makechrootpkg.in5
3 files changed, 5 insertions, 13 deletions
diff --git a/archbuild.in b/archbuild.in
index 73ae65d..7e1a964 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -45,7 +45,7 @@ while getopts 'hcr:' arg; do
esac
done
-check_root SOURCE_DATE_EPOCH
+check_root
if [ "${arch}" = "x86_64" ]; then
cache_dir=''
@@ -100,10 +100,5 @@ else
pacman --arch ${arch} -Syu --noconfirm || abort
fi
-# Always build official packages reproducibly
-if [[ ! -v SOURCE_DATE_EPOCH ]]; then
- export SOURCE_DATE_EPOCH=$(date +%s)
-fi
-
msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}"
exec makechrootpkg -r "${chroots}/${repo}-${arch}" "${makechrootpkg_args[@]}"
diff --git a/lib/archroot.sh b/lib/archroot.sh
index f279603..98fd2cf 100644
--- a/lib/archroot.sh
+++ b/lib/archroot.sh
@@ -6,15 +6,13 @@
CHROOT_VERSION='v4'
##
-# usage : check_root $keepenv
+# usage : check_root
##
orig_argv=("$0" "$@")
check_root() {
- local keepenv=$1
-
(( EUID == 0 )) && return
if type -P sudo >/dev/null; then
- exec sudo --preserve-env=$keepenv -- "${orig_argv[@]}"
+ exec sudo -- "${orig_argv[@]}"
else
exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
fi
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 725a97c..08b9aac 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -206,7 +206,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
@@ -233,7 +232,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() {
@@ -345,7 +344,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")