diff options
Diffstat (limited to 'abs/core-testing')
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_software.py | 6 | ||||
| -rw-r--r-- | abs/core-testing/local-website/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core-testing/local-website/htdocs/index.html | 18 | ||||
| -rw-r--r-- | abs/core-testing/mythinstall/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/mythinstall/installsettings.cpp | 13 | ||||
| -rwxr-xr-x | abs/core-testing/mythinstall/installsettings.h | 1 | ||||
| -rw-r--r-- | abs/core-testing/mythtv/stable/mytharchive/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core-testing/mythtv/stable/mythtv/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core-testing/php/PKGBUILD | 4 | ||||
| -rw-r--r-- | abs/core-testing/php/php.ini | 2 | ||||
| -rw-r--r-- | abs/core-testing/udev/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core-testing/udev/usb-storage.rules | 2 | ||||
| -rw-r--r-- | abs/core-testing/zoneminder/PKGBUILD | 21 | ||||
| -rwxr-xr-x | abs/core-testing/zoneminder/run | 6 | ||||
| -rw-r--r-- | abs/core-testing/zoneminder/zm.conf.patch | 4 | ||||
| -rw-r--r-- | abs/core-testing/zoneminder/zoneminder.install | 40 |
17 files changed, 66 insertions, 63 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") 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 @@ </p> - <p><a href="foldingathome/"><b>My Folding Status</b></a>: <br> + <p><a href="http://fah-web.stanford.edu/cgi-bin/main.py?qtype=teampage&teamnum=50975"><b>Folding@home</b></a>: <br> - Status of the folding@home work for the local user. - </p> + KnoppMyth Team status for the folding@home effort. Install via the Service Menu. + </p> - - <p><a href="http://fah-web.stanford.edu/cgi-bin/main.py?qtype=teampage&teamnum=50975"><b>Folding@home</b></a>: <br> + <p><a href="foldingathome/"><b>My Folding Status</b></a>: <br> - KnoppMyth Team status for the folding@home effort. + Status of the folding@home work for the local user. </p> @@ -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.</p><p><a style="font-weight: bold;" href="mediaserv.php"><span style="text-decoration: underline;">Mediaserv</span></a><br> +try FUPPES. Install via the Service Menu.</p><p><a style="font-weight: bold;" href="mediaserv.php"><span style="text-decoration: underline;">Mediaserv</span></a><br> 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/ </p><p><a href="rrd/index.html"><b>RRDTool</b></a>: <br> - Hardware status graphs. + Hardware status graphs. Install via the Service Menu. </p> @@ -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.</p> + <p><a style="font-weight: bold;" href="zm/"><span style="text-decoration: underline;">ZoneMinder</span></a><br> + Video camera security software with motion detection. Install via the Service Menu. + </p> </td> </tr> 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/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" 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' diff --git a/abs/core-testing/php/PKGBUILD b/abs/core-testing/php/PKGBUILD index c549d56..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=20 +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') 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 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 <thomas@archlinux.org> 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"# diff --git a/abs/core-testing/zoneminder/PKGBUILD b/abs/core-testing/zoneminder/PKGBUILD index 5071e81..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=7 +pkgrel=10 pkgdesc="Capture, analyse, record and monitor video security cameras." arch=('i686') url="http://www.zoneminder.com" @@ -26,11 +26,12 @@ 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' - '246852035905589617b9e0dc63759d27' + '1a6c94411f8adb53a10dc7c19c3bbf02' '320dd41725945218de0672f899e1d739' '818cec2eba7e1efb3f5c410f6dd8d528' 'f9720872736f26d17bc49d8725b75ae4' @@ -51,11 +52,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 +72,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/ @@ -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/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..1f3cfc0 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 @@ -78,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() { @@ -88,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: |