[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.0] Bug 41014: Update libdmg-hfsplus to drop our patch to disable OpenSSL support

Title: GitLab

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:

Changes:

  • projects/libdmg-hfsplus/build
    ... ... @@ -9,10 +9,7 @@ export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH"
    9 9 
     mkdir /var/tmp/build
    10 10 
     tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
    11 11 
     cd /var/tmp/build/[% project %]-[% c('version') %]
    12 
    -[% IF c("container/global_disable") -%]
    13 
    -  patch -p1 < "$rootdir/no-openssl.diff"
    14 
    -[% END -%]
    15 
    -cmake . -GNinja -DCMAKE_BUILD_TYPE=Release [% c("var/cmake_opts") %]
    12 
    +cmake . -GNinja -DCMAKE_BUILD_TYPE=Release
    16 13 
     ninja -j[% c("num_procs") %] -v
    17 14
    18 15 
     mkdir $distdir

  • projects/libdmg-hfsplus/config
    1 1 
     # vim: filetype=yaml sw=2
    2 2 
     version: '[% c("abbrev") %]'
    3 3 
     git_url: https://github.com/mozilla/libdmg-hfsplus
    4 
    -git_hash: 2cb30de5b277bf2bc1fc129899bb9382bb56ccca
    4 
    +git_hash: a0a959bd25370c1c0a00c9ec525e3e78285adbf9
    5 5 
     filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    6 6 
     container:
    7 7 
       use_container: 1
    ... ... @@ -10,15 +10,9 @@ var:
    10 10 
         - build-essential
    11 11 
         - zlib1g-dev
    12 12 
         - libbz2-dev
    13 
    -targets:
    14 
    -  no_containers:
    15 
    -    var:
    16 
    -      cmake_opts: '-DUSE_OPENSSL=OFF'
    17 13 
     input_files:
    18 14 
       - project: container-image
    19 15 
       - name: cmake
    20 16 
         project: cmake
    21 17 
       - name: ninja
    22 18 
         project: ninja
    23 
    -  - filename: no-openssl.diff
    24 
    -    enable: '[% c("container/global_disable") %]'

  • projects/libdmg-hfsplus/no-openssl.diff deleted
    1 
    -diff --git a/CMakeLists.txt b/CMakeLists.txt
    2 
    -index 79d4302..b54e81d 100644
    3 
    ---- a/CMakeLists.txt
    4 
    -+++ b/CMakeLists.txt
    5 
    -@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6)
    6 
    -
    7 
    - project (libdmg-hfsplus)
    8 
    -
    9 
    -+option(USE_OPENSSL "Enable or disable OpenSSL (1.0.x is currently required)" ON)
    10 
    -+
    11 
    - # We want win32 executables to build staticly by default, since it's more difficult to keep the shared libraries straight on Windows
    12 
    - IF(WIN32)
    13 
    - 	SET(BUILD_STATIC ON CACHE BOOL "Force compilation with static libraries")
    14 
    -diff --git a/dmg/CMakeLists.txt b/dmg/CMakeLists.txt
    15 
    -index 36f6bb6..ffdac77 100644
    16 
    ---- a/dmg/CMakeLists.txt
    17 
    -+++ b/dmg/CMakeLists.txt
    18 
    -@@ -18,14 +18,14 @@ link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs)
    19 
    -
    20 
    - 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)
    21 
    -
    22 
    --IF(OPENSSL_FOUND)
    23 
    -+IF(OPENSSL_FOUND AND USE_OPENSSL)
    24 
    - 	add_definitions(-DHAVE_CRYPT)
    25 
    - 	include_directories(${OPENSSL_INCLUDE_DIR})
    26 
    - 	target_link_libraries(dmg ${OPENSSL_CRYPTO_LIBRARY} $<$<BOOL:${OPENSSL_USE_STATIC_LIBS}>:${CMAKE_DL_LIBS}>)
    27 
    - 	IF(WIN32)
    28 
    - 		TARGET_LINK_LIBRARIES(dmg gdi32)
    29 
    - 	ENDIF(WIN32)
    30 
    --ENDIF(OPENSSL_FOUND)
    31 
    -+ENDIF(OPENSSL_FOUND AND USE_OPENSSL)
    32 
    -
    33 
    - target_link_libraries(dmg common hfs z bz2)
    34 
    -

  • tools/signing/gatekeeper-bundling.sh
    ... ... @@ -39,7 +39,7 @@ test -f $faketime_path || \
    39 39 
       exit_error "$faketime_path is missing"
    40 40 
     test -d $macos_stapled_dir || \
    41 41 
       exit_error "The stapled macos zip files should be placed in directory $macos_stapled_dir"
    42 
    -libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2cb30de5b277-68b0fc.tar.zst"
    42 
    +libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-a0a959bd2537-f2819c.tar.zst"
    43 43 
     test -f "$libdmg_file" || \
    44 44 
       exit_error "$libdmg_file is missing." \
    45 45 
                  "You can build it with:" \

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits