- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by richard (＠richard) 08 Sep '23

08 Sep '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: bba964da by Pier Angelo Vendrame at 2023-09-07T22:19:02+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow customizing the updater URL with config options. With this, we will not need sed hacks on tor-browser-build anymore. - - - - - 3 changed files: - build/application.ini.in - build/moz.build - build/moz.configure/update-programs.configure Changes: ===================================== build/application.ini.in ===================================== @@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO #if MOZ_UPDATER [AppUpdate] -URL=https://aus1.torproject.org/basebrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL +URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL #endif ===================================== build/moz.build ===================================== @@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]: "MAR_CHANNEL_ID", "MOZ_APP_REMOTINGNAME", "MOZ_CRASHREPORTER_URL", + "BB_UPDATER_URL", ): appini_defines[var] = CONFIG[var] ===================================== build/moz.configure/update-programs.configure ===================================== @@ -204,3 +204,19 @@ option( set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") + + +# Updater URL +# ============================================================== + +option( + "--with-updater-url", + default="https://aus1.torproject.org/torbrowser/update_3/", + nargs=1, + help="Set the updater URL", +) + +set_config( + "BB_UPDATER_URL", + depends("--with-updater-url")(lambda x: x[0].rstrip("/")), +) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bba964d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by richard (＠richard) 08 Sep '23

08 Sep '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 9b73a337 by Pier Angelo Vendrame at 2023-09-06T22:20:01+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow customizing the updater URL with config options. With this, we will not need sed hacks on tor-browser-build anymore. - - - - - 3 changed files: - build/application.ini.in - build/moz.build - build/moz.configure/update-programs.configure Changes: ===================================== build/application.ini.in ===================================== @@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO #if MOZ_UPDATER [AppUpdate] -URL=https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL +URL=@BB_UPDATER_URL@/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL #endif ===================================== build/moz.build ===================================== @@ -75,6 +75,7 @@ if CONFIG["MOZ_APP_BASENAME"]: "MAR_CHANNEL_ID", "MOZ_APP_REMOTINGNAME", "MOZ_CRASHREPORTER_URL", + "BB_UPDATER_URL", ): appini_defines[var] = CONFIG[var] ===================================== build/moz.configure/update-programs.configure ===================================== @@ -204,3 +204,19 @@ option( set_config("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") set_define("BASE_BROWSER_UPDATE", True, when="--enable-base-browser-update") + + +# Updater URL +# ============================================================== + +option( + "--with-updater-url", + default="https://aus1.torproject.org/torbrowser/update_3/", + nargs=1, + help="Set the updater URL", +) + +set_config( + "BB_UPDATER_URL", + depends("--with-updater-url")(lambda x: x[0].rstrip("/")), +) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b73a33… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b73a33… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: bb9daa6d by Richard Pospesel at 2023-09-06T20:50:30+00:00 fixup! Firefox preference overrides. Bug 42057: Disable GetIsTextRecognitionSupported by default - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -539,6 +539,9 @@ pref("privacy.query_stripping.enabled", true); pref("privacy.query_stripping.enabled.pbmode", true); pref("privacy.query_stripping.strip_on_share.enabled", true); +// Disable platform text recogniition functionality (tor-browser#42057) +pref("dom.text-recognition.enabled", false); + #ifdef XP_WIN // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) // this pref changes the app's set AUMID to be dependent on the profile path, rather than View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bb9daa6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/bb9daa6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: f60ab8ba by Richard Pospesel at 2023-09-05T21:04:40+00:00 fixup! Firefox preference overrides. Bug 42057: Disable GetIsTextRecognitionSupported by default - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -539,6 +539,9 @@ pref("privacy.query_stripping.enabled", true); pref("privacy.query_stripping.enabled.pbmode", true); pref("privacy.query_stripping.strip_on_share.enabled", true); +// Disable platform text recogniition functionality (tor-browser#42057) +pref("dom.text-recognition.enabled", false); + #ifdef XP_WIN // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) // this pref changes the app's set AUMID to be dependent on the profile path, rather than View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f60ab8b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f60ab8b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Add Tor integration and UI
by Dan Ballard (＠dan) 07 Sep '23

