From 8c074684855b3b85ed11a0fb9fe6e20ac694802b Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 8 Oct 2018 19:27:23 +0200
Subject: Update tinc to 1.1pre17

Security update
---
 app/CMakeLists.txt | 5 +++--
 app/build.gradle   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'app')

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
 
 ExternalProject_Add(tinc
   DEPENDS           lzo libressl
-  URL               https://tinc-vpn.org/packages/tinc-1.1pre16.tar.gz
-  URL_HASH          SHA256=9934c53f8b22bbcbfa0faae0cb7ea13875fe1990cce75af728a7f4ced2c0230b
+  URL               https://tinc-vpn.org/packages/tinc-1.1pre17.tar.gz
+  URL_HASH          SHA256=61b9c9f9f396768551f39216edcc41918c65909ffd9af071feb3b5f9f9ac1c27
+  PATCH_COMMAND     sed -i -e "s/test(void)/test(void *x)/" <SOURCE_DIR>/m4/attribute.m4
   CONFIGURE_COMMAND autoreconf -fsi <SOURCE_DIR> &&
                     <SOURCE_DIR>/configure ${xCONFIG}
                       --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 {
     //noinspection OldTargetApi
     targetSdkVersion 27
     multiDexEnabled true
-    versionCode 22
-    versionName '0.22'
+    versionCode 23
+    versionName '0.23'
     ndk {
       abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
     }
-- 
cgit v1.2.3