Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing

40 files changed, 511 insertions, 120 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index ad8b9b6..d30fc63 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=2.3
-pkgrel=71
+pkgrel=76
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -109,12 +109,12 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27'
          '16b98fcb3753ef6cfc35075c326d30e4'
          'e36da536dd651ef182e7642337889e77'
          '985891a43f7c4c983eb2a362162f1a0f'
-         '2f0b85d37b15956b3d92419c886e040c'
-         '5b41574597ac5096fe3462afeb0376e4'
+         '3f5693c76c7e483dd3c2184bc2546c82'
+         '5a31addfbdc1154b05997f972a32fa33'
          'c20f73d4da5d7e15e1f3eb85c7dcb49a'
          '68199e861c2933ccbb84735b9b440157'
          '9ae8d79f620c6d19973c55c32a921874'
-         '6aea8876ab690e0edf817fe6cb5b7abc'
+         '79579277e0545aeeb50fba403434194c'
          '960017a34d9cc78af6298f45aad6eb8e'
          'ecf9e5df20683a769c4a8a8f2d65de85'
          '6d32a88e76b0a97b0ce67d37ef6394aa'
@@ -127,7 +127,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27'
          '9151c74fcaf18ec4cf5e757cfdbc7017'
          '3d1e4a119f38cff0498bf8a67e94e4b3'
          '71fd2d0d448fc2fcd15415a1beed7109'
-         '5f3259afe031fda189edae41dd1458f0'
+         'b83072f08725f1216a4d31e02d60c5e5'
          'e1715bbbabd42e7419755b09f60734aa'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
          '6801f87992b44118a12b6dfe6ea68127'
diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh
index c807f15..08206fc 100755
--- a/abs/core/LinHES-config/install_functions.sh
+++ b/abs/core/LinHES-config/install_functions.sh
@@ -315,6 +315,11 @@ function in_kernel_support() {
     #For disabling other protocols, adjust to the new location in 2.6.37.    91
     if [ -d /sys/class/rc ] && [ "$(ls -A /sys/class/rc)" ]
     then
+        LCDDSTOP=0
+        if [ -d /service/lcdd ]; then
+            sv stop lcdd
+            LCDDSTOP=1
+        fi
         for file in `find /sys/class/rc/*/ -name protocols`
         do
             if [ "$1" = "disable" ]
@@ -327,6 +332,9 @@ function in_kernel_support() {
                 done
             fi
         done
+        if [ $LCDDSTOP -eq 1 ]; then
+            sv start lcdd
+        fi
     fi
 }
 
diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh
index 4bb2444..2449874 100755
--- a/abs/core/LinHES-config/install_proxy.sh
+++ b/abs/core/LinHES-config/install_proxy.sh
@@ -119,6 +119,7 @@ case $1 in
                                         echo " network check nameserver"
                                         mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'`
                                         ping -c 1 $mydns
+                                        echo " DNS server is $mydns"
                                         if [ ! $? = 0 ]
                                         then
                                             exit 5
@@ -170,14 +171,18 @@ case $1 in
                                             echo "Assuming hostname is OK"
                                             echo "DNS unknown: $unkownhostip"
                                             echo "    HOSTDNS: $hoip       "
+                                            echo "    HOST: "
                                             /sbin/ifconfig -a |grep "inet addr"
+                                            status=0
                                         else
                                             echo "IP in DNS but doesn't match mine, hostname is not safe to use"
-                                            echo "DNS:$hoip"
-                                            echo "HOST: "
+                                            echo " hout: $hout"
+                                            echo "    DNS unknown: $unkownhostip"
+                                            echo "    DNS IP:$hoip"
+                                            echo "    HOST: "
                                             /sbin/ifconfig -a |grep "inet addr"
                                             status=7
-                                            fi
+                                        fi
                                     fi
                                 else
                                     echo "Couldn't find hostname in DNS, must be safe to use"
diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py
index dd00f1d..7608604 100755
--- a/abs/core/LinHES-config/mv_advanced.py
+++ b/abs/core/LinHES-config/mv_advanced.py
@@ -34,28 +34,53 @@ def setup_pacman(create_link):
     else:
         logging.info("    Pacman link will not be created")
     return
-
-def setup_ncid_client(dbhost,templatefile):
-    #This always runs
-    logging.debug("    Configuring ncid client with server %s",dbhost)
-    cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile)
+def setup_ncid_client(runclient):
+    logging.debug("    Configuring ncid client")
+    if runclient == "1" :
+        mv_common.pacinstall("ncid")
+        mv_common.add_service("ncid-client")
+    else:
+        logging.debug("    Removing ncid client")
+        mv_common.remove_service("ncid-client")
     return
 
