diff options
29 files changed, 306 insertions, 322 deletions
@@ -23,3 +23,4 @@ srclinks.* *.pkg.tar.* */git_src/mythtv abs/core/mythtv/stable-0.25/git_src/mythtv +abs/core/mythtv/stable-0.25/git_src/mythweb diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2777277..cf5a630 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=65 +pkgrel=68 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' @@ -128,14 +128,14 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' '5f3259afe031fda189edae41dd1458f0' 'dc150c1e2c915a55a616d1af5bb1f6de' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '03d866e4dc287d13734e35f4ebe15edb' + '6801f87992b44118a12b6dfe6ea68127' '5e69839659d65ddda35b8a9982dc29e9' - '62b4ce94277c32f525db5c1480670acd' + '3afd18517bb765d1680f4fcc8d08c9cc' 'ec6a9961e4d1b53ec1240c5979efff11' 'fe5e31b833cc6707209e9d656b6eb53c' '76140f4160ebb1790a24f9b51b542a7b' '23d0e12b7ca1cc6ea6b993c1d7ff20b9' - 'bce31dc826812d1b32003f77f9945ca9' + '0b5b9e5385c7ae77e561812e96ce8161' '59dd4d49fd92a35f4111aa9b77fa21b6' '2596460462cf6c889cf8f95485537b20' 'a63ff9ef5250965aeabc74bfa8e43981') diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py index 1396dfe..59b05b6 100755 --- a/abs/core/LinHES-config/mv_hostype.py +++ b/abs/core/LinHES-config/mv_hostype.py @@ -272,7 +272,7 @@ def hostypeprint(systemconfig): run_mysqlnetwork = True if systemconfig.get("hostypec"): setup_db() - install_list=["mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] + install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd"] @@ -289,7 +289,7 @@ def hostypeprint(systemconfig): logging.info("Master backend system being configured") setup_ntp(False,"null") setup_avahi(systemconfig.get("TEMPLATES")) - install_list=["mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] + install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd"] EnableNetwork = True run_mysqlnetwork = True @@ -312,7 +312,7 @@ def hostypeprint(systemconfig): if systemconfig.get("hostypec"): setup_db() - install_list = ["rpcbind", "nfs-utils", "avahi", "libmysqlclient" ] + install_list = [ "nss-mdns", "rpcbind", "nfs-utils", "avahi", "libmysqlclient" ] daemon_list = ["mythbackend", "rpcbind", "nfs-common", "netfs", "avahi" ] daemon_remove_list=["mysql", "lighttpd", "certmaster"] @@ -335,7 +335,7 @@ def hostypeprint(systemconfig): install_list=["mysql-clients", "libmysqlclient", "avahi", "rpcbind", "nfs-utils"] remove_list=["mysql","lighttpd"] - daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs" ] + daemon_list=["nss-mdns", "mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs" ] daemon_remove_list=["mysql", "mythbackend","lighttpd"] if xymon_supported: install_list.append('xymonclient') diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index df6feb5..36f7545 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -57,8 +57,8 @@ def add_module(filename,module): mv_common.runcmd(cmd) def unload_all_lirc(): - logging.debug(" Unloading all lirc modules") - cmd = "sv stop lircd" + logging.debug(" Unloading all remote modules") + cmd = "sv stop remotes" mv_common.runcmd(cmd) cmd = "killall -9 lircd" mv_common.runcmd(cmd) @@ -83,7 +83,7 @@ def include_file( incfile,filename): def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType): logging.debug(" Setup of remote type %s",Remotetype) if Remotetype == "no_remote" and HostBlasterType == "None" : - mv_common.remove_service("lircd") + mv_common.remove_service("remotes") elif Remotetype == "tinker": pass else: @@ -155,7 +155,7 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType): cmd = "chmod 755 /etc/lircrc /etc/remote.run" mv_common.runcmd(cmd) - mv_common.add_service("lircd") + mv_common.add_service("remotes") def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): @@ -375,7 +375,7 @@ def setup_ir(systemconfig, data_config): mv_common.runcmd(cmd) time.sleep(2) mv_common.udev_trigger() - cmd="sv start lircd" + cmd="sv start remotes" mv_common.runcmd(cmd) rc = [ True , True ] if systemconfig.get("LCDtype"): diff --git a/abs/core/LinHES-config/mv_network.py b/abs/core/LinHES-config/mv_network.py index f25d4bc..aab1345 100755 --- a/abs/core/LinHES-config/mv_network.py +++ b/abs/core/LinHES-config/mv_network.py @@ -143,6 +143,13 @@ def kill_dhcp(basedir): def setup_nameserver(dns): logging.info(" Adding %s for DNS", dns) + lan="local" + cmd = '''grep -q %s /etc/resolv.conf''' %lan + status = mv_common.runcmd(cmd) + if not status == 0 : + cmd = ''' echo "search %s" >> /etc/resolv.conf ''' %lan + mv_common.runcmd(cmd) + cmd = '''grep -q %s /etc/resolv.conf''' %dns status = mv_common.runcmd(cmd) if not status == 0 : @@ -301,6 +308,15 @@ def setup_interface(netdev,systemconfig): logging.info(" Enabling DHCP support") cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' %s/%s/options''' %(etcnetdir, netdev) mv_common.runcmd(cmd) + #add .local .lan + local="local" + cmd = '''grep -q %s /etc/resolv.conf.head''' %local + status = mv_common.runcmd(cmd) + if not status == 0 : + cmd = ''' echo "search %s" >> /etc/resolv.conf.head ''' %local + mv_common.runcmd(cmd) + + else: logging.info(" Using static ip address of %s",netinfo["ip"]) cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' %s/%s/options''' %(etcnetdir, netdev) @@ -384,6 +400,10 @@ def find_active(systemconfig,this_is_install): mv_common.remove_file("/etc/resolv.conf") cmd = ''' echo search lan > /etc/resolv.conf ''' mv_common.runcmd(cmd) + + cmd = ''' echo search local >> /etc/resolv.conf ''' + mv_common.runcmd(cmd) + cmd = ''' echo nameserver 127.0.0.1 >> /etc/resolv.conf ''' mv_common.runcmd(cmd) @@ -487,6 +507,9 @@ def setup_network (systemconfig,this_is_install): return False logging.info("____Start of network____") logging.info(" Setting up the network") + mv_common.pacinstall("nss-mdns") + mv_common.pacinstall("avahi") + setup_nsswitch() restartfe = hostname_change_check(systemconfig) setup_hostname(systemconfig) find_active(systemconfig,this_is_install) @@ -494,12 +517,18 @@ def setup_network (systemconfig,this_is_install): logging.info("__End of network\n") return restartfe +def setup_nsswitch(): + logging.info(" Adding mdns4 to nsswitch.conf") + cmd = '''sed -i "s/hosts:.*$/hosts: files mdns4_minimal dns mdns4/" /etc/nsswitch.conf''' + mv_common.runcmd(cmd) ##this is used by the install process to start the network def install_network_setup(systemconfig): logging.info("____Start of network_install____") logging.info(" Setting up the network") + + #setup_MYTH_vars setup_hostname(systemconfig) stop_network() diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 18d67e5..91807c1 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=44 +pkgrel=45 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -59,11 +59,11 @@ md5sums=('e8a0e71dabadb5a860b4e113615c3071' 'd1f27cb422010077c841376526fe46ea' '2ef9f945e034119f77d9b6beb17e4fa5' 'c1c5f68835afbb2bad5d5e6cec0fc1dc' - '5e67a8b7ff57ec32d668bce7aab0aa6d' + 'cbe4cba14fa9d01a62e2196edc1bd98b' 'dc3eef2a624754e16805d72bbe488b67' 'dc0be354ce77ba2b89868fc29b942c43' '542e670e78d117657f93141e9689f54d' - '752488eb8bfb672ce0e4c924f7faf3d1' + '35011127753a2d8f6e212353da719557' 'ba351b92e69bcaf26a9bf80417b09c3c' '294e54209538018008323d164ce39fb3' '962a3e9eaba2d1466251b7ab0956705d' diff --git a/abs/core/LinHES-system/firstboot.sh b/abs/core/LinHES-system/firstboot.sh index 8e3dc57..c405df8 100755 --- a/abs/core/LinHES-system/firstboot.sh +++ b/abs/core/LinHES-system/firstboot.sh @@ -56,7 +56,7 @@ then while [ $fb_status != 0 ] do fix_lirc_socket - try_smolt +# try_smolt if [ $fb_status != 0 ] then sleep 1 diff --git a/abs/core/LinHES-system/mythfrontend-start b/abs/core/LinHES-system/mythfrontend-start index c92d024..e2645bf 100755 --- a/abs/core/LinHES-system/mythfrontend-start +++ b/abs/core/LinHES-system/mythfrontend-start @@ -15,8 +15,8 @@ then mythvantage -q "${question}" if [ $? = 16 ] then - mythfrontend --logfile /var/log/mythtv/mythfrontend.log + mythfrontend -d --syslog local6 fi else - mythfrontend --logfile /var/log/mythtv/mythfrontend.log + mythfrontend -d --syslog local6 fi diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD index 6caea3f..01f8f14 100644 --- a/abs/core/fluxbox/PKGBUILD +++ b/abs/core/fluxbox/PKGBUILD @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.1 -pkgrel=3 +pkgrel=5 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" @@ -35,5 +35,5 @@ package() { } md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed' - 'f46ddb76de4766a7a31a98d0205c330f' + '501a4d423db5493fa2f2e5eb30d72e6f' '7d2fff845c9f951e925b9adcd1053242') diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys index a2bfd93..79abb52 100644 --- a/abs/core/fluxbox/keys +++ b/abs/core/fluxbox/keys @@ -35,7 +35,7 @@ Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start Mod1 1 :ExecCommand sudo sv start mythbackend Mod1 2 :ExecCommand sudo sv stop mythbackend Mod1 3 :ExecCommand sudo sv restart mythbackend -Mod1 h :ExecCommand MythVantage -h +Mod1 h :ExecCommand MythVantage -H Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh Mod1 Escape :GotoWindow {1} Mod4 w :Restart wmaker diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD index 5ae239a..2a21d9f 100644 --- a/abs/core/keylaunch/PKGBUILD +++ b/abs/core/keylaunch/PKGBUILD @@ -1,6 +1,6 @@ pkgname=keylaunch pkgver=1.3.9 -pkgrel=2 +pkgrel=4 arch=('i686') pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. " url="http://www.oroborus.org/" @@ -16,4 +16,4 @@ build() { install -D -m0755 ../example_rc $startdir/pkg/etc/keylaunchrc } md5sums=('710f68a3e7026b4139cc94ea790576c3' - '652de5f0db90f32c664c9698f865e07a') + 'd465a4c892daedd558ec83e59734877e') diff --git a/abs/core/keylaunch/example_rc b/abs/core/keylaunch/example_rc index 8b5ca34..650e078 100644 --- a/abs/core/keylaunch/example_rc +++ b/abs/core/keylaunch/example_rc @@ -13,7 +13,7 @@ key=..*x:/usr/LH/bin/tvterm.sh key=..*s:sudo /usr/bin/mythtv-setup key=..*u:/usr/LH/bin/unclutter-toggle.sh key=.**u:/usr/LH/bin/unclutter-toggle.sh -key=..*h:/usr/MythVantage/bin/mythinstall -h +key=..*h:/usr/MythVantage/bin/mythinstall -H key=..*m:/usr/LH/bin/mythfrontend-start diff --git a/abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh b/abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh new file mode 100644 index 0000000..6e8e67e --- /dev/null +++ b/abs/core/mythtv/stable-0.25/git_src/checkout_mythweb.sh @@ -0,0 +1,38 @@ +#!/bin/bash +#Quick script used to checkout the Mythweb source +#This source should be used build all mythplugins & main program +#76df8e6c8f7b84a157607d8c25fd19f39d8dc830 +_gitroot="https://github.com/MythTV/mythweb.git" +_gitname="mythweb" +startdir=`pwd` +#Set this to True, to update mythtv to the latest. +#If not true then it will use the hash stored in git_hash +_current="True" + +_checkoutHASH=`cat git_hash_web` + +if [ -d $_gitname ] +then + cd $_gitname + git checkout fixes/0.25 + git pull + echo "The local files are updated." +else + git clone -b fixes/0.25 $_gitroot +fi + +if [ -d $_gitname ] +then + cd $_gitname + if [ $_current == True ] + then + git rev-parse HEAD > $startdir/git_hash_web + else + git checkout $_checkoutHASH + fi + pwd + ls +fi +echo "GIT checkout done or server timeout" + + diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash_web b/abs/core/mythtv/stable-0.25/git_src/git_hash_web new file mode 100644 index 0000000..0bcf85d --- /dev/null +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash_web @@ -0,0 +1 @@ +1d056f77dc29045008b52b82e90bc935ff1ab948 diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index 37c3643..9768370 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=1 +pkgrel=3 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -59,7 +59,8 @@ groups=('pvr') install='mythtv.install' patchs=('myth_settings.patch') optdepends=('xmltv: to download tv listings') -conflicts=('mythvideo') +replaces=('mythvideo' 'myththemes') +conflicts=('mythvideo' 'myththemes') source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty' ) diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD index cab8fbd..f78c224 100644 --- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD @@ -1,24 +1,41 @@ pkgname=mythweb -pkgver=0.24 -pkgrel=16 -pkgdesc="Web interface for MythTV's backend" +pkgver=0.25 +pkgrel=1 + +commit_hash=`cat ../git_src/git_hash_web` + +pkgdesc="Web interface for MythTV's backend, $commit_hash" url="http://www.mythtv.org" license="GPL" arch=('i686' 'x86_64') -depends=('mythtv>=0.24' 'lighttpd' 'php' 'local-website') +depends=('mythtv>=0.25' 'lighttpd' 'php' 'local-website') groups=('mythtv-extras') patches=() -source=('ftp://ftp.knoppmyth.net/R6/sources/mythweb-0.24-fixes.tar.bz2' `echo ${patches[@]:0}`) +source=(`echo ${patches[@]:0}`) DOCROOT=/data/srv/httpd/htdocs/mythweb -_gitroot="https://github.com/mythtv/mythweb.git" -_gitname="${pkgname}" build() { + if [ -e ${srcdir}/mythweb ] + then + rm -rf ${srcdir}/mythweb + fi + + cd ${startdir} + msg "copy in myth web src" + cp -rp ../git_src/mythweb $srcdir + cd ${srcdir}/${pkgbase} + + + + msg "The local files are updated." + + cd $startdir/src/mythweb - git pull + + echo "--------------------------applying patches----------------------------------------------------" for i in `echo ${patches[@]:0} ` diff --git a/abs/core/nss-mdns/PKGBUILD b/abs/core/nss-mdns/PKGBUILD new file mode 100644 index 0000000..643dac8 --- /dev/null +++ b/abs/core/nss-mdns/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 124100 2011-05-16 15:17:50Z andrea $ +# Maintainer: +# Contributor: Travis Willard <travis@archlinux.org> + +pkgname=nss-mdns +pkgver=0.10 +pkgrel=3 +pkgdesc="glibc plugin providing host name resolution via mDNS" +arch=('i686' 'x86_64') +url="http://0pointer.de/lennart/projects/nss-mdns/" +license=('LGPL') +depends=('glibc') +makedepends=('pkgconfig') +backup=('etc/mdns.allow') +install=nss-mdns.install +source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'mdns.allow') +md5sums=('03938f17646efbb50aa70ba5f99f51d7' + '904abb492fb1f56722826c0c3a997bf0') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --prefix=/ \ + --disable-lynx \ + --enable-avahi + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}"/mdns.allow "${pkgdir}"/etc/mdns.allow +} + diff --git a/abs/core/nss-mdns/mdns.allow b/abs/core/nss-mdns/mdns.allow new file mode 100644 index 0000000..ed64c97 --- /dev/null +++ b/abs/core/nss-mdns/mdns.allow @@ -0,0 +1,8 @@ +# +# /etc/mdns.allow +# + +.local. +.local + +# End of file diff --git a/abs/core/nss-mdns/nss-mdns.install b/abs/core/nss-mdns/nss-mdns.install new file mode 100644 index 0000000..85e4d26 --- /dev/null +++ b/abs/core/nss-mdns/nss-mdns.install @@ -0,0 +1,20 @@ +post_install() { + cat << 'EOM' +==> To enable IPv4 multicast DNS lookups, append 'mdns4' to the hosts line + in /etc/nsswitch.conf. Use 'mdns6' for IPv6 or 'mdns' for both. +EOM +} + +post_upgrade() { + if [ "$2" == "0.7-1" ]; then + echo -n "disabling mdns lookups in /etc/nsswitch.conf... " + sed -i -e '/^hosts: / s/ mdns\([46]\)\?\>//g' etc/nsswitch.conf && echo "done." + fi + cat << 'EOM' +==> Please note that due to security reasons from version 0.9 on the + minimal mDNS stack included in nss-mdns (dubbed "legacy") is no + longer built - nss-mdns will not work unless Avahi is running. +EOM + + post_install +} diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD index a4fbf81..5ea3587 100644 --- a/abs/core/rsyslog/PKGBUILD +++ b/abs/core/rsyslog/PKGBUILD @@ -3,7 +3,7 @@ pkgname=rsyslog pkgver=5.8.6 -pkgrel=2 +pkgrel=4 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -50,5 +50,5 @@ package() { md5sums=('c46db0496066b82faf735bd4222208d7' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '1a0cd4530dd5d1439456d5ae230574d9' - '1e4a87a2ffea61c066a0b01fc9392849' + 'fae023a980db26f0ee27bd2f80d3e6f2' '86a7e28b59ad80998b2163860d5d612a') diff --git a/abs/core/rsyslog/rsyslog.conf.linhes b/abs/core/rsyslog/rsyslog.conf.linhes index ab6d56f..5d8eb63 100644 --- a/abs/core/rsyslog/rsyslog.conf.linhes +++ b/abs/core/rsyslog/rsyslog.conf.linhes @@ -20,13 +20,19 @@ $template DynMail,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_maillog" $template DynCron,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_cron" $template DynBoot,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_boot.log" $template DynSpooler,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_spooler" +$template DynLighttpd,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_lighttpd" +$template DynMyth,"/var/log/%$YEAR%-%$MONTH%-%$DAY%/%HOSTNAME%_%programname%.%syslogtag:R,ERE,1,ZERO:\[([[:digit:]]{1,})\]--end%.log" -if $programname contains 'lighttpd' then ?DynFile +if $programname contains 'lighttpd' then ?DynLighttpd +& ~ + +local6.* ?DynMyth & ~ # Log anything (except mail) of level info or higher. # Don't log private authentication messages! #*.info;mail.none;authpriv.none;cron.none -/var/log/messages *.info;mail.none;authpriv.none;cron.none -?DailyPerHostLogs +*.info;mail.none;authpriv.none;cron.none -?DynFile # The authpriv file has restricted access. #authpriv.* /var/log/secure @@ -50,7 +56,7 @@ uucp,news.crit -?DynSpooler # Save boot messages also to boot.log #local7.* /var/log/boot.log -local7.* ?DynBoot +local7.* ?DynFile # Remote Logging (we use TCP for reliable delivery) # An on-disk queue is created for this action. If the remote host is diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index b368cd0..fd205aa 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=58 +pkgrel=61 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" @@ -27,5 +27,6 @@ build() { install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv chmod -R 755 $startdir/pkg/etc/sv + chown -R root:root $startdir/pkg/etc/sv } md5sums=('c79246677d5ffe687bcf6df1b9c2abc2') diff --git a/abs/core/runit-scripts/__changelog b/abs/core/runit-scripts/__changelog new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/abs/core/runit-scripts/__changelog @@ -0,0 +1 @@ + diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install index 2f9cf90..d77c9aa 100755 --- a/abs/core/runit-scripts/runit.install +++ b/abs/core/runit-scripts/runit.install @@ -3,7 +3,7 @@ post_install () { [ -e /service ] || mkdir /service - servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus sshd rsyslog tty2 tty3" + servicelist="acpid cron frontend remotes ntpd alsa-utils avahi dbus sshd rsyslog tty2 tty3" for i in $servicelist do ln -s /etc/sv/$i /service/$i @@ -43,9 +43,28 @@ post_upgrade(){ fi + if [ -e /service/lircd ] + then + /sbin/sv stop lircd + /sbin/remove_service.sh lircd + /sbin/add_service.sh remotes + fi + + if [ -e /etc/sv/lircd ] + then + rm -r /etc/sv/lircd + fi } +pre_upgrade(){ + if [ $(vercmp $2 2.1.1-60 ) -lt 0 ] + then + echo "Updating file permissions for /etc/sv to 755" + chmod -R 755 /etc/sv + fi +} + op=$1 shift diff --git a/abs/core/runit-scripts/runitscripts/services/lircd/finish b/abs/core/runit-scripts/runitscripts/services/lircd/finish deleted file mode 100755 index f6d8b95..0000000 --- a/abs/core/runit-scripts/runitscripts/services/lircd/finish +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -export TERM=linux -. /etc/rc.conf -. /etc/rc.d/functions -. /usr/MythVantage/bin/install_functions.sh - -killall -9 lircd 2>/dev/null -rm -f /var/run/lirc*.pid -[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime -touch /etc/sv/lircd/.runtime/`date +%s` -numfiles=`/usr/bin/file_time_offset.py -s4 -d/etc/sv/lircd/.runtime ` -if [ $numfiles -gt 3 ] -then - rm -f /etc/sv/lircd/.runtime/* 2>/dev/null - sv stop lircd - printhl " lircd is not able to start, disabling it" -fi - - - - - - in_kernel_support "enable"
\ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/lircd/run b/abs/core/runit-scripts/runitscripts/services/lircd/run deleted file mode 100755 index 93d9585..0000000 --- a/abs/core/runit-scripts/runitscripts/services/lircd/run +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/bash - -exec 2>&1 -export TERM=linux - -. /etc/rc.conf -. /etc/rc.d/functions -. /usr/MythVantage/bin/install_functions.sh - -LOG=/tmp/lirc.log - -if [ -f $LOG ] -then - rm -f $LOG -fi - - - - - - - - -#since what we do may not be enough -#if your one of those people, this is where you place your stuff -#This means place your lirc stuff in /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 ] -then - #program must not terminate. - - stat_runit "Starting lirc" - - /etc/runit/lirc.sh -else - . /etc/systemconfig - stat_runit "Starting lirc" - - in_kernel_support "disable" - - [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime - [ -e /var/run/lirc ] || mkdir -p /var/run/lirc - - function dvico_detect { - if [[ x$Remotetype = xdvico* ]] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ] - then - RunDvico=true - else - RunDvico=false - fi - } - - num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l ` - num_lirc=$((num_lirc-1)) - - serial_port="" - - if [ x$ReceiverType = xSerial ] - then - serial_port=$ReceiverSerialport - elif [ x$HostBlasterType = xSerial ] - then - serial_port=$HostSerialPort_blasterlirc - fi - - if [ -n "$serial_port" ] - then - #/dev/ttyS0 (COM1), port 0x3f8, irq 4 - #/dev/ttyS1 (COM2), port 0x2f8, irq 3 - #/dev/ttyS2 (COM3), port 0x3e8, irq 4 - #/dev/ttyS3 (COM4), port 0x2e8, irq 3 - - case $serial_port in - ttyS0) - FLAGS="io=0x3f8 irq=4" - ;; - ttyS1) - FLAGS="io=0x2f8 irq=3" - ;; - ttyS2) - FLAGS="io=0x3e8 irq=4" - ;; - ttyS3) - FLAGS="io=0x2e8 irq=3" - ;; - esac - /usr/bin/setserial /dev/$serial_port uart none - sleep 0.5 - /sbin/modprobe lirc_serial $FLAGS - sleep 0.5 - fi - - dvico_detect - - if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] - then - CMD="/usr/sbin/lircd -r -n --driver=commandir" - printhl " Using commandir" - $CMD >>$LOG 2>>$LOG - #echo $CMD - elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] - then - sv start igdaemon - CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" - printhl " Using iguanaIR usb" - #echo $CMD - $CMD >>$LOG 2>>$LOG - - elif [ x$ReceiverType = "xSiliconDust_HDHR" ] - then - # if using the SiliconDust_HDHR as an I/R Receiver - printhl " Using SiliconDust on port 5000" - CMD="/usr/sbin/lircd -H udp -d 5000 -n" - exec $CMD >>$LOG 2>>$LOG - else - LASTCMD="" - - for i in `seq 1 $num_lirc` - do - CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" - printhl " Device $i" - #echo $CMD - $CMD >>$LOG 2>>$LOG - LASTCMD="--connect=localhost:876$i $LASTCMD " - done - - if [ $RunDvico = "true" ] - then - if [[ x$Remotetype = xdvico* ]] - then - LCMD="/usr/sbin/lircd -r -n -d /dev/remotes/dvicoIR --driver=dvico --output /var/run/lirc/lircd" - else - LCMD="/usr/sbin/lircd -r -n -d /dev/remotes/dvicoDualDigital4 --driver=devinput --output /var/run/lirc/lircd" - fi - - if [ $num_lirc -lt 0 ] - then - # Only run Dvico - printhl " Device $Remotetype" - #echo $LCMD - exec $LCMD >>$LOG 2>>$LOG - elif [ $num_lirc -gt -1 ] - then - i=$((i+1)) - CMD="$LCMD --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" - $CMD >> $LOG - LASTCMD="--connect=localhost:876$i $LASTCMD " - printhl " Device Dvico" - /usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD >>$LOG 2>>$LOG - fi - elif [[ x$Remotetype = ximon* ]] - then - /usr/bin/ir-keytable -c -p lirc -w /etc/rc_keymaps/imon_pad - LCMD="/usr/sbin/lircd -r -n --driver devinput -d /dev/remotes/SoundGraph --output /var/run/lirc/lircd" - exec $LCMD >>$LOG 2>>$LOG - else - LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD" - #echo $LCMD - exec $LCMD >>$LOG 2>>$LOG - fi - fi -fi diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run index 96d21ee..4ff0e9f 100755 --- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run +++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run @@ -40,5 +40,5 @@ fi # sleep 10 # # else - exec su mythtv -c "/usr/bin/mythbackend -q --logpath /var/log/mythtv/" + exec su mythtv -c "/usr/bin/mythbackend -q --syslog local6" # fi diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/finish b/abs/core/runit-scripts/runitscripts/services/remotes/finish index ac04a33..c1a5554 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/finish +++ b/abs/core/runit-scripts/runitscripts/services/remotes/finish @@ -4,6 +4,9 @@ export TERM=linux . /etc/rc.d/functions . /usr/MythVantage/bin/install_functions.sh +LOG=/tmp/remotes.log +echo "`date` --- finish started" >> $LOG + killall -9 lircd 2>/dev/null rm -f /var/run/lirc*.pid [ -e /etc/sv/remotes/.runtime ] || mkdir -p /etc/sv/remotes/.runtime @@ -12,10 +15,11 @@ numfiles=`/usr/bin/file_time_offset.py -s4 -d/etc/sv/remotes/.runtime ` if [ $numfiles -gt 3 ] then rm -f /etc/sv/remotes/.runtime/* 2>/dev/null - sv stop remotes + sv stop remotes >> $LOG printhl " remotes is not able to start, disabling it" + echo " remotes is not able to start, disabling it" >> $LOG fi - +echo "Enable in kernel remote driver" >> $LOG in_kernel_support "enable" diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run index d32b09e..9d46b0e 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/run +++ b/abs/core/runit-scripts/runitscripts/services/remotes/run @@ -14,112 +14,102 @@ then rm -f $LOG fi +echo "`date` --- run started" >> $LOG +. /etc/systemconfig +stat_runit "Starting remotes" +[ -e /etc/sv/remotes/.runtime ] || mkdir -p /etc/sv/remotes/.runtime +[ -e /var/run/lirc ] || mkdir -p /var/run/lirc -#What is done in this file may not be enough to start your specific remote -#If that is true of your remote place your remote startup commands in: -# /etc/remotes.sh -#Anything in that file will be used and the rest of this file is ignored +num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l ` +num_lirc=$((num_lirc-1)) -if [ -f /etc/remotes.sh ] +serial_port="" + +if [ x$ReceiverType = xSerial ] +then + serial_port=$ReceiverSerialport +elif [ x$HostBlasterType = xSerial ] then - #program must not terminate. + serial_port=$HostSerialPort_blasterlirc +fi - stat_runit "Starting remotes from /etc/remotes.sh" +if [ -n "$serial_port" ] +then + #/dev/ttyS0 (COM1), port 0x3f8, irq 4 + #/dev/ttyS1 (COM2), port 0x2f8, irq 3 + #/dev/ttyS2 (COM3), port 0x3e8, irq 4 + #/dev/ttyS3 (COM4), port 0x2e8, irq 3 + + case $serial_port in + ttyS0) + FLAGS="io=0x3f8 irq=4" + ;; + ttyS1) + FLAGS="io=0x2f8 irq=3" + ;; + ttyS2) + FLAGS="io=0x3e8 irq=4" + ;; + ttyS3) + FLAGS="io=0x2e8 irq=3" + ;; + esac + /usr/bin/setserial /dev/$serial_port uart none + sleep 0.5 + /sbin/modprobe lirc_serial $FLAGS + sleep 0.5 +fi - /etc/remotes.sh +if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] +then + CMD="/usr/sbin/lircd -r -n --driver=commandir" + printhl " Using commandir" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG +elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] +then + sv start igdaemon + CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" + printhl " Using iguanaIR usb" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG +elif [ x$ReceiverType = "xSiliconDust_HDHR" ] +then + # if using the SiliconDust_HDHR as an I/R Receiver + CMD="/usr/sbin/lircd -H udp -d 5000 -n" + printhl " Using SiliconDust on port 5000" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG else - . /etc/systemconfig - stat_runit "Starting remotes" - - [ -e /etc/sv/remotes/.runtime ] || mkdir -p /etc/sv/remotes/.runtime - [ -e /var/run/lirc ] || mkdir -p /var/run/lirc - - num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l ` - num_lirc=$((num_lirc-1)) + LASTCMD="" - serial_port="" + for i in `seq 1 $num_lirc` + do + CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + printhl " Device $i" + echo $CMD >>$LOG + $CMD >>$LOG 2>>$LOG + LASTCMD="--connect=localhost:876$i $LASTCMD " + done - if [ x$ReceiverType = xSerial ] - then - serial_port=$ReceiverSerialport - elif [ x$HostBlasterType = xSerial ] - then - serial_port=$HostSerialPort_blasterlirc - fi + echo $LASTCMD >>$LOG - if [ -n "$serial_port" ] + if [ -f /etc/remote.run ] then - #/dev/ttyS0 (COM1), port 0x3f8, irq 4 - #/dev/ttyS1 (COM2), port 0x2f8, irq 3 - #/dev/ttyS2 (COM3), port 0x3e8, irq 4 - #/dev/ttyS3 (COM4), port 0x2e8, irq 3 - - case $serial_port in - ttyS0) - FLAGS="io=0x3f8 irq=4" - ;; - ttyS1) - FLAGS="io=0x2f8 irq=3" - ;; - ttyS2) - FLAGS="io=0x3e8 irq=4" - ;; - ttyS3) - FLAGS="io=0x2e8 irq=3" - ;; - esac - /usr/bin/setserial /dev/$serial_port uart none - sleep 0.5 - /sbin/modprobe lirc_serial $FLAGS - sleep 0.5 - fi + #program must not terminate. - if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] - then - CMD="/usr/sbin/lircd -r -n --driver=commandir" - printhl " Using commandir" - $CMD >>$LOG 2>>$LOG - #echo $CMD - elif [ x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ] - then - sv start igdaemon - CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" - printhl " Using iguanaIR usb" - #echo $CMD - $CMD >>$LOG 2>>$LOG - elif [ x$ReceiverType = "xSiliconDust_HDHR" ] - then - # if using the SiliconDust_HDHR as an I/R Receiver - printhl " Using SiliconDust on port 5000" - CMD="/usr/sbin/lircd -H udp -d 5000 -n" - exec $CMD >>$LOG 2>>$LOG + stat_runit "Starting remotes from /etc/remote.run" + LCMD="/etc/remote.run $LASTCMD" + echo "Starting remotes from $LCMD" >>$LOG + exec $LCMD >>$LOG 2>>$LOG else - LASTCMD="" - - for i in `seq 1 $num_lirc` - do - CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" - printhl " Device $i" - #echo $CMD - $CMD >>$LOG 2>>$LOG - LASTCMD="--connect=localhost:876$i $LASTCMD " - done - - if [ -f /etc/remote.run ] - then - #program must not terminate. - - stat_runit "Starting remotes from /etc/remote.run" - - /etc/remote.run - else - in_kernel_support "disable" - LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD" - #echo $LCMD - exec $LCMD >>$LOG 2>>$LOG - fi + echo "Disable in kernel remote driver" >>$LOG + in_kernel_support "disable" + LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD" + echo "Starting remotes from $LCMD" >>$LOG + exec $LCMD >>$LOG 2>>$LOG fi fi |