This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 3b6a56b1f00c25dc59bfb134ac52a05958d06136 Author: Georg Koppen gk@torproject.org AuthorDate: Sat Apr 30 20:02:46 2022 +0000

Bug 40288: Bump mmdebstrap version to 0.8.6

Closes: #40288. --- keyring/mmdebstrap.gpg | Bin 0 -> 6435 bytes projects/mmdebstrap-image/config | 6 +---- .../mmdebstrap-image/mmdebstrap-no-user-ns.patch | 30 --------------------- projects/mmdebstrap/config | 8 +++--- 4 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/keyring/mmdebstrap.gpg b/keyring/mmdebstrap.gpg new file mode 100644 index 0000000..6879c62 Binary files /dev/null and b/keyring/mmdebstrap.gpg differ diff --git a/projects/mmdebstrap-image/config b/projects/mmdebstrap-image/config index c25a6c4..e2d0f6a 100644 --- a/projects/mmdebstrap-image/config +++ b/projects/mmdebstrap-image/config @@ -15,13 +15,10 @@ pre: | rootdir=$(pwd) export DEBIAN_FRONTEND=noninteractive apt-get update -y -q - apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg patch + apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg

export SOURCE_DATE_EPOCH='[% c("timestamp") %]' tar -xf [% c('input_files_by_name/mmdebstrap') %] - # As a user namespace inside an other user namespace doesn't seem to work, - # we patch mmdebstrap to avoid creating a new user namespace - patch -d mmdebstrap -p1 < mmdebstrap-no-user-ns.patch ./mmdebstrap/mmdebstrap --mode=unshare [% c("var/container/mmdebstrap_opt") %] [% c("var/container/suite") %] output.tar.gz [% c("var/container/debian_mirror") %]

[% IF c("var/minimal_apt_version") -%] @@ -60,4 +57,3 @@ input_files: - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/%5B% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07 - - filename: mmdebstrap-no-user-ns.patch diff --git a/projects/mmdebstrap-image/mmdebstrap-no-user-ns.patch b/projects/mmdebstrap-image/mmdebstrap-no-user-ns.patch deleted file mode 100644 index 15c547e..0000000 --- a/projects/mmdebstrap-image/mmdebstrap-no-user-ns.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/mmdebstrap b/mmdebstrap -index 9b7d892..5d85a74 100755 ---- a/mmdebstrap -+++ b/mmdebstrap -@@ -204,6 +204,7 @@ sub get_tar_compressor { - } - - sub test_unshare { -+ return 1; - my $verbose = shift; - if ($EFFECTIVE_USER_ID == 0) { - my $msg = "cannot use unshare mode when executing as root"; -@@ -382,7 +383,7 @@ sub get_unshare_cmd { - my $idmap = shift; - - my $unshare_flags -- = $CLONE_NEWUSER | $CLONE_NEWNS | $CLONE_NEWPID | $CLONE_NEWUTS -+ = $CLONE_NEWNS | $CLONE_NEWPID | $CLONE_NEWUTS - | $CLONE_NEWIPC; - - if (0) { -@@ -457,6 +458,8 @@ sub get_unshare_cmd { - $gidmapcmd .= " $hostid $nsid $range"; - } - } -+ $uidmapcmd = ""; -+ $gidmapcmd = ""; - my $idmapcmd = ''; - if ($uidmapcmd ne "") { - 0 == system "newuidmap $ppid $uidmapcmd" diff --git a/projects/mmdebstrap/config b/projects/mmdebstrap/config index 8fbfc97..4f1e7d8 100644 --- a/projects/mmdebstrap/config +++ b/projects/mmdebstrap/config @@ -1,5 +1,7 @@ # vim: filetype=yaml sw=2 -version: 655857e5259436755f34b908d07a6ebd4c8b0303 -git_url: http://gitlab.mister-muffin.de/josch/mmdebstrap.git -git_hash: '[% c("version") %]' filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: 0.8.6 +git_hash: '[% c("version") %]' +git_url: https://gitlab.mister-muffin.de/josch/mmdebstrap.git +gpg_keyring: mmdebstrap.gpg +tag_gpg_id: 1