From 423d8f85c7541a6643c49f8313e2387b1f07a346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?p=E2=89=A1p?= <aw@pep.security>
Date: Tue, 22 Sep 2020 16:24:39 +0000
Subject: [PATCH] labcoat: add 2.7.4

closes #880
---
 metadata/security.pEp.yml | 65 +++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/metadata/security.pEp.yml b/metadata/security.pEp.yml
index f6d5f41e21..36dab44f86 100644
--- a/metadata/security.pEp.yml
+++ b/metadata/security.pEp.yml
@@ -48,7 +48,6 @@ Repo: https://letsencrypt.pep-security.lu/gitlab/android/pep.git
 Builds:
   - versionName: 1.0.101rc1.withoutKeysync
     versionCode: 2
-    disable: temporarily unlist per upstream wishes
     commit: v1.0.101rc1
     subdir: k9mail
     gradle:
@@ -74,7 +73,6 @@ Builds:
 
   - versionName: 1.0.209.withoutKeysync
     versionCode: 19
-    disable: temporarily unlist per upstream wishes
     commit: v1.0.209
     subdir: k9mail
     gradle:
@@ -100,7 +98,6 @@ Builds:
 
   - versionName: 1.0.213.withoutKeysync
     versionCode: 23
-    disable: temporarily unlist per upstream wishes
     commit: v1.0.213
     subdir: k9mail
     gradle:
@@ -133,7 +130,6 @@ Builds:
 
   - versionName: 1.1.008
     versionCode: 54
-    disable: temporarily unlist per upstream wishes
     commit: v1.1.008
     subdir: k9mail
     sudo:
@@ -187,7 +183,64 @@ Builds:
         javac) | sed "s:bin/javac::")"':' $$pEpJNIAdapter$$/src/Makefile
     ndk: r20b
 
+  - versionName: 1.1.200
+    versionCode: 67
+    commit: v1.1.200
+    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
+      - pEpEngine@Release_2.1.0-RC27
+      - pEpJNIAdapter@Release_2.1.0-RC12
+      - libpEpAdapter@Release_2.1.0-RC23
+    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:include.*arm64-v8a.*armeabi-v7a.*x86.*x86_64.*:include "arm64-v8a":'
+        build.gradle
+      - 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:21.0.6113669:20.1.5948944:' $$pEpJNIAdapter$$/android/build.gradle
+      - echo -e "DEBUG=0\nYML2_PATH=$$yml2$$" > $$pEpEngine$$/local.conf
+      - echo -e "DEBUG=0\nYML2_PATH=$$yml2$$\nENGINE_INC_PATH=$$pEpEngine$$/src\nAD_INC_PATH=$$pEpJNIAdapter$$/src/"
+        > $$pEpJNIAdapter$$/local.conf
+      - sed -i 's/def threadsToUse.*/def threadsToUse = 1/' $$pEpJNIAdapter$$/android/build.gradle
+      - sed -i '/        threadsToUse.*/d' $$pEpJNIAdapter$$/android/build.gradle
+      - ln -s $$pEpEngine$$/src/ $$pEpEngine$$/src/pEp
+      - sed -i 's:cargo build:~/.cargo/bin/cargo build:' $$pEpJNIAdapter$$/android/external/**/Makefile
+    ndk: r20b
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 1.1.008
-CurrentVersionCode: 54
+CurrentVersion: 1.1.200
+CurrentVersionCode: 67