diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-02-20 12:48:59 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2017-02-20 12:49:26 +0200 |
| commit | 28e30fde7bea8b1a7a532a937a501f486bcd9715 (patch) | |
| tree | 68431bdb88c2ef95f0c8956799b8d767be50534f | |
| parent | 5f9faf37a3af65f4d4ab5b14840528d5b540ce60 (diff) | |
| download | aports-28e30fde7bea8b1a7a532a937a501f486bcd9715.tar.bz2 aports-28e30fde7bea8b1a7a532a937a501f486bcd9715.tar.xz | |
community/zoneminder: fix errors on startup
also remove obsolete post-install script
| -rw-r--r-- | community/zoneminder/APKBUILD | 6 | ||||
| -rw-r--r-- | community/zoneminder/zoneminder.initd | 2 | ||||
| -rw-r--r-- | community/zoneminder/zoneminder.post-upgrade | 7 |
3 files changed, 3 insertions, 12 deletions
diff --git a/community/zoneminder/APKBUILD b/community/zoneminder/APKBUILD index 14f879161b..d148295a87 100644 --- a/community/zoneminder/APKBUILD +++ b/community/zoneminder/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=zoneminder pkgver=1.30.2 -pkgrel=1 +pkgrel=2 _crud=c3976f1478c681b0bbc132ec3a3e82c3984eeed5 pkgdesc="Video camera surveillance system" url="http://www.zoneminder.com/" @@ -19,7 +19,6 @@ depends="ffmpeg perl perl-archive-zip perl-date-manip perl-dbd-mysql makedepends="bash bzip2-dev cmake curl-dev ffmpeg-dev gnutls-dev libgcrypt-dev libjpeg-turbo-dev mariadb-dev pcre-dev perl-dev ${_php}-cli polkit-dev vlc-dev x264-dev gzip" -install=$pkgname.post-upgrade subpackages=$pkgname-doc source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/archive/${pkgver}.tar.gz crud-$_crud.tar.gz::https://github.com/FriendsOfCake/crud/archive/$_crud.tar.gz @@ -68,7 +67,6 @@ package() { find "$pkgdir" -name perllocal.pod -delete install -D zmlinkcontent.sh "$pkgdir"/usr/sbin/zmlinkcontent.sh - echo -n $pkgver > "$pkgdir/usr/share/$pkgname/version" install -D -m 755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" chmod 640 "$pkgdir/etc/zm.conf" @@ -84,6 +82,6 @@ package() { } sha512sums="2c6be4f6ae88eacf422a2f2dec303adfc61411d403ec0489e0b84ee919fe040b902b2e85cf78cd0f5a615b40a1f104a5faba6e08e0771a4c55616e36fc9afb11 zoneminder-1.30.2.tar.gz f665741a1fbcca5e48ab8eddaa4686b23426aed7b22d68fdfa6c951fb6ce7dbbcfce5f1807e30a18fbc8fd4e3a8028a5687db17a070d05301d93d49f67952e44 crud-c3976f1478c681b0bbc132ec3a3e82c3984eeed5.tar.gz -17a4ea70e0f8e3f64a7fe9f357fe5259c5716aa0be86ae5d9be0c5cb9a05c3e27969413c64186421e78e57c0af0c1f9cd0ec7305aa3311d4e9584b3e49e120ce zoneminder.initd +ae02daacc41e2b32ca0da5cf407c05447a5ce8e0cf035421111856511dc1075da75d9da32f8f013940c631215a62f3133860b35225bda405230b94a6b097c865 zoneminder.initd 34a18a6db3ebc5bfba0b40894e85112ad50d0caedf4e69f23ec98dedcba03fe223d5f3dc1ad3c76269b9cb48d60464e1674e0571a52d840f95c3adeac42d601f musl-fix.patch 9f794b14125bae50a517008a20bc8728dfae6fbd074cf54a57fe4685b4fccfae4a211dce4d40bf2fdb6d92b0c4d7d9f238d9ab03e3dbdf934da21cf0ed8abd6b 0001-zmlinkcontent-fix-syntax-error.patch" diff --git a/community/zoneminder/zoneminder.initd b/community/zoneminder/zoneminder.initd index ec9a1d1029..95c61a8acc 100644 --- a/community/zoneminder/zoneminder.initd +++ b/community/zoneminder/zoneminder.initd @@ -16,7 +16,6 @@ start() { if status > /dev/null; then ewarn "$name already started" else - ( . /etc/zm.conf && chgrp $ZM_WEB_GROUP /etc/zm.conf ) zmlinkcontent.sh > /dev/null && $command start fi eend $? @@ -33,6 +32,7 @@ stop() { } status() { + ( . /etc/zm.conf && chgrp $ZM_WEB_GROUP /etc/zm.conf ) status=$($command status) echo $status [ "$status" = running ] diff --git a/community/zoneminder/zoneminder.post-upgrade b/community/zoneminder/zoneminder.post-upgrade deleted file mode 100644 index 4dd9d91c2b..0000000000 --- a/community/zoneminder/zoneminder.post-upgrade +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# post-upgrade script for zoneminder -# Copyright (c) 2013 Kaarle Ritvanen - -sed -i 's/^\(ZM_VERSION=\).*/\1'$(cat /usr/share/zoneminder/version)/ \ - /etc/zm.conf |