From a32431e69350d94c73cbc473634d9aa329fb7f56 Mon Sep 17 00:00:00 2001
From: Eelco Maljaars <eelco@maljaars-it.nl>
Date: Sun, 19 Feb 2017 15:44:48 +0100
Subject: [PATCH 1/3] Added missing mbstring php module to xenial setup in
 vagrant

---
 util/vagrant_provision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh
index 100764caba..6b7f0b862e 100644
--- a/util/vagrant_provision.sh
+++ b/util/vagrant_provision.sh
@@ -51,7 +51,7 @@ if [ $( lsb_release -c | cut -f 2 ) == "trusty" ]; then
     sudo service apache2 restart
 elif [ $( lsb_release -c | cut -f 2 ) == "xenial" ]; then
     echo ">>> Installing PHP7"
-    sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd
+    sudo apt-get install -y php libapache2-mod-php php-cli php-mysql php-curl php-gd php-mbstring
     sudo apt-get install -y imagemagick
     sudo apt-get install -y php-imagick
     sudo systemctl restart apache2

From 36265d984e9d2eaafe34f1bdada5ef860c483f56 Mon Sep 17 00:00:00 2001
From: Eelco Maljaars <eelco@maljaars-it.nl>
Date: Sun, 19 Feb 2017 15:53:29 +0100
Subject: [PATCH 2/3] Ran into an installation problem today that is linked to
 newer MySQL builds

This commit expands the INSTALL.txt with notes when this problem arises and
how it should be handled. In the end the database code should probably be fixed
but this should help in the short term.
---
 INSTALL.txt | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index a9d42495bc..a96c9fd5a2 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -64,7 +64,7 @@ you wish to communicate with the Diaspora network.
 password, database name).
 
     - Friendica needs the permission to create and delete fields and tables in its own database.
-
+    - Please check the additional notes if running on MySQ 5.7.17 or newer
 
 4. If you know in advance that it will be impossible for the web server to 
 write or create files in your web directory, create an empty file called 
@@ -291,3 +291,21 @@ This is obvious as soon as you notice that the friendica-cron uses proc_open to
 execute php-scripts that also use proc_open, but it took me quite some time to
 find that out. I hope this saves some time for other people using suhosin with
 function blacklists.
+
+########################################################################
+Unable to create alle mysql tables on MySQL 5.7.17 or newer
+#######################################################################
+
+If the setup fails to create all the database tables and/or manual
+creation from the command line failes, with this error : 
+
+ERROR 1067 (42000) at line XX: Invalid default value for 'created' 
+
+You need to adjust your my.cnf and add the following setting under 
+the [mysqld] setion : 
+
+sql_mode = '';
+
+After that, restart mysql and try again. 
+
+

From 38aea0aeacbc85ad4b1e561a123af240fe6e4b29 Mon Sep 17 00:00:00 2001
From: Eelco Maljaars <eelco@maljaars-it.nl>
Date: Sun, 19 Feb 2017 16:36:40 +0100
Subject: [PATCH 3/3] Typos fixed

---
 INSTALL.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index a96c9fd5a2..4c57064f6b 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -293,16 +293,16 @@ find that out. I hope this saves some time for other people using suhosin with
 function blacklists.
 
 ########################################################################
-Unable to create alle mysql tables on MySQL 5.7.17 or newer
+Unable to create all mysql tables on MySQL 5.7.17 or newer
 #######################################################################
 
 If the setup fails to create all the database tables and/or manual
-creation from the command line failes, with this error : 
+creation from the command line fails, with this error: 
 
 ERROR 1067 (42000) at line XX: Invalid default value for 'created' 
 
 You need to adjust your my.cnf and add the following setting under 
-the [mysqld] setion : 
+the [mysqld] section : 
 
 sql_mode = '';