diff options
| -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/zoneminder/PKGBUILD | 16 | ||||
| -rw-r--r-- | abs/core-testing/zoneminder/zm.conf.patch | 4 | ||||
| -rw-r--r-- | abs/core-testing/zoneminder/zoneminder.install | 36 |
5 files changed, 18 insertions, 44 deletions
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/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 |