From edcddc496b6e0a979f440e27b1593349cde8cf36 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 13 Apr 2014 11:46:18 +0200 Subject: [PATCH 1/4] Add SpongCastle srclib --- srclibs/SpongyCastle.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srclibs/SpongyCastle.txt diff --git a/srclibs/SpongyCastle.txt b/srclibs/SpongyCastle.txt new file mode 100644 index 0000000000..8714d8f602 --- /dev/null +++ b/srclibs/SpongyCastle.txt @@ -0,0 +1,15 @@ +# Source details (the only mandatory fields) +Repo Type:git +Repo:https://github.com/rtyley/spongycastle.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 6f8e92840130d1705aad851dabfeaed11b9e4a02 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sat, 19 Apr 2014 15:28:23 +0200 Subject: [PATCH 2/4] Conversations: Build BouncyCastle from source --- metadata/eu.siacs.conversations.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt index 3132901944..6a9bffccbc 100644 --- a/metadata/eu.siacs.conversations.txt +++ b/metadata/eu.siacs.conversations.txt @@ -33,9 +33,11 @@ Build:0.1.3,9 srclibs=Otr4j-jitsi@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50 commit=0.1.3 submodules=yes - rm=libs/android-support-v4.jar - extlibs=android/android-support-v4.jar + rm=libs/bcprov-jdk15on-150.jar scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar + prebuild=pushd $$BouncyCastle$$ && \ + ant -f ant/jdk15+.xml build-provider && \ + popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ Maintainer Notes: @@ -44,11 +46,8 @@ 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/ +== OTR4J == +cp -r $$Otr4j-jitsi$$/src/main src/ Commits for otr4j: otr4j-0.10 33d95bb3710986d048fb4cbe42dc991f9ddd9de2 From 94b8905e3fbe6bc9d55bc33341e087f989056b4e Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sat, 19 Apr 2014 18:18:49 +0200 Subject: [PATCH 3/4] Conversations: Build otr4j from source --- metadata/eu.siacs.conversations.txt | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt index 6a9bffccbc..e83e8f85fa 100644 --- a/metadata/eu.siacs.conversations.txt +++ b/metadata/eu.siacs.conversations.txt @@ -21,39 +21,23 @@ 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@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50 + srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50 commit=0.1.3 submodules=yes - rm=libs/bcprov-jdk15on-150.jar + rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar prebuild=pushd $$BouncyCastle$$ && \ ant -f ant/jdk15+.xml build-provider && \ - popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ - -Maintainer Notes: - -This app uses precompiled open-source jars that have been verified to -match hashes from upstream. - -HASHES MUST BE RE-CHECKED ON CHANGE! - -== OTR4J == -cp -r $$Otr4j-jitsi$$/src/main src/ - -Commits for otr4j: -otr4j-0.10 33d95bb3710986d048fb4cbe42dc991f9ddd9de2 -otr4j-HEAD 6d879761605dba48c80c0d3f44a6555b522d0c2e - -. + popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \ + pushd $$Otr4j-jitsi$$ && \ + mvn clean && mvn package && popd && \ + cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/ Auto Update Mode:None Update Check Mode:Tags From f016cc034c4c5d3a2324d3ecc55c4e36c1731e79 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Tue, 22 Apr 2014 13:09:34 +0200 Subject: [PATCH 4/4] Conversations: Postpone changes for 0.1.4, re-enable last build recipe --- metadata/eu.siacs.conversations.txt | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt index e83e8f85fa..0224ff01bc 100644 --- a/metadata/eu.siacs.conversations.txt +++ b/metadata/eu.siacs.conversations.txt @@ -21,15 +21,32 @@ 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@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50 + srclibs=Otr4j-jitsi@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50 commit=0.1.3 submodules=yes + 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: +0.1.3,9 uses precompiled open-source jars that have been verified to match +hashes from upstream. An upcomming 0.1.4 should be build according to the +following recipe: + +Build:0.1.4,10 + disable=not released, works for 0.1.3 + srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50 + commit=0.1.4 + submodules=yes rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar prebuild=pushd $$BouncyCastle$$ && \ @@ -39,8 +56,11 @@ Build:0.1.3,9 mvn clean && mvn package && popd && \ cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/ +Remove notice in the description as well, if 0.1.4 is build from completly from +source. 0.1.3 should be disabled after some time afterwards. +. + Auto Update Mode:None Update Check Mode:Tags Current Version:0.1.3 Current Version Code:9 -