-def setup_ncid_daemon(port,templatefile,Runncidd):
+def setup_ncid_daemon(Runncidd):
     logging.info("    Configuring callerid daemon")
     if Runncidd == "1":
-        logging.debug("    Port: %s",port)
-        mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile)
-        cmd = '''sed -e "s/.*set ttyport.*$/set ttyport =  \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile)
-        mv_common.runcmd(cmd)
-        mv_common.pacinstall("ncidd")
-        mv_common.add_service("ncidd")
+        mv_common.pacinstall("ncid")
+        mv_common.add_service("ncid-server")
+        mv_common.add_service("ncid-logger")
     else:
         logging.debug("    Callerid will not run")
-        mv_common.pacremove("ncidd")
-        mv_common.remove_service("ncidd")
+        mv_common.pacremove("ncid")
+        mv_common.remove_service("ncid-server")
+        mv_common.remove_service("ncid-logger")
+
     return
 
+
+
+#def setup_ncid_client(dbhost,templatefile):
+    ##This always runs
+    #logging.debug("    Configuring ncid client with server %s",dbhost)
+    #cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile)
+    #return
+
+#def setup_ncid_daemon(port,templatefile,Runncidd):
+    #logging.info("    Configuring callerid daemon")
+    #if Runncidd == "1":
+        #logging.debug("    Port: %s",port)
+        #mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile)
+        #cmd = '''sed -e "s/.*set ttyport.*$/set ttyport =  \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile)
+        #mv_common.runcmd(cmd)
+        #mv_common.pacinstall("ncidd")
+        #mv_common.add_service("ncidd")
+    #else:
+        #logging.debug("    Callerid will not run")
+        #mv_common.pacremove("ncidd")
+        #mv_common.remove_service("ncidd")
+    #return
+
 def setup_splash(Usebootsplash):
     if Usebootsplash == "1":
         logging.info("    Enabling splash")
@@ -359,12 +384,15 @@ def setup_advanced(systemconfig,data_config):
     if systemconfig.get("SystemType") == "Master_backend":
         create_link = True
     setup_pacman(create_link)
-    setup_ncid_client(systemconfig.get("dbhost"),
-                      systemconfig.get("TEMPLATES")+"/ncid.conf.template")
 
-    setup_ncid_daemon(systemconfig.get("nciddSerialPort"),
-                      systemconfig.get("TEMPLATES")+"/ncidd.conf.template",
-                      systemconfig.get("Runncidd"))
+    setup_ncid_client(systemconfig.get("ncidclient"))
+    setup_ncid_daemon(systemconfig.get("Runncidd"))
+    #setup_ncid_client(systemconfig.get("dbhost"),
+                      #systemconfig.get("TEMPLATES")+"/ncid.conf.template")
+
+    #setup_ncid_daemon(systemconfig.get("nciddSerialPort"),
+                      #systemconfig.get("TEMPLATES")+"/ncidd.conf.template",
+                      #systemconfig.get("Runncidd"))
 
     setup_splash(systemconfig.get("Usebootsplash"))
     if data_config.SYSTEMTYPE == "MythVantage":
diff --git a/abs/core/LinHES-config/myth_settings_wrapper.sh b/abs/core/LinHES-config/myth_settings_wrapper.sh
index bcba9d1..33f401f 100644
--- a/abs/core/LinHES-config/myth_settings_wrapper.sh
+++ b/abs/core/LinHES-config/myth_settings_wrapper.sh
@@ -233,14 +233,14 @@ case $OPERATION in
 
             for i in $LIST
             do
-                define_xml 1 $i settings $hostname
+                define_xml 1 $hostname settings $i
                 load_xml $gen_xml
             done
 
             LIST="HostaccesshostypeSystemtype Hostaccessuser"
             for i in $LIST
             do
-                define_xml 0 $i settings $hostname
+                define_xml 0 $hostname settings $i
                 load_xml $gen_xml
             done
             ;;
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 1a460b5..f01e569 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -36,16 +36,16 @@ export MALLOC_CHECK_=0
 # }
 
 
