From 4bf190421959d26abed6e7c1f111948377cffe55 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Fri, 11 Apr 2014 21:57:13 +0200
Subject: [PATCH 1/3] Conversations: Try to remove jars...

---
 metadata/eu.siacs.conversations.txt |  7 ++++---
 srclibs/BouncyCastle.txt            | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srclibs/BouncyCastle.txt

diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 3db4a5f4ae..2b7fc60bf4 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -26,13 +26,14 @@ Noteable XEPs:
 Repo Type:git
 Repo:https://github.com/siacs/Conversations.git
 
-Build:0.1.2,8
-    disable=tried to remove jars, see maintainer notes
+Build:0.1.3,9
+    srclibs=Otr4j-jitsi@6d879761605dba48c80c0d3f44a6555b522d0c2e,BouncyCastle@r1rv50
     commit=0.1.2
     submodules=yes
+    rm=libs/*jar
+    prebuild=pushd $$BouncyCastle$$ && gradle jar && popd && cp $$BouncyCastle$$/prov/build/libs/* libs/ && cp -r $$Otr4j-jitsi$$/src/main src/
 
 Maintainer Notes:
-    srclibs=Otr4j-jitsi@6d879761605dba48c80c0d3f44a6555b522d0c2e
     prebuild=pushd libs && rm android-support-v4.jar bcprov-jdk15on-150.jar && \
         git clone https://github.com/bcgit/bc-java.git && pushd bc-java && \
         gradle jar && cp prov/build/libs/* ../ && popd && rm -fR bc-java && popd
diff --git a/srclibs/BouncyCastle.txt b/srclibs/BouncyCastle.txt
new file mode 100644
index 0000000000..78ac649bc8
--- /dev/null
+++ b/srclibs/BouncyCastle.txt
@@ -0,0 +1,15 @@
+# Source details (the only mandatory fields)
+Repo Type:git
+Repo:https://github.com/bcgit/bc-java.git
+
+# Comma-separated list of subdirs to use. The first existing subdirectory
+# found between those given will be used. If none is found or provided, the
+# root of the repo directory will be used instead.
+Subdir:
+
+# Any extra commands to prepare the source library
+Prepare:
+
+# If given "Yes", "android update project -p ." will be executed
+Update Project:
+

From 063cca4be0aff6424d036d2f5a9c9308b7c662c0 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Sat, 12 Apr 2014 17:07:59 +0200
Subject: [PATCH 2/3] Conversations: Update to 0.1.3 (9)

---
 metadata/eu.siacs.conversations.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 2b7fc60bf4..68ef630169 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -28,7 +28,7 @@ Repo:https://github.com/siacs/Conversations.git
 
 Build:0.1.3,9
     srclibs=Otr4j-jitsi@6d879761605dba48c80c0d3f44a6555b522d0c2e,BouncyCastle@r1rv50
-    commit=0.1.2
+    commit=0.1.3
     submodules=yes
     rm=libs/*jar
     prebuild=pushd $$BouncyCastle$$ && gradle jar && popd && cp $$BouncyCastle$$/prov/build/libs/* libs/ && cp -r $$Otr4j-jitsi$$/src/main src/

From 3a53084373ca0614d9d3b3b4c2dde8c3b5bf40ca Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Sat, 12 Apr 2014 20:40:35 +0200
Subject: [PATCH 3/3] Conversations: Enable build with verified jars

---
 metadata/eu.siacs.conversations.txt | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 68ef630169..3132901944 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -21,24 +21,39 @@ Noteable XEPs:
 * XEP-0198: Stream Management
 * XEP-0280: Message Carbons
 * XEP-0237: Roster Versioning
+
+This app uses precompiled binary libraries verified to match their
+upstream hashes.
 .
 
 Repo Type:git
 Repo:https://github.com/siacs/Conversations.git
 
 Build:0.1.3,9
-    srclibs=Otr4j-jitsi@6d879761605dba48c80c0d3f44a6555b522d0c2e,BouncyCastle@r1rv50
+    srclibs=Otr4j-jitsi@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50
     commit=0.1.3
     submodules=yes
-    rm=libs/*jar
-    prebuild=pushd $$BouncyCastle$$ && gradle jar && popd && cp $$BouncyCastle$$/prov/build/libs/* libs/ && cp -r $$Otr4j-jitsi$$/src/main src/
+    rm=libs/android-support-v4.jar
+    extlibs=android/android-support-v4.jar
+    scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
 
 Maintainer Notes:
-    prebuild=pushd libs && rm android-support-v4.jar bcprov-jdk15on-150.jar && \
-        git clone https://github.com/bcgit/bc-java.git && pushd bc-java && \
-        gradle jar && cp prov/build/libs/* ../ && popd && rm -fR bc-java && popd
 
-(Note: don't run git clone manually, use another srclib)
+This app uses precompiled open-source jars that have been verified to
+match hashes from upstream. 
+
+HASHES MUST BE RE-CHECKED ON CHANGE!
+
+However, we should built thoses jars from sourc asap, like:
+
+    rm=libs/android-support-v4.jar,libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
+    prebuild=pushd $$BouncyCastle$$ && gradle jar && popd && cp $$BouncyCastle$$/prov/build/libs/* libs/ && \
+         cp -r $$Otr4j-jitsi$$/src/main src/
+
+Commits for otr4j:
+otr4j-0.10 33d95bb3710986d048fb4cbe42dc991f9ddd9de2
+otr4j-HEAD 6d879761605dba48c80c0d3f44a6555b522d0c2e
+
 .
 
 Auto Update Mode:None