[tor-commits] [tor-messenger-build/master] Link libdmg-hfsplus from tor-browser-build

[sukhbir at torproject.org]

commit 711d3f0f39b81a796e42e1b06871593a5a8cd689
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Jul 24 10:41:40 2017 -0400

    Link libdmg-hfsplus from tor-browser-build
---
 projects/libdmg-hfsplus              |  1 +
 projects/libdmg-hfsplus/build        | 16 ---------------
 projects/libdmg-hfsplus/config       | 15 --------------
 projects/libdmg-hfsplus/libdmg.patch | 39 ------------------------------------
 4 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/projects/libdmg-hfsplus b/projects/libdmg-hfsplus
new file mode 120000
index 0000000..f473842
--- /dev/null
+++ b/projects/libdmg-hfsplus
@@ -0,0 +1 @@
+../tor-browser-build/projects/libdmg-hfsplus
\ No newline at end of file
diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build
deleted file mode 100644
index 2903150..0000000
--- a/projects/libdmg-hfsplus/build
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-distdir=$(pwd)/dist
-mkdir -p $distdir/[% project %]
-tar xf [% project %]-[% c('version') %].tar.gz
-cd [% project %]-[% c('version') %]
-patch -p1 < ../libdmg.patch
-cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt
-cd dmg
-make -j4
-make install
-cd $distdir
-[% c('tar', {
-        tar_src => [ project ],
-        tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
-        }) %]
diff --git a/projects/libdmg-hfsplus/config b/projects/libdmg-hfsplus/config
deleted file mode 100644
index 9071078..0000000
--- a/projects/libdmg-hfsplus/config
+++ /dev/null
@@ -1,15 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/vasi/libdmg-hfsplus
-git_hash: dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
-filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-remote_docker: 1
-var:
-  deps:
-    - build-essential
-    - cmake
-    - zlib1g-dev
-    - libbz2-dev
-input_files:
-  - filename: libdmg.patch
-  - project: docker-image
diff --git a/projects/libdmg-hfsplus/libdmg.patch b/projects/libdmg-hfsplus/libdmg.patch
deleted file mode 100644
index a84ac3e..0000000
--- a/projects/libdmg-hfsplus/libdmg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001
-From: Mike Perry <mikeperry-git at 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
-