diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2014-06-25 11:34:19 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2014-06-25 11:36:14 +0200 |
| commit | 295eec75ce7b6de2f4ad9144ed0344d57b145288 (patch) | |
| tree | 2785acf1c86a11499f6803d858036df9bf2031b3 /main/zoneminder | |
| parent | 18ea80fb4ac96d340e2de9b1a3ec730dcea0b0ba (diff) | |
| download | aports-295eec75ce7b6de2f4ad9144ed0344d57b145288.tar.bz2 aports-295eec75ce7b6de2f4ad9144ed0344d57b145288.tar.xz | |
main/zoneminder: create run dir and make busybox compat
Diffstat (limited to 'main/zoneminder')
| -rw-r--r-- | main/zoneminder/0001-scripts-BusyBox-compatibility.patch | 34 | ||||
| -rw-r--r-- | main/zoneminder/APKBUILD | 20 | ||||
| -rw-r--r-- | main/zoneminder/zoneminder.initd | 7 |
3 files changed, 53 insertions, 8 deletions
diff --git a/main/zoneminder/0001-scripts-BusyBox-compatibility.patch b/main/zoneminder/0001-scripts-BusyBox-compatibility.patch new file mode 100644 index 0000000000..7ef1031b69 --- /dev/null +++ b/main/zoneminder/0001-scripts-BusyBox-compatibility.patch @@ -0,0 +1,34 @@ +From b2323cb36d2b6c6dc5fe064c5dedfb1264179283 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@gmail.com> +Date: Wed, 25 Jun 2014 11:19:15 +0200 +Subject: [PATCH] scripts: BusyBox compatibility + +BusyBox killall does not support long options using short options instead +--- + scripts/zmdc.pl.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in +index c891553..579e093 100644 +--- a/scripts/zmdc.pl.in ++++ b/scripts/zmdc.pl.in +@@ -784,14 +784,14 @@ sub killAll + sleep( $delay ); + foreach my $daemon ( @daemons ) + { +- my $cmd = "killall --quiet --signal TERM $daemon"; ++ my $cmd = "killall -q -s TERM $daemon"; + Debug( $cmd ); + qx( $cmd ); + } + sleep( $delay ); + foreach my $daemon ( @daemons ) + { +- my $cmd = "killall --quiet --signal KILL $daemon"; ++ my $cmd = "killall -q -s KILL $daemon"; + Debug( $cmd ); + qx( $cmd ); + } +-- +2.0.0 + diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD index b76b8c2428..98ae0494a8 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=6 +pkgrel=7 pkgdesc="Video camera surveillance system" url="http://www.zoneminder.com/" arch="all" @@ -19,7 +19,8 @@ subpackages=$pkgname-doc source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/archive/v${pkgver}.tar.gz $pkgname.initd musl-fix.patch - zm-additional.sql" + zm-additional.sql + 0001-scripts-BusyBox-compatibility.patch" _builddir=$srcdir/ZoneMinder-$pkgver prepare() { @@ -83,14 +84,17 @@ package() { } md5sums="9ff149baa1a0d04931fbafcdb3200fab zoneminder-1.27.0.tar.gz -bf468cdc3b1e8cb81ee612c6691ee4e9 zoneminder.initd +69cdce32a962bdbe2a4ec427d706e42b zoneminder.initd d148970bda67b1e257bb3e1f48404f91 musl-fix.patch -775f1e13017e7cd1ad11bfe4383c2c2d zm-additional.sql" +775f1e13017e7cd1ad11bfe4383c2c2d zm-additional.sql +f8fffdbaecf2ca29742199fd905aa709 0001-scripts-BusyBox-compatibility.patch" sha256sums="2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 zoneminder-1.27.0.tar.gz -f351efa868640ed16552f46f9d61dbca02f1ec1fdd6b4a5e0115212bba98b624 zoneminder.initd +af98661b569f46ff9066758d2de91b3de11dc0ac09ec62d3f20624a5c75fc4e0 zoneminder.initd d5c1ce946c44e1979cc144f36930827da725919b9d53c1aee0e8749c4ff719d9 musl-fix.patch -0b514a0506425e4dbde7030e7feabadb8b1d723946e0409ea0cd5f45833fee1b zm-additional.sql" +0b514a0506425e4dbde7030e7feabadb8b1d723946e0409ea0cd5f45833fee1b zm-additional.sql +1d459bd9d4315ba8933c049b8f42cdc0c3dc3682c02cacd93a3c46d4429837e4 0001-scripts-BusyBox-compatibility.patch" sha512sums="8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14 zoneminder-1.27.0.tar.gz -bf42d95bc9bf14992f8ea324e90633e7cbe60e4c13e4235b2542de85f01cecb6f23a639c4bc4e3576f25b752f36a5218a3eba5480edc64e3602a844ac96a313c zoneminder.initd +77609ead64e27331ebbb0f268ae57b227f11dcda8cafcff003f5477db252cc6c8529c28c754eec5e15ce2baf76dd031bf333e2d38c3d1dd854ca7e9017276de0 zoneminder.initd b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f musl-fix.patch -4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f zm-additional.sql" +4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f zm-additional.sql +719803331bcb14da8a21f3964f14c2f02be4a310d3bcf30e6744872f20f4f129f4e8b21ae7065151289a01c36b7a653e9cf2d88522e6fdd0ed72f045d95bd6f6 0001-scripts-BusyBox-compatibility.patch" diff --git a/main/zoneminder/zoneminder.initd b/main/zoneminder/zoneminder.initd index 592faca6aa..bfb32318dc 100644 --- a/main/zoneminder/zoneminder.initd +++ b/main/zoneminder/zoneminder.initd @@ -16,6 +16,7 @@ start() { if status > /dev/null; then ewarn "$name already started" else + mkrundir $command start fi eend $? @@ -51,3 +52,9 @@ perms() { chown -R $ZM_WEB_USER:$ZM_WEB_GROUP \ /var/*/zoneminder } + +mkrundir() { + . /etc/zm.conf + install -d -o $ZM_WEB_USER -g $ZM_WEB_GROUP \ + /var/run/zoneminder +} |