PKGBUILD: fix PID file permissions

3 files changed, 31 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88628d9da120..3721b833e05a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zoneminder-git
 	pkgdesc = Capture, analyse, record and monitor video security cameras
-	pkgver = 1.28.1
-	pkgrel = 2
+	pkgver = 1.28.100
+	pkgrel = 1
 	url = https://github.com/ZoneMinder/ZoneMinder/releases
 	install = zoneminder.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index ffb5129073ee..08be99f6ff4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 # Orginally based on a Debian Squeeze package
 _pkgname=zoneminder
 pkgname=zoneminder-git
-pkgver=1.28.1
-pkgrel=2
+pkgver=1.28.100
+pkgrel=1
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=( i686 x86_64 mips64el arm armv7h )
 backup=( etc/zm.conf )
@@ -46,7 +46,8 @@ source=(
 # Because the source is not static, skip Git checksum:
 sha256sums=('SKIP'
             'c2ca71ec57e53da040de61ff212ac063574e5ddfb4c333b70be060d5ec26c62c'
-            '7eb2f26246e240e23502da44854d5ed14485aa11bc448ad73e9b57fee13f00a3')
+            '7eb2f26246e240e23502da44854d5ed14485aa11bc448ad73e9b57fee13f00a3'
+           )
      
 pkgver() {
     cd "$_pkgname"
@@ -69,7 +70,7 @@ build() {
           -DZM_RUNDIR=/srv/zoneminder \
           -DZM_TMPDIR=/srv/zoneminder/tmp \
           -DZM_SOCKDIR=/srv/zoneminder/socks .
-    
+     
     make V=0
 }
      
@@ -87,7 +88,9 @@ package() {
     mkdir -pv           $pkgdir/var/{cache/zoneminder,log/zoneminder}
     chown -Rv http.http $pkgdir/var/{cache/zoneminder,log/zoneminder}
     
-    mkdir -pv          $pkgdir/srv/zoneminder/socks
+    mkdir -v           $pkgdir/srv/zoneminder
+    chown -v http.http $pkgdir/srv/zoneminder
+    mkdir -v           $pkgdir/srv/zoneminder/socks
     chown -v http.http $pkgdir/srv/zoneminder/socks
     
     mkdir -pv          $pkgdir/srv/zoneminder/tmp
@@ -114,13 +117,16 @@ package() {
     # ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$_pkgname
 
     # Install configuration files
-    mkdir -p                                       $pkgdir/etc/httpd/conf/extra
-    install -D -m 644 $srcdir/httpd-$_pkgname.conf $pkgdir/etc/httpd/conf/extra
+    mkdir -p                                        $pkgdir/etc/httpd/conf/extra
+    install -D -m 644 $srcdir/httpd-$_pkgname.conf  $pkgdir/etc/httpd/conf/extra
+    
+    mkdir -p                                        $pkgdir/usr/lib/systemd/system
+    install -D -m 644 $srcdir/$_pkgname.service     $pkgdir/usr/lib/systemd/system
     
-    mkdir -p                                    $pkgdir/usr/lib/systemd/system
-    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 COPYING     $pkgdir/usr/share/license/$_pkgname
-    install -D -m 644 db/zm*.sql  $pkgdir/usr/share/$_pkgname/db     
+    mkdir -p                                        $pkgdir/usr/share/doc/$_pkgname
+    # install -D -m 644 $srcdir/README              $pkgdir/usr/share/doc/$_pkgname
 
 }
diff --git a/zoneminder.install b/zoneminder.install
index e890c604834b..edc233de602f 100644
--- a/zoneminder.install
+++ b/zoneminder.install
@@ -10,7 +10,7 @@ post_install() {
     \|^;extension=pdo_mysql.so$| s|^;||;
     \|^;extension=sockets.so$|   s|^;||;
     \|^;extension=zip.so$|       s|^;||;
-    ' /etc/php/php.ini > /etc/php/php.ini.zoneminder
+    ' /etc/php/php.ini > /tmp/php.ini.zoneminder
 
     # edit /etc/httpd/conf/httpd.conf for Zoneminder
     sed -e '
@@ -29,7 +29,7 @@ post_install() {
     # Include httpd-zoneminder.conf
     \|^Include /etc/httpd/conf/extra/httpd-zoneminder.conf$|d;
     s|^# Server-pool management (MPM specific)$|\nInclude /etc/httpd/conf/extra/httpd-zoneminder.conf\n&|;    
-    ' /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.zoneminder
+    ' /etc/httpd/conf/httpd.conf > /tmp/httpd.conf.zoneminder
     
     cat << EOF
 
@@ -48,7 +48,7 @@ post_install() {
 
   PHP configuration
   -----------------
-  * Check and make sure these are uncommented in /etc/php/php.ini: 
+  * Check and make sure these are uncommented in /etc/php/php.ini:
     extension=ftp.so
     extension=gd.so
     extension=gettext.so
@@ -57,8 +57,6 @@ post_install() {
     extension=pdo_mysql.so
     extension=sockets.so
     extension=zip.so
-  * Add /etc/zm.conf, /srv/http/zoneminder, /var/cache/zoneminder, and /srv/zoneminder/socks to open_basedir in the zoneminder vhosts configuration file in apache:
-    php_admin_value open_basedir "/srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/:/etc/zm.conf:/srv/http/zoneminder/:/var/cache/zoneminder/:/srv/zoneminder/socks/:/var/log/zoneminder/"
   * Set your timezone in php.ini:
     date.timezone = <your_country>/<your_city>
 
@@ -111,13 +109,15 @@ Note:
 
 ==> Disable php with mysql if it isn't needed with others servers, 
 ==> comment that lines in /etc/php/php.ini:
-==> "extension=mysql.so"
-==> "extension=gd.so"
-==> "extension=gettext.so"
-==> "extension=mcrypt.so"
-==> "extension=mysqli.so"
-==> "extension=sockets.so"
-==> "date.timezone = <my_country>/<my_city>"
+    # extension=ftp.so
+    # extension=gd.so
+    # extension=gettext.so
+    # extension=mcrypt.so
+    # extension=openssl.so
+    # extension=pdo_mysql.so
+    # extension=sockets.so
+    # extension=zip.so
+    # "date.timezone = <my_country>/<my_city>"
 
 ==> Remove log files and "zoneminder" directory in "/var/log/zoneminder".