From e701828d0ad4e5b2476f6e88163f17eb182fcf96 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Mon, 31 Aug 2009 19:44:03 -0700 Subject: MythAppleTrailers:Fixes the URL change. --- abs/extra-testing/mythappletrailers/PKGBUILD | 5 +- .../mythappletrailers/appletrailer.xml | 306 ++++++++++----------- .../mythappletrailers/fix_aple_url.sh | 3 + abs/extra-testing/mythappletrailers/trailers | 2 +- 4 files changed, 145 insertions(+), 171 deletions(-) create mode 100644 abs/extra-testing/mythappletrailers/fix_aple_url.sh diff --git a/abs/extra-testing/mythappletrailers/PKGBUILD b/abs/extra-testing/mythappletrailers/PKGBUILD index 7cb7f7a..fd9a6b8 100644 --- a/abs/extra-testing/mythappletrailers/PKGBUILD +++ b/abs/extra-testing/mythappletrailers/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mythappletrailers pkgver=0.04.3 -pkgrel=29 +pkgrel=30 pkgdesc="Unofficial Add-on for MythTV to get Apple.com Movie Trailers." arch=('i686' 'x86_64') license=('GPL2') @@ -11,7 +11,7 @@ url="http://www.mythtv.org/wiki/index.php/Myth_Apple_Trailers" depends=('php' 'mythtv' 'mplayer-wrapper') install=mythappletrailers.install source=('myth_trailers_grabber' 'appletrailer.xml' - 'trailers' 'loading.sh') +'trailers' 'loading.sh' 'fix_aple_url.sh') build() { mkdir -p $startdir/pkg/usr/bin @@ -26,4 +26,5 @@ build() { cp myth_trailers_grabber $startdir/pkg/usr/bin/ cp loading.sh $startdir/pkg/usr/bin/ cp trailers $startdir/pkg/etc/cron.daily/ + install -m755 $srcdir/fix_aple_url.sh $pkgdir/usr/bin } diff --git a/abs/extra-testing/mythappletrailers/appletrailer.xml b/abs/extra-testing/mythappletrailers/appletrailer.xml index 11f5f9d..dc0c938 100644 --- a/abs/extra-testing/mythappletrailers/appletrailer.xml +++ b/abs/extra-testing/mythappletrailers/appletrailer.xml @@ -2,751 +2,721 @@ + + - - - - - - - - + + - - - - - - diff --git a/abs/extra-testing/mythappletrailers/fix_aple_url.sh b/abs/extra-testing/mythappletrailers/fix_aple_url.sh new file mode 100644 index 0000000..a08be65 --- /dev/null +++ b/abs/extra-testing/mythappletrailers/fix_aple_url.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cat /home/mythtv/appletrailer.xml | sed -e 's|http:/\/\movies.apple|http:\/\/apple|g' > /tmp/appletrailer.xml +mv /tmp/appletrailer.xml /home/mythtv diff --git a/abs/extra-testing/mythappletrailers/trailers b/abs/extra-testing/mythappletrailers/trailers index aa705c9..241a60a 100755 --- a/abs/extra-testing/mythappletrailers/trailers +++ b/abs/extra-testing/mythappletrailers/trailers @@ -1,2 +1,2 @@ #!/bin/sh -su mythtv -c '/usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml' 2>/dev/null +su mythtv -c '/usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml && /usr/bin/fix_aple_url.sh' 2>/dev/null -- cgit v0.12 From e3ae7b7fe750ebf74ca2e6749ecd9a284f9fdda8 Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Fri, 4 Sep 2009 07:44:49 +0930 Subject: scanfw scte65scan: initial inclusion --- abs/extra-testing/rrdtool/PKGBUILD | 2 +- abs/extra-testing/scanfw/PKGBUILD | 23 +++++++++++++++++++++++ abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz | Bin 0 -> 45883 bytes abs/extra-testing/scanfw/scanfw.install | 5 +++++ abs/extra-testing/scte65scan/PKGBUILD | 23 +++++++++++++++++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 abs/extra-testing/scanfw/PKGBUILD create mode 100644 abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz create mode 100644 abs/extra-testing/scanfw/scanfw.install create mode 100644 abs/extra-testing/scte65scan/PKGBUILD diff --git a/abs/extra-testing/rrdtool/PKGBUILD b/abs/extra-testing/rrdtool/PKGBUILD index e128f0e..9d67224 100644 --- a/abs/extra-testing/rrdtool/PKGBUILD +++ b/abs/extra-testing/rrdtool/PKGBUILD @@ -4,7 +4,7 @@ pkgname=rrdtool pkgver=1.3.6 -pkgrel=5 +pkgrel=7 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64') url="http://www.rrdtool.org" diff --git a/abs/extra-testing/scanfw/PKGBUILD b/abs/extra-testing/scanfw/PKGBUILD new file mode 100644 index 0000000..21d4f29 --- /dev/null +++ b/abs/extra-testing/scanfw/PKGBUILD @@ -0,0 +1,23 @@ +# Contributor: Michael Hanson +pkgname=scanfw +pkgver=98d.beta +pkgrel=1 +pkgdesc="A CCI scanner for MythTV" +arch=('i686') +url="https://help.ubuntu.com/community/MythTV_Firewire/scanfw" +license=('GPL2') +depends=('libraw1394' 'libiec61883' 'libavc1394') +install=scanfw.install +source=($pkgname-$pkgver.tar.gz) +md5sums=('8b1da4fca459062f366232a3de6c7775') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make || return 1 + mkdir -p "$pkgdir"/usr/bin + mkdir -p "$pkgdir"/usr/share/doc/"$pkgname" + cp "$srcdir"/"$pkgname"-"$pkgver"/scanfw "$pkgdir"/usr/bin/ || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/mythtv.firewire.channels.pl "$pkgdir"/usr/bin/ || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/SCAN_TIPS "$pkgdir"/usr/share/doc/"$pkgname" || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/README "$pkgdir"/usr/share/doc/"$pkgname" || return 1 +} diff --git a/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz b/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz new file mode 100644 index 0000000..7bd0ee9 Binary files /dev/null and b/abs/extra-testing/scanfw/scanfw-98d.beta.tar.gz differ diff --git a/abs/extra-testing/scanfw/scanfw.install b/abs/extra-testing/scanfw/scanfw.install new file mode 100644 index 0000000..d5695a9 --- /dev/null +++ b/abs/extra-testing/scanfw/scanfw.install @@ -0,0 +1,5 @@ +post_install() { + echo "==> Information on usage is in /usr/share/doc/scanfw/README." + echo "==> Scanning tips can be found in /usr/share/doc/scanfw/SCAN_TIPS." +} + diff --git a/abs/extra-testing/scte65scan/PKGBUILD b/abs/extra-testing/scte65scan/PKGBUILD new file mode 100644 index 0000000..221b7ba --- /dev/null +++ b/abs/extra-testing/scte65scan/PKGBUILD @@ -0,0 +1,23 @@ +# Contributor: Michael Hanson +pkgname=scte65scan +pkgver=0.2.1 +pkgrel=1 +pkgdesc="A reader and parser of SCTE-65 in-band SI data with HDHomerun support." +arch=('i686') +url="http://scte65scan.sourceforge.net/" +license=('GPL') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz http://download.silicondust.com/hdhomerun/libhdhomerun_20090830.tgz) +md5sums=('1ab2d5f1895931c9c1192ee0dcc46f11' + '9c51200782c159703f3b32de24ae2608') + +build() { + cd "$srcdir/$pkgname-$pkgver" + tar zxf "$srcdir"/libhdhomerun_20090830.tgz + make -f Makefile.hdhr || return 1 + mkdir -p "$pkgdir"/usr/bin || return 1 + mkdir -p "$pkgdir"/usr/share/doc/"$pkgname" || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/scte65scan "$pkgdir"/usr/bin/ || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/Changelog "$pkgdir"/usr/share/doc/"$pkgname" || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/README "$pkgdir"/usr/share/doc/"$pkgname" || return 1 + cp "$srcdir"/"$pkgname"-"$pkgver"/us-Cable-Standard-center-frequencies-QAM256 "$pkgdir"/usr/share/doc/"$pkgname" || return 1 +} -- cgit v0.12 From ac4712c7309eb92589350836870bd882233fc7cc Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 12:19:49 -0700 Subject: PHP:Changes to php.ini for Zoneminder. --- abs/core-testing/php/PKGBUILD | 2 +- abs/core-testing/php/php.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/php/PKGBUILD b/abs/core-testing/php/PKGBUILD index c549d56..45cc17a 100644 --- a/abs/core-testing/php/PKGBUILD +++ b/abs/core-testing/php/PKGBUILD @@ -1,6 +1,6 @@ pkgname=php pkgver=5.2.6 -pkgrel=20 +pkgrel=21 _suhosinver=0.9.6.2 pkgdesc='A high-level scripting language' arch=('i686' 'x86_64') diff --git a/abs/core-testing/php/php.ini b/abs/core-testing/php/php.ini index 21c3db1..8cbcd56 100644 --- a/abs/core-testing/php/php.ini +++ b/abs/core-testing/php/php.ini @@ -249,7 +249,7 @@ safe_mode_protected_env_vars = LD_LIBRARY_PATH ; and below. This directive makes most sense if used in a per-directory ; or per-virtualhost web server configuration file. This directive is ; *NOT* affected by whether Safe Mode is turned On or Off. -open_basedir = /data/srv/httpd/htdocs/:/home/:/tmp/:/usr/share/pear/:/data/srv/tmp:/usr/share/mythtv/mythweather/scripts/:/data/srv/httpd/htdocs/mythweb/data/video:/myth/ipodfeed:/data/srv/httpd/htdocs/archive +open_basedir = /data/srv/httpd/htdocs/:/home/:/tmp/:/usr/share/pear/:/data/srv/tmp:/usr/share/mythtv/mythweather/scripts/:/data/srv/httpd/htdocs/mythweb/data/video:/myth/ipodfeed:/data/srv/httpd/htdocs/archive:/etc ; This directive allows you to disable certain functions for security reasons. ; It receives a comma-delimited list of function names. This directive is -- cgit v0.12 From 8151fa32c2bf2c112d9110ecf9232b0f7bab331d Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 12:21:54 -0700 Subject: PHP: Updated md5sum for php.ini. --- abs/core-testing/php/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/php/PKGBUILD b/abs/core-testing/php/PKGBUILD index 45cc17a..978bf8c 100644 --- a/abs/core-testing/php/PKGBUILD +++ b/abs/core-testing/php/PKGBUILD @@ -1,6 +1,6 @@ pkgname=php pkgver=5.2.6 -pkgrel=21 +pkgrel=22 _suhosinver=0.9.6.2 pkgdesc='A high-level scripting language' arch=('i686' 'x86_64') @@ -44,7 +44,7 @@ source=("http://museum.php.net/php5/${pkgname}-${pkgver}.tar.bz2" \ 'php.ini' 'apache.conf' 'db-configure.patch') md5sums=('7380ffecebd95c6edb317ef861229ebd' 'f2ec986341a314c271259dbe4d940858' - '160b4a4f6fba59e646c3b79e3cb0f134' + 'fda535c2b333297972aad48ee9285b45' '96ca078be6729b665be8a865535a97bf' '74e5ce5a02488ec91b1c59f539e42936') -- cgit v0.12 From 87af0223bb6bf389e73bd6d474b31b6a7177f86f Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 14:08:49 -0700 Subject: Zoneminder:Changes needed to run on LinHES. --- abs/core-testing/zoneminder/PKGBUILD | 16 ++++++------ abs/core-testing/zoneminder/zm.conf.patch | 4 +-- abs/core-testing/zoneminder/zoneminder.install | 36 ++++---------------------- 3 files changed, 15 insertions(+), 41 deletions(-) diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD index 5071e81..91723cb 100644 --- a/abs/core-testing/zoneminder/PKGBUILD +++ b/abs/core-testing/zoneminder/PKGBUILD @@ -3,7 +3,7 @@ pkgname=zoneminder pkgver=1.23.3 -pkgrel=7 +pkgrel=8 pkgdesc="Capture, analyse, record and monitor video security cameras." arch=('i686') url="http://www.zoneminder.com" @@ -30,7 +30,7 @@ source=(http://www2.zoneminder.com/downloads/ZoneMinder-$pkgver.tar.gz \ noextract=() md5sums=('ee803f0f71d6e67adf602c3557fb6bc9' 'af8631abe20cd7dcab1a023af7d4f3e8' - '246852035905589617b9e0dc63759d27' + '1a6c94411f8adb53a10dc7c19c3bbf02' '320dd41725945218de0672f899e1d739' '818cec2eba7e1efb3f5c410f6dd8d528' 'f9720872736f26d17bc49d8725b75ae4' @@ -51,11 +51,11 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --with-webuser=nobody \ - --with-webgroup=nobody \ + --with-webuser=http \ + --with-webgroup=http \ --with-mysql=/usr \ - --with-webdir=/home/httpd/html/zm \ - --with-cgidir=/home/httpd/cgi-bin \ + --with-webdir=/data/srv/httpd/htdocs/zm \ + --with-cgidir=/data/srv/httpd/htdocs/cgi-bin \ --bindir=/usr/lib/zm/bin patch -p1 < $startdir/src/Makefile.patch @@ -71,9 +71,9 @@ build() { install -D -m 700 $startdir/src/zmeventdump $startdir/pkg/etc/cron.hourly/zmeventdump tar -zxf $startdir/src/cambozola-0.50.tar.gz - install -m 644 cambozola-0.50/dist/cambozola.jar $startdir/pkg/home/httpd/html/zm/cambozola.jar + install -m 644 cambozola-0.50/dist/cambozola.jar $startdir/pkg/data/srv/httpd/htdocs/zm/cambozola.jar - install $startdir/src/mootools.v1.11.js $startdir/pkg/home/httpd/html/zm/mootools.js + install $startdir/src/mootools.v1.11.js $startdir/pkg/data/srv/httpd/htdocs/zm/mootools.js install -D -m 700 $startdir/src/customdb $startdir/pkg/usr/lib/zm/upgrade/customdb install -D db/zm*.sql $startdir/pkg/usr/lib/zm/upgrade/ diff --git a/abs/core-testing/zoneminder/zm.conf.patch b/abs/core-testing/zoneminder/zm.conf.patch index b3406a8..f7a9870 100644 --- a/abs/core-testing/zoneminder/zm.conf.patch +++ b/abs/core-testing/zoneminder/zm.conf.patch @@ -13,8 +13,8 @@ # ZoneMinder database user -ZM_DB_USER=@ZM_DB_USER@ -+ZM_DB_USER= ++ZM_DB_USER=mythtv # ZoneMinder database password -ZM_DB_PASS=@ZM_DB_PASS@ -+ZM_DB_PASS= ++ZM_DB_PASS=mythtv diff --git a/abs/core-testing/zoneminder/zoneminder.install b/abs/core-testing/zoneminder/zoneminder.install index 27ba60a..c2ae861 100644 --- a/abs/core-testing/zoneminder/zoneminder.install +++ b/abs/core-testing/zoneminder/zoneminder.install @@ -7,46 +7,20 @@ pre_install() { ## arg 1: the new package version post_install() { -chown nobody.nobody /home/httpd/html/zm/events -chown nobody.nobody /home/httpd/html/zm/images -chown nobody.nobody /home/httpd/html/zm/temp -chown nobody.nobody /etc/zm.conf +chown http.http /data/srv/httpd/htdocs/zm/events +chown http.http /data/srv/httpd/htdocs/zm/images +chown http.http /data/srv/httpd/htdocs/zm/temp +chown http.http /etc/zm.conf cat << EOF Note: -==> Edit /etc/zm.conf to define a user and password for +==> mythtv has been defined in /etc/zm.conf as user and password for ==> The zoneminder (zm) database ==> To initialize the ZoneMinder database run (as root) ==> /usr/lib/zm/bin/zminit EOF -cat /etc/php/php.ini |grep "^extension=mysql.so" >/dev/null || cat << EOF -==> You must edit /etc/php/php.ini and uncomment "extension=mysql.so" -==> so php and MySQL can play together. - -EOF -cat /etc/php/php.ini |grep "^short_open_tag = On" >/dev/null || cat << EOF -==> You must edit /etc/php/php.ini and set short_open_tag = On -==> or ZoneMinder will not work - -EOF - - -cat /etc/php/php.ini |grep "^open_basedir.*/etc/" >/dev/null || cat << EOF -==> You must edit /etc/php/php.ini and add to it open_basedir "/etc/" as such: -==> open_basedir = /home/:/tmp/:/usr/share/pear/:/etc/ -==> Otherwise ZoneMinder will be unable to read /etc/zm.conf - -EOF - -cat /etc/httpd/conf/httpd.conf |grep "^LoadModule php" >/dev/null || cat << EOF -Note: -==> You must edit /etc/httpd/conf/httpd.conf and uncomment the line -==> #LoadModule php5_module modules/libphp5.so - -EOF - cat /etc/sysctl.conf |grep "kernel.shmall" >/dev/null || cat << EOF ==> To raise the limit on shared memory for zoneminder ==> add these lines to /etc/sysctl.conf -- cgit v0.12 From 5651b03574d2dc2d117840022d01326885d7392f Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 15:43:09 -0700 Subject: MythInstall:Added MythZoneMinder to list of installable software. --- abs/core-testing/mythinstall/PKGBUILD | 2 +- abs/core-testing/mythinstall/installsettings.cpp | 13 +++++++++++++ abs/core-testing/mythinstall/installsettings.h | 1 + abs/core-testing/mythtv/stable/mythtv/PKGBUILD | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD index c614fac..5a936da 100644 --- a/abs/core-testing/mythinstall/PKGBUILD +++ b/abs/core-testing/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=1 -pkgrel=10 +pkgrel=11 pkgdesc="LinHES installer/systemconfig GUI." arch=i686 depends=() diff --git a/abs/core-testing/mythinstall/installsettings.cpp b/abs/core-testing/mythinstall/installsettings.cpp index 3942460..0a6afb5 100755 --- a/abs/core-testing/mythinstall/installsettings.cpp +++ b/abs/core-testing/mythinstall/installsettings.cpp @@ -1344,6 +1344,16 @@ static HostCheckBox *HostXscreensaver() }; +static HostCheckBox *Hostpluginmythzoneminder() +{ + HostCheckBox *gc = new HostCheckBox("Hostpluginmythzoneminder"); + gc->setLabel(QObject::tr("mythzoneminder")); + gc->setValue(false); + gc->setHelpText(QObject::tr("check to enable mythzoneminder")); + return gc; +}; + + // -------------End plugins-------------------------------- @@ -3923,6 +3933,7 @@ void writesettings () hostparm.ThisHostpluginmythsmolt = gContext->GetSetting("Hostpluginmythsmolt"); hostparm.ThisHostpluginmythvideo = gContext->GetSetting("Hostpluginmythvideo"); hostparm.ThisHostpluginmythweather = gContext->GetSetting("Hostpluginmythweather"); + hostparm.ThisHostpluginmythzoneminder = gContext->GetSetting("Hostpluginmythzoneminder"); hostparm.ThisHostpluginmythgameFceu = gContext->GetSetting("HostpluginmythgameFceu"); hostparm.ThisHostpluginmythgameZsnes = gContext->GetSetting("HostpluginmythgameZsnes"); hostparm.ThisHostpluginmythgameMame = gContext->GetSetting("HostpluginmythgameMame"); @@ -4168,6 +4179,7 @@ void writesettings () myfile << "mythsmolt=\"" + hostparm.ThisHostpluginmythsmolt + "\"\n"; myfile << "mythvideo=\"" + hostparm.ThisHostpluginmythvideo + "\"\n"; myfile << "mythweather=\"" + hostparm.ThisHostpluginmythweather + "\"\n"; + myfile << "mythzoneminder=\"" + hostparm.ThisHostpluginmythzoneminder + "\"\n"; myfile << "fceu=\"" + hostparm.ThisHostpluginmythgameFceu + "\"\n"; myfile << "zsnes=\"" + hostparm.ThisHostpluginmythgameZsnes + "\"\n"; @@ -4427,6 +4439,7 @@ MythInstallSettings::MythInstallSettings() GridShowPlugin2->addChild(Hostpluginmythphone()); GridShowPlugin2->addChild(Hostpluginmythsmolt()); GridShowPlugin2->addChild(Hostpluginmythweather()); + GridShowPlugin2->addChild(Hostpluginmythzoneminder()); ConfigurationGroup *GridShowPlugin4 = new GridConfigurationGroup(2); GridShowPlugin4->addChild(Hostpluginmythappletrailers()); diff --git a/abs/core-testing/mythinstall/installsettings.h b/abs/core-testing/mythinstall/installsettings.h index c140f3d..a177921 100755 --- a/abs/core-testing/mythinstall/installsettings.h +++ b/abs/core-testing/mythinstall/installsettings.h @@ -442,6 +442,7 @@ struct HostParms QString ThisHostpluginmythsmolt; QString ThisHostpluginmythvideo; QString ThisHostpluginmythweather; + QString ThisHostpluginmythzoneminder; QString ThisHostpluginmythgameFceu; QString ThisHostpluginmythgameZsnes; QString ThisHostpluginmythgameMame; diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD index f6114c4..4b67da4 100644 --- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.21 -pkgrel=81 +pkgrel=82 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' -- cgit v0.12 From a3bffeb6e46ffef4c418be6d52b6c5c4428f2745 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 15:45:15 -0700 Subject: LinHES-config:Added mythzoneminder. --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/mv_software.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index de4e94b..4d01bbe 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.0 -pkgrel=90 +pkgrel=91 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted diff --git a/abs/core-testing/LinHES-config/mv_software.py b/abs/core-testing/LinHES-config/mv_software.py index 0a96bb3..55711da 100755 --- a/abs/core-testing/LinHES-config/mv_software.py +++ b/abs/core-testing/LinHES-config/mv_software.py @@ -15,7 +15,8 @@ def setup_software(systemconfig, data_config): postfix = "-svn" default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", - "mythgame", "mythflix", "mythweather" ) + "mythgame", "mythflix", "mythweather", + "mythzoneminder" ) default_installed=("mythcontrols", "mythgallery", "mythmovies", "mythmusic", "mythsmolt", "mythvideo") @@ -23,7 +24,8 @@ def setup_software(systemconfig, data_config): else: default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews", "mythgame", "mythflix", "mythweather", - "mythappletrailers", "mythstream", "mythvodka") + "mythappletrailers", "mythstream", "mythvodka", + "mythzoneminder" ) default_installed=("mythcontrols", "mythgallery", "mythmovies", "mythmusic", "mythsmolt", "mythvideo") -- cgit v0.12 From afe6ac82a74d0e3a561dd52aaac6c9e4ac7e4ad8 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 18:21:48 -0700 Subject: zoneminder:bumped to recompile for ffmpeg-svn. --- abs/core-testing/zoneminder/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD index 91723cb..fdb0dbc 100644 --- a/abs/core-testing/zoneminder/PKGBUILD +++ b/abs/core-testing/zoneminder/PKGBUILD @@ -3,7 +3,7 @@ pkgname=zoneminder pkgver=1.23.3 -pkgrel=8 +pkgrel=9 pkgdesc="Capture, analyse, record and monitor video security cameras." arch=('i686') url="http://www.zoneminder.com" -- cgit v0.12 From 4c2bbdfa9aec057c1815345a2790d58318f80165 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 20:42:14 -0700 Subject: ZoneMinder:Further enhancements to run on LinHES. --- abs/core-testing/zoneminder/PKGBUILD | 7 +++++-- abs/core-testing/zoneminder/run | 6 ++++++ abs/core-testing/zoneminder/zoneminder.install | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 abs/core-testing/zoneminder/run diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD index fdb0dbc..94a543a 100644 --- a/abs/core-testing/zoneminder/PKGBUILD +++ b/abs/core-testing/zoneminder/PKGBUILD @@ -3,7 +3,7 @@ pkgname=zoneminder pkgver=1.23.3 -pkgrel=9 +pkgrel=10 pkgdesc="Capture, analyse, record and monitor video security cameras." arch=('i686') url="http://www.zoneminder.com" @@ -26,7 +26,8 @@ source=(http://www2.zoneminder.com/downloads/ZoneMinder-$pkgver.tar.gz \ customdb \ mootools.v1.11.js \ http://www.charliemouse.com:8080/code/cambozola/cambozola-0.50.tar.gz \ - zmeventdump) + zmeventdump \ + run) noextract=() md5sums=('ee803f0f71d6e67adf602c3557fb6bc9' 'af8631abe20cd7dcab1a023af7d4f3e8' @@ -84,6 +85,8 @@ build() { -o -name ".packlist" \ -o -name "*.bs" \ |xargs -i rm -f {} + mkdir -p $pkgdir/etc/sv/zm + install -D -m 755 $srcdir/run $pkgdir/etc/sv/zm } diff --git a/abs/core-testing/zoneminder/run b/abs/core-testing/zoneminder/run new file mode 100755 index 0000000..e458bc8 --- /dev/null +++ b/abs/core-testing/zoneminder/run @@ -0,0 +1,6 @@ +#!/bin/bash +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting ZoneMinder" +exec /etc/rc.d/zm start diff --git a/abs/core-testing/zoneminder/zoneminder.install b/abs/core-testing/zoneminder/zoneminder.install index c2ae861..1f3cfc0 100644 --- a/abs/core-testing/zoneminder/zoneminder.install +++ b/abs/core-testing/zoneminder/zoneminder.install @@ -52,7 +52,8 @@ post_upgrade() { # Reuse the old config [ -f /etc/zm.conf.pacnew ] && cat /etc/zm.conf | sed -e "s/^ZM_VERSION=.*$/ZM_VERSION=1.23.3/" > /tmp/zm.conf [ -f /etc/zm.conf.pacsave ] && cat /etc/zm.conf.pacsave | sed -e "s/^ZM_VERSION=.*$/ZM_VERSION=1.23.3/" > /tmp/zm.conf -[ -f /tmp/zm.conf ] && mv -f /tmp/zm.conf /etc/zm.conf && chown -R nobody.nobody /etc/zm.conf +[ -f /tmp/zm.conf ] && mv -f /tmp/zm.conf /etc/zm.conf && chown -R http.http /etc/zm.conf +add_service.sh zm } ## arg 1: the old package version pre_remove() { @@ -62,6 +63,7 @@ pre_remove() { ## arg 1: the old package version post_remove() { echo + remove_service.sh zm } # vim:set ts=2 sw=2 et: -- cgit v0.12 From 4ce64b1d23306dae9301c7ff84eafeff4443fe27 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 21:35:50 -0700 Subject: Local-website:Added zoneminder. --- abs/core-testing/local-website/PKGBUILD | 2 +- abs/core-testing/local-website/htdocs/index.html | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/abs/core-testing/local-website/PKGBUILD b/abs/core-testing/local-website/PKGBUILD index da53253..1f1faa9 100644 --- a/abs/core-testing/local-website/PKGBUILD +++ b/abs/core-testing/local-website/PKGBUILD @@ -1,6 +1,6 @@ pkgname=local-website pkgver=2 -pkgrel=14 +pkgrel=15 pkgdesc="Contents of http://localhost" arch=(i686 x86_64) license=('GPL') diff --git a/abs/core-testing/local-website/htdocs/index.html b/abs/core-testing/local-website/htdocs/index.html index 964ca9c..9c46aac 100644 --- a/abs/core-testing/local-website/htdocs/index.html +++ b/abs/core-testing/local-website/htdocs/index.html @@ -68,15 +68,14 @@

-

My Folding Status:
+

Folding@home:
-     Status of the folding@home work for the local user. -

+     KnoppMyth Team status for the folding@home effort. Install via the Service Menu. +

- -

Folding@home:
+

My Folding Status:
-     KnoppMyth Team status for the folding@home effort. +     Status of the folding@home work for the local user.

@@ -90,7 +89,7 @@     FUPPES - Free UPnP Entertainment Service.  A UPnP to be used inplace of the UPnP server that comes with MythTV.  If the UPnP that comes with MythTV doesn't work for you, you can -try FUPPES.

Mediaserv
+try FUPPES. Install via the Service Menu.

Mediaserv
    Mediaserv - A on-demand transcoding server for videos.  Mediaserv is designed to transcode video in a format playable on the Nokia Internet Tablets.  However it works well at @@ -101,7 +100,7 @@ TV recordings (pretty) and your video directory.  Additionally if you want it to stream contents from a network share, it will!  ln -s /path/to/share /myth/mediaserv/media/

RRDTool:
-     Hardware status graphs. +     Hardware status graphs. Install via the Service Menu.

@@ -109,6 +108,9 @@ you want it to stream contents from a network share, it will!  ln     Your music must be encoded as MP3 in MythMusic for this to work.

+

ZoneMinder
+     Video camera security software with motion detection. Install via the Service Menu. +

-- cgit v0.12 From d750af1992378de933ba197a8e757b92d02c21af Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 21:36:20 -0700 Subject: udev:modified usb-storage rule to cleanly unmount. --- abs/core-testing/udev/PKGBUILD | 2 +- abs/core-testing/udev/usb-storage.rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core-testing/udev/PKGBUILD b/abs/core-testing/udev/PKGBUILD index 1acfb02..c22b10b 100644 --- a/abs/core-testing/udev/PKGBUILD +++ b/abs/core-testing/udev/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Bächler pkgname=udev pkgver=135 -pkgrel=6 +pkgrel=7 pkgdesc="The userspace dev tools (udev)" arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" diff --git a/abs/core-testing/udev/usb-storage.rules b/abs/core-testing/udev/usb-storage.rules index 86eca8e..a7e0726 100644 --- a/abs/core-testing/udev/usb-storage.rules +++ b/abs/core-testing/udev/usb-storage.rules @@ -1,4 +1,4 @@ SUBSYSTEMS=="usb", KERNEL=="sd[b-z]", NAME="%k", SYMLINK+="usb-%k", GROUP="users", OPTIONS="last_rule" ACTION=="add", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", SYMLINK+="usb-%k", GROUP="users", NAME="%k" ACTION=="add", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", RUN+="/etc/udev/scripts/mount-usb mount %k", OPTIONS="last_rule" -ACTION=="remove", SUBSYSTEMS=="usb", KERNEL=="sd[b-z][0-9]", RUN+="/etc/udev/scripts/mount-usb umount %k", OPTIONS="last_rule"# +ACTION=="remove", SUBSYSTEMS=="block", RUN+="/etc/udev/scripts/mount-usb umount %k", OPTIONS="last_rule"# -- cgit v0.12 From a570bbef2eb3d159de626060e39531c21d018f29 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 5 Sep 2009 23:46:59 -0700 Subject: fuppes:Added logrotation. --- abs/extra-testing/fuppes-svn/PKGBUILD | 9 +++++---- abs/extra-testing/fuppes-svn/fuppes.lr | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 abs/extra-testing/fuppes-svn/fuppes.lr diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD index d236fa9..79d11e2 100644 --- a/abs/extra-testing/fuppes-svn/PKGBUILD +++ b/abs/extra-testing/fuppes-svn/PKGBUILD @@ -3,7 +3,7 @@ pkgname=fuppes-svn pkgver=636 -pkgrel=8 +pkgrel=9 pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer" arch=('i686' 'x86_64') url="http://fuppes.ulrich-voelkel.de/" @@ -11,7 +11,7 @@ license=('GPL2') depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad') makdepends=('pkgconfig' 'autoconf' 'subversion') install=fuppes.install -source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch) +source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr) md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \ 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \ '3c355b860f1b0d273f5aa8b2bea1bde6') @@ -44,8 +44,9 @@ build() mkdir -p $startdir/pkg/etc/fuppes cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes mkdir -p $startdir/pkg/etc/cron.hourly - mkdir -p $startdir/pkg/etc/sve/fuppes/supervise + mkdir -p $startdir/pkg/etc/logrotate.d/ + mkdir -p $startdir/pkg/etc/sv/fuppes/supervise install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes + install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d } - diff --git a/abs/extra-testing/fuppes-svn/fuppes.lr b/abs/extra-testing/fuppes-svn/fuppes.lr new file mode 100644 index 0000000..ec2f88f --- /dev/null +++ b/abs/extra-testing/fuppes-svn/fuppes.lr @@ -0,0 +1,9 @@ +/var/log/fuppes/fuppes.log { + copytruncate + daily + size 10M + missingok + rotate 7 + compress + notifempty +} -- cgit v0.12 From e90eb9cd27994ab8ef1993355914e50ec61a7a71 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sun, 6 Sep 2009 03:14:40 -0700 Subject: mytharchive:bumped to compile latest. --- abs/core-testing/mythtv/stable/mytharchive/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD index 81465ec..f5c51f2 100644 --- a/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mytharchive/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mytharchive pkgver=0.21 -pkgrel=8 +pkgrel=9 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows." arch=('i686' 'x86_64') url="http://www.mythtv.org" -- cgit v0.12 From ba38d110a556bc739c6306b4ecdb0c2765d15deb Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sun, 6 Sep 2009 03:14:58 -0700 Subject: Fuppes:bumped to compile latest. --- abs/extra-testing/fuppes-svn/PKGBUILD | 6 ++-- abs/extra-testing/fuppes-svn/PKGBUILD.orig | 52 ++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 abs/extra-testing/fuppes-svn/PKGBUILD.orig diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD index 79d11e2..67936c0 100644 --- a/abs/extra-testing/fuppes-svn/PKGBUILD +++ b/abs/extra-testing/fuppes-svn/PKGBUILD @@ -24,13 +24,13 @@ build() cd ${startdir}/src msg "Getting sources..." - svn co -r 636 ${_svntrunk} ${_svnmod} + svn co ${_svntrunk} ${_svnmod} msg "Done getting sources or failed to connect to server." cd ${_svnmod} - patch -Np0 -i ../fuppes-r634-archlinux.patch - patch -Np0 -i ../fuppes.diff +# patch -Np0 -i ../fuppes-r634-archlinux.patch +# patch -Np0 -i ../fuppes.diff autoreconf -vfi ./configure --prefix=/usr \ diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD.orig b/abs/extra-testing/fuppes-svn/PKGBUILD.orig new file mode 100644 index 0000000..79d11e2 --- /dev/null +++ b/abs/extra-testing/fuppes-svn/PKGBUILD.orig @@ -0,0 +1,52 @@ +# Contributor: Andrew Krawchyk +# patch for svn r634: Ivan Yurasov + +pkgname=fuppes-svn +pkgver=636 +pkgrel=9 +pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer" +arch=('i686' 'x86_64') +url="http://fuppes.ulrich-voelkel.de/" +license=('GPL2') +depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad') +makdepends=('pkgconfig' 'autoconf' 'subversion') +install=fuppes.install +source=(fuppes-r634-archlinux.patch fuppes.diff fuppes.cfg run fuppes.ch fuppes.lr) +md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee' \ + 'b0cef07d8e60d01c8146a69870672e1f' '3850001378088e5efac60487e5550d54' \ + '3c355b860f1b0d273f5aa8b2bea1bde6') + +_svnmod="fuppes" +_svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk" + +build() +{ + cd ${startdir}/src + + msg "Getting sources..." + svn co -r 636 ${_svntrunk} ${_svnmod} + msg "Done getting sources or failed to connect to server." + + cd ${_svnmod} + + patch -Np0 -i ../fuppes-r634-archlinux.patch + patch -Np0 -i ../fuppes.diff + autoreconf -vfi + + ./configure --prefix=/usr \ + --enable-video-transcoding \ + --disable-twolame || return 1 + + make || return 1 + make DESTDIR=$startdir/pkg install || return 1 + mkdir -p $startdir/pkg/etc/sv/fuppes/supervise + install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes/ + mkdir -p $startdir/pkg/etc/fuppes + cp $startdir/src/fuppes.cfg $startdir/pkg/etc/fuppes + mkdir -p $startdir/pkg/etc/cron.hourly + mkdir -p $startdir/pkg/etc/logrotate.d/ + mkdir -p $startdir/pkg/etc/sv/fuppes/supervise + install -D -m755 $startdir/src/fuppes.ch $startdir/pkg/etc/cron.hourly + install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/fuppes + install -D -m755 $startdir/src/fuppes.lr $startdir/pkg/etc/logrotate.d +} -- cgit v0.12