From ce1e3248220dd8944edb2727f08d2212c4d9fe73 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 15 Nov 2018 14:43:03 -0200 Subject: [PATCH 1/3] Fix Briar build error --- metadata/org.briarproject.briar.android.txt | 33 +-------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/metadata/org.briarproject.briar.android.txt b/metadata/org.briarproject.briar.android.txt index e8f2005ba2..0aba290481 100644 --- a/metadata/org.briarproject.briar.android.txt +++ b/metadata/org.briarproject.briar.android.txt @@ -31,42 +31,11 @@ Build:1.0.1,10001 gradle=yes rm=bramble-j2se -Build:1.1.0,10100 - disable=doesn't verify - commit=release-1.1.0 - subdir=briar-android - gradle=yes - rm=bramble-java - -Build:1.1.1,10101 - commit=release-1.1.1 - subdir=briar-android - gradle=official - rm=bramble-java - -Build:1.1.2,10102 - commit=release-1.1.2 - subdir=briar-android - gradle=official - rm=bramble-java - -Build:1.1.3,10103 - commit=release-1.1.3 - subdir=briar-android - gradle=official - rm=bramble-java - -Build:1.1.4,10104 - commit=release-1.1.4 - subdir=briar-android - gradle=official - rm=bramble-java - Build:1.1.5,10105 commit=release-1.1.5 subdir=briar-android gradle=official - rm=bramble-java + rm=bramble-java,briar-headless Maintainer Notes: This app should be build reproducible, because upstream wants to use its own signature. From 7fb7bec3ec1c214500148962959229b7c2b203f6 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 15 Nov 2018 15:37:03 -0200 Subject: [PATCH 2/3] Install disorderfs and sort build filesystem before building This will enable Briar to build deterministically and works around an Android build tools bug. --- metadata/org.briarproject.briar.android.txt | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/metadata/org.briarproject.briar.android.txt b/metadata/org.briarproject.briar.android.txt index 0aba290481..b814606b5c 100644 --- a/metadata/org.briarproject.briar.android.txt +++ b/metadata/org.briarproject.briar.android.txt @@ -34,22 +34,16 @@ Build:1.0.1,10001 Build:1.1.5,10105 commit=release-1.1.5 subdir=briar-android + sudo=apt-get update && \ + apt-get install -y disorderfs + init=cd ../.. && \ + mv org.briarproject.briar.android org.briarproject.briar.android.build && \ + mkdir org.briarproject.briar.android && \ + disorderfs --sort-dirents=yes --reverse-dirents=no org.briarproject.briar.android.build org.briarproject.briar.android gradle=official rm=bramble-java,briar-headless -Maintainer Notes: -This app should be build reproducible, because upstream wants to use its own signature. - -Until we can build the latest version, all else go to the archive directly. - -Upstream issue for F-Droid inclusion: -https://code.briarproject.org/akwizgran/briar/issues/1035 - -Upstream issue for general reproducible builds: -https://code.briarproject.org/akwizgran/briar/issues/1273 -. - -Archive Policy:0 versions +Archive Policy:3 versions Auto Update Mode:Version release-%v Update Check Mode:Tags Current Version:1.1.5 From e3c0a5431ae82af42d7e3dac8333c1ce1899ebd7 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 15 Nov 2018 16:59:23 -0200 Subject: [PATCH 3/3] Briar: Update source code and issue tracker links --- metadata/org.briarproject.briar.android.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/org.briarproject.briar.android.txt b/metadata/org.briarproject.briar.android.txt index b814606b5c..96829fdc0d 100644 --- a/metadata/org.briarproject.briar.android.txt +++ b/metadata/org.briarproject.briar.android.txt @@ -1,8 +1,8 @@ Categories:Connectivity,Internet,Security License:GPL-3.0-or-later Web Site:https://briarproject.org/ -Source Code:https://code.briarproject.org/akwizgran/briar -Issue Tracker:https://code.briarproject.org/akwizgran/briar/issues +Source Code:https://code.briarproject.org/briar/briar +Issue Tracker:https://code.briarproject.org/briar/briar/issues FlattrID:592836 LiberapayID:34745 Bitcoin:1NZCKkUCtJV2U2Y9hDb9uq8S7ksFCFGR6K