07 Sep '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: cd1efeff by Dan Ballard at 2023-08-29T11:46:45-07:00 fixup! Add Tor integration and UI Bug 42038: Remove firefox branding overlap on homescreen - - - - - 2 changed files: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/res/layout/fragment_home.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -1100,7 +1100,7 @@ class HomeFragment : Fragment() { else -> ColorStateList.valueOf(color) } - binding.wordmarkText.imageTintList = tintColor + //binding.wordmarkText.imageTintList = tintColor binding.privateBrowsingButton.imageTintList = tintColor } ===================================== fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -70,9 +70,10 @@ android:layout_marginEnd="10.dp" android:adjustViewBounds="true" android:contentDescription="@null" - app:srcCompat="?fenixWordmarkLogo" + app:srcCompat="@mipmap/ic_launcher" tools:ignore="ImageContrastCheck" /> +  + + <TextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="9dp" + android:width="130dp" + android:height="60dp" + android:clickable="false" + android:focusable="false" + android:importantForAccessibility="no" + android:lines="2" + android:text="@string/app_name" + android:fontFamily="Roboto-Medium" + android:textColor="#DEFFFFFF" + android:textSize="20sp" + android:lineSpacingMultiplier="1.2" /> + </LinearLayout> - <TextView - android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="80dp" - android:layout_marginTop="9dp" - android:gravity="center_vertical" - android:width="130dp" - android:height="60dp" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - android:lines="2" - android:text="@string/app_name" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" - android:textSize="20sp" - android:lineSpacingMultiplier="1.2" /> + </com.google.android.material.appbar.CollapsingToolbarLayout> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/cd1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/cd1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 40944: Avoid parsing .incremental.mar files as non-incremental mars
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 486e1ea1 by Nicolas Vigier at 2023-09-06T18:38:34+00:00 Bug 40944: Avoid parsing .incremental.mar files as non-incremental mars - - - - - 20b24282 by Nicolas Vigier at 2023-09-06T18:38:34+00:00 Bug 40944: In update_responses, make an error if we see an unkwown OS If a mar file is found with an OS name that doesn't have a corresponding `build_targets` entry in the config, the OS name was being used as build target to generate the `.htaccess` file. This is not supposed to happen, except when something is wrong, so instead we should make an error in that case. - - - - - f6da50f9 by Nicolas Vigier at 2023-09-06T18:38:34+00:00 Bug 40947: Remove migrate_langs from tools/signing/nightly/update-responses-base-config.yml - - - - - 2 changed files: - tools/signing/nightly/update-responses-base-config.yml - tools/update-responses/update_responses Changes: ===================================== tools/signing/nightly/update-responses-base-config.yml ===================================== @@ -18,8 +18,6 @@ versions: nightly_version: platformVersion: 115.1.0 detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/ - migrate_langs: - pt-PT: pt-BR macos: minSupportedOSVersion: 16.0.0 windows-i686: ===================================== tools/update-responses/update_responses ===================================== @@ -50,7 +50,7 @@ sub get_tmpdir { } sub build_targets_by_os { - return ($_[0]) unless $config->{build_targets}{$_[0]}; + exit_error "Unknown build target for OS $_[0]" unless $config->{build_targets}{$_[0]}; my $r = $config->{build_targets}{$_[0]}; return ref $r eq 'ARRAY' ? @$r : ($r); } @@ -98,7 +98,8 @@ sub get_version_files { opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; - if ($file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) { + if ($file !~ m/incremental\.mar$/ && + $file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40948: Don't check lyrebird-vendor sha256sum in nightly
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 639e1671 by Nicolas Vigier at 2023-09-06T18:30:37+00:00 Bug 40948: Don't check lyrebird-vendor sha256sum in nightly Also update rbm for rbm#40059. - - - - - 2 changed files: - projects/lyrebird/config - rbm Changes: ===================================== projects/lyrebird/config ===================================== @@ -17,7 +17,7 @@ targets: version: '[% c("abbrev") %]' tag_gpg_id: 0 var: - go_vendor_sha256sum: 028c4536c10266331d680c0618b859d8f4ea8d630cd8588f13cfcc5b2d4272a1 + go_vendor_sha256sum: '' steps: build: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 6a20418284d94edad88986eaa4f01fc4e4476854 +Subproject commit c4c1716dcbffa58c102daa8a5f3e188acdaf823a View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40059: Make it possible to have empty sha256sum value to disable sha256sum check
by richard (＠richard) 07 Sep '23

07 Sep '23

