January 2021 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40195: Remove unused tor-android-service patches
by sysrqb＠torproject.org 07 Jan '21

07 Jan '21

commit 2f85c86ab40e57a1ea86a806d9790093e6d9d7af Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 27 10:30:33 2020 +0000 Bug 40195: Remove unused tor-android-service patches --- projects/tor-android-service/disable-daemon.patch | 19 ------------------ projects/tor-android-service/maven-local.patch | 23 ---------------------- .../tor-android-service/remove-native-build.patch | 17 ---------------- 3 files changed, 59 deletions(-) diff --git a/projects/tor-android-service/disable-daemon.patch b/projects/tor-android-service/disable-daemon.patch deleted file mode 100644 index 5156d77..0000000 --- a/projects/tor-android-service/disable-daemon.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/gradle.properties b/gradle.properties -index 75f5aba..27d94ab 100644 ---- a/gradle.properties -+++ b/gradle.properties -@@ -6,7 +6,6 @@ - # http://www.gradle.org/docs/current/userguide/build_environment.html - # Specifies the JVM arguments used for the daemon process. - # The setting is particularly useful for tweaking memory settings. --org.gradle.jvmargs=-Xmx1536m - # When configured, Gradle will run in incubating parallel mode. - # This option should only be used with decoupled projects. More details, visit - # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:… -@@ -21,4 +20,4 @@ androidplugin=3.4.0 - appcompatVersion=28.0.0 - compileVersion=28 - targetVersion=28 --minVersion=21 -\ No newline at end of file -+minVersion=21 diff --git a/projects/tor-android-service/maven-local.patch b/projects/tor-android-service/maven-local.patch deleted file mode 100644 index c52a1d3..0000000 --- a/projects/tor-android-service/maven-local.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 671edab..c7870e6 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -5,6 +5,7 @@ buildscript { - repositories { - google() - mavenCentral() -+ mavenLocal() - } - dependencies { - classpath "com.android.tools.build:gradle:${androidplugin}" -@@ -18,7 +19,8 @@ allprojects { - repositories { - google() - mavenCentral() -+ mavenLocal() - maven { url "https://repo.spring.io/plugins-release" } - maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } - } --} -\ No newline at end of file -+} diff --git a/projects/tor-android-service/remove-native-build.patch b/projects/tor-android-service/remove-native-build.patch deleted file mode 100644 index 1ddcd94..0000000 --- a/projects/tor-android-service/remove-native-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/service/build.gradle b/service/build.gradle -index b414557..ae3e203 100644 ---- a/service/build.gradle -+++ b/service/build.gradle -@@ -16,12 +16,6 @@ android { - } - } - -- externalNativeBuild { -- ndkBuild { -- path "src/main/jni/Android.mk" -- buildStagingDirectory "./outputs/ndk-build" -- } -- } - - lintOptions { - abortOnError false

1 0

[tor-android-service/master] Bug 40005: Replace repo.spring.io with jcenter()
by sysrqb＠torproject.org 07 Jan '21

07 Jan '21

commit 603775f877f6e294e25f053a4d1fc10dce96e9bf Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 27 10:37:48 2020 +0000 Bug 40005: Replace repo.spring.io with jcenter() See: tor-browser-build#40195 for more context --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 986f2ef..8960121 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenLocal() google() mavenCentral() - maven { url "https://repo.spring.io/plugins-release" } + jcenter() } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" @@ -21,7 +21,7 @@ allprojects { mavenLocal() google() mavenCentral() - maven { url "https://repo.spring.io/plugins-release" } + jcenter() maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } } }

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-67.0.17-10.0-1
by Matthew Finkel 07 Jan '21

07 Jan '21

Matthew Finkel pushed new branch android-components-67.0.17-10.0-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-84.1.4-10.0-1
by Matthew Finkel 07 Jan '21

07 Jan '21

Matthew Finkel pushed new branch tor-browser-84.1.4-10.0-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-84.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-10.0-android] Update PGP keyrings
by sysrqb＠torproject.org 07 Jan '21

07 Jan '21

commit ae8b662cd073bca192768c5224b6f12945725698 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jan 7 18:36:01 2021 +0000 Update PGP keyrings --- keyring/torbrowser.gpg | Bin 2839 -> 12262 bytes keyring/torbutton.gpg | Bin 135425 -> 140731 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index ec64740..b23cae3 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 0e93d2e..a925b14 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser-build/maint-10.0-desktop] Update PGP keyrings
by sysrqb＠torproject.org 07 Jan '21

07 Jan '21

