Fix database build failures

Author: shawniverson

build/MYSQL/create.sql

@@ -124,6 +124,8 @@ CREATE TABLE IF NOT EXISTS `maillog` (
   `time` time DEFAULT NULL,
   `headers` mediumtext COLLATE utf8_unicode_ci,
   `quarantined` tinyint(1) DEFAULT '0',
+  `rblspamreport` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `token` CHAR(64) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`maillog_id`),
   KEY `maillog_datetime_idx` (`date`,`time`),
   KEY `maillog_id_idx` (`id`(20)),
@@ -134,8 +136,8 @@ CREATE TABLE IF NOT EXISTS `maillog` (
   KEY `from_domain_idx` (`from_domain`(50)),
   KEY `to_domain_idx` (`to_domain`(50)),
   KEY `maillog_quarantined` (`quarantined`),
-  KEY `timestamp_idx` (`timestamp`),
-  FULLTEXT KEY `subject_idx` (`subject`)
+  KEY `timestamp_idx` (`timestamp`)
+  /*!50604 , FULLTEXT KEY `subject_idx` (`subject`) */
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- --------------------------------------------------------
@@ -258,6 +260,9 @@ CREATE TABLE IF NOT EXISTS `users` (
   `resetid` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
   `resetexpire` bigint(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `lastreset` bigint(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `login_expiry` bigint(20) COLLATE utf8_unicode_ci DEFAULT '-1',
+  `last_login` bigint(20) COLLATE utf8_unicode_ci DEFAULT '-1',
+  `login_timeout` smallint(5) COLLATE utf8_unicode_ci DEFAULT '-1',
   PRIMARY KEY (`username`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 

build/build.bash

@@ -763,10 +763,9 @@ EOF
     rm -rf docs
 
     cp conf.php.example conf.php
-    # Issue #66 grab all passwords from EFA-Config
-    sed -i "/^define('DB_PASS',/ c\$efa_config = preg_grep('/^MAILWATCHSQLPWD/', file('/etc/EFA-Config'));\nforeach(\$efa_config as \$num => \$line) {\n  if (\$line) {\n    \$db_pass_tmp = chop(preg_replace('/^MAILWATCHSQLPWD:(.*)/','\$1', \$line));\n  }\n}\ndefine('DB_PASS', \$db_pass_tmp);" conf.php
+    # Issue #66 grab all passwords from EFA-Config    
     sed -i "/^define('DB_USER',/ c\define('DB_USER', 'mailwatch');" conf.php
-    #sed -i "/^define('DB_PASS',/ c\define('DB_PASS', '$password');" conf.php
+    sed -i "/^define('DB_PASS',/ c\define('DB_PASS', '$password');" conf.php
     sed -i "/^define('TIME_ZONE',/ c\define('TIME_ZONE', 'Etc/UTC');" conf.php
     sed -i "/^define('QUARANTINE_USE_FLAG',/ c\define('QUARANTINE_USE_FLAG', true);" conf.php
     sed -i "/^define('QUARANTINE_REPORT_FROM_NAME',/ c\define('QUARANTINE_REPORT_FROM_NAME', 'EFA - Email Filter Appliance');" conf.php
@@ -846,6 +845,9 @@ EOF
 
     /usr/bin/php /usr/src/EFA/MailWatch-$MAILWATCHBRANCH/upgrade.php --skip-user-confirm /var/www/html/mailscanner/functions.php
 
+    # Update conf.php to grab password from EFA-Config after running upgrade.php
+    sed -i "/^define('DB_PASS',/ c\$efa_config = preg_grep('/^MAILWATCHSQLPWD/', file('/etc/EFA-Config'));\nforeach(\$efa_config as \$num => \$line) {\n  if (\$line) {\n    \$db_pass_tmp = chop(preg_replace('/^MAILWATCHSQLPWD:(.*)/','\$1', \$line));\n  }\n}\ndefine('DB_PASS', \$db_pass_tmp);" /var/www/html/mailscanner/conf.php
+    
     # Issue #308 ClamAV Status Page blank
     usermod apache -G mtagroup