Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 69 insertions, 30 deletions

diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 64c3f94b0..e5e54537b 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -8,39 +8,75 @@
 
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=19
+pkgrel=20
 pkgdesc='Capture, analyse, record and monitor video security cameras'
-arch=(i686 x86_64 mips64el)
-backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf)
-url=http://www.$pkgname.com
-license=(GPL)
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+backup=(
+  etc/zm.conf
+)
+url="http://www.$pkgname.com"
+license=(
+  GPL
+)
 depends=(
-  apache cambozola ffmpeg-static gnutls mysql perl-archive-zip perl-date-manip
-  perl-dbd-mysql perl-dbi perl-expect perl-libwww perl-mime-lite
-  perl-mime-tools perl-php-serialization perl-net-sftp-foreign perl-sys-mmap
-  perl-time-modules perl-x10 php php-apache php-gd php-mcrypt
+  apache
+  cambozola
+  ffmpeg-static
+  gnutls
+  mysql
+  perl-archive-zip
+  perl-date-manip
+  perl-dbd-mysql
+  perl-dbi
+  perl-expect
+  perl-libwww
+  perl-mime-lite
+  perl-mime-tools
+  perl-php-serialization
+  perl-net-sftp-foreign
+  perl-sys-mmap
+  perl-time-modules
+  perl-x10
+  php
+  php-apache
+  php-gd
+  php-mcrypt
+)
+makedepends=(
+  netpbm
+)
+optdepends=(
+  netpbm
 )
-makedepends=(netpbm)
 install=$pkgname.install
 source=(
   http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz
-  httpd-zm.conf
-  zm.rc.d
+  httpd-$pkgname.conf
+  $pkgname
   $pkgname.service
   patch-ffmpeg-0.11.patch
 )
-md5sums=(
-  eaefa14befd482154970541252aa1a39
-  72380d8793a784ec24cb6809aea4a739
-  034b61cda8849fc3001849e76ef26041
-  7487cc72ead82aea0bc78f2e4106ae1a
-  81c8be870260142e2633eedf73c72040
+sha512sums=(
+  3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375
+  4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08
+  ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
+  cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  382799ad6add1632d934544230520f942dae37913b58cfa19e0cb2b11e7002267b1fdb9aa535f2217bcccf0c85c4d754f316dc3980a3ca267e5b3f5500536024
 )
+
 build() {
   cd $srcdir/ZoneMinder-$pkgver
 
+  # ZM_RUNDIR need change to run dir
   export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    ZM_SSL_LIB=gnutls
+    ZM_LOGDIR=/var/log/$pkgname\
+    ZM_RUNDIR=/tmp/$pkgname\
+    ZM_SSL_LIB=gnutls\
+    ZM_TMPDIR=/tmp/$pkgname
 
   # Patch for GCC 4.7.x
   sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
@@ -61,13 +97,15 @@ build() {
     /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
 
-  # Patch for change path
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/tmp\/zm/run/;
-    /ZM_PATH_LOGS/,+1 s/zm/zonemider/;
-    /ZM_PATH_SWAP/,+1 s/zm/zonemider/'\
+  # Patch for change path run dir
+  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
+    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+
+  # Patch for change ZM name to ZoneMinder
+  sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
     scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
 
-  # Patch for v4l1 compat
+  # Patch for v4l1 compat support
   sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l1compat.so\' ;/"\
     scripts/zmdc.pl.in || read
 
@@ -139,11 +177,12 @@ build() {
 package() {
   cd $srcdir/ZoneMinder-$pkgver
 
-  make DESTDIR=$pkgdir RUNDIR=$pkdir/run ZM_RUNDIR=$pkgdir/run install
+  make DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}}
 
   chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}}
+  chmod 0700 $pkgdir/etc/zm.conf
 
   for i in events images temp; do
     mv    $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
@@ -153,9 +192,9 @@ package() {
   ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
   ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
 
-  install -D -m 644 $srcdir/httpd-zm.conf    $pkgdir/etc/httpd/conf/extra
-  install -D -m 644 $srcdir/zm.rc.d          $pkgdir/etc/rc.d/${pkgname}d
-  install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system
-  install -D -m 644 COPYING                  $pkgdir/usr/share/license/$pkgname
-  install -D -m 644 db/zm*.sql               $pkgdir/usr/share/$pkgname/db
+  install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra
+  install -D -m 644 $srcdir/$pkgname            $pkgdir/etc/rc.d
+  install -D -m 644 $srcdir/$pkgname.service    $pkgdir/usr/lib/systemd/system
+  install -D -m 644 COPYING                     $pkgdir/usr/share/license/$pkgname
+  install -D -m 644 db/zm*.sql                  $pkgdir/usr/share/$pkgname/db
 }