From 1c71b4c2e9f9d396cb67aecf581b3d518be0ac9c Mon Sep 17 00:00:00 2001
From: pacien
Date: Wed, 9 Sep 2020 18:56:25 +0200
Subject: tinc: fix FORTIFY error when initialising a new tinc configuration

This fixes the "FORTIFY: umask: called with invalid mask -601" error
when attempting to create a new tinc configuration on builds having
the FORTIFY option enabled (by default in NDK >=r21).

Upstream patch: https://github.com/gsliepen/tinc/pull/251
GitHub: closes #99
---
 app/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/CMakeLists.txt')

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 6511df1..1962fbf 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -56,6 +56,8 @@ ExternalProject_Add(tinc
   DEPENDS           lzo libressl
   URL               https://github.com/gsliepen/tinc/archive/f5223937e62e1cc5e9b3d322490dd3af8d666750.tar.gz
   URL_HASH          SHA256=3fe923e8fbb1e0192986039e91d6945ffbbe326ee8c2c0a13bacf80e87dad4a9
+  # TODO: remove patch once merged in upstream (https://github.com/gsliepen/tinc/pull/251)
+  PATCH_COMMAND     patch -p1 < ${PROJECT_SOURCE_DIR}/src/main/c/0001-tincctl-restrict-umask-argument-for-FORTIFY.patch
   CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
                     <SOURCE_DIR>/configure ${xCONFIG}
                       --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
-- 
cgit v1.2.3