richard pushed to branch maint-13.0 at The Tor Project / Applications /
tor-browser-build
Commits:
f8395db4 by Pier Angelo Vendrame at 2023-11-16T18:44:15+00:00
Bug 41014: Update libdmg-hfsplus to drop our patch to disable OpenSSL support
The new upstream tree has a similar patch now.
- - - - -
4 changed files:
- projects/libdmg-hfsplus/build
- projects/libdmg-hfsplus/config
- − projects/libdmg-hfsplus/no-openssl.diff
- tools/signing/gatekeeper-bundling.sh
Changes:
=====================================
projects/libdmg-hfsplus/build
=====================================
@@ -9,10 +9,7 @@ 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') %]
-[% IF c("container/global_disable") -%]
- patch -p1 < "$rootdir/no-openssl.diff"
-[% END -%]
-cmake . -GNinja -DCMAKE_BUILD_TYPE=Release [% c("var/cmake_opts") %]
+cmake . -GNinja -DCMAKE_BUILD_TYPE=Release
ninja -j[% c("num_procs") %] -v
mkdir $distdir
=====================================
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: 2cb30de5b277bf2bc1fc129899bb9382bb56ccca
+git_hash: a0a959bd25370c1c0a00c9ec525e3e78285adbf9
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[%
c("compress_tar") %]'
container:
use_container: 1
@@ -10,15 +10,9 @@ var:
- build-essential
- zlib1g-dev
- libbz2-dev
-targets:
- no_containers:
- var:
- cmake_opts: '-DUSE_OPENSSL=OFF'
input_files:
- project: container-image
- name: cmake
project: cmake
- name: ninja
project: ninja
- - filename: no-openssl.diff
- enable: '[% c("container/global_disable") %]'
=====================================
projects/libdmg-hfsplus/no-openssl.diff deleted
=====================================
@@ -1,34 +0,0 @@
-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)
-
=====================================
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-2cb30de5b277-68b0fc.tar.zst"
+libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-a0a959bd2537-f2819c.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/f8395db4f7eb501da134bcb43a8eb95945469f16
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f8395db4f7eb501da134bcb43a8eb95945469f16
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
