diff options
| author | Kaarle Ritvanen <kunkku@alpinelinux.org> | 2022-09-03 20:22:09 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kunkku@alpinelinux.org> | 2022-09-03 20:39:19 +0300 |
| commit | 5aa0841c96da077f2d303edc8ae48c5f924a79f3 (patch) | |
| tree | cc2046d13aa3a6244910a83338bf910cf91b6d81 | |
| parent | ec4b708180ca915180acdb63772d8072864c8a15 (diff) | |
community/zoneminder: fix various issues
* add missing dependency
* correct configuration file path in init script
* set ZM_PATH_ZMS
| -rw-r--r-- | community/zoneminder/APKBUILD | 9 | ||||
| -rw-r--r-- | community/zoneminder/zoneminder.initd | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/community/zoneminder/APKBUILD b/community/zoneminder/APKBUILD index ce3abcfd19d..f61cd634285 100644 --- a/community/zoneminder/APKBUILD +++ b/community/zoneminder/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kaarle Ritvanen <kunkku@alpinelinux.org> pkgname=zoneminder pkgver=1.36.21 -pkgrel=2 +pkgrel=3 _crud=14292374ccf1328f2d5db20897bd06f99ba4d938 _enum=ea90c0cd7f6e24333a90885e563b5d30b793db29 _rtsp=eab32851421ffe54fec0229c3efc44c642bc8d46 @@ -20,7 +20,7 @@ depends="bash ffmpeg linux-headers perl perl-archive-zip perl-number-bytes-human perl-php-serialization perl-sys-meminfo perl-sys-mmap perl-time-hires $_php $_php-apcu $_php-ctype $_php-gd $_php-pdo_mysql - $_php-session $_php-sockets procps sudo zip" + $_php-session $_php-sockets $_php-sysvsem procps sudo zip" makedepends="bzip2-dev cmake curl-dev ffmpeg-dev gnutls-dev gzip libgcrypt-dev libjpeg-turbo-dev openssl-dev>3 mariadb-connector-c-dev pcre-dev perl-dev $_php-cli @@ -106,7 +106,8 @@ build() { -DZM_SOCKDIR=/var/run/zoneminder \ -DZM_TMPDIR=/var/lib/zoneminder/temp \ -DZM_WEBDIR=/usr/share/webapps/$pkgname/htdocs \ - -DZM_CONFIG_DIR=/etc/zm + -DZM_CONFIG_DIR=/etc/zm \ + -DZM_PATH_ZMS=/cgi-bin/zm/nph-zms cmake --build build } @@ -136,7 +137,7 @@ sha512sums=" 245012f634b6039f819ac2fb512313797dd514e160a9d0dbfd7e03e8d957b73846746ce5b5575341628a3e7aac0085891f01bb1d0e709b804ffaf27541e76f53 RtspServer-eab32851421ffe54fec0229c3efc44c642bc8d46.tar.gz 75f2188e548b98191c8df82fb76e918f3bda9788f541449df8fa92449ad19aa0b9c13420dd91c760e08a4d31956ad51602242ab97e3bd4460f01e99f49992453 CakePHP-Enum-Behavior-ea90c0cd7f6e24333a90885e563b5d30b793db29.tar.gz da58528686baf05385ad08079f965bce10eba6d599133ab773e9ab1f9e4b7d82cf5431b4b773317b90effb16e0b026a029bdfabe08a9ef1a5e9b94e7a1c2ea9e crud-14292374ccf1328f2d5db20897bd06f99ba4d938.tar.gz -ae02daacc41e2b32ca0da5cf407c05447a5ce8e0cf035421111856511dc1075da75d9da32f8f013940c631215a62f3133860b35225bda405230b94a6b097c865 zoneminder.initd +7f1fdf38e25be97abe98a15a2fba33faa75bfd6a4cb3d1bb0a453db066f4902e808c561b85f034e65e5c242703276d1f9d22b6a22a59d8fe763b741cfee61da9 zoneminder.initd b1ca1fd225092a092d3ec2903d02b66a5698b7c1106eeed8627d7c954cf4f7d91b8ca7db3eb351fb8c7b585678091c2fcf2f8adb8cbfceea9e0494f9a71cd30f musl-fix.patch f39cefa953dad29415ff584aeca6fa09ddaa9b964d739333984626a720aa11b461b3312f5a556c4fa77aaebf5f81f5e9fc7004cc2acd3ef4d4661a9fa5088fb1 fix-zm_packet.patch " diff --git a/community/zoneminder/zoneminder.initd b/community/zoneminder/zoneminder.initd index 95c61a8accb..34bbc0919a3 100644 --- a/community/zoneminder/zoneminder.initd +++ b/community/zoneminder/zoneminder.initd @@ -1,11 +1,12 @@ #!/sbin/openrc-run # init.d file for zoneminder -# Copyright (c) 2013-2017 Kaarle Ritvanen +# Copyright (c) 2013-2022 Kaarle Ritvanen name=zoneminder command=/usr/bin/zmpkg.pl extra_commands="setup" +CONFIG_FILE=/etc/zm/zm.conf depend() { after mariadb @@ -32,14 +33,14 @@ stop() { } status() { - ( . /etc/zm.conf && chgrp $ZM_WEB_GROUP /etc/zm.conf ) + ( . $CONFIG_FILE && chgrp $ZM_WEB_GROUP $CONFIG_FILE ) status=$($command status) echo $status [ "$status" = running ] } setup() { - . /etc/zm.conf + . $CONFIG_FILE ebegin "Initializing $name database" mysql -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS \ < $ZM_PATH_DATA/db/zm_create.sql |