From 8262b7bc2db8283183de630d032d10628c612f34 Mon Sep 17 00:00:00 2001
From: huss <huss@pep-project.org>
Date: Fri, 9 Jun 2017 09:57:59 +0000
Subject: [PATCH] update pEp version: Add 0.9.10.1

---
 metadata/pep.android.k9.txt | 22 ++++++++++++++++++++--
 srclibs/pEpEngine.txt       |  4 ++--
 srclibs/pEpJNIAdapter.txt   |  4 ++--
 srclibs/yml2.txt            |  4 ++--
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/metadata/pep.android.k9.txt b/metadata/pep.android.k9.txt
index 3f72cc737e..b78a3dc6f6 100644
--- a/metadata/pep.android.k9.txt
+++ b/metadata/pep.android.k9.txt
@@ -41,7 +41,7 @@ Just install the app and you can communicate in confidence with your peers.
 .
 
 Repo Type:git
-Repo:https://download.pep-security.net/git/k9-pep
+Repo:https://letsencrypt.pep-security.lu/gitlab/android/pep.git
 
 Build:0.7.3,8
     disable=old failing build
@@ -133,6 +133,24 @@ Build:0.9.4,13
         sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
     ndk=r11c
 
+Build:0.9.10.1,60
+    commit=v0.9.10.1
+    subdir=k9mail
+    gradle=WiththoutkeysyncPlayStore
+    srclibs=pEpJNIAdapter@f5210e9e14a7,pEpEngine@46fa9082dd6b,yml2@2.5.5
+    prebuild=sed -i 's:file("../pEpJNIAdapter/android"):file("../srclib/pEpJNIAdapter/android"):' ../settings.gradle && \
+        sed -i "s/4.8/4.9/" $$pEpJNIAdapter$$/android/external/Makefile && \
+        sed -i 's:include $(ANDROID_NDK_HOME)/\(toolchains/$(NDK_TOOLCHAIN)/setup.mk\):include $(ANDROID_NDK_HOME)/build/core/\1:' $$pEpJNIAdapter$$/android/external/Makefile && \
+        sed -i 's:\(ICONV_PREFIX=$(LOCAL)\) \(./build.sh\):\1 bash \2:' $$pEpJNIAdapter$$/android/external/Makefile && \
+        sed -i "s:yml2proc:../$$yml2$$/yml2proc:" $$pEpJNIAdapter$$/src/Makefile && \
+        sed -i 's:env python:env python2:' $$yml2$$/yml2proc && \
+        sed -i "s:backend.includePath.extend(dirs):backend.includePath.extend(['$(realpath $$yml2$$)']):" $$yml2$$/yml2proc && \
+        sed -i 's:YML2PROC=.*$:YML2PROC=src/$$yml2$$/yml2proc:;s:YML_PATH=.*$:YML_PATH=src/$$yml2$$:' $$pEpEngine$$/Makefile.conf && \
+        sed -i "s:/bin/sh:/bin/bash:" $$pEpEngine$$/build-android/build.sh && \
+        sed -i 's:ASN1C_INCLUDE=.*$:ASN1C_INCLUDE=/usr/share/asn1c:' $$pEpEngine$$/Makefile.conf && \
+        sed -i 's:-fcompound-names:-fcompound-names -fnative-types:' $$pEpEngine$$/asn.1/Makefile
+    ndk=r11c
+
 Maintainer Notes:
 Do not set AUM when srclibs tend to change!
 
@@ -142,4 +160,4 @@ Auto Update Mode:Version v%v
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:Unknown
-Current Version Code:59
+Current Version Code:60
diff --git a/srclibs/pEpEngine.txt b/srclibs/pEpEngine.txt
index c4519a3f79..dcc0646103 100644
--- a/srclibs/pEpEngine.txt
+++ b/srclibs/pEpEngine.txt
@@ -1,2 +1,2 @@
-Repo Type:git
-Repo:https://download.pep-security.net/git/pEpEngine
+Repo Type:hg
+Repo:https://letsencrypt.pep.foundation/dev/repos/pEpEngine/
diff --git a/srclibs/pEpJNIAdapter.txt b/srclibs/pEpJNIAdapter.txt
index 96ceffd9b2..5c4be865a9 100644
--- a/srclibs/pEpJNIAdapter.txt
+++ b/srclibs/pEpJNIAdapter.txt
@@ -1,2 +1,2 @@
-Repo Type:git
-Repo:https://download.pep-security.net/git/pEpJNIAdapter/
+Repo Type:hg
+Repo:https://letsencrypt.pep.foundation/dev/repos/pEpJNIAdapter/
diff --git a/srclibs/yml2.txt b/srclibs/yml2.txt
index fb0c408429..31d30f4947 100644
--- a/srclibs/yml2.txt
+++ b/srclibs/yml2.txt
@@ -1,2 +1,2 @@
-Repo Type:git
-Repo:https://download.pep-security.net/git/yml2
+Repo Type:hg
+Repo:https://letsencrypt.pep.foundation/dev/repos/yml2/