Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

4 files changed, 36 insertions, 14 deletions

diff --git a/abs/core/ncid/PKGBUILD b/abs/core/ncid/PKGBUILD
index dbf5daa..6e09ef8 100644..100755
--- a/abs/core/ncid/PKGBUILD
+++ b/abs/core/ncid/PKGBUILD
@@ -1,19 +1,19 @@
 pkgname=ncid
-pkgver=0.83
+pkgver=0.84
 pkgrel=1
 pkgdesc="daemon to display callerid"
 url="http://ncid.sourceforge.net/"
 license=""
-depends=(python)
+depends=(python2)
 makedepends=()
 conflicts=()
 replaces=()
 backup=()
-arch=('i686')
+arch=('i686' 'x86_64' )
 install=ncid.install
 #source=(http://voxel.dl.sourceforge.net/project/ncid/ncid/$pkgver/$pkgname-$pkgver-src.tar.gz  ncidd.conf ncid.conf ncid.py ncidpermissions.sql ncid.sql)
 source=(http://voxel.dl.sourceforge.net/project/ncid/ncid/$pkgver/$pkgname-$pkgver-src.tar.gz ncid-log.py ncidpermissions.sql ncid.sql ncid-linhes)
-
+#must be built with -j 1
 build() {
    cd $startdir/src/$pkgname
 #  ./configure --prefix=/usr
@@ -25,15 +25,17 @@ package(){
   #sed out MakeFILE
 
   sed  -i "s|^.*\$(MAKE) install prefix=/usr prefix2=|\t\$(MAKE) install prefix=${pkgdir}/usr prefix2=$pkgdir|" Makefile
+  #sed  -i "s|^.*\$(MAKE) install prefix=/usr prefix2=|\t\$(MAKE) install prefix=${pkgdir}/usr prefix2=|" Makefile
+  mkdir -p ${pkgdir}/etc
   make package-install
   install -m 755 $startdir/src/ncid-linhes $startdir/pkg/usr/share/ncid
   install -m 755  $startdir/src/ncid-log.py   $startdir/pkg/usr/bin/ncid-log.py
   install -m 755 -D  $startdir/src/ncid.sql  $startdir/pkg/tmp/ncid.sql
-  install -m 755 -D $startdir/src/ncidpermissions.sql  $startdir/pkg/tmp/ncidpermissions.sql  
+  install -m 755 -D $startdir/src/ncidpermissions.sql  $startdir/pkg/tmp/ncidpermissions.sql
   chmod 777 $startdir/pkg/tmp
 }
-md5sums=('710de8ab6d61ae48bd6e6ba159e95222'
-         'd4d51f0025baae4d6e0cd51d9dbd3a11'
+md5sums=('4451cb67bd13899e3f98aeda8d8e4f40'
+         'd921bc210d5fa63855edd6c0e0102f68'
          '7655255b35a4fcdc0645c4f9018c1ed1'
-         'dbb9688e9af3fe60a0082c81db067d4a'
-         'dfb2f34dc6102f35765acb7aa881ec89')
+         'b7a95f89fe5cb46e50ff25df7adc18b4'
+         'abc3db9c6676b89081d5d412e46772a3')
diff --git a/abs/core/ncid/ncid-linhes b/abs/core/ncid/ncid-linhes
index 1a9e74c..faa1056 100644
--- a/abs/core/ncid/ncid-linhes
+++ b/abs/core/ncid/ncid-linhes
@@ -15,6 +15,8 @@
 #   OUT: outgoing call
 #   HUP: blacklisted hangup
 #   MSG: message instead of a call
+MYTH_RUN_STATUS=1
+. /etc/profile
 
 ConfigDir=/etc/ncid
 ConfigFile=$ConfigDir/ncidmodules.conf
@@ -28,6 +30,22 @@ read CIDNAME
 read CIDLINE
 read CIDTYPE
 
+LOC=''
+
+#areacode=`echo $CIDNMBR | cut -d "(" -f2 | cut -d ")" -f1`
+areacode=`echo $CIDNMBR | cut -d "-" -f1`
+if [ -e $MV_ROOT/templates/ncid/areacodes.csv ]
+then
+    LOC=`grep $areacode $MV_ROOT/templates/ncid/areacodes.csv  |cut -d ","  -f2`
+fi
+
+
+
+
 #echo "$CIDDATE|$CIDTIME|$CIDNMBR|$CIDNAME|$CIDLINE|$CIDTYPE" > /dev/tty
-/usr/LH/bin/lh_message.sh "$CIDNMBR\n$CIDNAME\n$CIDTYPE"
+
+/usr/LH/bin/msg_client.py --clear
+/usr/LH/bin/msg_client.py --kill
+sleep .2
+/usr/LH/bin/msg_client.py --msg "$CIDNMBR\n$CIDNAME\n$CIDTYPE\n$LOC"
 exit 0
diff --git a/abs/core/ncid/ncid-log.py b/abs/core/ncid/ncid-log.py
index 1301da1..64006df 100644
--- a/abs/core/ncid/ncid-log.py
+++ b/abs/core/ncid/ncid-log.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 import MySQLdb
 import sys
@@ -18,7 +18,8 @@ def main(argv):
     TIME=sys.stdin.readline().strip()
     NUMBER=sys.stdin.readline().strip()
     NAME=sys.stdin.readline().strip()
-
+    LINE=sys.stdin.readline().strip()
+    TYPE=sys.stdin.readline().strip()
 
     #print "start of line"
     #print DATE
@@ -27,8 +28,8 @@ def main(argv):
     #print NAME
     #print "$$$$$$$$$$$$$$$$$$"
     ncursor=cdb.cursor()
-    ncursor.execute ("""INSERT INTO cid (date,time,name,number) VALUES
-                    ('%s', '%s','%s','%s');""" %(DATE,TIME,NAME,NUMBER ))
+    ncursor.execute ("""INSERT INTO cid (date,time,name,number,calltype) VALUES
+                    ('%s', '%s','%s','%s','%s');""" %(DATE,TIME,NAME,NUMBER,TYPE ))
 
 if __name__ == "__main__":
     main(sys.argv[1:])
diff --git a/abs/core/ncid/ncid.sql b/abs/core/ncid/ncid.sql
index 556b4ba..bcef947 100644
--- a/abs/core/ncid/ncid.sql
+++ b/abs/core/ncid/ncid.sql
@@ -26,6 +26,7 @@ CREATE TABLE `cid` (
   `time` varchar(32) default NULL,
   `name` varchar(32) default NULL,
   `number` varchar(32) default NULL,
+  `calltype` varchar(32) default NULL,
   `ts` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=latin1;