-
-. /etc/osd_cat.cfg || {
-        color=yellow
-        outline=2
-        outlinecolour=black
-        shadow=0
-        shadowcolour=black
-        font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-
+#
+# . /etc/osd_cat.cfg || {
+#         color=yellow
+#         outline=2
+#         outlinecolour=black
+#         shadow=0
+#         shadowcolour=black
+#         font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+# }
+#
 function delay_osd(){
     if [ x$STARTUP_STYLE = xmythvantage ]
     then
@@ -65,23 +65,23 @@ function delay_osd(){
 
 
     }
-
-function msg_osd(){
-    echo -e "$1"  | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
-}
-
-function msg_pyosd(){
-    /usr/LH/bin/xmsg.py -m "$1"
-}
+#
+# function msg_osd(){
+#     echo -e "$1"  | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
+# }
+#
+# function msg_pyosd(){
+#     /usr/LH/bin/xmsg.py -m "$1"
+# }
 
 function msg(){
-    if [ x$STARTUP_STYLE = xmythvantage ]
-    then
-        msg_pyosd "$1"
-    else
-        msg_osd "$1"
-    fi
-
+#     if [ x$STARTUP_STYLE = xmythvantage ]
+#     then
+#         msg_pyosd "$1"
+#     else
+#         msg_osd "$1"
+#     fi
+    /usr/LH/bin/lh_message.sh "$1"
 }
 
 
@@ -132,7 +132,7 @@ function run_tilda(){
 
         width=`/usr/bin/xwininfo -root|grep Width | awk '{ print $2}'`
         height=`/usr/bin/xwininfo -root|grep Height | awk '{ print $2}'`
-	center=$[width/2]
+        center=$[width/2]
         sixtypercent=`echo "scale=0; ( $width*.6) / 1" |bc`
         quarter_height=`echo "scale=0; ($height*.35) /1" |bc`
 
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 73bfb69..3a0c60f 100644
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=2
-pkgrel=47
+pkgrel=50
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -21,7 +21,7 @@ binfiles="LinHES-start optimize_mythdb.py
  lh_system_all_host_update
  add_storage.py
  diskspace.sh
- cacheclean"
+ cacheclean lh_message.sh switch_web.sh"
 
 source=(LinHES-session LinHES-profile.sh $binfiles alsa-base myth_mtc.lr 
  diskspace smolt.cron cacheclean.cron)
@@ -52,7 +52,7 @@ build() {
         mkdir $startdir/pkg/etc/logrotate.d
         cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d
 }
-md5sums=('c26486418b0fc1eee4fc4e24c0a44988'
+md5sums=('e62397288e9b3b41c5ca2a73500db865'
          '5881bdb43d578ec3a79d1f77ea58a3db'
          'a875ee97f86e46f34a741c2bc455f894'
          '76b2637cac0452b3acdbeeb4e8a5474b'
@@ -76,6 +76,8 @@ md5sums=('c26486418b0fc1eee4fc4e24c0a44988'
          '6faeba0aeb38e772121f751cabda8683'
          '68e3e87571f3b0fa4a48a10df50dc220'
          '9603b0ca6e090eff31e76482a3c335e7'
+         'b798ee0796d1b760a2998f90eb8ce9cc'
+         '4a3cd8f9b33b2b86fdba47a8f1fa2859'
          'eb879fee9603a05d5420d4ce8ed9e450'
          'f1870a9522c79e6b248fcbf81dec3280'
          '84492954db16740f949d795b74383189'
diff --git a/abs/core/LinHES-system/lh_message.sh b/abs/core/LinHES-system/lh_message.sh
new file mode 100644
index 0000000..203d127
--- /dev/null
+++ b/abs/core/LinHES-system/lh_message.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+MYTH_RUN_STATUS="1"
+. /etc/profile
+. /etc/systemconfig
+
+
+if [ -e /etc/X11/WINDOWMANAGER ]
+then
+    . /etc/X11/WINDOWMANAGER
+fi
+
+
+. /etc/osd_cat.cfg || {
+        color=yellow
+        outline=2
+        outlinecolour=black
+        shadow=0
+        shadowcolour=black
+        font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+}
+
+function delay_osd(){
+    if [ x$STARTUP_STYLE = xmythvantage ]
+    then
+        cmd="ps -ef | grep -v grep | grep -q  xmsg.py"
+    else
+        cmd="ps -ef | grep -v grep | grep -q osd_cat"
+    fi
+
+    eval $cmd
+
+    rc=$?
+    while [ $rc = 0 ]
+    do
+        eval $cmd
+        rc=$?
+    done
+
+
+    }
+
+function msg_osd(){
+    DISPLAY=127.0.0.1:0   echo -e "$1"  | DISPLAY=127.0.0.1:0 osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
+}
+
+function msg_pyosd(){
+    DISPLAY=127.0.0.1:0 /usr/LH/bin/xmsg.py -m "$1"
+}
+
+function msg(){
+    if [ x$STARTUP_STYLE = xmythvantage ]
+    then
+        msg_pyosd "$1"
+    else
+        msg_osd "$1"
+    fi
+
+}
+
+if [ x"${@}" = x ]
+then
+    print "nothing to display"
+else
+    msg "${@}"
+fi
diff --git a/abs/core/LinHES-system/switch_web.sh b/abs/core/LinHES-system/switch_web.sh
new file mode 100644
index 0000000..bf57764
--- /dev/null
+++ b/abs/core/LinHES-system/switch_web.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#This script is used to switch the default homepage between supplementalweb and
+#the standard local webpage
+. /etc/systemconfig
+DATADIR=/data/srv/httpd/htdocs
+
+function rmindex {
+    if [ -L $DATADIR/index.html ]
+    then
+        rm -f $DATADIR/index.html
+    fi
+}
+
+if [ $SystemType = Master_backend -o  $SystemType = Standalone ]
+then
+    if [ x$1 = xsupplemental ]
+    then
+        rmindex
+        ln -s $DATADIR/alt_index.html $DATADIR/index.html
+   else
+       rmindex
+       ln -s $DATADIR/index.htm $DATADIR/index.html
+   fi
+else
+	echo "This service is only available for StandAlone or Master_backend LinHES systems"
+
+fi
+
+
diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD
index 44bd424..0772c4e 100644
--- a/abs/core/linux-firmware/PKGBUILD
+++ b/abs/core/linux-firmware/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=linux-firmware
 pkgver=20120227
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware files for Linux"
 arch=('any')
 url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
@@ -45,7 +45,7 @@ source=(v4l-cx23885-enc.fw
 
 package() {
   #copy in correct firmware
-  install -D -m755 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/"
+  install -D -m664 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/"
 
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/abs/core/local-website/PKGBUILD b/abs/core/local-website/PKGBUILD
index 71f90ae..82bf025 100644
--- a/abs/core/local-website/PKGBUILD
+++ b/abs/core/local-website/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=local-website
 pkgver=2
-pkgrel=29
+pkgrel=30
 pkgdesc="Contents of http://localhost"
 arch=(i686 x86_64)
 license=('GPL')
diff --git a/abs/core/local-website/htdocs/index.html b/abs/core/local-website/htdocs/index.htm
index 04dff38..04dff38 100755..100644
--- a/abs/core/local-website/htdocs/index.html
+++ b/abs/core/local-website/htdocs/index.htm
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index e4e26c8..6d6e615 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jams
 pkgname=mythinstall
 pkgver=3
-pkgrel=23
+pkgrel=24
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=('mythtv>=0.25')
diff --git a/abs/core/ncid/PKGBUILD b/abs/core/ncid/PKGBUILD
new file mode 100644
index 0000000..dbf5daa
--- /dev/null
+++ b/abs/core/ncid/PKGBUILD
@@ -0,0 +1,39 @@
+pkgname=ncid
+pkgver=0.83
+pkgrel=1
+pkgdesc="daemon to display callerid"
+url="http://ncid.sourceforge.net/"
+license=""
+depends=(python)
+makedepends=()
+conflicts=()
+replaces=()
+backup=()
+arch=('i686')
+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)
+
+build() {
+   cd $startdir/src/$pkgname
+#  ./configure --prefix=/usr
+  make clean
+  make package  || return 1
+  }
+package(){
+  cd $startdir/src/$pkgname
+  #sed out MakeFILE
+
+  sed  -i "s|^.*\$(MAKE) install prefix=/usr prefix2=|\t\$(MAKE) install prefix=${pkgdir}/usr prefix2=$pkgdir|" Makefile
+  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  
+  chmod 777 $startdir/pkg/tmp
+}
+md5sums=('710de8ab6d61ae48bd6e6ba159e95222'
+         'd4d51f0025baae4d6e0cd51d9dbd3a11'
+         '7655255b35a4fcdc0645c4f9018c1ed1'
+         'dbb9688e9af3fe60a0082c81db067d4a'
+         'dfb2f34dc6102f35765acb7aa881ec89')
diff --git a/abs/core/ncid/ncid-linhes b/abs/core/ncid/ncid-linhes
new file mode 100644
index 0000000..1a9e74c
--- /dev/null
+++ b/abs/core/ncid/ncid-linhes
@@ -0,0 +1,33 @@
+#!/bin/sh
+# keep "ncid-" in the name
+# input is 6 lines obtained from ncid
+# input: DATE\nTIME\nNUMBER\nNAME\nLINE\nTYPE\n
+#
+# input is 6 lines if a message was sent
+# input: \n\n\n<MESSAGE>\n\nMSG\n
+# Message will be in $CIDNAME
+#
+# ncid usage:
+#   ncid --no-gui [--message] --program ncid-linhes
+
+# $CIDTYPE is one of:
+#   CID: incoming call
+#   OUT: outgoing call
+#   HUP: blacklisted hangup
+#   MSG: message instead of a call
+
+ConfigDir=/etc/ncid
+ConfigFile=$ConfigDir/ncidmodules.conf
+
+[ -f $ConfigFile ] && . $ConfigFile
+
+read CIDDATE
+read CIDTIME
+read CIDNMBR
+read CIDNAME
+read CIDLINE
+read CIDTYPE
+
+#echo "$CIDDATE|$CIDTIME|$CIDNMBR|$CIDNAME|$CIDLINE|$CIDTYPE" > /dev/tty
+/usr/LH/bin/lh_message.sh "$CIDNMBR\n$CIDNAME\n$CIDTYPE"
+exit 0
diff --git a/abs/core/ncid/ncid-log.py b/abs/core/ncid/ncid-log.py
new file mode 100644
index 0000000..1301da1
--- /dev/null
+++ b/abs/core/ncid/ncid-log.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import MySQLdb
+import sys
+import getopt
+import socket
+import os
+cdb = MySQLdb.connect(host="127.0.0.1", user="mythtv", passwd="mythtv", db="ncid")
+#log to logger?
+
+
+
+#log to db
+
+def main(argv):
+
+    DATE=sys.stdin.readline().strip()
+    TIME=sys.stdin.readline().strip()
+    NUMBER=sys.stdin.readline().strip()
+    NAME=sys.stdin.readline().strip()
+
+
+    #print "start of line"
+    #print DATE
+    #print TIME
+    #print NUMBER
+    #print NAME
+    #print "$$$$$$$$$$$$$$$$$$"
+    ncursor=cdb.cursor()
+    ncursor.execute ("""INSERT INTO cid (date,time,name,number) VALUES
+                    ('%s', '%s','%s','%s');""" %(DATE,TIME,NAME,NUMBER ))
+
+if __name__ == "__main__":
+    main(sys.argv[1:])
+
diff --git a/abs/core/ncid/ncid.install b/abs/core/ncid/ncid.install
new file mode 100644
index 0000000..e000b3b
--- /dev/null
+++ b/abs/core/ncid/ncid.install
@@ -0,0 +1,17 @@
+
+post_install() {
+	
+        mysql -u root -e 'create database ncid;'  
+	echo installing the default database
+	mysql ncid < /tmp/ncid.sql 
+	mysql < /tmp/ncidpermissions.sql
+	rm /tmp/ncid.sql
+	rm /tmp/ncidpermissions.sql
+}
+post_upgrade() {
+	echo "nothing to do"
+}
+
+op=$1 
+shift 
+$op $*
diff --git a/abs/core/ncid/ncid.sql b/abs/core/ncid/ncid.sql
new file mode 100644
index 0000000..556b4ba
--- /dev/null
+++ b/abs/core/ncid/ncid.sql
@@ -0,0 +1,51 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: ncid
+-- ------------------------------------------------------
+-- Server version	5.0.27
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `cid`
+--
+
+DROP TABLE IF EXISTS `cid`;
+CREATE TABLE `cid` (
+  `id` int(11) NOT NULL auto_increment,
+  `date` varchar(36) NOT NULL default '',
+  `time` varchar(32) default NULL,
+  `name` varchar(32) default NULL,
+  `number` 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;
+
+--
+-- Dumping data for table `cid`
+--
+
+LOCK TABLES `cid` WRITE;
+/*!40000 ALTER TABLE `cid` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cid` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2007-10-29 14:36:50
diff --git a/abs/core/ncid/ncidclient.sh b/abs/core/ncid/ncidclient.sh
new file mode 100644
index 0000000..0d2be3f
--- /dev/null
+++ b/abs/core/ncid/ncidclient.sh
@@ -0,0 +1,2 @@
+ncid --no-gui --all  --call-prog --program /usr/bin/ncid.py 127.0.0.1 3333
+
diff --git a/abs/core/ncid/ncidpermissions.sql b/abs/core/ncid/ncidpermissions.sql
new file mode 100644
index 0000000..eb660fa
--- /dev/null
+++ b/abs/core/ncid/ncidpermissions.sql
@@ -0,0 +1,8 @@
+ 
+GRANT ALL ON ncid.* TO mythtv@localhost IDENTIFIED BY "mythtv";
+GRANT ALL ON ncid.* TO mythtv@"%" IDENTIFIED BY "mythtv";
+GRANT FILE ON *.* TO 'mythtv'@'%';
+FLUSH PRIVILEGES;
+
+FLUSH PRIVILEGES;
+ALTER DATABASE ncid DEFAULT CHARACTER SET latin1;
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 48e469d..9e73603 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=2.1.1
-pkgrel=63
+pkgrel=66
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/ncid-client/run b/abs/core/runit-scripts/runitscripts/services/ncid-client/run
new file mode 100644
index 0000000..80c2af5
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/ncid-client/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Start/stop the ncid-client 
+#
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/systemconfig
+stat_runit "Starting caller id client (ncid-client)"
+exec 2>&1
+exec /usr/bin/ncid --no-gui --program /usr/share/ncid/ncid-linhes  $dbhost 3333
diff --git a/abs/core/runit-scripts/runitscripts/services/ncid-logger/run b/abs/core/runit-scripts/runitscripts/services/ncid-logger/run
new file mode 100644
index 0000000..56f10d4
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/ncid-logger/run
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Start/stop the ncid-client 
+#
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/systemconfig
+sv start ncid-server
+stat_runit "Starting caller id logger"
+exec 2>&1
+exec /usr/bin/ncid --no-gui --program /usr/bin/ncid-log.py  127.0.0.1 3333
diff --git a/abs/core/runit-scripts/runitscripts/services/ncid-server/run b/abs/core/runit-scripts/runitscripts/services/ncid-server/run
new file mode 100644
index 0000000..126909d
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/ncid-server/run
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Start/stop the ncid-client 
+#
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/systemconfig
+stat_runit "Starting caller id server (ncid)"
+exec 2>&1
+if [ -f /etc/ncid/ncidd-user.conf ]
+then
+    exec /usr/sbin/ncidd -D -C /etc/ncid/ncidd-user.conf 
+else
+    exec /usr/sbin/ncidd -D -t /dev/$nciddSerialPort
+fi
diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run
index 0943a8e..2248322 100755
--- a/abs/core/runit-scripts/runitscripts/services/remotes/run
+++ b/abs/core/runit-scripts/runitscripts/services/remotes/run
@@ -23,7 +23,7 @@ echo "`date` --- run started" >> $LOG
 # /etc/runit/lirc.sh
 #Anything in that file will be used and the rest of this file is ignored.
 
-if [ -f /etc/runit/lirc.sh ]
+if [ -x /etc/runit/lirc.sh ]
 then
     #program must not terminate.
     stat_runit "Starting remotes from /etc/runit/lirc.sh"
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 40b1f7b..a756347 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=supplemental-web
 pkgver=1.0
-pkgrel=16
+pkgrel=17
 arch=('i686')
 MVDIR=$startdir/pkg/usr/MythVantage
 install=supplemental-web.install
 backup=('extra.cfg.txt')
 source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh backend_control.sh)
-depends=('lighttpd'  'php' 'fcgi' 'python' 'xymonserver' 'certmaster' 'func' 'python_aosd' )
+depends=('lighttpd'  'php' 'fcgi' 'python' 'xymonserver' 'certmaster' 'func' 'python_aosd'  'LinHES-system>=2-50')
 
 
 
@@ -32,7 +32,7 @@ build() {
 
 }
 
-md5sums=('2a9d042467220fd1f74f5b12730c2e06'
+md5sums=('30aa4235aff78c77d544f930f3d92b62'
          '3d8c7b430c1319d706ca420825918d2a'
          '81cdb6ee6804fa36366c6e259a80e7b4'
          'f37e10ef9fc84b384b9a2d41f82ef744')
diff --git a/abs/core/supplemental-web/contents/index.htm b/abs/core/supplemental-web/contents/alt_index.html
index faf09fb..faf09fb 100644
--- a/abs/core/supplemental-web/contents/index.htm
+++ b/abs/core/supplemental-web/contents/alt_index.html
diff --git a/abs/core/supplemental-web/contents/docs.html b/abs/core/supplemental-web/contents/docs.html
index 4a5e64a..21ba2dd 100644
--- a/abs/core/supplemental-web/contents/docs.html
+++ b/abs/core/supplemental-web/contents/docs.html
@@ -34,16 +34,12 @@ Starting and stopping services.
 	Other Random notes
 <br>
 <ul id="navlist">
-	<li>The root password is blank.  You will not be able to remotely access this account until the password is set.</li>
 	<li>To keep a host from showing up in the network map, add it to:
        	/data/srv/hobbit/server/ext/ignoreclient.py
 	</li>
 	<li>remove  "func" from bb-hosts to stop hobbit from running a func check on it </li>
 	<li>if /tmp/nomfe is present then mythfrontend will not restart </li>
-	<li>if /tmp/debug is present then mythfrontend and mythbackend will run with gdb.  Debug packages will need to be installed for this to be useful </li>
 
-	<li>create_master.sh will copy the contents of the cdrive to a "Gold" image for network/diskless  installation. Dhcp server must be enabled for netboot to work, please turn off any other dhcp servers on your network. </li>
-    <li>On the misc screen the nfsmap section will accept entries pointing to different servers.   For instance 192.168.1.5:nfsmap will pull the nfsmap file from the ip 192.168.1.5 (hostnames may also be used) </li>
     <li>adding pkg names to /etc/pkgname.blacklist will stop MythVantage from autoinstalling a package.</li>
 </div>
 <br>
diff --git a/abs/core/supplemental-web/contents/error/call_log.html b/abs/core/supplemental-web/contents/error/call_log.html
new file mode 100644
index 0000000..3f05f21
--- /dev/null
+++ b/abs/core/supplemental-web/contents/error/call_log.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<style type="text/css">@import "/frame.css";</style>
+</head>
+
+<body>
+Call logging is not enabled, or no calls logs
+</br>
+To enable logging of incoming phone calls please visit the advanced section of the service menu 
+</body>
+</html>
diff --git a/abs/core/supplemental-web/contents/error/mythexport.html b/abs/core/supplemental-web/contents/error/mythexport.html
new file mode 100644
index 0000000..88966c6
--- /dev/null
+++ b/abs/core/supplemental-web/contents/error/mythexport.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<style type="text/css">@import "/frame.css";</style>
+</head>
+
+<body>
+MythExport does not appear to be installed.
+</br>
+
+</body>
+</html>
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index e476799..1e69c1c 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -27,8 +27,10 @@ function r()
 		<!--		<li><a href="webcal/"  >Calendar</a></li> -->

 		<li><a   onClick=r() >Myth Backend Status</a></li>

 		<li><a href="mythweb/" >MythWeb</a></li>

-		<li><a href="phpMyAdmin/"  >phpMyAdmin</a></li>

-	</ul>

+        <li><a href="mythexport/setup.cgi"  >MythExport</a></li>

+

+        <li><a href="/calllog.shtml"  >Phone call log</a> </li>

+</ul>

 </div>

 </body>

 </html>

diff --git a/abs/core/supplemental-web/contents/links.html b/abs/core/supplemental-web/contents/links.html
index a44fefc..cfc7311 100644
--- a/abs/core/supplemental-web/contents/links.html
+++ b/abs/core/supplemental-web/contents/links.html
@@ -20,9 +20,12 @@ Other Links
         <li><a href="/calllog.shtml"  >Phone call log</a> </li>
 	<!--        <li><a href="/mvpmc.shtml"  >Media MVP setup</a> (dhcp server must be enabled) </li> -->
         <li><a href="http://www.linhes.org"  >linhes.org </a>Bugtracker</li>
-        <li><a href="http://linhes.org/bugs/projects/linhes/wiki"  >Wiki </a></li>
-        <li><a href="http://mysettopbox.tv/phpBB2/"  >Online User Forums</a></li>
-        <li><a href="http://www.mythtv.com"  >mythtv.com</a></li>
+        <li><a href="http://linhes.org/wiki"  >Wiki </a></li>
+        <li><a href="http://forums.linhes.org"  >Online User Forums</a></li>
+        <li><a href="http://www.mythtv.org"  >mythtv.org</a></li>
+        <li><a href="http://smolt.mythtv.org"  >mythtv smolt server</a></li>
+
+
 </ul>
 </div>
 
diff --git a/abs/core/supplemental-web/lighttpd-supplement.conf b/abs/core/supplemental-web/lighttpd-supplement.conf
index 7b214bb..24e1b4a 100644
--- a/abs/core/supplemental-web/lighttpd-supplement.conf
+++ b/abs/core/supplemental-web/lighttpd-supplement.conf
@@ -13,6 +13,13 @@ $HTTP["url"] =~ "(xymon)" {
 server.error-handler-404   = "/error/hobbit.html"
 }
 
+$HTTP["url"] =~ "(mythexport)" {
+server.error-handler-404   = "/error/mythexport.html"
+}
+
+$HTTP["url"] =~ "(call_log)" {
+server.error-handler-404   = "/error/call_log.html"
+}
 ## error-handler for status 404
 #server.error-handler-404   = "/error-handler.html"
 server.errorfile-prefix = "/data/srv/httpd/htdocs/error/status-"
diff --git a/abs/core/supplemental-web/supplemental-web.install b/abs/core/supplemental-web/supplemental-web.install
index 252a8e0..7dc0214 100644
--- a/abs/core/supplemental-web/supplemental-web.install
+++ b/abs/core/supplemental-web/supplemental-web.install
@@ -20,8 +20,7 @@ post_install() {
  echo "==> Forcing a re-read of lighttpd's configuration file."
  echo ""
  /sbin/sv hup /service/lighttpd
-
-
+ /usr/LH/bin/switch_web.sh supplemental
 }
 
 # arg 1:  the new package version
@@ -60,6 +59,7 @@ post_remove() {
   /sbin/sv hup /service/lighttpd
 
 
+ /usr/LH/bin/switch_web.sh local
 }
 
 op=$1
diff --git a/abs/core/windowmaker-crm-git/PKGBUILD b/abs/core/windowmaker-crm-git/PKGBUILD
deleted file mode 100644
index 6a47895..0000000
--- a/abs/core/windowmaker-crm-git/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 94218 2010-10-05 16:33:23Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=windowmaker-crm-git
-pkgver=20101005
-pkgrel=1
-pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra"
-arch=(i686 x86_64)
-url="http://www.windowmaker.org"
-license=('GPL' 'custom')
-depends=('libxinerama' 'libxrandr' 'libpng' 'libxpm' 'libxft' 'libtiff>=3.9.1' 'giflib' 'libxmu')
-options=('!libtool')
-provides=('windowmaker')
-conflicts=('windowmaker')
-source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop)
-md5sums=('8cc7e736a8d7e446f696b80fc7dcb79c'
-         '2fba97bebfd691836b92b8f0db79ff13')
-
-build() {
-  cd $srcdir/windowmaker-$pkgver
-  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
-    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
-    --enable-usermenu --enable-modelock
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
-  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
-}
diff --git a/abs/core/windowmaker-crm-git/libpng-1.4.patch b/abs/core/windowmaker-crm-git/libpng-1.4.patch
deleted file mode 100644
index 5dbe5fd..0000000
--- a/abs/core/windowmaker-crm-git/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur windowmaker-20091221-orig/wrlib/load.c windowmaker-20091221/wrlib/load.c
---- windowmaker-20091221-orig/wrlib/load.c	2010-01-21 17:01:10.000000000 -0500
-+++ windowmaker-20091221/wrlib/load.c	2010-01-21 17:02:38.000000000 -0500
-@@ -327,7 +327,7 @@
- 
- #ifdef USE_PNG
- 	/* check for PNG */
--	if (png_check_sig(buffer, 8))
-+	if (!png_sig_cmp(buffer, 0, 8))
- 		return IM_PNG;
- #endif
- 
diff --git a/abs/core/windowmaker/PKGBUILD b/abs/core/windowmaker/PKGBUILD
new file mode 100644
index 0000000..e9a9853
--- /dev/null
+++ b/abs/core/windowmaker/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 150208 2012-02-14 20:50:29Z daniel $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
+pkgname=windowmaker
+pkgver=0.95.2
+pkgrel=1
+pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
+arch=(i686 x86_64)
+url="http://www.windowmaker.org/"
+license=('GPL' 'custom')
+depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
+options=('!libtool')
+source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop)  
+md5sums=('ae62bad9c4dee504066e0f172b565ff0'
+         '2fba97bebfd691836b92b8f0db79ff13')
+
+build() {
+  cd $srcdir/WindowMaker-$pkgver
+  [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \
+    --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \
+    --enable-usermenu --enable-modelock --enable-xrandr
+  make
+}
+
+package() {
+  cd $srcdir/WindowMaker-$pkgver
+  
+  make DESTDIR=$pkgdir install
+  install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL
+  install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop
+}
+
diff --git a/abs/core/windowmaker/libpng-1.4.patch b/abs/core/windowmaker/libpng-1.4.patch
new file mode 100644
index 0000000..419e8fa
--- /dev/null
+++ b/abs/core/windowmaker/libpng-1.4.patch
@@ -0,0 +1,12 @@
+diff -Naur WindowMaker-0.92.0-orig/wrlib/load.c WindowMaker-0.92.0/wrlib/load.c
+--- WindowMaker-0.92.0-orig/wrlib/load.c	2010-01-21 16:10:39.000000000 -0500
++++ WindowMaker-0.92.0/wrlib/load.c	2010-01-21 16:13:15.000000000 -0500
+@@ -348,7 +348,7 @@
+ 
+ #ifdef USE_PNG
+     /* check for PNG */
+-    if (png_check_sig(buffer, 8))
++    if (!png_sig_cmp(buffer, 0, 8))
+         return IM_PNG;
+ #endif
+ 
diff --git a/abs/core/windowmaker/windowmaker-gcc4.patch.tar.bz2 b/abs/core/windowmaker/windowmaker-gcc4.patch.tar.bz2
new file mode 100644
index 0000000..fae12a9
--- /dev/null
+++ b/abs/core/windowmaker/windowmaker-gcc4.patch.tar.bz2
diff --git a/abs/core/windowmaker-crm-git/wmaker.desktop b/abs/core/windowmaker/wmaker.desktop
index f819c75..f819c75 100644
--- a/abs/core/windowmaker-crm-git/wmaker.desktop
+++ b/abs/core/windowmaker/wmaker.desktop