Merge tag 'v3.5.6' into develop

EasyEngine v3.5.6

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v3.5.6 - May 5, 2016
+- Patch for ImageMagick vulnerability CVE-2016–3714 - https://imagetragick.com/
+- Minor Fix for letsencrypt
+
 v3.5.5 - Apr 13, 2016
 - WP-CLI support for wordpress v4.5, PR #701
 - PR #686

ee/cli/plugins/site.py

@@ -1175,7 +1175,7 @@ def doupdatesite(self, pargs):
                 if (expiry_days <= min_expiry_days):
                     renewLetsEncrypt(self,ee_domain)
                 else:
-                    Log.error(self,"More than 60 days left for certificate Expiry. Not renewing now.")
+                    Log.error(self,"More than 30 days left for certificate Expiry. Not renewing now.")
 
             else:
                 Log.error(self,"Cannot RENEW ! SSL is not configured for given site .")
@@ -1219,6 +1219,7 @@ def doupdatesite(self, pargs):
                     Log.error(self, "SSl is not configured for given "
                              "site",False)
                     return 0
+            pass
 
         if pargs.letsencrypt:
             if pargs.letsencrypt == 'on':

ee/core/variables.py

@@ -12,11 +12,11 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.5.5"
+    ee_version = "3.5.6"
 
 
     # EasyEngine packages versions
-    ee_wp_cli = "0.22.0"
+    ee_wp_cli = "0.23.0"
     ee_adminer = "4.2.1"
     ee_roundcube = "1.1.4"
    # ee_vimbadmin = "3.0.12"

install

@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.5.5"
+readonly ee_version_new="3.5.6"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
@@ -87,7 +87,6 @@ fi
 # Generate Locale
 function ee_install_dep()
 {
-    ee_lib_echo "Installing required packages, please wait..."
     if [ "$ee_linux_distro" == "Ubuntu" ]; then
         apt-get -y install gcc curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar python-software-properties software-properties-common || ee_lib_error "Unable to install pre depedencies, exit status " 1
     elif [ "$ee_linux_distro" == "Debian" ]; then
@@ -234,7 +233,7 @@ function ee_update_wp_cli()
     if [ "${WP_CLI_PATH}" != "" ]; then
         # Get WP-CLI version
         WP_CLI_VERSION=$(${PHP_PATH} ${WP_CLI_PATH} --allow-root cli version | awk '{ print $2 }')
-        dpkg --compare-versions ${WP_CLI_VERSION} lt 0.21.1
+        dpkg --compare-versions ${WP_CLI_VERSION} lt 0.23.0
         # Update WP-CLI version
         if [ "$?" == "0" ]; then
            wget -qO ${WP_CLI_PATH} https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
@@ -365,6 +364,15 @@ function ee_upgrade_php(){
 
 function ee_update_latest()
 {
+  if [ -f /etc/ImageMagick/policy.xml  ]
+  then
+    if [ ! -f /etc/ImageMagick/patch.txt  ]
+      then
+      echo -e "\t<policy domain="coder" rights="none" pattern="EPHEMERAL" />\n\t<policy domain="coder" rights="none" pattern="URL" />\n\t<policy domain="coder" rights="none" pattern="HTTPS" />\n\t<policy domain="coder" rights="none" pattern="MVG" />\n\t<policy domain="coder" rights="none" pattern="MSL" />" >> /etc/ImageMagick/patch.txt
+      sed -i '/<policymap>/r /etc/ImageMagick/patch.txt' /etc/ImageMagick/policy.xml
+    fi
+  fi
+
     #Move ~/.my.cnf to /etc/mysql/conf.d/my.cnf
     if [ ! -f /etc/mysql/conf.d/my.cnf ]
     then

setup.py

@@ -58,7 +58,7 @@
       shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='ee',
-      version='3.5.5',
+      version='3.5.6',
       description=long_description,
       long_description=long_description,
       classifiers=[],