[builders/tor-browser-build] branch master updated (0bf62da -> 3b6a56b)
This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 0bf62da fixup! Bug 40451: Create Release Prep issue template new 6c656da Bug 40426: Update Ubuntu base image to 22.04 new 3b6a56b Bug 40288: Bump mmdebstrap version to 0.8.6 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: keyring/mmdebstrap.gpg | Bin 0 -> 6435 bytes projects/mmdebstrap-image/config | 21 +++++---------- .../mmdebstrap-image/mmdebstrap-no-user-ns.patch | 30 --------------------- projects/mmdebstrap/config | 8 +++--- 4 files changed, 12 insertions(+), 47 deletions(-) create mode 100644 keyring/mmdebstrap.gpg delete mode 100644 projects/mmdebstrap-image/mmdebstrap-no-user-ns.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository.
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 6c656da4fed3aa2d38264ade90eaaa80088d9134 Author: Georg Koppen <gk@torproject.org> AuthorDate: Sat Apr 30 20:04:50 2022 +0000 Bug 40426: Update Ubuntu base image to 22.04 This is necessary for the mmdebstrap bump to 0.8.6 as well (#40288). For the Jessie woes see: https://gitlab.mister-muffin.de/josch/mmdebstrap/issues/2#issuecomment-152. Closes: #40426. --- projects/mmdebstrap-image/config | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/mmdebstrap-image/config b/projects/mmdebstrap-image/config index f326728..c25a6c4 100644 --- a/projects/mmdebstrap-image/config +++ b/projects/mmdebstrap-image/config @@ -4,7 +4,7 @@ version: 1 pkg_type: build var: - ubuntu_version: 20.04.1 + ubuntu_version: 22.04 container: use_container: 1 @@ -42,13 +42,10 @@ targets: container: suite: jessie arch: amd64 - - buster-amd64: - var: - minimal_apt_version: 1.8.2 - container: - suite: buster - arch: amd64 + debian_mirror: > + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie-updates main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://security.debian.org/debian-security jessie/updates main" bullseye-amd64: var: @@ -62,5 +59,5 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% 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: 97f6cbcf41f39272c84e32b6f926ed5d6906c6e463a557025181f4aa191ad667 + sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07 - filename: mmdebstrap-no-user-ns.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository.
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/[% 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 -- To stop receiving notification emails like this one, please contact the administrator of this repository.
participants (1)
-
gitolite role