diff options
47 files changed, 748 insertions, 264 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index 1e61fdf..a336bfd 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.1 -pkgrel=1 +pkgrel=6 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted @@ -33,6 +33,7 @@ source=(mv_install.py README mv_advanced.py mv_common.py + mv_ddns.py mv_ir.py mv_misc.py mv_network.py @@ -76,6 +77,7 @@ build() { install -m 0755 mv_install.py $MVDIR/bin/mv_install.py install -m 0755 mv_advanced.py $MVDIR/bin/ install -m 0755 mv_common.py $MVDIR/bin/ + install -m 0755 mv_ddns.py $MVDIR/bin/ install -m 0755 mv_ir.py $MVDIR/bin/ install -m 0755 mv_misc.py $MVDIR/bin/ install -m 0755 mv_network.py $MVDIR/bin/ diff --git a/abs/core-testing/LinHES-config/mv_ddns.py b/abs/core-testing/LinHES-config/mv_ddns.py new file mode 100755 index 0000000..e43a7ce --- /dev/null +++ b/abs/core-testing/LinHES-config/mv_ddns.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +import logging, mv_common +import os, re + +config_file = "mv_config" + +def setup_ddns(systemconfig): + logging.info("____Start of setup_ddns____") + + if systemconfig["DDnsEnable"] == "1": + logging.debug(" Enabling DDNS") + cmd = ''' pacman --noconfirm -Sf ddclient ''' + mv_common.runcmd(cmd) + mv_common.cp_and_log("/etc/ddclient/ddclient.conf.dynamic.dyndns.sample", + "/etc/ddclient/ddclient.conf") + cmd = ''' sed -i -e "s/your-dynamic-dyndns-login/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnslogin"]) + mv_common.runcmd(cmd) + cmd = ''' sed -i -e "s/your-dynamic-dyndns-password/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnspassword"]) + mv_common.runcmd(cmd) + cmd = ''' sed -i -e "s/your-dynamic-dyndns-host/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnshostname"]) + mv_common.runcmd(cmd) + mv_common.add_service("ddclient") + else: + logging.debug(" Disabling DDNS") + mv_common.remove_service("ddclient") + + logging.info("__End of ddns\n") diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py index c559e09..28e2e7a 100755 --- a/abs/core-testing/LinHES-config/systemconfig.py +++ b/abs/core-testing/LinHES-config/systemconfig.py @@ -147,7 +147,8 @@ def main(argv): mv_webuser.setup_web_auth(systemconfig["UseMythWEB_auth"]) if cmdmodule["ddns"]: - print " LOOK FOR DDNS" + import mv_ddns + mv_ddns.setup_ddns(systemconfig) if cmdmodule["screensaver"]: import mv_screensaver diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD index 4b3244f..086e08a 100644 --- a/abs/core-testing/linhes-scripts/PKGBUILD +++ b/abs/core-testing/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=1 -pkgrel=35 +pkgrel=38 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -32,12 +32,13 @@ run-limit-mythcommflag linhes_update.sh linhes_update2.sh linhes_update3.sh +install_hulu.sh ) build() { cd $startdir/src mkdir -p $startdir/pkg/usr/LH/bin - install -D -m755 myt* 770* idle.sh imp* shoo* *commflag*sh mplayer* vdpau* screen* linhes_* $startdir/pkg/usr/LH/bin + install -D -m755 myt* 770* idle.sh imp* shoo* *commflag*sh mplayer* vdpau* screen* linhes_* install_hulu.sh $startdir/pkg/usr/LH/bin mkdir -p $startdir/pkg/etc/sv/pause-mythcommflag/supervise cp run-pause-mythcommflag $startdir/pkg/etc/sv/pause-mythcommflag/run mkdir -p $startdir/pkg/etc/sv/limit-mythcommflag/supervise diff --git a/abs/core-testing/linhes-scripts/install_hulu.sh b/abs/core-testing/linhes-scripts/install_hulu.sh new file mode 100644 index 0000000..28e855c --- /dev/null +++ b/abs/core-testing/linhes-scripts/install_hulu.sh @@ -0,0 +1,70 @@ +#!/bin/bash +#install_hulu.sh +if [ -e /tmp/huludesktop_i386.deb ] +then +cd /tmp +deb2targz huludesktop_i386.deb +tar -xzvf huludesktop_i386.tar.gz -C / +else +echo "Cannot find huludesktop_i386.deb." +echo "Please download it from http://www.hulu.com/labs/hulu-desktop-linux" +echo "Then copy (or move) it to /tmp" +exit +fi +if grep -q Hulu /usr/share/mythtv/is.xml +then +echo "Hulu Desktop exist in Online Streams!" +else + mv /usr/share/mythtv/is.xml /tmp + grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp + echo "<!--#Hulu-->" >> /tmp/is.xml.tmp + echo " <button>" >> /tmp/is.xml.tmp + echo " <type>STREAM</type>" >> /tmp/is.xml.tmp + echo " <text>Hulu Desktop</text>" >> /tmp/is.xml.tmp + echo " <action>EXEC huludesktop</action>" >> /tmp/is.xml.tmp + echo " </button>" >> /tmp/is.xml.tmp + echo "<!--#Hulu-->" >> /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + echo "</mythmenu>" >> /tmp/is.xml.tmp + mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml +echo "Hulu Desktop has been added to Online Streams!" +fi +if [ -e /home/mythtv/.huludesktop ] +then +echo "Found existing Hulu configuration file." +else +cat >> /home/mythtv/.huludesktop << EOF +[display] +fullscreen = TRUE +width = 1024 +height = 576 +pos_x = 201 +pos_y = 179 + +[remote] +lirc_device = /dev/lircd +lirc_remote_identifier = mceusb +lirc_release_suffix = _UP +lirc_repeat_threshold = 10 +button_name_up = Up +button_name_down = Down +button_name_left = Left +button_name_right = Right +button_name_select = OK +button_name_menu = Home + +[flash] +flash_location = /usr/lib/mozilla/plugins/libflashplayer.so + +[screensaver] +suspend_script = /usr/bin/xscreensaver-command -deactivate +resume_script = /usr/bin/xscreensaver-command -activate + +[version] +latest = (null) +eula_version = 0 +EOF +chown mythtv.mythtv /home/mythtv/.huludesktop +fi +echo "Integration of Hulu Desktop is now complete!" +echo "Thanks for using LinHES!" diff --git a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD index d3aad58..16f50ec 100644 --- a/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/morethemes/PKGBUILD @@ -1,5 +1,5 @@ pkgname=morethemes-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Additional themes for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/themes +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/themes +#_svntrunk=http://cvs.mythtv.org/svn/trunk/themes _svnmod=themes diff --git a/abs/core-testing/mythtv/trunk/mp_all.sh b/abs/core-testing/mythtv/trunk/mp_all.sh index f9593ff..c778047 100755 --- a/abs/core-testing/mythtv/trunk/mp_all.sh +++ b/abs/core-testing/mythtv/trunk/mp_all.sh @@ -1,5 +1,5 @@ #!/bin/sh -pkgver=21495 +pkgver=22494 pkgrel=1 # NOTE: Make sure to build and install mythtv first BEFORE building anything else diff --git a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD index 75779a1..9efb01f 100644 --- a/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mytharchive/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mytharchive-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows." url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD index 7495407..31872d3 100644 --- a/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythbrowser/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythbrowser-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Mini web browser for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD index e4ffbbf..9ebc985 100644 --- a/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythflix/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythflix-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Netflix access plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD index 7480178..c00fd81 100644 --- a/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythgallery/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythgallery-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Image gallery plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD index 8f2e582..be1226b 100644 --- a/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythgame/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythgame-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Emulation plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD index aca7c73..a794e3d 100644 --- a/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythmovies/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythmovies-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Displays information about movies playing in the area." url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD index df6d23d..4c0b5b7 100644 --- a/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythmusic/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythmusic-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Music playing plugin for MythTV" url="http://www.mythtv.org" @@ -14,7 +14,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD index b411e08..19f9430 100644 --- a/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythnews/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythnews-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="News checking plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD index 5d300e5..2dacdb2 100755 --- a/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/myththemes/PKGBUILD @@ -1,5 +1,5 @@ pkgname=myththemes-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Themes for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/myththemes +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/myththemes +#_svntrunk=http://cvs.mythtv.org/svn/trunk/myththemes _svnmod=myththemes diff --git a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD index db119bd..d984ae4 100755 --- a/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythtv/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythtv-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="A personal video recorder for Linux" url="http://www.mythtv.org" @@ -22,7 +22,8 @@ source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfron arch=('i686' 'x86_64') #md5sums=() -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythtv +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv _svnmod=mythtv build() { diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml index f257920..ac52497 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/HOST_SETTINGS.xml @@ -1,87 +1,94 @@ <mythmenu name="HOST_SETTINGS"> <button> - <type>MV_NETWORK_SETUP_MENU</type> + <type>MV_NETWORK_SETUP_MENU</type> <text>Network Settings</text> <action>EXEC mythinstall -s network </action> </button> <button> - <type>MV_SYSTEM_SETUP_MENU</type> - <text>System type</text> - <action>EXEC mythinstall -s hostype </action> + <type>MV_NETWORK_SETUP_MENU</type> + <text>DDNS Settings</text> + <action>EXEC mythinstall -s ddns </action> </button> - <button> - <type>MV_MISC_SETUP_MENU</type> - <text>Misc Settings</text> - <action>EXEC mythinstall -s misc </action> + <type>MV_SYSTEM_SETUP_MENU</type> + <text>System Type</text> + <action>EXEC mythinstall -s hostype </action> </button> <button> - <type>MV_SOFTWARE_MENU</type> - <text>Software</text> - <action>EXEC mythinstall -s plugins </action> + <type>MV_SCREENSAVER_SETUP_MENU</type> + <text>Screensaver Settings</text> + <action>EXEC mythinstall -s screensaver </action> </button> <button> - <type>MV_SHUTDOWN_SETUP_MENU</type> - <text>Shutdown settings</text> - <action>EXEC mythinstall -s sleep </action> + <type>MV_IR_SETUP_MENU</type> + <text>Remotes</text> + <action>EXEC mythinstall -s ir </action> </button> + <button> + <type>MV_MISC_SETUP_MENU</type> + <text>Miscellanous Settings</text> + <action>EXEC mythinstall -s misc </action> + </button> -<button> - <type>MV_ADVANCED_X_SETUP_MENU</type> - <text>Display</text> - <action>EXEC mythinstall -s advancedX</action> -</button> - -<button> - <type>MV_ADVANCED_SETUP_MENU</type> - <text>Advanced settings</text> - <action>EXEC mythinstall -s advanced</action> -</button> - - -<button> - <type>MV_AUDIO_SETUP_MENU</type> - <text>Audio settings</text> - <action>EXEC mythinstall -s sound </action> -</button> + <button> + <type>MV_SOFTWARE_MENU</type> + <text>Software</text> + <action>EXEC mythinstall -s plugins </action> + </button> + <button> + <type>MV_SHUTDOWN_SETUP_MENU</type> + <text>Shutdown Settings</text> + <action>EXEC mythinstall -s sleep </action> + </button> -<button> - <type>MV_ACCESS_SETUP_MENU</type> - <text>Access</text> - <action>EXEC mythinstall -s accesscontrol </action> -</button> + <button> + <type>MV_ADVANCED_X_SETUP_MENU</type> + <text>Display Settings</text> + <action>EXEC mythinstall -s advancedX</action> + </button> -<button> - <type>MV_USER_SETUP_MENU</type> - <text>Password </text> - <action>EXEC mythinstall -s user </action> -</button> + <button> + <type>MV_ADVANCED_SETUP_MENU</type> + <text>Advanced Settings</text> + <action>EXEC mythinstall -s advanced</action> + </button> -<button> - <type>MV_WEBACCESS_SETUP_MENU</type> - <text>Web security</text> - <action>EXEC mythinstall -s webuser </action> -</button> + <button> + <type>MV_AUDIO_SETUP_MENU</type> + <text>Audio Settings</text> + <action>EXEC mythinstall -s sound </action> + </button> + <button> + <type>MV_ACCESS_SETUP_MENU</type> + <text>Access Control</text> + <action>EXEC mythinstall -s accesscontrol </action> + </button> + <button> + <type>MV_USER_SETUP_MENU</type> + <text>User Accounts</text> + <action>EXEC mythinstall -s user </action> + </button> + <button> + <type>MV_WEBACCESS_SETUP_MENU</type> + <text>Web Security</text> + <action>EXEC mythinstall -s webuser </action> + </button> <!-- <button> - <type>SETUP_MENU</type> - <text>Settings profile manager</text> - <action>EXEC mythinstall -t </action> - + <type>SETUP_MENU</type> + <text>Settings Profile Manager</text> + <action>EXEC mythinstall -t </action> </button> --> - - - </mythmenu> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch index 14cb5f9..81ea604 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/library.xml.patch @@ -1,9 +1,9 @@ ---- library.xml.orig 2009-03-23 18:43:18.000000000 +0000 -+++ library.xml 2009-03-23 19:52:30.000000000 +0000 -@@ -126,8 +126,7 @@ - <text>Play Online Streams</text> - <text lang="HE">נגן מדיה מכוונת</text> +--- library.xml.orig 2009-10-16 12:45:44.000000000 +0000 ++++ library.xml 2009-10-16 17:21:44.000000000 +0000 +@@ -123,8 +123,7 @@ + <text lang="HU">Online folyam lejátszása</text> <description></description> + <description lang="DE"></description> - <action>PLUGIN mythstream</action> - <depends>mythstream</depends> + <action>MENU is.xml</action> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml index 8bc929f..ebc848b 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/linhes.xml @@ -1,36 +1,35 @@ <mythmenu name="LinHES"> - <button> - <type>SETUP_GENERAL</type> - <text>MythTV Configuration</text> - <text lang="IT">Impostazioni</text> - <text lang="ES">Configuración</text> - <text lang="CA">Configurar</text> - <text lang="FR">paramètres</text> - <text lang="DE">Zubehör / Konfiguration</text> - <text lang="DK">Tilbehør/Indstillinger</text> - <text lang="IS">Uppsetning</text> - <text lang="NL">Configuratie</text> - <text lang="PT">Utensílios</text> - <text lang="SV">Verktyg / Inställningar</text> - <text lang="JA">設定</text> - <text lang="FI">Oheis/Asetukset</text> - <text lang="ZH_TW">工具/設定</text> - <text lang="SI">Nastavitve</text> - <text lang="ET">Utiliidid / sätted</text> - <text lang="NB">Verktøy/Oppsett</text> - <text lang="CZ">Pomůcky</text> - <text lang="RU">Утилиты / Настройки</text> - <text lang="AR">تضبيطات</text> - <text lang="PL">Narzędzia / ustawienia</text> - <text lang="HE">עזרים / הגדרות</text> - <alttext lang="DE">Verschiedenes</alttext> - <alttext lang="SV">Inställningar</alttext> - <alttext lang="ET">Sätted</alttext> - <alttext lang="RU">Настройки</alttext> - <alttext lang="AR">تضبيطات</alttext> - <action>MENU util_menu.xml</action> - </button> + <button> + <type>SETUP_GENERAL</type> + <text>MythTV Configuration</text> + <text lang="IT">Impostazioni</text> + <text lang="ES">Configuración</text> + <text lang="DE">Zubehör / Konfiguration</text> + <text lang="DA">Tilbehør/Indstillinger</text> + <text lang="IS">Uppsetning</text> + <text lang="NL">Configuratie</text> + <text lang="PT">Utensílios</text> + <text lang="SV">Verktyg / Inställningar</text> + <text lang="JA">設~Z</text> + <text lang="FI">Oheis/Asetukset</text> + <text lang="ZH_TW">工~E/設~Z</text> + <text lang="SL">Nastavitve</text> + <text lang="ET">Utiliidid / sätted</text> + <text lang="RU">У~Bили~B~K / ~]а~A~B~@ойки</text> + <text lang="AR">تضب~Jطات</text> + <text lang="PL">Narz~Ydzia / ustawienia</text> + <text lang="HE">ע~Vר~Y~] / ~T~R~Sר~Uת</text> + <text lang="HU">Eszközök / Beállítások</text> + <alttext lang="DE">Verschiedenes</alttext> + <alttext lang="SV">Inställningar</alttext> + <alttext lang="ET">Sätted</alttext> + <alttext lang="RU">~]а~A~B~@ойки</alttext> + <alttext lang="AR">تضب~Jطات</alttext> + <description>Configure MythTV and plugins</description> + <description lang="DE">MythTV und Plugins konfigurieren</description> + <action>MENU util_menu.xml</action> + </button> <button> <type>LINHES_SETUP</type> @@ -49,6 +48,12 @@ <text>Restore LinHES</text> <action>MENU mythrestore.xml</action> </button> - -</mythmenu> +<!--#Check for updates--> + <button> + <type>UPGRADE</type> + <text>Upgrade LinHES</text> + <action>MENU update.xml</action> + </button> +<!--#Check for updates--> +</mythmenu> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch index 0ec8143..ed5dc72 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mainmenu.xml.patch @@ -1,14 +1,12 @@ ---- mainmenu.xml.orig 2009-03-23 18:43:18.000000000 +0000 -+++ mainmenu.xml 2009-03-23 19:47:20.000000000 +0000 -@@ -163,35 +163,9 @@ +--- mainmenu.xml.orig 2009-10-16 12:45:44.000000000 +0000 ++++ mainmenu.xml 2009-10-16 14:30:57.000000000 +0000 +@@ -157,33 +157,9 @@ <button> <type>MENU_UTILITIES_SETUP</type> - <text>Utilities / Setup</text> - <text lang="IT">Impostazioni</text> - <text lang="ES">Configuración</text> -- <text lang="CS">Configurar</text> -- <text lang="FR">paramètres</text> - <text lang="DE">Zubehör / Konfiguration</text> - <text lang="DA">Tilbehør/Indstillinger</text> - <text lang="IS">Uppsetning</text> @@ -20,18 +18,18 @@ - <text lang="ZH_TW">工具/設定</text> - <text lang="SL">Nastavitve</text> - <text lang="ET">Utiliidid / sätted</text> -- <text lang="NB">Verktøy/Oppsett</text> -- <text lang="CS">Pomůcky</text> - <text lang="RU">Утилиты / Настройки</text> - <text lang="AR">تضبيطات</text> - <text lang="PL">Narzędzia / ustawienia</text> - <text lang="HE">עזרים / הגדרות</text> +- <text lang="HU">Eszközök / Beállítások</text> - <alttext lang="DE">Verschiedenes</alttext> - <alttext lang="SV">Inställningar</alttext> - <alttext lang="ET">Sätted</alttext> - <alttext lang="RU">Настройки</alttext> - <alttext lang="AR">تضبيطات</alttext> - <description>Configure MythTV and plugins</description> +- <description lang="DE">MythTV und Plugins konfigurieren</description> - <action>MENU util_menu.xml</action> + <text>Service Menu</text> + <description>LinHES Service Menu</description> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml index 656860d..5914b33 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythbackup.xml @@ -15,6 +15,6 @@ <button> <type>BACKUP</type> <text>No</text> - <action>MENU linhes.xml</action> + <action>UPMENU</action> </button> </mythmenu> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml index 05cb0a7..8f5c285 100644 --- a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/mythrestore.xml @@ -15,6 +15,6 @@ <button> <type>BACKUP</type> <text>No</text> - <action>MENU linhes.xml</action> + <action>UPMENU</action> </button> </mythmenu> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update.xml new file mode 100644 index 0000000..5b28833 --- /dev/null +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update.xml @@ -0,0 +1,20 @@ +<mythmenu name="LinHES"> + + <button> + <type>UPGRADE</type> + <text>Check for updates?</text> + <action>NONE</action> + </button> + + <button> + <type>UPGRADE</type> + <text>Yes</text> + <action>EXEC sudo /usr/LH/bin/linhes_update.sh</action> + </button> + + <button> + <type>UPGRADE</type> + <text>No</text> + <action>UPMENU</action> + </button> +</mythmenu> diff --git a/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update2.xml b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update2.xml new file mode 100644 index 0000000..2ab82ea --- /dev/null +++ b/abs/core-testing/mythtv/trunk/mythtv/menu-xml/update2.xml @@ -0,0 +1,26 @@ +<mythmenu name="LinHES"> + + <button> + <type>UPGRADE</type> + <text>Perform updates?</text> + <action>NONE</action> + </button> + + <button> + <type>UPGRADE</type> + <text>Yes</text> + <action>EXEC sudo /usr/LH/bin/linhes_update2.sh</action> + </button> + + <button> + <type>UPGRADE</type> + <text>No</text> + <action>UPMENU</action> + </button> + + <button> + <type>UPGRADE</type> + <text>View files to be upgraded.</text> + <action>EXEC sudo /usr/LH/bin/linhes_update3.sh</action> + </button> +</mythmenu> diff --git a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD index 797b641..9581d9a 100644 --- a/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythvideo/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythvideo-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Video playback and browsing plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD index 0655236..4340ee7 100644 --- a/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythweather/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythweather-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Weather checking plugin for MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD index 8f472b7..94662e2 100644 --- a/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythweb/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythweb-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Web interface for MythTV's backend" url="http://www.mythtv.org" @@ -13,7 +13,8 @@ install=mythweb.install patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins DOCROOT=/data/srv/httpd/htdocs/mythweb diff --git a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD index 7ace30f..decdad3 100644 --- a/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD +++ b/abs/core-testing/mythtv/trunk/mythzoneminder/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mythzoneminder-svn -pkgver=21495 +pkgver=22494 pkgrel=1 pkgdesc="Integrates ZoneMinder into MythTV" url="http://www.mythtv.org" @@ -12,7 +12,8 @@ groups=('mythtv-extras-svn') patches=() source=(`echo ${patches[@]:0}`) -_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins +_svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins +#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins _svnmod=mythplugins diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD index 1615994..3407502 100755 --- a/abs/core-testing/runit-scripts/PKGBUILD +++ b/abs/core-testing/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=1.8.0 -pkgrel=95 +pkgrel=97 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core-testing/runit-scripts/runitscripts/services/ddclient/run b/abs/core-testing/runit-scripts/runitscripts/services/ddclient/run new file mode 100755 index 0000000..c5488f6 --- /dev/null +++ b/abs/core-testing/runit-scripts/runitscripts/services/ddclient/run @@ -0,0 +1,8 @@ +#!/bin/sh +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting ddclient" + + +exec /usr/sbin/ddclient -foreground &> /var/log/ddclient.log diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run index 0a398ac..9498f02 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run @@ -82,14 +82,14 @@ else if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] then - CMD="/usr/sbin/lircd -n --driver=commandir" + 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 -n --driver=iguanaIR" + CMD="/usr/sbin/lircd -r -n --driver=iguanaIR" printhl " Using iguanaIR usb" #echo $CMD $CMD >>$LOG 2>>$LOG @@ -98,7 +98,7 @@ else for i in `seq 1 $num_lirc` do - CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" printhl " Device $i" #echo $CMD $CMD >>$LOG 2>>$LOG @@ -109,9 +109,9 @@ else then if [ x$Remotetype = "xdvico" ] then - LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" + LCMD="/usr/sbin/lircd -r -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" else - LCMD="/usr/sbin/lircd -n -d /dev/input/irremote --driver=devinput --output /dev/lircd" + LCMD="/usr/sbin/lircd -r -n -d /dev/input/irremote --driver=devinput --output /dev/lircd" fi if [ $num_lirc -lt 0 ] @@ -127,10 +127,10 @@ else $CMD >> $LOG LASTCMD="--connect=localhost:876$i $LASTCMD " printhl " Device Dvico" - /usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG + /usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG fi else - LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd $LASTCMD" + LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd $LASTCMD" #echo $LCMD exec $LCMD >>$LOG 2>>$LOG fi diff --git a/abs/extra-testing/community/firefox/PKGBUILD b/abs/extra-testing/community/firefox/PKGBUILD index 191c913..17a70b3 100644 --- a/abs/extra-testing/community/firefox/PKGBUILD +++ b/abs/extra-testing/community/firefox/PKGBUILD @@ -3,12 +3,12 @@ pkgname=firefox pkgver=3.5.1 -pkgrel=3 +pkgrel=4 _xulver=1.9.1.1 pkgdesc="Standalone web browser from mozilla.org" arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') -depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8") +depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8" gconf) makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python') replaces=('firefox3') install=firefox.install @@ -70,6 +70,7 @@ build() { mv ${pkgdir}/usr/bin/firefox ${pkgdir}/usr/bin/firefox.bin echo "#!/bin/bash +/usr/lib/GConf/gconfd-2 & export LD_PRELOAD=/usr/lib/libGL.so.1 /usr/bin/firefox.bin" > ${pkgdir}/usr/bin/firefox chmod 755 ${pkgdir}/usr/bin/firefox diff --git a/abs/extra-testing/ddclient/ChangeLog b/abs/extra-testing/ddclient/ChangeLog deleted file mode 100644 index 4520b69..0000000 --- a/abs/extra-testing/ddclient/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -2008-08-07 Abhishek Dasgupta <abhidg@gmail.com> - - * ddclient 3.7.3-2 - * added /etc/conf.d/ddclient for modifying - daemon poll frequency. This overrides the - setting specified in /etc/ddclient/ddclient.conf - when ddclient is called as an rc script. - -2007-08-08 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - - * ddclient-3.7.3-1 - * version bump - * GPL -> GPL2 - * shortened pkgdesc - -2007-07-02 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 - -2007-06-29 Georg Grabler (STiAT) <ggrabler@gmail.com> - - * Version Bump to 3.7.2 diff --git a/abs/extra-testing/ddclient/PKGBUILD b/abs/extra-testing/ddclient/PKGBUILD index 121d2c5..f283cb9 100644 --- a/abs/extra-testing/ddclient/PKGBUILD +++ b/abs/extra-testing/ddclient/PKGBUILD @@ -3,33 +3,31 @@ # Contributor: David Rosenstrauch <darose@darose.net> pkgname=ddclient -pkgver=3.7.3 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Update dynamic DNS entries for accounts on many dynamic DNS services." arch=('i686' 'x86_64') url="http://ddclient.sourceforge.net/" license=('GPL2') depends=('perl' 'perl-io-socket-ssl') -backup=('etc/ddclient/ddclient.conf' 'etc/conf.d/ddclient') -install=ddclient.install -source=(http://downloads.sourceforge.net/sourceforge/ddclient/ddclient-$pkgver.tar.bz2 ddclient.rc ddclient.conf.d) +backup=('etc/ddclient.conf') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + ddclient.conf.dynamic.dyndns.sample + ddclient-foreground.patch) build() { - cd ${srcdir}/ddclient-${pkgver} + cd ${srcdir}/$pkgname-${pkgver} + patch < ${srcdir}/ddclient-foreground.patch # core files install -D -m755 ddclient ${pkgdir}/usr/sbin/ddclient - install -D -m755 ${srcdir}/ddclient.rc ${pkgdir}/etc/rc.d/ddclient - install -D -m600 sample-etc_ddclient.conf ${pkgdir}/etc/ddclient/ddclient.conf - install -D -m644 ${srcdir}/ddclient.conf.d ${pkgdir}/etc/conf.d/ddclient + install -D -m600 sample-etc_ddclient.conf ${pkgdir}/etc/ddclient/ddclient.conf.sample + install -D -m600 ${srcdir}/ddclient.conf.dynamic.dyndns.sample ${pkgdir}/etc/ddclient/ install -d ${pkgdir}/var/cache/ddclient # additional instructions, sample configs - install -D -m644 README ${pkgdir}/etc/ddclient/samples/README - install -D -m644 sample-etc_cron.d_ddclient ${pkgdir}/etc/ddclient/samples/sample-etc_cron.d_ddclient - install -D -m644 sample-etc_dhcpc_dhcpcd-eth0.exe ${pkgdir}/etc/ddclient/samples/sample-etc_dhcpc_dhcpcd-eth0.exe - install -D -m644 sample-etc_ppp_ip-up.local ${pkgdir}/etc/ddclient/samples/sample-etc_ppp_ip-up.local + install -D -m644 README ${pkgdir}/etc/ddclient/README } -md5sums=('f6a55bc68cf73ffe7e80d2fa5cd44f85' - '7035bf8132f3517a59167f61ee5e8b90' - 'b8f39c82827776da948b76ef83544d33') +md5sums=('6cac7a5eb1da781bfd4d98cef0b21f8e' + '4194825b9b4a7fcc1c57c2f5a4f6162b' + 'd8ffc95f98f9afcb4a06a1e192220e35') diff --git a/abs/extra-testing/ddclient/ddclient-foreground.patch b/abs/extra-testing/ddclient/ddclient-foreground.patch new file mode 100644 index 0000000..a814ede --- /dev/null +++ b/abs/extra-testing/ddclient/ddclient-foreground.patch @@ -0,0 +1,47 @@ +--- ../ddclient-orig/ddclient 2009-10-19 22:45:15.000000000 +1030 ++++ ddclient 2009-10-19 22:50:11.000000000 +1030 +@@ -307,6 +307,7 @@ + my %variables = ( + 'global-defaults' => { + 'daemon' => setv(T_DELAY, 0, 0, 1, 0, interval('60s')), ++ 'foreground' => setv(T_BOOL, 0, 0, 1, 0, undef), + 'file' => setv(T_FILE, 0, 0, 1, "$etc$program.conf", undef), + 'cache' => setv(T_FILE, 0, 0, 1, "$cachedir$program.cache", undef), + 'pid' => setv(T_FILE, 0, 0, 1, "", undef), +@@ -535,6 +536,7 @@ + "usage: ${program} [options]", + "options are:", + [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ], ++ [ "foreground", "!", "-foreground : do not fork" ], + [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ], + [ "server", "=s", "-server host : update DNS information on 'host'" ], + [ "protocol", "=s", "-protocol type : update protocol used" ], +@@ -623,7 +625,10 @@ + $SIG{'HUP'} = sub { $caught_hup = 1; }; + $SIG{'TERM'} = sub { $caught_term = 1; }; + $SIG{'KILL'} = sub { $caught_kill = 1; }; +-if (opt('daemon') && !opt('force')) { ++# don't fork() if foreground or force is on ++if (opt('foreground') || opt('force')) { ++ ; ++} elsif (opt('daemon')) { + $SIG{'CHLD'} = 'IGNORE'; + my $pid = fork; + if ($pid < 0) { +@@ -633,12 +638,15 @@ + exit 0; + } + $SIG{'CHLD'} = 'DEFAULT'; +- $opt{'syslog'} = 1; + open(STDOUT, ">/dev/null"); + open(STDERR, ">/dev/null"); + open(STDIN, "</dev/null"); ++} + ++# write out the pid file if we're daemon'ized ++if(opt('daemon')) { + write_pid(); ++ $opt{'syslog'} = 1; + } + + umask 077; diff --git a/abs/extra-testing/ddclient/ddclient.conf.d b/abs/extra-testing/ddclient/ddclient.conf.d deleted file mode 100644 index 8b754a3..0000000 --- a/abs/extra-testing/ddclient/ddclient.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -# Parameters passed to ddclient -EXTRA_ARGS="-daemon 300" diff --git a/abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample b/abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample new file mode 100644 index 0000000..a492c8b --- /dev/null +++ b/abs/extra-testing/ddclient/ddclient.conf.dynamic.dyndns.sample @@ -0,0 +1,162 @@ +###################################################################### +## +## $Id: sample-etc_ddclient.conf 102 2008-11-01 11:23:03Z wimpunk $ +## +## Define default global variables with lines like: +## var=value [, var=value]* +## These values will be used for each following host unless overridden +## with a local variable definition. +## +## Define local variables for one or more hosts with: +## var=value [, var=value]* host.and.domain[,host2.and.domain...] +## +## Lines can be continued on the following line by ending the line +## with a \ +## +## +## Warning: not all supported routers or dynamic DNS services +## are mentioned here. +## +###################################################################### +daemon=300 # check every 300 seconds +syslog=yes # log update msgs to syslog +mail=root # mail all msgs to root +mail-failure=root # mail failed update msgs to root +pid=/var/run/ddclient.pid # record PID in file. +ssl=yes # use ssl-support. Works with + # ssl-library +# postscript=script # run script after updating. The + # new IP is added as argument. +# +#use=watchguard-soho, fw=192.168.111.1:80 # via Watchguard's SOHO FW +#use=netopia-r910, fw=192.168.111.1:80 # via Netopia R910 FW +#use=smc-barricade, fw=192.168.123.254:80 # via SMC's Barricade FW +#use=netgear-rt3xx, fw=192.168.0.1:80 # via Netgear's internet FW +#use=linksys, fw=192.168.1.1:80 # via Linksys's internet FW +#use=maxgate-ugate3x00, fw=192.168.0.1:80 # via MaxGate's UGATE-3x00 FW +#use=elsa-lancom-dsl10, fw=10.0.0.254:80 # via ELSA LanCom DSL/10 DSL Router +#use=elsa-lancom-dsl10-ch01, fw=10.0.0.254:80 # via ELSA LanCom DSL/10 DSL Router +#use=elsa-lancom-dsl10-ch02, fw=10.0.0.254:80 # via ELSA LanCom DSL/10 DSL Router +#use=alcatel-stp, fw=10.0.0.138:80 # via Alcatel Speed Touch Pro +#use=xsense-aero, fw=192.168.1.1:80 # via Xsense Aero Router +#use=allnet-1298, fw=192.168.1.1:80 # via AllNet 1298 DSL Router +#use=3com-oc-remote812, fw=192.168.0.254:80 # via 3com OfficeConnect Remote 812 +#use=e-tech, fw=192.168.1.1:80 # via E-tech Router +#use=cayman-3220h, fw=192.168.0.1:1080 # via Cayman 3220-H DSL Router +# +#fw-login=admin, fw-password=XXXXXX # FW login and password +# +## To obtain an IP address from FW status page (using fw-login, fw-password) +#use=fw, fw=192.168.1.254/status.htm, fw-skip='IP Address' # found after IP Address +# +## To obtain an IP address from Web status page (using the proxy if defined) +#use=web, web=checkip.dyndns.org/, web-skip='IP Address' # found after IP Address +# +#use=ip, ip=127.0.0.1 # via static IP's +#use=if, if=eth0 # via interfaces +use=web # via web +# +#protocol=dyndns2 # default protocol +#proxy=fasthttp.sympatico.ca:80 # default proxy +#server=members.dyndns.org # default server +#server=members.dyndns.org:8245 # default server (bypassing proxies) + +login=your-dynamic-dyndns-login # default login +password=your-dynamic-dyndns-password # default password +#mx=mx.for.your.host # default MX +#backupmx=yes|no # host is primary MX? +#wildcard=yes|no # add wildcard CNAME? + +## +## dyndns.org dynamic addresses +## +## (supports variables: wildcard,mx,backupmx) +## +server=members.dyndns.org, \ +protocol=dyndns2 \ +your-dynamic-dyndns-host + +## +## dyndns.org static addresses +## +## (supports variables: wildcard,mx,backupmx) +## +# static=yes, \ +# server=members.dyndns.org, \ +# protocol=dyndns2 \ +# your-static-host.dyndns.org + +## +## +## dyndns.org custom addresses +## +## (supports variables: wildcard,mx,backupmx) +## +# custom=yes, \ +# server=members.dyndns.org, \ +# protocol=dyndns2 \ +# your-domain.top-level,your-other-domain.top-level + +## +## ZoneEdit (zoneedit.com) +## +# server=dynamic.zoneedit.com, \ +# protocol=zoneedit1, \ +# login=your-zoneedit-login, \ +# password=your-zoneedit-password \ +# your.any.domain,your-2nd.any.dom + +## +## EasyDNS (easydns.com) +## +# server=members.easydns.com, \ +# protocol=easydns, \ +# login=your-easydns-login, \ +# password=your-easydns-password \ +# your.any.domain,your-2nd.any.domain + +## +## Hammernode (hn.org) dynamic addresses +## +# server=dup.hn.org, \ +# protocol=hammernode1, \ +# login=your-hn-login, \ +# password=your-hn-password \ +# your-hn-host.hn.org,your-2nd-hn-host.hn.org + +## +## dslreports.com dynamic-host monitoring +## +# server=members.dslreports.com \ +# protocol=dslreports1, \ +# login=dslreports-login, \ +# password=dslreports-password \ +# dslreports-unique-id + +## +## OrgDNS.org account-configuration +## +# use=web, web=members.orgdns.org/nic/ip +# server=www.orgdns.org \ +# protocol=dyndns2 \ +# login=yourLoginName \ +# password=yourPassword \ +# yourSubdomain.orgdns.org + +## +## dnspark.com +## (supports variables: mx, mxpri) +## +# use=web, web=ipdetect.dnspark.com, web-skip='Current Address:' +# protocol=dnspark, \ +# server=www.dnspark.com, \ +# your-host.dnspark.com + +## +## NameCheap (namecheap.com) +## +# protocol=namecheap, \ +# server=dynamicdns.park-your-domain.com, \ +# login=my-namecheap.com-login, \ +# password=my-namecheap.com-password \ +# myhost.namecheap.com diff --git a/abs/extra-testing/ddclient/ddclient.install b/abs/extra-testing/ddclient/ddclient.install deleted file mode 100644 index d6edc0e..0000000 --- a/abs/extra-testing/ddclient/ddclient.install +++ /dev/null @@ -1,41 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOM - -If you want to use ddclient with dhcpcd, cron or pppd, -see /etc/ddclient/samples for further instructions. - -If you have ddclient in the DAEMONS array of /etc/rc.conf: -- Change /etc/conf.d/ddclient according to your needs. -- This setting OVERRIDES any setting in - /etc/ddclient/ddclient.conf - -EOM -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - -if [ -f /etc/ddclient/ddclient.cache ]; then - echo -n "Moving ddclient.cache from /etc/ddclient/ to /var/cache/ddclient/." - mv /etc/ddclient/ddclient.cache /var/cache/ddclient/ - echo " (done)" -fi - -if [ "$(vercmp $2 3.7.3-2)" -lt 0 ]; then -cat << EOM - -If you have ddclient in the DAEMONS array of /etc/rc.conf: -- Change /etc/conf.d/ddclient according to your needs. -- This setting OVERRIDES any setting in - /etc/ddclient/ddclient.conf - -EOM -fi - -} - -op=$1 -shift -$op $* diff --git a/abs/extra-testing/ddclient/ddclient.rc b/abs/extra-testing/ddclient/ddclient.rc deleted file mode 100644 index a9093f7..0000000 --- a/abs/extra-testing/ddclient/ddclient.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/ddclient ] && . /etc/conf.d/ddclient - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/ddclient` -case "$1" in - start) - stat_busy "Starting ddclient" - [ -z "$PID" ] && /usr/sbin/ddclient ${EXTRA_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ddclient - stat_done - fi - ;; - stop) - stat_busy "Stopping ddclient" - [ -n "$PID" ] && kill -15 $PID >/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ddclient - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/abs/extra-testing/deb2targz/PKGBUILD b/abs/extra-testing/deb2targz/PKGBUILD new file mode 100644 index 0000000..adf074d --- /dev/null +++ b/abs/extra-testing/deb2targz/PKGBUILD @@ -0,0 +1,20 @@ +# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.org> +# Contributor: Jason Erik Jackson <jacksonje@gmail.org> + +pkgname=deb2targz +pkgver=1 +pkgrel=2 +pkgdesc="Converts .deb archives to tar.gz" +arch=('i686' 'x86_64') +url="http://www.miketaylor.org.uk/tech/deb/" +depends=("perl") +source=("http://www.miketaylor.org.uk/tech/deb/$pkgname") + +md5sums=('5b944785778d023a43e33af53bea2056') + +build() { + mkdir -p $startdir/pkg/usr/bin + install -m755 $startdir/src/$pkgname $startdir/pkg/usr/bin +} + + diff --git a/abs/extra-testing/huludesktop/PKGBUILD b/abs/extra-testing/huludesktop/PKGBUILD new file mode 100644 index 0000000..b215d19 --- /dev/null +++ b/abs/extra-testing/huludesktop/PKGBUILD @@ -0,0 +1,21 @@ +pkgname=huludesktop +pkgver=0.1 +pkgrel=5 +pkgdesc="Hulu Desktop for Linux" +arch=(i686) +url="http://www.hulu.com/labs/hulu-desktop-linux" +license=('unknown') +makedepends=('deb2targz') +depends=('glib2' 'gtk2' 'lirc' 'flashplugin') +install=huludesktop.install +options=('') +source=('http://download.hulu.com/huludesktop_i386.deb' 'huludesktop') +md5sums=('ee339181b7fb206e2ca2795d46213529') + +build() { + cd $startdir/src + deb2targz huludesktop_i386.deb + tar -xzvf huludesktop_i386.tar.gz -C $pkgdir + mkdir -p $pkgdir/home/mythtv + cp huludesktop $pkgdir/home/mythtv/.huludesktop +} diff --git a/abs/extra-testing/huludesktop/huludesktop b/abs/extra-testing/huludesktop/huludesktop new file mode 100644 index 0000000..c3ae870 --- /dev/null +++ b/abs/extra-testing/huludesktop/huludesktop @@ -0,0 +1,25 @@ +[display] +fullscreen = TRUE +width = 1024 +height = 576 +pos_x = 201 +pos_y = 179 + +[remote] +lirc_device = /dev/lircd +lirc_remote_identifier = mceusb +lirc_release_suffix = _UP +lirc_repeat_threshold = 10 +button_name_up = Up +button_name_down = Down +button_name_left = Left +button_name_right = Right +button_name_select = OK +button_name_menu = Home + +[flash] +flash_location = /usr/lib/mozilla/plugins/libflashplayer.so + +[version] +latest = (null) +eula_version = 0 diff --git a/abs/extra-testing/huludesktop/huludesktop.install b/abs/extra-testing/huludesktop/huludesktop.install new file mode 100644 index 0000000..271c5a1 --- /dev/null +++ b/abs/extra-testing/huludesktop/huludesktop.install @@ -0,0 +1,26 @@ +# arg 1: the new package version +post_install() { + mv /usr/share/mythtv/is.xml /tmp + grep -v -e /mythmenu /tmp/is.xml > /tmp/is.xml.tmp + echo "<!--#Hulu-->" >> /tmp/is.xml.tmp + echo " <button>" >> /tmp/is.xml.tmp + echo " <type>STREAM</type>" >> /tmp/is.xml.tmp + echo " <text>Hulu Desktop</text>" >> /tmp/is.xml.tmp + echo " <action>EXEC huludesktop</action>" >> /tmp/is.xml.tmp + echo " </button>" >> /tmp/is.xml.tmp + echo "<!--#Hulu-->" >> /tmp/is.xml.tmp + echo "" >> /tmp/is.xml.tmp + echo "</mythmenu>" >> /tmp/is.xml.tmp + mv /tmp/is.xml.tmp /usr/share/mythtv/is.xml +} +# arg 1: the new package version +# arg 2: the old package version +post_remove() { + rm -fr /usr/share/mythtv/appletrailer.xml + mv /usr/share/mythtv/is.xml /tmp/is.xml.tmp + sed -e '/\#Hulu/,/\#Hulu/d' < /tmp/is.xml.tmp > /usr/share/mythtv/is.xml +} + +op=$1 +shift +$op $* diff --git a/abs/extra-testing/mupen64plus-svn/PKGBUILD b/abs/extra-testing/mupen64plus-svn/PKGBUILD new file mode 100644 index 0000000..5df794d --- /dev/null +++ b/abs/extra-testing/mupen64plus-svn/PKGBUILD @@ -0,0 +1,71 @@ +#!!! Due to a limitation in pacman's SVN package handling, +# this package requires out-of-the-ordinary building. pacman checks +# the SVN repo for new revisions before scanning the PKGBUILD. +#!!! So, when you run makepkg, if it asks you for a password for 'mupen64', +# give it 'Dyson5632-kart' without the quotes. If it asks for a password +# for _your_ username, hit Enter to make it ask for a new username, tell it +# 'mupen64' without the quotes, and then give it the password above. When +# it asks you to save the password unencrypted, you can say yes, because +# it's just a read-only access login :P Once you do that, you shouldn't +# need to do the above anymore. + +# Maintainer: Devin Cofer <ranguvar@archlinux.us> +# Contributor: Rudy Matela <rudy.matela@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Zephyr + +pkgname=mupen64plus-svn +pkgver=1416 +pkgrel=1 +pkgdesc="Nintendo64 emulator, SVN version" +arch=('i686' 'x86_64') +url="http://code.google.com/p/mupen64plus/" +license=('GPL2') + +makedepends=('subversion' 'pkgconfig' 'libsamplerate' 'yasm' 'mesa') +depends=('gtk2' 'sdl_ttf') +optdepends=('libsamplerate: Higher quality audio') +conflicts=('mupen64plus') +provides=('mupen64plus') +source=('install.patch' + 'fix-gcc4.4-const-char.patch') +md5sums=('f6a3bc6e59d4f2af9db1b3fce257eb43' + '7bb0182949bf043847ad7ff66097e66f') + +_svnuser=mupen64 +_svnpass=Dyson5632-kart +_svntrunk=svn://$_svnuser:$_svnpass@fascination.homelinux.net:7684/mupen64plus/trunk +_svnmod=mupen64plus + +build() { + if [ -d $_svnmod/.svn ]; then + (cd $_svnmod &&\ + svn up --config-dir . -r $pkgver \ + --non-interactive --username $_svnuser --password $_svnpass) + else + svn co $_svntrunk --config-dir . -r $pkgver $_svnmod \ + --non-interactive --username $_svnuser --password $_svnpass + fi + msg "SVN checkout done or server timeout" + + cp -r $_svnmod $_svnmod-build + patch -d $_svnmod-build < install.patch || return 1 +# patch -p0 -d $_svnmod-build < fix-gcc4.4-const-char.patch || return 1 + cd $_svnmod-build + + make PREFIX="/usr" LIRC=1 all || return 1 + make PREFIX="$pkgdir/usr" install || return 1 + + ##### Qt 4 GUI build ##### + #==> Currently broken + #make PREFIX="/usr" GUI=QT4 all || return 1 + #install -m755 mupen64plus "$pkgdir/usr/bin/mupen64plus-qt" + # + #cd "$pkgdir/usr/share/applications" + #cp mupen64plus.desktop mupen64plus-qt.desktop + #sed -i "s#Name=Mupen64Plus#Name=Mupen64Plus (Qt)#" mupen64plus-qt.desktop || return 1 + #sed -i "s#Exec=mupen64plus#Exec=mupen64plus-qt#" mupen64plus-qt.desktop || return 1 + ##### End Qt 4 GUI build ##### + + rm -r "$srcdir/$_svnmod-build" +} diff --git a/abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch b/abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch new file mode 100644 index 0000000..fd1495d --- /dev/null +++ b/abs/extra-testing/mupen64plus-svn/fix-gcc4.4-const-char.patch @@ -0,0 +1,22 @@ +--- glide64/Combine.old.cpp 2009-06-19 17:59:20.191723065 -0400 ++++ glide64/Combine.cpp 2009-06-19 18:43:46.955453868 -0400 +@@ -11873,7 +11873,7 @@ + LOG ("InitCombine() "); + memset(&cmb, 0, sizeof(cmb)); + const char *extensions = grGetString (GR_EXTENSION); +- if (char * extstr = strstr(extensions, "COMBINE")) { ++ if (const char * extstr = strstr(extensions, "COMBINE")) { + if (!strncmp(extstr, "COMBINE", 7)) { + LOG ("extensions "); + cmb.grColorCombineExt = (GRCOLORCOMBINEEXT) grGetProcAddress("grColorCombineExt"); +--- glide64/Main.old.cpp 2009-06-19 18:47:04.238930057 -0400 ++++ glide64/Main.cpp 2009-06-19 18:47:18.018772876 -0400 +@@ -784,7 +784,7 @@ + printf("bebefore2\n"); + if (settings.fb_hires) + { +- if (char * extstr = strstr(extensions, "TEXTUREBUFFER")) ++ if (const char * extstr = strstr(extensions, "TEXTUREBUFFER")) + { + if (!strncmp(extstr, "TEXTUREBUFFER", 13)) + { diff --git a/abs/extra-testing/mupen64plus-svn/install.patch b/abs/extra-testing/mupen64plus-svn/install.patch new file mode 100644 index 0000000..5e41460 --- /dev/null +++ b/abs/extra-testing/mupen64plus-svn/install.patch @@ -0,0 +1,13 @@ +Index: install.sh +=================================================================== +--- install.sh (revision 1295) ++++ install.sh (working copy) +@@ -90,7 +90,7 @@ + if [ -f mupen64plus.desktop ] + then + $INSTALL -d -v "${APPLICATIONSDIR}" +- $INSTALL -m 0644 mupen64plus.desktop "${APPLICATIONSDIR}" ++ $INSTALL -m 0644 mupen64plus.desktop "${APPLICATIONSDIR}/mupen64plus.desktop" + fi + if [ "x$(ls plugins/)" != "x" ] + then |