summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2018-10-08 19:27:23 +0200
committerpacien2018-10-08 19:27:23 +0200
commit8c074684855b3b85ed11a0fb9fe6e20ac694802b (patch)
treed1e17d24614e9d411b0776cc63a3d3e11dda7045
parent3700f1cf9e1890e55b3b80c888297f1cb21b5a6b (diff)
downloadtincapp-8c074684855b3b85ed11a0fb9fe6e20ac694802b.tar.gz
Update tinc to 1.1pre17v0.23
Security update
-rw-r--r--app/CMakeLists.txt5
-rw-r--r--app/build.gradle4
2 files changed, 5 insertions, 4 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 25cc810..ce018e1 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -54,8 +54,9 @@ ExternalProject_Add(libressl
54 54
55ExternalProject_Add(tinc 55ExternalProject_Add(tinc
56 DEPENDS lzo libressl 56 DEPENDS lzo libressl
57 URL https://tinc-vpn.org/packages/tinc-1.1pre16.tar.gz 57 URL https://tinc-vpn.org/packages/tinc-1.1pre17.tar.gz
58 URL_HASH SHA256=9934c53f8b22bbcbfa0faae0cb7ea13875fe1990cce75af728a7f4ced2c0230b 58 URL_HASH SHA256=61b9c9f9f396768551f39216edcc41918c65909ffd9af071feb3b5f9f9ac1c27
59 PATCH_COMMAND sed -i -e "s/test(void)/test(void *x)/" <SOURCE_DIR>/m4/attribute.m4
59 CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> && 60 CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
60 <SOURCE_DIR>/configure ${xCONFIG} 61 <SOURCE_DIR>/configure ${xCONFIG}
61 --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local 62 --with-openssl=${CMAKE_CURRENT_BINARY_DIR}/usr/local
diff --git a/app/build.gradle b/app/build.gradle
index c4b66cb..92ff42c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,8 +36,8 @@ android {
36 //noinspection OldTargetApi 36 //noinspection OldTargetApi
37 targetSdkVersion 27 37 targetSdkVersion 27
38 multiDexEnabled true 38 multiDexEnabled true
39 versionCode 22 39 versionCode 23
40 versionName '0.22' 40 versionName '0.23'
41 ndk { 41 ndk {
42 abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' 42 abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
43 } 43 }