main/zoneminder: upgrade to 1.28.0

3 files changed, 11 insertions, 108 deletions

diff --git a/main/zoneminder/0001-scripts-BusyBox-compatibility.patch b/main/zoneminder/0001-scripts-BusyBox-compatibility.patch
deleted file mode 100644
index 7ef1031b69..0000000000
--- a/main/zoneminder/0001-scripts-BusyBox-compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 88edfd8936..ea31b158db 100644
--- a/main/zoneminder/APKBUILD
+++ b/main/zoneminder/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=zoneminder
-pkgver=1.27.0
-pkgrel=12
+pkgver=1.28.0
+pkgrel=0
 pkgdesc="Video camera surveillance system"
 url="http://www.zoneminder.com/"
 arch="x86_64"
@@ -11,17 +11,15 @@ 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 ffmpeg"
-makedepends="autoconf automake bash bzip2-dev ffmpeg-dev gnutls-dev
+makedepends="autoconf automake bash bzip2-dev curl-dev ffmpeg-dev gnutls-dev
              libgcrypt-dev libjpeg-turbo-dev mysql-dev pcre-dev perl-dev
-             php-cli vlc-dev x264-dev curl-dev"
+             php-cli polkit-dev vlc-dev x264-dev"
 install=$pkgname.post-upgrade
 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
-	0001-scripts-BusyBox-compatibility.patch
-	same-dvr-controlls-in-event-as-in-monitor.patch"
+	zm-additional.sql"
 
 _builddir=$srcdir/ZoneMinder-$pkgver
 prepare() {
@@ -82,21 +80,15 @@ package() {
 		"$pkgdir"/usr/share/zoneminder/db/zm_create.sql
 }
 
-md5sums="9ff149baa1a0d04931fbafcdb3200fab  zoneminder-1.27.0.tar.gz
+md5sums="b0317c6fe003de9a0c7c76078b0adc2b  zoneminder-1.28.0.tar.gz
 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
+775f1e13017e7cd1ad11bfe4383c2c2d  zm-additional.sql"
+sha256sums="b9ee65635753e094dcad6cdb480acc42bff8b8f023ee008790883a4308273ca2  zoneminder-1.28.0.tar.gz
 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
+0b514a0506425e4dbde7030e7feabadb8b1d723946e0409ea0cd5f45833fee1b  zm-additional.sql"
+sha512sums="ac2a036adac436d76db8bb0b161d063111cc7cc7f6bcb9ca1b46862cfb0285b291926df716df645c0be47b7465bbbf3b1050c85529ff5068bdcc34f1c8ba6df1  zoneminder-1.28.0.tar.gz
 f5adb7abdb07cae3fc396791208a3796fce6db56b9a3f5570e5955dca38adb05085e38f2cf69fe0cdedb94adce459568976dcfe53c7a9866335f441f0e9fb584  zoneminder.initd
 b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f  musl-fix.patch
-4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f  zm-additional.sql
-719803331bcb14da8a21f3964f14c2f02be4a310d3bcf30e6744872f20f4f129f4e8b21ae7065151289a01c36b7a653e9cf2d88522e6fdd0ed72f045d95bd6f6  0001-scripts-BusyBox-compatibility.patch
-ea6dd8ab828f9ee390318902e05b36e1f27f24706630455703b7177aa99a0304f57af96309f2dfb8cc970aea0003f2aab4921d4a91b96d45e75449d7de322a6d  same-dvr-controlls-in-event-as-in-monitor.patch"
+4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f  zm-additional.sql"
diff --git a/main/zoneminder/same-dvr-controlls-in-event-as-in-monitor.patch b/main/zoneminder/same-dvr-controlls-in-event-as-in-monitor.patch
deleted file mode 100644
index 6d80ec6223..0000000000
--- a/main/zoneminder/same-dvr-controlls-in-event-as-in-monitor.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bd5e25644e5b12c354b8c5832ecc68e8ff1299da Mon Sep 17 00:00:00 2001
-From: m-bene <hub@bene.priv.at>
-Date: Wed, 9 Apr 2014 20:19:23 +0200
-Subject: [PATCH] same dvr controlls in event as in monitor
-
----
- web/skins/flat/views/css/event.css | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/web/skins/flat/views/css/event.css b/web/skins/flat/views/css/event.css
-index 995a06c..17c4f70 100644
---- a/web/skins/flat/views/css/event.css
-+++ b/web/skins/flat/views/css/event.css
-@@ -88,10 +88,10 @@
- }
- 
- #dvrControls input {
--    height: 20px;
--    width: 28px;
--    padding-bottom: 3px;
-+    padding: 10px 10px;
-+    width: 50px;
-     margin: 0 3px;
-+    font-weight: 900;
- }
- 
- #dvrControls input[disabled=disabled] {
-@@ -99,15 +99,21 @@
- }
- 
- #dvrControls input.active {
--    border: 1px solid blue;
-+    border: 0;
-+    background-color: #2ecc71;
-+    color: #fff;
- }
- 
- #dvrControls input.inactive {
--    border: 1px solid green;
-+    border: 0;
-+    background-color: #e67e22;
-+    color: #fff;
- }
- 
- #dvrControls input.unavail {
--    border: 1px solid red;
-+    background-color: #ccc;
-+    border: 0;
-+    cursor: default;
- }
- 
- #replayStatus {
--- 
-1.9.3
-