richard pushed to branch main at The Tor Project / Applications / RBM Commits: c4c1716d by Nicolas Vigier at 2023-09-06T15:30:45+02:00 Bug 40059: Make it possible to have empty sha256sum value to disable sha256sum check - - - - - 2 changed files: - doc/rbm_input_files.asc - lib/RBM.pm Changes: ===================================== doc/rbm_input_files.asc ===================================== @@ -113,6 +113,7 @@ refresh_input:: sha256sum:: The sha256 checksum of the file. The build will fail with an error if the file does not match the expected sha256 checksum. + If the value is empty, the checksum is not checked. file_gpg_id:: If this option is set to 1, the file is checked for a gpg ===================================== lib/RBM.pm ===================================== @@ -782,14 +782,17 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) + && $t->('sha256sum') && $t->('sha256sum') ne sha256file($fname)) { sha256file($fname, { remove_cache => 1 }); $fname = undef; } if ($action eq 'input_files_id') { return undef if $input_file->{input_file_id}; - return undef if $input_file->{sha256sum}; - return undef if $input_file->{norec}{sha256sum}; + if ( ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) + && $t->('sha256sum') ) { + return undef; + } return undef if $input_file->{exec}; return undef if $fname; return 1 if $input_file->{URL}; @@ -814,7 +817,8 @@ sub input_file_id { my ($input_file, $t, $fname, $filename) = @_; return $t->('input_file_id') if $input_file->{input_file_id}; return $input_file->{project} . ':' . $filename if $input_file->{project}; - if ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) { + if ( ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) + && $t->('sha256sum') ) { return $filename . ':' . $t->('sha256sum'); } my $opts = { norec => { output_dir => '/out', getting_id => 1, }}; View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c4c1716dcbffa58… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c4c1716dcbffa58… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Updated Lyrebird dependencies hash.
by Pier Angelo Vendrame (＠pierov) 07 Sep '23

07 Sep '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 1215282c by Pier Angelo Vendrame at 2023-09-06T16:09:37+00:00 Updated Lyrebird dependencies hash. utls has been updated to v1.5.3 and crypto to v0.13.0. - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -17,7 +17,7 @@ targets: version: '[% c("abbrev") %]' tag_gpg_id: 0 var: - go_vendor_sha256sum: 8e9a5fd52f5a3a2b2b891389a224fcfc83b6c081658161bf40882b23fb58834c + go_vendor_sha256sum: 028c4536c10266331d680c0618b859d8f4ea8d630cd8588f13cfcc5b2d4272a1 steps: build: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40943: Update libdmg-hfs to drop our patch
by Pier Angelo Vendrame (＠pierov) 06 Sep '23

