From 702f21f7f64da8d0c8f9e368b6a8f7b95792b717 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 26 Dec 2022 08:13:43 -0700 Subject: [PATCH] Remove anything after whitespace in MANIFEST when building tarball. This is consistent with how sudo's Makefile builds the tarball. --- scripts/build_pkgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_pkgs b/scripts/build_pkgs index 0452e4e28..2e7773cb1 100755 --- a/scripts/build_pkgs +++ b/scripts/build_pkgs @@ -792,7 +792,7 @@ sub wait_for_ssh { sub create_tarball { die "$0: unable to create directory $sudo_tmpdir/sudo: $!\n" unless mkdir("$sudo_tmpdir/sudo", 0755); - system("hg archive -R $repo -r $rev --type=files $sudo_tmpdir/sudo && hg log -R $repo --template=changelog -r 'sort(branch(.) or follow(), -date)' > $sudo_tmpdir/sudo/ChangeLog && cd $sudo_tmpdir && sed 's/^/sudo\\//' sudo/MANIFEST | GZIP=-9 pax -wz -x ustar -f sudo.tar.gz && rm -rf sudo"); + system("hg archive -R $repo -r $rev --type=files $sudo_tmpdir/sudo && hg log -R $repo --template=changelog -r 'sort(branch(.) or follow(), -date)' > $sudo_tmpdir/sudo/ChangeLog && cd $sudo_tmpdir && sed -e 's/^/sudo\\//' -e 's/[ ].*//' sudo/MANIFEST | GZIP=-9 pax -wz -x ustar -f sudo.tar.gz && rm -rf sudo"); return $? ? undef : "$sudo_tmpdir/sudo.tar.gz"; }