main/zoneminder: upgrade to 1.29.0

3 files changed, 40 insertions, 44 deletions

diff --git a/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
deleted file mode 100644
index b7cbb4c3c2f..00000000000
--- a/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5779b2e20fe7d5e43a5a38ab289e45fc0ffc9545 Mon Sep 17 00:00:00 2001
-From: Sune1337 <kristoffer.lindahl@gmail.com>
-Date: Wed, 8 Apr 2015 22:15:54 +0200
-Subject: [PATCH] * use pthread_join instead of pthread_tryjoin_np
-
----
- src/zm_ffmpeg_camera.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
-index 9a4ea5f..5ae1e4a 100644
---- a/src/zm_ffmpeg_camera.cpp
-+++ b/src/zm_ffmpeg_camera.cpp
-@@ -120,7 +120,7 @@ int FfmpegCamera::Capture( Image &image )
-         void *retval = 0;
-         int ret;
-         
--        ret = pthread_tryjoin_np(mReopenThread, &retval);
-+        ret = pthread_join(mReopenThread, &retval);
-         if (ret != 0){
-             Error("Could not join reopen thread.");
-         }
--- 
-2.1.0
-
diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD
index 93050a88f6a..5a95bcbcc89 100644
--- a/main/zoneminder/APKBUILD
+++ b/main/zoneminder/APKBUILD
@@ -2,16 +2,18 @@
 # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=zoneminder
-pkgver=1.28.1
-pkgrel=3
+pkgver=1.29.0
+pkgrel=0
 pkgdesc="Video camera surveillance system"
 url="http://www.zoneminder.com/"
 arch="x86_64"
 license="GPL2+"
-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"
+depends="ffmpeg perl perl-archive-zip perl-date-manip perl-dbd-mysql
+         perl-dbi perl-device-serialport perl-libwww
+         perl-lwp-protocol-https perl-mail-tools perl-mime-lite
+         perl-mime-tools perl-php-serialization perl-sys-mmap
+         perl-time-hires php php-pdo_mysql php-sockets procps sudo
+         zip"
 makedepends="autoconf automake bash bzip2-dev 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"
@@ -20,7 +22,6 @@ subpackages=$pkgname-doc
 source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/archive/v${pkgver}.tar.gz
 	$pkgname.initd
 	musl-fix.patch
-	0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
 	zm-additional.sql"
 
 _builddir=$srcdir/ZoneMinder-$pkgver
@@ -82,18 +83,15 @@ package() {
 		"$pkgdir"/usr/share/zoneminder/db/zm_create.sql
 }
 
-md5sums="e8b27b818e074e5739b2bad8c57671a1  zoneminder-1.28.1.tar.gz
+md5sums="b4de8dd3fd86fc72e929e116e926d901  zoneminder-1.29.0.tar.gz
 96e34b42475ca3858ca257306e9dc8f5  zoneminder.initd
-d148970bda67b1e257bb3e1f48404f91  musl-fix.patch
-23b941874876a38c99584d2f57fd0428  0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+b95482fefbf22e8a89fb061805d05f03  musl-fix.patch
 775f1e13017e7cd1ad11bfe4383c2c2d  zm-additional.sql"
-sha256sums="e55fa6ce1fd6c27912cd1de67fca3f80fad579f330020a384dc82838704d11ba  zoneminder-1.28.1.tar.gz
+sha256sums="34e1f0d4b616e320e557f8e3fbe278d3ab70f30f6278cc153b44f2193c85ddbd  zoneminder-1.29.0.tar.gz
 d8548979a7f740d5f93e825f171113273da1ffa4a77c7ede19b146020931ba81  zoneminder.initd
-d5c1ce946c44e1979cc144f36930827da725919b9d53c1aee0e8749c4ff719d9  musl-fix.patch
-a1149a87136860dcf8b1c0014eb97876f988dae2298d2af75b6462e32e136d3c  0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+829551a83e62ff84fcba7a0f88105a0b6d15d89a66e1e98dc50098c30c48672f  musl-fix.patch
 0b514a0506425e4dbde7030e7feabadb8b1d723946e0409ea0cd5f45833fee1b  zm-additional.sql"
-sha512sums="0ae29870e12b7ad0852510a17439df49dd35245aa1486a5d0ff71e17dbf89840d08c65b4485c93739f1fbcc253599162e28e0382c28927aa84cd734248587ea1  zoneminder-1.28.1.tar.gz
+sha512sums="71a397df83c92de3b977832bb0a11791a3a756e7219e0cf3dc6c5c30fa0dd488ea00a925433669bf4e79873df980a852f2c805d1b7c9c8a06b6c39b9a16a2fda  zoneminder-1.29.0.tar.gz
 ac28d707f1573303c2f304c6edb10c9dd449b6987352de7a328607a6c78ca286dcf82b65ad13d47f2e98710d3a231d0cdb6fdd9a10c370064f380f24b61f1de7  zoneminder.initd
-b62533a7d025afb9852b9ac6b10b20f030a900f34b16808f655c8e558a2bcf62c1913e278d7a6c8c600d0e4844d846c8cec43a9daf78332da2c1e8816a65776f  musl-fix.patch
-81175d21d33171522a9db76e36f0d506cacf35c4db737517f5612431cff440826110aad57aec4d5a00664f92d0656f3ea237825f1ae33cf1b2b8850b9d061b47  0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch
+b2c4e31fd0a31f034be3029eab4f2943e07e95e64bb2d8eb38d93b790059d694a9a007e98b0f9b4c47ecfe91296bc21a3795b8a4aaf5b2a83071251456e533da  musl-fix.patch
 4b2e357110cb45a25953d06e0b6e70ff06642985b0607b58d1fd718f7e17cd256d46808a69f46bb6594557e38f2f2f847e2cda3137f38842b25eb2d4143efd0f  zm-additional.sql"
diff --git a/main/zoneminder/musl-fix.patch b/main/zoneminder/musl-fix.patch
index 72effe90a8c..fd48cd55c50 100644
--- a/main/zoneminder/musl-fix.patch
+++ b/main/zoneminder/musl-fix.patch
@@ -1,6 +1,6 @@
---- ZoneMinder-1.26.5/src/zm_comms.h
-+++ ZoneMinder-1.26.5.musl/src/zm_comms.h
-@@ -25,6 +25,8 @@
+--- ZoneMinder-1.29.0/src/zm_comms.h
++++ ZoneMinder-1.29.0.musl/src/zm_comms.h
+@@ -26,6 +26,8 @@
  #include <unistd.h>
  #include <netdb.h>
  #include <errno.h>
@@ -9,3 +9,26 @@
  #include <sys/un.h>
  
  #include <set>
+--- ZoneMinder-1.29.0/src/zm_logger.cpp
++++ ZoneMinder-1.29.0.musl/src/zm_logger.cpp
+@@ -33,8 +33,8 @@
+ #include <errno.h>
+ #ifdef __FreeBSD__
+ #include <sys/thr.h>
+-#include <libgen.h>
+ #endif
++#include <libgen.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+@@ -504,7 +504,9 @@
+         va_list         argPtr;
+         struct timeval  timeVal;
+ 
+-        const char * const file = basename(filepath);
++        char *s = strdup(filepath);
++        const char * const file = basename(s);
++        free(s);
+         
+         if ( level < PANIC || level > DEBUG9 )
+             Panic( "Invalid logger level %d", level );