Merge remote-tracking branch 'upstream/Release_2.1' into build-windows

android/external/Makefile.conf

@@ -20,7 +20,7 @@ NETTLE_VERSION=3.7.3
 
 ### Git deps repos
 EXTERNAL_GIT_REPOS += libetpan|https://gitea.pep.foundation/pEp.foundation/libetpan.git?0123f34ec4ef7711b3670b744b3ae7e97178afe1
-EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.3.0
+EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.3.1
 
 ### Common variables
 #### Source code targets

scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile

@@ -20,7 +20,7 @@ RUN git clone --depth=1 \
 WORKDIR ${BUILDROOT}/libpEpAdapter
 
 ### Build libpEpAdapter
-RUN sh ./scripts/${CURRENT_DISTRO}/build_libpEpAdapter.sh && \
+RUN sh ./scripts/common/build_libpEpAdapter.sh && \
     rm -rf ${BUILDROOT}/*
 
 

scripts/debian10/pEpJNIAdapter.debian10.Dockerfile

@@ -20,7 +20,7 @@ RUN git clone --depth=1 \
 WORKDIR ${BUILDROOT}/libpEpAdapter
 
 ### Build libpEpAdapter
-RUN sh ./scripts/${CURRENT_DISTRO}/build_libpEpAdapter.sh && \
+RUN sh ./scripts/common/build_libpEpAdapter.sh && \
     rm -rf ${BUILDROOT}/*
 
 ### Install system dependencies

src/cxx/jniutils.cc

@@ -432,7 +432,7 @@ timestamp *to_timestamp(JNIEnv *env,
 
     if (t) {
         time_t clock = t / 1000;
-        gmtime_r(&clock, ts);
+        gmtime_r(&clock, (struct tm*)ts);
 
         //LOGD("/* Seconds (0-60) */  TO     :%d", ts->tm_sec);
         //LOGD("/* Minutes (0-59) */         :%d", ts->tm_min);