commit 42dc93684a75c1d3bdcc400b1339544494f35bf3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jan 7 18:36:01 2021 +0000 Update PGP keyrings --- keyring/torbrowser.gpg | Bin 2839 -> 12262 bytes keyring/torbutton.gpg | Bin 135425 -> 140731 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index ec64740..b23cae3 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 0e93d2e..a925b14 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[rbm/master] Bug 40001: export exit_error in lib/RBM.pm
by gk＠torproject.org 07 Jan '21

07 Jan '21

commit 4296f180f6005467488bf93ea15a2a544f0d88b6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 16 19:39:12 2020 +0200 Bug 40001: export exit_error in lib/RBM.pm --- lib/RBM.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/RBM.pm b/lib/RBM.pm index 074e385..f750e83 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -23,6 +23,13 @@ use Data::UUID; use Data::Dump qw(dd pp); use feature "state"; + +BEGIN { + require Exporter; + our @ISA = qw(Exporter); + our @EXPORT = qw(exit_error); +} + our $config; sub load_config_file {

1 0

[rbm/master] Bug 40001: Add the rbmdir config option
by gk＠torproject.org 07 Jan '21

07 Jan '21

commit 30dda1539035eb5528ce7555a418a030c634fc35 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 16 19:43:04 2020 +0200 Bug 40001: Add the rbmdir config option --- doc/rbm_config.asc | 3 +++ lib/RBM.pm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 43feb9a..111b115 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -142,6 +142,9 @@ rbm_tmp_dir:: automatically when rbm exits. When running scripts, the TMPDIR environment variable is also set to this directory. +rbmdir:: + The directory where the rbm script is located. + output_dir:: The directory where output files (tarballs, spec files or packages) are created. The default value is +out+. diff --git a/lib/RBM.pm b/lib/RBM.pm index f750e83..94f2e9d 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -21,6 +21,7 @@ use RBM::DefaultConfig; use Digest::SHA qw(sha256_hex); use Data::UUID; use Data::Dump qw(dd pp); +use FindBin; use feature "state"; @@ -54,6 +55,7 @@ sub load_config { $config = load_config_file($config_file); $config->{default} = \%default_config; $config->{basedir} = dirname($config_file); + $config->{rbmdir} = $FindBin::Bin; $config->{step} = 'rbm_init'; $config->{opt} = {}; my $pdir = $config->{projects_dir} || $config->{default}{projects_dir};

1 0

[rbm/master] Bug 40001: Add a container script
by gk＠torproject.org 07 Jan '21

07 Jan '21

commit cfb4018d34400e43837e77754519b3c2761b7ae6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 16 19:57:19 2020 +0200 Bug 40001: Add a container script This script can be used to start/stop containers during rbm builds. --- container | 296 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 296 insertions(+) diff --git a/container b/container new file mode 100755 index 0000000..3f07f24 --- /dev/null +++ b/container @@ -0,0 +1,296 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use File::Basename; +use lib dirname($0) . '/lib'; +use RBM qw(exit_error); +use English; +use Getopt::Long; +use Path::Tiny; +use File::Path qw(make_path); +use File::Copy::Recursive qw(pathrmdir rcopy fcopy); +require "syscall.ph"; + +*CLONE_NEWNS = \0x20000; +*CLONE_NEWUTS = \0x4000000; +*CLONE_NEWIPC = \0x8000000; +*CLONE_NEWUSER = \0x10000000; +*CLONE_NEWPID = \0x20000000; +*CLONE_NEWNET = \0x40000000; +our ( + $CLONE_NEWNS, $CLONE_NEWUTS, $CLONE_NEWIPC, + $CLONE_NEWUSER, $CLONE_NEWPID, $CLONE_NEWNET +); + +my @bind_mounts = qw(/dev/console /dev/full /dev/null /dev/ptmx /dev/random + /dev/tty /dev/urandom /dev/zero); + +sub create_devfiles { + my ($rootfsdir) = @_; + my @dirs = qw(pts shm); + my %links = ( + fd => '/proc/self/fd', + stderr => '/proc/self/fd/2', + stdin => '/proc/self/fd/0', + stdout => '/proc/self/fd/1', + ); + make_path("$rootfsdir/dev"); + foreach my $dir (@dirs) { + make_path("$rootfsdir/dev/$dir"); + chmod 0755, "$rootfsdir/dev/$dir"; + } + foreach my $l (keys %links) { + next if -e "$rootfsdir/dev/$l"; + symlink $links{$l}, "$rootfsdir/dev/$l" + or exit_error "Error creating symlink $l"; + } +} + +sub do_mounts { + my ($rootfsdir) = @_; + foreach my $mount (@bind_mounts) { + open my $fh, '>', "$rootfsdir$mount" + or exit_error "error opening $rootfsdir$mount: $!"; + close $fh; + system('mount', '-o', 'bind', $mount, "$rootfsdir$mount") == 0 + or exit_error "Error bind mounting $mount"; + } + system('mount', '-o', 'rbind', '/sys', "$rootfsdir/sys") == 0 + or exit_error 'Error rbind mounting /sys'; + system('mount', '-t', 'proc', 'proc', "$rootfsdir/proc") == 0 + or exit_error 'Error mounting /proc'; + chmod oct(1777), "$rootfsdir/dev/shm"; + system('mount', '-t', 'tmpfs', 'none', "$rootfsdir/dev/shm") == 0 + or exit_error "Error mounting /dev/shm"; +} + +sub do_unmounts { + my ($rootfsdir) = @_; + my @othermounts = qw(/proc /dev/shm); + foreach my $mount (@bind_mounts, @othermounts) { + system('umount', '--no-mtab', "$rootfsdir$mount") == 0 + or warn "Error unmounting $mount"; + } + system('umount', '--no-mtab', '--lazy', "$rootfsdir/sys") == 0 + or warn "Error unmounting /sys"; +} + +sub extract_tar { + my ($rootfsdir, $tarfile) = @_; + make_path($rootfsdir); + system('tar', '--exclude=./dev', '-C', $rootfsdir, '-xf', $tarfile); +}; + +sub create_tar { + my ($rootfsdir, $tarfile) = @_; + system('tar', '--exclude=./dev', '-C', $rootfsdir, '-caf', $tarfile, '.'); +} + +sub run_chroot { + my ($rootfsdir, $cmd) = @_; + create_devfiles($rootfsdir); + do_mounts($rootfsdir); + fcopy('/etc/resolv.conf', "$rootfsdir/etc/resolv.conf"); + local %ENV = (); + system('hostname', 'rbm'); + my $res = system('/usr/sbin/chroot', $rootfsdir, @$cmd); + do_unmounts($rootfsdir); + return $res; +} + +sub copy_file_to { + my ($rootfsdir, $src, $dst, $owner) = @_; + make_path("$rootfsdir/$dst"); + my $filename = fileparse($src); + rcopy($src, "$rootfsdir/$dst/$filename") + or exit_error "Failed to copy $src to $rootfsdir/$dst/$filename"; + return run_chroot($rootfsdir, ['chown', '-R', $owner, $dst]); +} + +sub copy_file_from { + my ($rootfsdir, $src, $dst) = @_; + make_path($dst); + rcopy("$rootfsdir/$src", $dst) + or exit_error "Failed to copy $rootfsdir/$src to $dst"; +} + +sub get_guidmapcmd { + my ($guid) = (@_); + my $config_file = "/etc/sub${guid}"; + my ($id) = ${guid} eq 'uid' ? ($UID) : split(' ', $GID); + my ($current_usergroup) = ${guid} eq 'uid' ? getpwuid($id) : getgrgid($id); + for my $line (path($config_file)->lines) { + chomp $line; + my ($usergroup, $lowerid, $count) = split(':', $line); + next unless ($usergroup eq $current_usergroup || $usergroup eq $id); + return "0 $id 1 1 $lowerid $count"; + } + exit_error "Could not find $guid in $config_file"; +} + +sub unshare_run { + my ($s, $options) = @_; + my $f1 = fork(); + if ($f1 == 0) { + my $ppid = $$; + pipe my $rfh, my $wfh; + my $pid = fork() // exit_error("fork() failed: $!"); + if ($pid == 0) { + close $wfh; + exit_error("read() did not receive EOF") + unless sysread($rfh, my $c, 1) == 0; + my $uidmapcmd = get_guidmapcmd('uid'); + exit_error("newuidmap $ppid $uidmapcmd failed: $!") + unless system("newuidmap $ppid $uidmapcmd") == 0; + my $gidmapcmd = get_guidmapcmd('gid'); + exit_error("newgidmap $ppid $gidmapcmd failed: $!") + unless system("newgidmap $ppid $gidmapcmd") == 0; + exit 0; + } + + my $unshare_flags = $CLONE_NEWUSER | $CLONE_NEWNS | $CLONE_NEWPID | $CLONE_NEWUTS + | $CLONE_NEWIPC; + $unshare_flags |= $CLONE_NEWNET if $options->{'disable-network'}; + syscall &SYS_unshare, $unshare_flags; + close $wfh; + waitpid($pid, 0) or exit_error("waitpid() failed: $!"); + exit_error("failed to set uidmap") if $? >> 8; + syscall(&SYS_setgid, 0) == 0 or exit_error("setgid failed: $!"); + syscall(&SYS_setuid, 0) == 0 or exit_error("setuid failed: $!"); + syscall(&SYS_setgroups, 0, 0) == 0 or exit_error("setgroups failed: $!"); + + my $f2 = fork() // exit_error("fork() failed: $!"); + if ($f2) { + waitpid($f2, 0) or exit_error("waitpid() failed: $!"); + exit $? >> 8; + } + my $res = $s->(); + exit($res ? $res >> 8 : 0); + } + waitpid($f1, 0) or exit_error("waitpid() failed: $!"); + exit $? >> 8; +} + +my %actions = ( + archive => { + descr => 'Archive a container directory', + usage => "$0 archive <container-dir> <dest-tarball>", + run => sub { + usageexit($ARGV[0]) unless @ARGV == 3; + unshare_run( + sub { + return create_tar($ARGV[1], $ARGV[2]); + } + ); + }, + }, + extract => { + descr => 'Extract a container', + usage => "$0 extract <container-dir> <tarball>", + run => sub { + usageexit($ARGV[0]) unless @ARGV == 3; + exit_error "$ARGV[0] already exists" if -e $ARGV[1]; + unshare_run( + sub { + return extract_tar($ARGV[1], $ARGV[2]); + } + ); + }, + }, + remove => { + descr => "Remove a container directory", + usage => "$0 remove <container-dir>", + run => sub { + usageexit($ARGV[0]) unless @ARGV == 2; + exit_error "$ARGV[1] is not a directory" unless -d $ARGV[1]; + unshare_run( + sub { + return pathrmdir($ARGV[1]); + } + ); + }, + }, + put => { + descr => "Copy a file or directory to the container directory", + usage => "$0 put <container-dir> <src> <dst> <owner>", + run => sub { + usageexit($ARGV[0]) unless @ARGV == 5; + exit_error "$ARGV[1] is not a directory" unless -d $ARGV[1]; + my (undef, @args) = @ARGV; + unshare_run( + sub { + return copy_file_to(@args); + } + ); + }, + }, + get => { + descr => "Copy a file or a directory from the container directory", + usage => "$0 get <container-dir> <src> <dst>", + run => sub { + usageexit($ARGV[0]) unless @ARGV == 4; + exit_error "$ARGV[1] is not a directory" unless -d $ARGV[1]; + my (undef, @args) = @ARGV; + unshare_run( + sub { + return copy_file_from(@args); + } + ); + }, + }, + run => { + descr => "Run a command in a container", + usage => "$0 run [--disable-network] [--chroot=<container-dir>] [--] <command> [<arg>...]", + run => sub { + usageexit($_[0]) unless @_>= 2; + shift; + my @options = qw(disable-network! chroot=s); + my %val; + Getopt::Long::GetOptionsFromArray(\@_, \%val, @options) || exit 1; + my (@cmd) = @_; + unshare_run( + sub { + return $val{chroot} ? run_chroot($val{chroot}, [@cmd]) : system(@cmd); + }, + \%val + ); + }, + }, + usage => { + run => \&usage, + descr => 'Show usage information for an action', + }, + '--help' => { + run => \&usage, + }, +); + +sub usage { + if ($_[1] && $actions{$_[1]} && $actions{$_[1]}->{usage}) { + print $actions{$_[1]}{usage}, "\n"; + } else { + print STDERR "$0 <action> [options]\n"; + print STDERR "$0 usage [action]\n\n"; + print STDERR "Available actions:\n"; + my @actions = grep { $actions{$_}->{descr} } keys %actions; + print STDERR map { " - $_: $actions{$_}->{descr}\n" } @actions; + print STDERR "\nSee '$0 usage <action>' for usage information\n"; + } + exit 0; +} +sub usageexit { + my $cmd = shift; + print STDERR "Incorrect argument(s).\n"; + print STDERR "See '$0 usage $cmd' for usage information\n"; + exit 1; +} + + +if (@ARGV == 0 || !$actions{$ARGV[0]}) { + usage(); + exit 1; +} +usage('usage', $ARGV[0]) if grep { $_ eq '--help' } @ARGV[1..(@ARGV - 1)]; +$actions{$ARGV[0]}->{run}->(@ARGV);

1 0