From c5471bd6117c8bee76fcd8a0ecf89f584420997c Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Thu, 3 Jul 2014 10:35:18 +0200
Subject: main/zoneminder: add ffmpeg to depends and add perms initd option

---
 main/zoneminder/APKBUILD         | 11 +++++------
 main/zoneminder/zoneminder.initd | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'main')

diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD
index 413a177f75..2f0dae2604 100644
--- a/main/zoneminder/APKBUILD
+++ b/main/zoneminder/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=zoneminder
 pkgver=1.27.0
-pkgrel=10
+pkgrel=11
 pkgdesc="Video camera surveillance system"
 url="http://www.zoneminder.com/"
 arch="x86_64"
@@ -10,7 +10,7 @@ license="GPL2+"
 depends="perl perl-archive-zip perl-date-manip perl-dbd-mysql perl-dbi
 	perl-device-serialport perl-libwww perl-mail-tools perl-mime-lite
 	perl-mime-tools perl-sys-mmap perl-time-hires php php-mysql sudo
-	zip perl-php-serialization php-sockets"
+	zip perl-php-serialization php-sockets ffmpeg"
 makedepends="autoconf automake bash bzip2-dev ffmpeg-dev gnutls-dev
              libgcrypt-dev libjpeg-turbo-dev mysql-dev pcre-dev perl-dev
              php-cli vlc-dev x264-dev curl-dev"
@@ -56,7 +56,6 @@ package() {
 	cd "$_builddir"
 	local dir
 	make install DESTDIR=$pkgdir
-	rmdir "$pkgdir/tmp"
 	find "$pkgdir" -name perllocal.pod -delete
 	echo -n $pkgver > "$pkgdir/usr/share/$pkgname/version"
 	install -D -m 755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
@@ -84,19 +83,19 @@ package() {
 }
 
 md5sums="9ff149baa1a0d04931fbafcdb3200fab  zoneminder-1.27.0.tar.gz
-13ac97abf1565b69aa154bd81af9ed1d  zoneminder.initd
+ecb53d18aba7be7ea2e97a20ffa43238  zoneminder.initd
 d148970bda67b1e257bb3e1f48404f91  musl-fix.patch
 775f1e13017e7cd1ad11bfe4383c2c2d  zm-additional.sql
 f8fffdbaecf2ca29742199fd905aa709  0001-scripts-BusyBox-compatibility.patch
 244796943da9b443472c98df81477953  same-dvr-controlls-in-event-as-in-monitor.patch"
 sha256sums="2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2  zoneminder-1.27.0.tar.gz
-189d07168732a9b6a65926112bed1564b4f7a25084505120fed6ccfb4773b7e6  zoneminder.initd
+983b076560676b86a29ee9be046e1d237309c6d3ba82c74021881f24d5f1280f  zoneminder.initd
 d5c1ce946c44e1979cc144f36930827da725919b9d53c1aee0e8749c4ff719d9  musl-fix.patch
 0b514a0506425e4dbde7030e7feabadb8b1d723946e0409ea0cd5f45833fee1b  zm-additional.sql
 1d459bd9d4315ba8933c049b8f42cdc0c3dc3682c02cacd93a3c46d4429837e4  0001-scripts-BusyBox-compatibility.patch
 8e19b1459840d4ca6346b6fb81f66a21692e1bd7f48a8009a68340be735a9c7d  same-dvr-controlls-in-event-as-in-monitor.patch"
 sha512sums="8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14  zoneminder-1.27.0.tar.gz
-77f6001b2a8cfb04a6d684e98c0648cdaad3a5ede8259d138ee00a39e50870fa956d73ca60bccf12576bf9d339bdcc0e91cd6a0216fff7985a4276ab46eebcdf  zoneminder.initd
+f5adb7abdb07cae3fc396791208a3796fce6db56b9a3f5570e5955dca38adb05085e38f2cf69fe0cdedb94adce459568976dcfe53c7a9866335f441f0e9fb584  zoneminder.initd
 b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f  musl-fix.patch
 4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f  zm-additional.sql
 719803331bcb14da8a21f3964f14c2f02be4a310d3bcf30e6744872f20f4f129f4e8b21ae7065151289a01c36b7a653e9cf2d88522e6fdd0ed72f045d95bd6f6  0001-scripts-BusyBox-compatibility.patch
diff --git a/main/zoneminder/zoneminder.initd b/main/zoneminder/zoneminder.initd
index 0cecd48010..91d6a05faa 100644
--- a/main/zoneminder/zoneminder.initd
+++ b/main/zoneminder/zoneminder.initd
@@ -5,7 +5,7 @@
 
 name=zoneminder
 command=/usr/bin/zmpkg.pl
-extra_commands="setup"
+extra_commands="setup perms"
 
 depend() {
 	after mysql
@@ -50,7 +50,17 @@ prepare() {
 	. /etc/zm.conf
 	install -d -o $ZM_WEB_USER -g $ZM_WEB_GROUP \
 		/var/run/zoneminder
-	chown $ZM_WEB_USER:$ZM_WEB_GROUP \
+	perms simple
+}
+
+perms() {
+	. /etc/zm.conf
+	if [ "$1" != "simple" ]; then
+		ebegin "Setting correct permssion, this could take a while"
+		RECURSIVE="-R"
+	fi
+	chown $RECURSIVE $ZM_WEB_USER:$ZM_WEB_GROUP \
 		/var/lib/zoneminder/* \
 		/var/log/zoneminder
 }
+
-- 
cgit v1.2.3