From dba1a16f82edc49e662a864ffad078f12658a470 Mon Sep 17 00:00:00 2001 From: Hussein Kasem Date: Thu, 23 Sep 2021 17:29:33 +0200 Subject: [PATCH 1/2] Android build: Use sequoia patch release v1.3.1 Make android build use sequoia v1.3.1 instead of 1.3.0 which just includes: - Fixed a crash resulting from unconstrained, attacker-controlled heap allocations. --- android/external/Makefile.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/external/Makefile.conf b/android/external/Makefile.conf index a8a6d2d..232f3a4 100644 --- a/android/external/Makefile.conf +++ b/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 From 8029ef2ec07df738d36b357cdfb499f78257f66c Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Tue, 19 Oct 2021 21:22:58 -0700 Subject: [PATCH 2/2] CI: update script path for building libpEpAdapter libpEpAdapter now uses a common script between Linux distros for building. This commit fixes our scripts to use the correct path. --- scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile | 2 +- scripts/debian10/pEpJNIAdapter.debian10.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile b/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile index 3a0d415..7be655a 100644 --- a/scripts/debian10/java8.pEpJNIAdapter.debian10.Dockerfile +++ b/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}/* diff --git a/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile b/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile index 77bdb54..f3708fd 100644 --- a/scripts/debian10/pEpJNIAdapter.debian10.Dockerfile +++ b/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