From 0e9fcb2114efa5ce0d087a83aed2659d7f79cbe4 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Sun, 16 Apr 2017 00:44:20 +0300
Subject: community/zoneminder: upstream redefined 1.30.2 tag

fixes #6913
---
 .../0001-zmlinkcontent-fix-syntax-error.patch      | 25 ----------------------
 community/zoneminder/APKBUILD                      | 13 +++++------
 2 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 community/zoneminder/0001-zmlinkcontent-fix-syntax-error.patch

diff --git a/community/zoneminder/0001-zmlinkcontent-fix-syntax-error.patch b/community/zoneminder/0001-zmlinkcontent-fix-syntax-error.patch
deleted file mode 100644
index 329e0d7f0e..0000000000
--- a/community/zoneminder/0001-zmlinkcontent-fix-syntax-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 548464c0d58676225dc15f0604df7df1961abb83 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Mon, 20 Feb 2017 11:12:15 +0200
-Subject: [PATCH] zmlinkcontent: fix syntax error
-
----
- zmlinkcontent.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zmlinkcontent.sh.in b/zmlinkcontent.sh.in
-index 5f0d833..d6c7918 100755
---- a/zmlinkcontent.sh.in
-+++ b/zmlinkcontent.sh.in
-@@ -69,7 +69,7 @@ if [ -n "$ZM_CONFIG" ]; then
- elif [ -f "zm.conf" ]; then
- 	echo "Using local zm.conf"
- 	source "zm.conf"
--elif [ -f "/etc/zm.conf"]; then
-+elif [ -f "/etc/zm.conf" ]; then
- 	echo "Using system zm.conf"
- 	source "/etc/zm.conf"
- else
--- 
-2.9.3
-
diff --git a/community/zoneminder/APKBUILD b/community/zoneminder/APKBUILD
index 7fbb45370a..a396250d44 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=2
+pkgrel=3
 _crud=c3976f1478c681b0bbc132ec3a3e82c3984eeed5
 pkgdesc="Video camera surveillance system"
 url="http://www.zoneminder.com/"
@@ -23,13 +23,15 @@ 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
 	$pkgname.initd
-	musl-fix.patch
-	0001-zmlinkcontent-fix-syntax-error.patch"
+	musl-fix.patch"
 
 # secfixes:
 #   1.30.2-r0:
 #     - CVE-2016-10140
 #     - CVE-2017-5595
+#   1.30.2-r3:
+#     - CVE-2017-5367
+#     - CVE-2017-5368
 
 _builddir=$srcdir/ZoneMinder-$pkgver
 prepare() {
@@ -85,8 +87,7 @@ package() {
 	ln -sf /usr/share/webapps/zoneminder/cgi-bin \
 		"$pkgdir"/var/www/localhost/cgi-bin/zm
 }
-sha512sums="2c6be4f6ae88eacf422a2f2dec303adfc61411d403ec0489e0b84ee919fe040b902b2e85cf78cd0f5a615b40a1f104a5faba6e08e0771a4c55616e36fc9afb11  zoneminder-1.30.2.tar.gz
+sha512sums="98bd6d42ecc19bcd317a30e1a9c57bd6bd295593bcc6c12e2fbe1beddfe43fb0301e042323a88969fd5f7da1dc45a1c01324878837633e5a5ed4fa54bed8690a  zoneminder-1.30.2.tar.gz
 f665741a1fbcca5e48ab8eddaa4686b23426aed7b22d68fdfa6c951fb6ce7dbbcfce5f1807e30a18fbc8fd4e3a8028a5687db17a070d05301d93d49f67952e44  crud-c3976f1478c681b0bbc132ec3a3e82c3984eeed5.tar.gz
 ae02daacc41e2b32ca0da5cf407c05447a5ce8e0cf035421111856511dc1075da75d9da32f8f013940c631215a62f3133860b35225bda405230b94a6b097c865  zoneminder.initd
-34a18a6db3ebc5bfba0b40894e85112ad50d0caedf4e69f23ec98dedcba03fe223d5f3dc1ad3c76269b9cb48d60464e1674e0571a52d840f95c3adeac42d601f  musl-fix.patch
-9f794b14125bae50a517008a20bc8728dfae6fbd074cf54a57fe4685b4fccfae4a211dce4d40bf2fdb6d92b0c4d7d9f238d9ab03e3dbdf934da21cf0ed8abd6b  0001-zmlinkcontent-fix-syntax-error.patch"
+34a18a6db3ebc5bfba0b40894e85112ad50d0caedf4e69f23ec98dedcba03fe223d5f3dc1ad3c76269b9cb48d60464e1674e0571a52d840f95c3adeac42d601f  musl-fix.patch"
-- 
cgit v1.2.3