Merge branch 'testing'

4 files changed, 55 insertions, 41 deletions

diff --git a/abs/core/mythdb-initial/PKGBUILD b/abs/core/mythdb-initial/PKGBUILD
index e7052f4..6d014bc 100755
--- a/abs/core/mythdb-initial/PKGBUILD
+++ b/abs/core/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythdb-initial
-pkgver=8.4
-pkgrel=5
+pkgver=8.5
+pkgrel=4
 pkgdesc="setup the initial mythtv database for linhes"
 url=""
 license=()
@@ -11,7 +11,7 @@ replaces=()
 backup=()
 install=mythdb.install
 source=(mc.sql permissions.sql custom.sql )
-arch=('i686' 'x86_64')
+arch=('x86_64')
 package() {
   cd $srcdir
   mkdir -p $pkgdir/data/database
@@ -20,6 +20,6 @@ package() {
   cp $srcdir/custom.sql  $pkgdir/data/database/custom.sql
 }
 
-md5sums=('5f3492d396142d394c095749363fd03d'
+md5sums=('fb6be5fd1f77fd4211e9727061e2dca5'
          'ad0e57ac5e7c3677808a670e16634bba'
-         '1701d4b347aebe6cee63408c90cd7a74')
+         '9246104782d867342c63510d3c77f573')
diff --git a/abs/core/mythdb-initial/custom.sql b/abs/core/mythdb-initial/custom.sql
index 7c97589..a666a2f 100644
--- a/abs/core/mythdb-initial/custom.sql
+++ b/abs/core/mythdb-initial/custom.sql
@@ -32,18 +32,31 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 
 -- Clear out old values because mysql is mysql
 DELETE from settings where value in
-('WOLbackendReconnectWaitTime','AutoStartFrontend',
- 'AllowQuitShutdown','BackendServerIP'
- 'BackendServerIP6','HaltCommand'
- 'RebootCommand','Theme'
+('WOLbackendReconnectWaitTime',
+ 'MasterServerName',
+ 'StorageScheduler',
+ 'AutoStartFrontend',
+ 'AllowQuitShutdown',
+ 'AllowConnFromAll',
+ 'ListenOnAllIps',
+ 'BackendServerIP',
+ 'BackendServerIP6',
+ 'HaltCommand',
+ 'RebootCommand',
+ 'Theme',
+ 'ThemePainter',
  'LircSocket');
 
 INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
- ('WOLbackendReconnectWaitTime','5',NULL);
+ ('WOLbackendReconnectWaitTime','5',NULL),
+ ('MasterServerName','apheleia',NULL),
+ ('StorageScheduler','Combination',NULL);
 
 INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
  ('AutoStartFrontend'     ,'1'                             , 'apheleia'),
  ('AllowQuitShutdown'     ,'4'                             , 'apheleia'),
+ ('AllowConnFromAll'      ,'0'                             , 'apheleia'),
+ ('ListenOnAllIps'        ,'0'                             , 'apheleia'),
  ('BackendServerIP'       ,'127.0.0.1'                     , 'apheleia'),
  ('BackendServerIP6'      ,'::1'                           , 'apheleia'),
  ('HaltCommand'           ,'sudo /sbin/halt'               , 'apheleia'),
@@ -67,7 +80,6 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 
 
 -- MythVideo old local dir..replaced by storage groups, but should set values to null
-
 INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 ('ScreenShotPath'              ,''  , 'apheleia'),
 ('VideoStartupDir'             ,''  , 'apheleia'),
@@ -106,7 +118,9 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 
 -- Clear out old values because mysql is mysql
 DELETE from settings where value in
-('OverrideExitMenu','NetworkControlEnabled''SecurityPin',
+('OverrideExitMenu',
+ 'NetworkControlEnabled',
+ 'SecurityPin',
  'BackendStopCommand',
  'BackendStartCommand');
 
@@ -171,7 +185,7 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 ('HOSTOSsize',      '5'    ,   'apheleia'),
 ('HOSTrootfstype',  'ext4' ,   'apheleia'),
 ('HOSTHOMEsize',    '5'    ,   'apheleia'),
-('HOSTDatabasesize','2'    ,   'apheleia'),
+('HOSTDatabasesize','3'    ,   'apheleia'),
 ('HostUseSWAP',     '1'    ,   'apheleia'),
 ('HostUseALLdata',  '1'    ,   'apheleia'),
 ('HOSTdatafstype',  'xfs'  ,   'apheleia');
diff --git a/abs/core/mythdb-initial/mc.sql b/abs/core/mythdb-initial/mc.sql
index 8d683f0..c0343f0 100644
--- a/abs/core/mythdb-initial/mc.sql
+++ b/abs/core/mythdb-initial/mc.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.6.28, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.6.35, for Linux (x86_64)
 --
 -- Host: localhost    Database: mythconverg
 -- ------------------------------------------------------
--- Server version	5.6.28
+-- Server version	5.6.35
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -88,6 +88,8 @@ CREATE TABLE `capturecard` (
   `quicktune` tinyint(4) NOT NULL DEFAULT '0',
   `schedorder` int(10) unsigned NOT NULL DEFAULT '1',
   `livetvorder` int(10) unsigned NOT NULL DEFAULT '1',
+  `reclimit` int(10) unsigned NOT NULL DEFAULT '1',
+  `schedgroup` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`cardid`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -870,7 +872,7 @@ CREATE TABLE `housekeeping` (
 
 LOCK TABLES `housekeeping` WRITE;
 /*!40000 ALTER TABLE `housekeeping` DISABLE KEYS */;
-INSERT INTO `housekeeping` VALUES ('BackupDB',NULL,'2016-04-21 18:49:32','2016-04-21 18:49:32');
+INSERT INTO `housekeeping` VALUES ('BackupDB',NULL,'2017-09-18 03:10:11',NULL);
 /*!40000 ALTER TABLE `housekeeping` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1665,10 +1667,10 @@ CREATE TABLE `record` (
   `recordid` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `type` int(10) unsigned NOT NULL DEFAULT '0',
   `chanid` int(10) unsigned DEFAULT NULL,
-  `starttime` time NOT NULL DEFAULT '00:00:00',
-  `startdate` date NOT NULL DEFAULT '0000-00-00',
-  `endtime` time NOT NULL DEFAULT '00:00:00',
-  `enddate` date NOT NULL DEFAULT '0000-00-00',
+  `starttime` time DEFAULT NULL,
+  `startdate` date DEFAULT NULL,
+  `endtime` time DEFAULT NULL,
+  `enddate` date DEFAULT NULL,
   `title` varchar(128) NOT NULL DEFAULT '',
   `subtitle` varchar(128) NOT NULL DEFAULT '',
   `description` varchar(16000) NOT NULL DEFAULT '',
@@ -2203,7 +2205,7 @@ CREATE TABLE `settings` (
 
 LOCK TABLES `settings` WRITE;
 /*!40000 ALTER TABLE `settings` DISABLE KEYS */;
-INSERT INTO `settings` VALUES ('mythfilldatabaseLastRunStart','',NULL),('mythfilldatabaseLastRunEnd','',NULL),('mythfilldatabaseLastRunStatus','',NULL),('DataDirectMessage','',NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1344',NULL),('WebBrowserZoomLevel','1','apheleia'),('Language','en_US',NULL),('Country','US',NULL),('FreqTable','us-bcast',NULL),('ISO639Language0','eng',NULL),('ISO639Language1','eng',NULL),('TVFormat','NTSC',NULL),('VbiFormat','NTSC Closed Caption',NULL),('DateFormat','ddd MMM d yyyy','apheleia'),('MythArchiveDateFormat','%a %b %d %Y','apheleia'),('MythArchiveTimeFormat','%I:%M %p','apheleia'),('MythArchiveVideoFormat','NTSC','apheleia'),('ShortDateFormat','M/d','apheleia'),('TimeFormat','h:mm AP','apheleia'),('BackupDBLastRunStart','2016-04-21 18:49:31',NULL),('BackupDBLastRunEnd','2016-04-21 18:49:32',NULL),('HardwareProfileEnabled','0',NULL),('BackendServerIP','127.0.0.1','apheleia'),('BackendServerIP6','::1','apheleia'),('AllowLinkLocal','1','apheleia'),('BackendServerPort','6543','apheleia'),('BackendStatusPort','6544','apheleia'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','0',NULL),('TruncateDeletesSlowly','0','apheleia'),('HDRingbufferSize','9400',NULL),('StorageScheduler','BalancedFreeSpace',NULL),('UPnP/WMPSource','0',NULL),('DisableAutomaticBackup','0',NULL),('DisableFirewireReset','0','apheleia'),('EITTransportTimeout','5',NULL),('EITCrawIdleStart','60',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('WOLbackendConnectRetry','5',NULL),('BackendStopCommand','killall mythbackend',NULL),('BackendStartCommand','mythbackend',NULL),('JobQueueMaxSimultaneousJobs','1','apheleia'),('JobQueueCheckFrequency','60','apheleia'),('JobQueueWindowStart','00:00','apheleia'),('JobQueueWindowEnd','23:59','apheleia'),('JobQueueCPU','0','apheleia'),('JobAllowMetadata','1','apheleia'),('JobAllowCommFlag','1','apheleia'),('JobAllowTranscode','1','apheleia'),('JobAllowUserJob1','0','apheleia'),('JobAllowUserJob2','0','apheleia'),('JobAllowUserJob3','0','apheleia'),('JobAllowUserJob4','0','apheleia'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJobDesc2','User Job #2',NULL),('UserJobDesc3','User Job #3',NULL),('UserJobDesc4','User Job #4',NULL),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillMaxHour','23',NULL),('MythFillGrabberSuggestsTime','1',NULL),('DateFormat','ddd MMM d yyyy','apheleia'),('MythArchiveDateFormat','%a %b %d %Y','apheleia'),('MythArchiveTimeFormat','%I:%M %p','apheleia'),('MythArchiveVideoFormat','NTSC','apheleia'),('ShortDateFormat','M/d','apheleia'),('TimeFormat','h:mm AP','apheleia'),('WebBrowserZoomLevel','1','apheleia'),('ImageStorageGroupName','Images',NULL),('ImageSortOrder','0',NULL),('ImageShowHiddenFiles','0',NULL),('ImageSlideShowTime','3500',NULL),('ImageTransitionType','1',NULL),('ImageTransitionTime','1000',NULL);
+INSERT INTO `settings` VALUES ('mythfilldatabaseLastRunStart','',NULL),('mythfilldatabaseLastRunEnd','',NULL),('mythfilldatabaseLastRunStatus','',NULL),('DataDirectMessage','',NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1348',NULL),('Language','en_US',NULL),('Country','US',NULL),('FreqTable','us-bcast',NULL),('ISO639Language0','eng',NULL),('ISO639Language1','eng',NULL),('TVFormat','NTSC',NULL),('VbiFormat','NTSC Closed Caption',NULL),('BackupDBLastRunStart','2017-09-18 03:10:10',NULL),('BackupDBLastRunEnd','2017-09-18 03:10:11',NULL),('HardwareProfileEnabled','0',NULL),('BackendServerIP','127.0.0.1','apheleia'),('BackendServerIP6','::1','apheleia'),('AllowLinkLocal','1','apheleia'),('BackendServerPort','6543','apheleia'),('BackendStatusPort','6544','apheleia'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','0',NULL),('TruncateDeletesSlowly','0','apheleia'),('HDRingbufferSize','9400',NULL),('StorageScheduler','BalancedFreeSpace',NULL),('UPnP/WMPSource','0',NULL),('DisableAutomaticBackup','0',NULL),('DisableFirewireReset','0','apheleia'),('EITTransportTimeout','5',NULL),('EITCrawIdleStart','60',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('WOLbackendConnectRetry','5',NULL),('BackendStopCommand','killall mythbackend',NULL),('BackendStartCommand','mythbackend',NULL),('JobQueueMaxSimultaneousJobs','1','apheleia'),('JobQueueCheckFrequency','60','apheleia'),('JobQueueWindowStart','00:00','apheleia'),('JobQueueWindowEnd','23:59','apheleia'),('JobQueueCPU','0','apheleia'),('JobAllowMetadata','1','apheleia'),('JobAllowCommFlag','1','apheleia'),('JobAllowTranscode','1','apheleia'),('JobAllowUserJob1','0','apheleia'),('JobAllowUserJob2','0','apheleia'),('JobAllowUserJob3','0','apheleia'),('JobAllowUserJob4','0','apheleia'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJobDesc2','User Job #2',NULL),('UserJobDesc3','User Job #3',NULL),('UserJobDesc4','User Job #4',NULL),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillMaxHour','23',NULL),('MythFillGrabberSuggestsTime','1',NULL),('DateFormat','ddd MMM d yyyy','apheleia'),('MythArchiveDateFormat','%a %b %d %Y','apheleia'),('MythArchiveTimeFormat','%I:%M %p','apheleia'),('MythArchiveVideoFormat','NTSC','apheleia'),('ShortDateFormat','M/d','apheleia'),('TimeFormat','h:mm AP','apheleia'),('WebBrowserZoomLevel','1','apheleia'),('ImageStorageGroupName','Images',NULL),('ImageSortOrder','0',NULL),('ImageShowHiddenFiles','0',NULL),('ImageSlideShowTime','3500',NULL),('ImageTransitionType','1',NULL),('ImageTransitionTime','1000',NULL),('MasterServerName','apheleia',NULL),('BackendServerAddr','127.0.0.1','apheleia');
 /*!40000 ALTER TABLE `settings` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2784,4 +2786,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-04-21 14:50:08
+-- Dump completed on 2017-09-17 22:11:31
diff --git a/abs/core/mythdb-initial/mythdb.install b/abs/core/mythdb-initial/mythdb.install
index be4e64f..1302d30 100755
--- a/abs/core/mythdb-initial/mythdb.install
+++ b/abs/core/mythdb-initial/mythdb.install
@@ -1,30 +1,28 @@
 mydate=`date +%m-%d-%y`
 HOST=`hostname`
 post_install() {
-	mysqldump mythconverg   >/data/database/mythconverg.${mydate}.sql
-	#load timezone info for mythtv .26
-	mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root  mysql
-	mysql -u root -e 'drop database mythconverg;'
+    mysqldump mythconverg   >/data/database/mythconverg.${mydate}.sql
+    #load timezone info for mythtv .26
+    mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root  mysql
+    mysql -u root -e 'drop database mythconverg;'
     mysql -u root -e 'create database mythconverg;'
 
-	echo installing the default database
-	if [  $HOST = 'apheleia' ]
-	then
-       cp /data/database/mc.sql.initial /data/database/mc.sql.fixed
-	   cp /data/database/permissions.sql  /data/database/permissions.sql.fixed
-	   cp /data/database/custom.sql  /data/database/custom.sql.fixed
-	else
-	    sed -e "s/apheleia/$HOST/g" /data/database/mc.sql.initial > /data/database/mc.sql.fixed
-	    sed -e "s/apheleia/$HOST/g" /data/database/permissions.sql > /data/database/permissions.sql.fixed
-	    sed -e "s/apheleia/$HOST/g" /data/database/custom.sql > /data/database/custom.sql.fixed
-
+    echo installing the default database
+    if [  $HOST = 'apheleia' ]
+    then
+        cp /data/database/mc.sql.initial /data/database/mc.sql.fixed
+        cp /data/database/permissions.sql  /data/database/permissions.sql.fixed
+        cp /data/database/custom.sql  /data/database/custom.sql.fixed
+    else
+        sed -e "s/apheleia/$HOST/g" /data/database/mc.sql.initial > /data/database/mc.sql.fixed
+        sed -e "s/apheleia/$HOST/g" /data/database/permissions.sql > /data/database/permissions.sql.fixed
+        sed -e "s/apheleia/$HOST/g" /data/database/custom.sql > /data/database/custom.sql.fixed
 	fi
 
-
     MC="/data/database/mc.sql.fixed"
-	mysql mythconverg < $MC 2>/dev/null
-	mysql < /data/database/permissions.sql.fixed 2>/dev/null
-	mysql mythconverg < /data/database/custom.sql.fixed 2>/dev/null
+    mysql mythconverg < $MC 2>/dev/null
+    mysql < /data/database/permissions.sql.fixed 2>/dev/null
+    mysql mythconverg < /data/database/custom.sql.fixed 2>/dev/null
 
 #	rm /data/database/mc.sql.initial
 #	rm /data/database/custom.sql.fixed