06 Sep '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2941c888 by Pier Angelo Vendrame at 2023-09-05T16:56:42+02:00 Bug 40943: Update libdmg-hfs to drop our patch We have uplifted one of our libdmg-hfs patches, so we can update our git_hash to the upstream commit that includes it. Also, deleted the OpenSSL 1.0.2 project in favor of a patch to optionally completely disable OpenSSL, since we do not need the functionalities it provides. - - - - - 7 changed files: - projects/libdmg-hfsplus/build - projects/libdmg-hfsplus/config - − projects/libdmg-hfsplus/libdmg.patch - + projects/libdmg-hfsplus/no-openssl.diff - − projects/openssl-1.0.2/build - − projects/openssl-1.0.2/config - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/libdmg-hfsplus/build ===================================== @@ -4,15 +4,14 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] -[% IF c("container/global_disable") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl-1.0.2') %] -[% END -%] export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] cd /var/tmp/build/[% project %]-[% c('version') %] -patch -p1 < "$rootdir/libdmg.patch" +[% IF c("container/global_disable") -%] + patch -p1 < "$rootdir/no-openssl.diff" +[% END -%] cmake . -GNinja -DCMAKE_BUILD_TYPE=Release [% c("var/cmake_opts") %] ninja -j[% c("num_procs") %] -v ===================================== projects/libdmg-hfsplus/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/libdmg-hfsplus -git_hash: 2ee327795680101d36f9700bd0fb618362237718 +git_hash: 2cb30de5b277bf2bc1fc129899bb9382bb56ccca filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -13,16 +13,12 @@ var: targets: no_containers: var: - cmake_opts: | - -DOPENSSL_USE_STATIC_LIBS=1 \ - -DOPENSSL_ROOT_DIR=/var/tmp/dist/openssl + cmake_opts: '-DUSE_OPENSSL=OFF' input_files: - project: container-image - name: cmake project: cmake - name: ninja project: ninja - - filename: libdmg.patch - - name: openssl-1.0.2 - project: openssl-1.0.2 + - filename: no-openssl.diff enable: '[% c("container/global_disable") %]' ===================================== projects/libdmg-hfsplus/libdmg.patch deleted ===================================== @@ -1,39 +0,0 @@ -From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Thu, 6 Mar 2014 19:47:05 -0800 -Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. - -Some of the struct padding and fields contained unitialized memory, which -caused two successive invocations to produce archives that differed in some -bytes. ---- - dmg/dmglib.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dmg/dmglib.c b/dmg/dmglib.c -index f481b1f..b74e50b 100644 ---- a/dmg/dmglib.c -+++ b/dmg/dmglib.c -@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { - ChecksumToken dataForkToken; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - off_t plistOffset; - uint32_t plistSize; - uint32_t dataForkChecksum; -@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { - uint64_t numSectors; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - char partitionName[512]; - - off_t fileLength; --- -1.8.1.2 - ===================================== projects/libdmg-hfsplus/no-openssl.diff ===================================== @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79d4302..b54e81d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6) + + project (libdmg-hfsplus) + ++option(USE_OPENSSL "Enable or disable OpenSSL (1.0.x is currently required)" ON) ++ + # We want win32 executables to build staticly by default, since it's more difficult to keep the shared libraries straight on Windows + IF(WIN32) + SET(BUILD_STATIC ON CACHE BOOL "Force compilation with static libraries") +diff --git a/dmg/CMakeLists.txt b/dmg/CMakeLists.txt +index 36f6bb6..ffdac77 100644 +--- a/dmg/CMakeLists.txt ++++ b/dmg/CMakeLists.txt +@@ -18,14 +18,14 @@ link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs) + + add_library(dmg adc.c checksum.c dmgfile.c dmglib.c filevault.c io.c partition.c resources.c udif.c ../includes/dmg/adc.h ../includes/dmg/dmg.h ../includes/dmg/dmgfile.h ../includes/dmg/dmglib.h ../includes/dmg/filevault.h) + +-IF(OPENSSL_FOUND) ++IF(OPENSSL_FOUND AND USE_OPENSSL) + add_definitions(-DHAVE_CRYPT) + include_directories(${OPENSSL_INCLUDE_DIR}) + target_link_libraries(dmg ${OPENSSL_CRYPTO_LIBRARY} $<$<BOOL:${OPENSSL_USE_STATIC_LIBS}>:${CMAKE_DL_LIBS}>) + IF(WIN32) + TARGET_LINK_LIBRARIES(dmg gdi32) + ENDIF(WIN32) +-ENDIF(OPENSSL_FOUND) ++ENDIF(OPENSSL_FOUND AND USE_OPENSSL) + + target_link_libraries(dmg common hfs z bz2) + ===================================== projects/openssl-1.0.2/build deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/openssl -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf openssl-[% c('version') %].tar.[% c('compress_tar') %] -cd /var/tmp/build/openssl-[% c('version') %] -export SOURCE_DATE_EPOCH='[% c("timestamp") %]' -./Configure --prefix="$distdir" -shared enable-ec_nistp_64_gcc_128 linux-x86_64 -make -j[% c("num_procs") %] -make -j[% c("num_procs") %] install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ 'openssl' ], - tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/openssl-1.0.2/config deleted ===================================== @@ -1,11 +0,0 @@ -# vim: filetype=yaml sw=2 -# -# We need openssl-1.0.2 for building libdmg-hfsplus: -# https://github.com/planetbeing/libdmg-hfsplus/issues/14 -# -version: 1.0.2u -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' - -input_files: - - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -39,7 +39,7 @@ test -f $faketime_path || \ exit_error "$faketime_path is missing" test -d $macos_stapled_dir || \ exit_error "The stapled macos zip files should be placed in directory $macos_stapled_dir" -libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2ee327795680-555a7e.tar.gz" +libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2cb30de5b277-68b0fc.tar.zst" test -f "$libdmg_file" || \ exit_error "$libdmg_file is missing." \ "You can build it with:" \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0