Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	abs/core/LinHES-config/PKGBUILD

1 files changed, 55 insertions, 64 deletions

diff --git a/abs/core/zoneminder/PKGBUILD b/abs/core/zoneminder/PKGBUILD
index 94a543a..6b5c6c8 100644..100755
--- a/abs/core/zoneminder/PKGBUILD
+++ b/abs/core/zoneminder/PKGBUILD
@@ -2,92 +2,83 @@
 # Contributor: Ross melin <rdmelin@gmail.com>
 
 pkgname=zoneminder
-pkgver=1.23.3
-pkgrel=10
+pkgver=1.25.0
+pkgrel=2
 pkgdesc="Capture, analyse, record and monitor video security cameras."
-arch=('i686')
+arch=('i686' 'x86_64')
 url="http://www.zoneminder.com"
 license=('GPL')
-groups=()
-depends=('lighttpd' 'php' 'mysql' 'pcre' 'gnutls' 'ffmpeg' 'perl-php-serialization' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules')
+depends=('cambozola' 'apache' 'php' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-php-serialization' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'sudo' 'libv4l')
 makedepends=()
-provides=(zoneminder)
-conflicts=()
-replaces=()
-backup=(etc/zm.conf)
-options=()
 install=zoneminder.install
-source=(http://www2.zoneminder.com/downloads/ZoneMinder-$pkgver.tar.gz \
-	zm.rc.d \
- 	zm.conf.patch \
-  zmupdate.patch \
-  Makefile.patch \
- 	zminit.arch \
-	customdb \
-  mootools.v1.11.js \
-  http://www.charliemouse.com:8080/code/cambozola/cambozola-0.50.tar.gz \
-  zmeventdump \
-  run)
-noextract=()
-md5sums=('ee803f0f71d6e67adf602c3557fb6bc9'
-         'af8631abe20cd7dcab1a023af7d4f3e8'
-         '1a6c94411f8adb53a10dc7c19c3bbf02'
-         '320dd41725945218de0672f899e1d739'
-         '818cec2eba7e1efb3f5c410f6dd8d528'
-         'f9720872736f26d17bc49d8725b75ae4'
-         'f0c4b80b3c2f1e0fe90d7b52191b7e51'
-         '0df5bf23f9b09f0cae2e7f0a9e0ef16e'
-         'daded58688e16ab513920a54a0599267'
-         '3046d91dde4a753867c62aba985c647e')
+source=("http://www2.zoneminder.com/downloads/ZoneMinder-${pkgver}.tar.gz"
+zm.rc.d 
+Controls_Orbit.sql 
+zminit.arch 
+customdb 
+httpd-zm.conf 
+zmfilter.pl 
+zmeventbackup
+Makefile.patch
+run)
 
 build() {
-	cd "$srcdir/ZoneMinder-$pkgver"
-
-	patch -p1 < $startdir/src/zm.conf.patch
-  patch -p1 < $startdir/src/zmupdate.patch
-
-  sed -i 's|<ffmpeg/avformat.h>|<libavformat/avformat.h>|' $srcdir/ZoneMinder-$pkgver/src/zm_mpeg.h
-  sed -i 's|<ffmpeg/swscale.h>|<libswscale/swscale.h>|' $srcdir/ZoneMinder-$pkgver/src/zm_mpeg.h
-  sed -i 's|--- Created by|-- Created by|'  $srcdir/ZoneMinder-$pkgver/scripts/zmdbbackup.in
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--with-webuser=http  \
-		--with-webgroup=http \
-		--with-mysql=/usr  \
-		--with-webdir=/data/srv/httpd/htdocs/zm  \
-		--with-cgidir=/data/srv/httpd/htdocs/cgi-bin \
-		--bindir=/usr/lib/zm/bin
+  cd "$srcdir/ZoneMinder-$pkgver"
 
-  patch -p1 < $startdir/src/Makefile.patch
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
+  cat ../Controls_Orbit.sql >> db/zm_create.sql.in
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-webuser=http  \
+    --with-webgroup=http \
+    --with-mysql=/usr  \
+    --with-webdir=/srv/zoneminder/www  \
+    --with-cgidir=/srv/zoneminder/cgi-bin \
+    --bindir=/srv/zoneminder/bin \
+    ZM_SSL_LIB=openssl \
+    CPPFLAGS=-D__STDC_CONSTANT_MACROS
+  # goddamn chown line just mucks everything up, we'll chown it in the install
+  # script.
+  sed -i '/chown/d' Makefile
+  make || return 1
+  make DESTDIR="$pkgdir" install || return 1
 
-	install -D -m 700 $startdir/src/zminit.arch  $startdir/pkg/usr/lib/zm/bin/zminit
-	install -D -m 700 $startdir/src/zm.rc.d  $startdir/pkg/etc/rc.d/zm
-  install -D -m 700 scripts/zmdbbackup  $startdir/pkg/usr/lib/zm/bin/zmdbbackup
+  install -D -m 700 $startdir/src/zminit.arch  $startdir/pkg/usr/lib/zm/bin/zminit
+  install -D -m 700 $startdir/src/zm.rc.d  $startdir/pkg/etc/rc.d/zm
   install -D -m 700 scripts/zmdbbackup  $startdir/pkg/usr/lib/zm/bin/zmdbbackup
   install -D -m 700 scripts/zmdbrestore  $startdir/pkg/usr/lib/zm/bin/zmdbrestore
+  install -D -m 700 scripts/zmeventdump  $startdir/pkg/usr/lib/zm/bin/zmeventdump
   install -D -m 700 scripts/zmlogrotate.conf  $startdir/pkg/etc/logrotate.d/zm
-  install -D -m 700 $startdir/src/zmeventdump  $startdir/pkg/etc/cron.hourly/zmeventdump
+  install -D -m 700 $startdir/src/zmeventbackup  $startdir/pkg/etc/cron.hourly/zmeventbackup
+  install -D -m 755 scripts/zmfilter.pl $startdir/pkg/usr/lib/zm/bin/zmfilter.pl
+  install -D -m 755 scripts/zmupdate.pl $startdir/pkg/usr/lib/zm/bin/zmupdate.pl
 
-  tar -zxf $startdir/src/cambozola-0.50.tar.gz 
-  install -m 644  cambozola-0.50/dist/cambozola.jar $startdir/pkg/data/srv/httpd/htdocs/zm/cambozola.jar
+  mkdir -p  $startdir/pkg/etc/httpd/conf/extra/
+  install -m 644 $startdir/src/httpd-zm.conf $startdir/pkg/etc/httpd/conf/extra/httpd-zm.conf
 
-  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/
+  install -D  db/zm*.sql $startdir/pkg/usr/lib/zm/upgrade/
 
   mkdir -p $startdir/pkg/var/run/zm
+  mkdir -p $startdir/pkg/var/lib/zm
+
+  #install runit files
+  mkdir -p $pkgdir/etc/sv/zm
+  install -D -m 755 $srcdir/run $pkgdir/etc/sv/zm
 
   ### remove special files
   find $startdir/pkg/ -name "perllocal.pod" \
     -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
 
 }
-
-# vim:set ts=2 sw=2 et:
+md5sums=('eaefa14befd482154970541252aa1a39'
+         'b20fb25b187eb6abb21321e153a7fb25'
+         '5033bc098bf497c8aed1fc1b3c9c5f9c'
+         'f9720872736f26d17bc49d8725b75ae4'
+         '4ace13d1e20934abe192ef7372c75988'
+         '00201eba9c0a5d1ed14b10cc55410698'
+         '80c52cc3575073a7462ff6a54886a345'
+         '8b40137b6ff54f2fb26104b70edd22e9'
+         'bb308c2393e947a224d56862c85a3ad9'
+         '0c7024c355ce36828627bed10d965202')