From b331e9b60fc18df575535bc12b445c9a2a4374d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?p=E2=89=A1p?= <aw@pep.security>
Date: Mon, 3 Aug 2020 13:59:40 +0000
Subject: [PATCH] Let's try with pip3 then, also ndk r20 seems to be a better
 fit to local.properties (generated on gradle clean) than r20b

---
 metadata/security.pEp.yml | 59 +++++++++++++++++++++++++++++++++++++--
 srclibs/libpEpAdapter.yml |  2 ++
 srclibs/sequoia-pgp.yml   |  2 ++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 srclibs/libpEpAdapter.yml
 create mode 100644 srclibs/sequoia-pgp.yml

diff --git a/metadata/security.pEp.yml b/metadata/security.pEp.yml
index 67a384f385..1cbf6bad45 100644
--- a/metadata/security.pEp.yml
+++ b/metadata/security.pEp.yml
@@ -128,7 +128,62 @@ Builds:
       - sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
     ndk: r18b
 
+  - versionName: 1.1.008
+    versionCode: 54
+    commit: v1.1.008
+    subdir: k9mail
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get purge asn1c
+      - apt-get install -y --no-install-recommends mercurial g++ clang nettle-dev
+        capnproto libsqlite3-dev libtool python3-lxml
+      - git clone https://github.com/vlm/asn1c /tmp/asn1c || true
+      - cd /tmp/asn1c
+      - git checkout v0.9.28
+      - autoreconf -iv
+      - ./configure
+      - make
+      - make install
+    gradle:
+      - WithkeysyncFDroid
+    srclibs:
+      - yml2@2.6.3
+      - sequoia-pgp@v0.16.0
+      - pEpEngine@4567
+      - pEpJNIAdapter@699
+      - libpEpAdapter@168
+    prebuild:
+      - wget https://sh.rustup.rs -O ~/rustup.sh
+      - chmod +x ~/rustup.sh
+      - ~/rustup.sh -v -y --no-modify-path --default-host x86_64-unknown-linux-gnu
+        -t i686-linux-android -t x86_64-linux-android -t armv7-linux-androideabi -t
+        aarch64-linux-android
+      - export NDKB=${NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/
+      - echo -e "[target.aarch64-linux-android]\nar = \"${NDKB}aarch64-linux-android-ar\"\nlinker
+        = \"${NDKB}aarch64-linux-android21-clang\"\n" > ~/.cargo/config
+      - echo -e "[target.armv7-linux-androideabi]\nar = \"${NDKB}arm-linux-androideabi-ar\"\nlinker
+        = \"${NDKB}armv7a-linux-androideabi18-clang\"\n" >> ~/.cargo/config
+      - echo -e "[target.x86_64-linux-android]\nar = \"${NDKB}x86_64-linux-android-ar\"\nlinker
+        = \"${NDKB}x86_64-linux-android21-clang\"\n" >> ~/.cargo/config
+      - echo -e "[target.i686-linux-android]\nar = \"${NDKB}i686-linux-android-ar\"\nlinker
+        = \"${NDKB}i686-linux-android18-clang\"" >> ~/.cargo/config
+      - echo -e "\norg.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:MaxPermSize=4096m" >>
+        ../gradle.properties
+      - sed -i 's:universalApk false:universalApk true:' build.gradle
+      - sed -i 's:enable true:enable false:' build.gradle
+      - sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):'
+        ../settings.gradle
+      - sed -i 's:20.0:20.1:' ../build.gradle
+      - sed -i 's:YML2_PATH=.*$:YML2_PATH=$$yml2$$:' $$pEpEngine$$/Makefile.conf
+      - sed -i 's:YML2_PATH=.*$:YML2_PATH=$$yml2$$:' $$pEpJNIAdapter$$/Makefile.conf
+      - sed -i 's:ENGINE_INC_PATH=.*$:ENGINE_INC_PATH=$$pEpEngine$$/src:' $$pEpJNIAdapter$$/Makefile.conf
+      - sed -i 's:threadsToUse = .*$:threadsToUse = 4:' $$pEpJNIAdapter$$/android/build.gradle
+      - sed -i 's:cargo build:~/.cargo/bin/cargo build:' $$pEpJNIAdapter$$/android/external/*/Makefile
+      - sed -i 's:$(error JAVA_HOME is not set!):JAVA_HOME='"$(readlink -f $(which
+        javac) | sed "s:bin/javac::")"':' $$pEpJNIAdapter$$/src/Makefile
+    ndk: r20b
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 1.0.213
-CurrentVersionCode: 23
+CurrentVersion: 1.1.008
+CurrentVersionCode: 54
diff --git a/srclibs/libpEpAdapter.yml b/srclibs/libpEpAdapter.yml
new file mode 100644
index 0000000000..1dd102d98c
--- /dev/null
+++ b/srclibs/libpEpAdapter.yml
@@ -0,0 +1,2 @@
+RepoType: hg
+Repo: https://pep.foundation/dev/repos/libpEpAdapter/
diff --git a/srclibs/sequoia-pgp.yml b/srclibs/sequoia-pgp.yml
new file mode 100644
index 0000000000..39534feb1d
--- /dev/null
+++ b/srclibs/sequoia-pgp.yml
@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://gitlab.com/sequoia-pgp/sequoia