From 90fa2f856f6214fc6401aaec722b20f63addff8b Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 1 Dec 2016 11:09:14 +0100
Subject: [PATCH] Bug 775363 - Fails to build with minimum CMake version

---
 CMakeLists.txt               | 27 ++++++++++++++++++++++-----
 cmake/modules/FindLDAP.cmake | 15 +++++++++++++--
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69754734b3..dbc83cb58f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Evolution build script
 
-cmake_minimum_required(VERSION 3.0)
-cmake_policy(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
+cmake_policy(VERSION 3.1)
 
 project(evolution
 	VERSION 3.23.3
@@ -433,7 +433,12 @@ endif(ENABLE_YTNEF)
 add_printable_variable_path(WITH_BOGOFILTER "Enable spam filtering using Bogofilter (defaults to /usr/bin/bogofilter)" ON)
 
 string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
-string(SUBSTRING "${WITH_BOGOFILTER}" 0 ${bindirlen} substr)
+string(LENGTH "${WITH_BOGOFILTER}" maxlen)
+if(maxlen LESS bindirlen)
+	set(substr "***")
+else(maxlen LESS bindirlen)
+	string(SUBSTRING "${WITH_BOGOFILTER}" 0 ${bindirlen} substr)
+endif(maxlen LESS bindirlen)
 string(TOUPPER "${WITH_BOGOFILTER}" optupper)
 
 set(BOGOFILTER_COMMAND "")
@@ -456,6 +461,7 @@ if(WITH_BOGOFILTER)
 endif(WITH_BOGOFILTER)
 
 unset(bindirlen)
+unset(maxlen)
 unset(substr)
 unset(optupper)
 
@@ -467,7 +473,12 @@ add_printable_variable_path(WITH_SPAMASSASSIN "Enable spam filtering using SpamA
 add_printable_variable_path(WITH_SA_LEARN "Full path command where sa-learn is located (defaults to /usr/bin/sa-learn)" ON)
 
 string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
-string(SUBSTRING "${WITH_SPAMASSASSIN}" 0 ${bindirlen} substr)
+string(LENGTH "${WITH_SPAMASSASSIN}" maxlen)
+if(maxlen LESS bindirlen)
+	set(substr "***")
+else(maxlen LESS bindirlen)
+	string(SUBSTRING "${WITH_SPAMASSASSIN}" 0 ${bindirlen} substr)
+endif(maxlen LESS bindirlen)
 string(TOUPPER "${WITH_SPAMASSASSIN}" optupper)
 
 set(SPAMASSASSIN_COMMAND "")
@@ -488,7 +499,12 @@ if(WITH_SPAMASSASSIN)
 		set(SPAMASSASSIN_COMMAND "/usr/bin/spamassassin")
 	endif(SPAMASSASSIN_COMMAND STREQUAL "")
 
-	string(SUBSTRING "${WITH_SA_LEARN}" 0 ${bindirlen} substr)
+	string(LENGTH "${WITH_SA_LEARN}" maxlen)
+	if(maxlen LESS bindirlen)
+		set(substr "***")
+	else(maxlen LESS bindirlen)
+		string(SUBSTRING "${WITH_SA_LEARN}" 0 ${bindirlen} substr)
+	endif(maxlen LESS bindirlen)
 	string(TOUPPER "${WITH_SA_LEARN}" optupper)
 
 	set(SA_LEARN_COMMAND "")
@@ -510,6 +526,7 @@ if(WITH_SPAMASSASSIN)
 endif(WITH_SPAMASSASSIN)
 
 unset(bindirlen)
+unset(maxlen)
 unset(substr)
 unset(optupper)
 
diff --git a/cmake/modules/FindLDAP.cmake b/cmake/modules/FindLDAP.cmake
index 6dde4b8af1..abbc3280d7 100644
--- a/cmake/modules/FindLDAP.cmake
+++ b/cmake/modules/FindLDAP.cmake
@@ -29,14 +29,24 @@ if((NOT WITH_OPENLDAP) AND (NOT WITH_SUNLDAP))
 endif((NOT WITH_OPENLDAP) AND (NOT WITH_SUNLDAP))
 
 string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
-string(SUBSTRING "${WITH_OPENLDAP}" 0 ${bindirlen} substr)
+string(LENGTH "${WITH_OPENLDAP}" maxlen)
+if(maxlen LESS bindirlen)
+	set(substr "***")
+else(maxlen LESS bindirlen)
+	string(SUBSTRING "${WITH_OPENLDAP}" 0 ${bindirlen} substr)
+endif(maxlen LESS bindirlen)
 string(TOUPPER "${WITH_OPENLDAP}" optupper)
 
 if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
 	set(WITH_OPENLDAP "/usr")
 endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
 
-string(SUBSTRING "${WITH_SUNLDAP}" 0 ${bindirlen} substr)
+string(LENGTH "${WITH_SUNLDAP}" maxlen)
+if(maxlen LESS bindirlen)
+	set(substr "***")
+else(maxlen LESS bindirlen)
+	string(SUBSTRING "${WITH_SUNLDAP}" 0 ${bindirlen} substr)
+endif(maxlen LESS bindirlen)
 string(TOUPPER "${WITH_SUNLDAP}" optupper)
 
 if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
@@ -44,6 +54,7 @@ if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")
 endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
 
 unset(bindirlen)
+unset(maxlen)
 unset(substr)
 unset(optupper)