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

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40943: Update libdmg-hfs to drop our patch

Title: GitLab

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:

Changes:

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

  • 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: 2ee327795680101d36f9700bd0fb618362237718
    4 
    +git_hash: 2cb30de5b277bf2bc1fc129899bb9382bb56ccca
    5 5 
     filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    6 6 
     container:
    7 7 
       use_container: 1
    ... ... @@ -13,16 +13,12 @@ var:
    13 13 
     targets:
    14 14 
       no_containers:
    15 15 
         var:
    16 
    -      cmake_opts: |
    17 
    -        -DOPENSSL_USE_STATIC_LIBS=1 \
    18 
    -        -DOPENSSL_ROOT_DIR=/var/tmp/dist/openssl
    16 
    +      cmake_opts: '-DUSE_OPENSSL=OFF'
    19 17 
     input_files:
    20 18 
       - project: container-image
    21 19 
       - name: cmake
    22 20 
         project: cmake
    23 21 
       - name: ninja
    24 22 
         project: ninja
    25 
    -  - filename: libdmg.patch
    26 
    -  - name: openssl-1.0.2
    27 
    -    project: openssl-1.0.2
    23 
    +  - filename: no-openssl.diff
    28 24 
         enable: '[% c("container/global_disable") %]'

  • projects/libdmg-hfsplus/libdmg.patch deleted
    1 
    -From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001
    2 
    -From: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
    3 
    -Date: Thu, 6 Mar 2014 19:47:05 -0800
    4 
    -Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility.
    5 
    -
    6 
    -Some of the struct padding and fields contained unitialized memory, which
    7 
    -caused two successive invocations to produce archives that differed in some
    8 
    -bytes.
    9 
    ----
    10 
    - dmg/dmglib.c | 6 ++++--
    11 
    - 1 file changed, 4 insertions(+), 2 deletions(-)
    12 
    -
    13 
    -diff --git a/dmg/dmglib.c b/dmg/dmglib.c
    14 
    -index f481b1f..b74e50b 100644
    15 
    ---- a/dmg/dmglib.c
    16 
    -+++ b/dmg/dmglib.c
    17 
    -@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) {
    18 
    - 	ChecksumToken dataForkToken;
    19 
    -
    20 
    - 	UDIFResourceFile koly;
    21 
    --
    22 
    -+	memset(&koly, 0, sizeof(koly));
    23 
    -+
    24 
    - 	off_t plistOffset;
    25 
    - 	uint32_t plistSize;
    26 
    - 	uint32_t dataForkChecksum;
    27 
    -@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) {
    28 
    - 	uint64_t numSectors;
    29 
    -
    30 
    - 	UDIFResourceFile koly;
    31 
    --
    32 
    -+	memset(&koly, 0, sizeof(koly));
    33 
    -+
    34 
    - 	char partitionName[512];
    35 
    -
    36 
    - 	off_t fileLength;
    37 
    ---
    38 
    -1.8.1.2
    39 
    -

  • projects/libdmg-hfsplus/no-openssl.diff
    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 
    +

  • projects/openssl-1.0.2/build deleted
    1 
    -#!/bin/bash
    2 
    -[% c("var/set_default_env") -%]
    3 
    -distdir=/var/tmp/dist/openssl
    4 
    -mkdir -p /var/tmp/build
    5 
    -tar -C /var/tmp/build -xf openssl-[% c('version') %].tar.[% c('compress_tar') %]
    6 
    -cd /var/tmp/build/openssl-[% c('version') %]
    7 
    -export SOURCE_DATE_EPOCH='[% c("timestamp") %]'
    8 
    -./Configure --prefix="$distdir" -shared enable-ec_nistp_64_gcc_128 linux-x86_64
    9 
    -make -j[% c("num_procs") %]
    10 
    -make -j[% c("num_procs") %] install
    11 
    -cd /var/tmp/dist
    12 
    -[% c('tar', {
    13 
    -        tar_src => [ 'openssl' ],
    14 
    -        tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'),
    15 
    -    }) %]

  • projects/openssl-1.0.2/config deleted
    1 
    -# vim: filetype=yaml sw=2
    2 
    -#
    3 
    -# We need openssl-1.0.2 for building libdmg-hfsplus:
    4 
    -# https://github.com/planetbeing/libdmg-hfsplus/issues/14
    5 
    -#
    6 
    -version: 1.0.2u
    7 
    -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    8 
    -
    9 
    -input_files:
    10 
    -  - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
    11 
    -    sha256sum: ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16

  • 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-2ee327795680-555a7e.tar.gz"
    42 
    +libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2cb30de5b277-68b0fc.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