diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-06 07:15:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:15 +0000 |
| commit | 6b09c7ad258b3d004d6255f5b0c9070ebbf25c8c (patch) | |
| tree | 3ba7881eacddcb503c9557473e88b9d5e29031a0 /community/zoneminder | |
| parent | f51f29175b118a9242ab8f52e3963dd7e7be9c51 (diff) | |
| download | aports-6b09c7ad258b3d004d6255f5b0c9070ebbf25c8c.tar.bz2 aports-6b09c7ad258b3d004d6255f5b0c9070ebbf25c8c.tar.xz | |
community/zoneminder: upgrade to 1.32.2
Diffstat (limited to 'community/zoneminder')
| -rw-r--r-- | community/zoneminder/APKBUILD | 14 | ||||
| -rw-r--r-- | community/zoneminder/musl-fix.patch | 42 |
2 files changed, 6 insertions, 50 deletions
diff --git a/community/zoneminder/APKBUILD b/community/zoneminder/APKBUILD index 411c97f3a7..5be9e6c983 100644 --- a/community/zoneminder/APKBUILD +++ b/community/zoneminder/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=zoneminder -pkgver=1.30.4 -pkgrel=6 +pkgver=1.32.2 +pkgrel=0 _crud=c3976f1478c681b0bbc132ec3a3e82c3984eeed5 pkgdesc="Video camera surveillance system" url="https://www.zoneminder.com/" @@ -11,7 +11,7 @@ arch="x86_64" license="GPL-2.0-or-later" _php=php5 depends="bash ffmpeg perl perl-archive-zip perl-date-manip perl-dbd-mysql - perl-dbi perl-device-serialport perl-libwww + perl-dbi perl-device-serialport perl-libwww linux-headers perl-lwp-protocol-https perl-mailtools perl-mime-lite perl-mime-tools perl-php-serialization perl-sys-mmap perl-time-hires $_php $_php-apcu $_php-ctype $_php-gd $_php-pdo_mysql @@ -23,7 +23,7 @@ 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" + " # secfixes: # 1.30.2-r0: @@ -51,7 +51,6 @@ prepare() { utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no utils/zmeditconfigdata.sh ZM_LOG_LEVEL_FILE 0 utils/zmeditconfigdata.sh ZM_LOG_LEVEL_SYSLOG -5 - utils/zmeditconfigdata.sh ZM_PATH_ZMS /cgi-bin/zm/nph-zms } build() { @@ -87,7 +86,6 @@ package() { ln -sf /usr/share/webapps/zoneminder/cgi-bin \ "$pkgdir"/var/www/localhost/cgi-bin/zm } -sha512sums="b55b2541bcaba08f89b95fdfb06b6cf3fc7b462b1f3fac2bb3fd6e8ee890735d4fac343c7625cf59b22fd25c19585900050cb5305b35aa8f6557421be09450b3 zoneminder-1.30.4.tar.gz +sha512sums="bfca23aeadcbcdca98243c11c792f105e7a07254b6b9bf38fc73091b00e0859ce81737702df6dce186b1537e850ce78f568e48c96c0be973c9c997ceb2638c72 zoneminder-1.32.2.tar.gz f665741a1fbcca5e48ab8eddaa4686b23426aed7b22d68fdfa6c951fb6ce7dbbcfce5f1807e30a18fbc8fd4e3a8028a5687db17a070d05301d93d49f67952e44 crud-c3976f1478c681b0bbc132ec3a3e82c3984eeed5.tar.gz -ae02daacc41e2b32ca0da5cf407c05447a5ce8e0cf035421111856511dc1075da75d9da32f8f013940c631215a62f3133860b35225bda405230b94a6b097c865 zoneminder.initd -34a18a6db3ebc5bfba0b40894e85112ad50d0caedf4e69f23ec98dedcba03fe223d5f3dc1ad3c76269b9cb48d60464e1674e0571a52d840f95c3adeac42d601f musl-fix.patch" +ae02daacc41e2b32ca0da5cf407c05447a5ce8e0cf035421111856511dc1075da75d9da32f8f013940c631215a62f3133860b35225bda405230b94a6b097c865 zoneminder.initd" diff --git a/community/zoneminder/musl-fix.patch b/community/zoneminder/musl-fix.patch deleted file mode 100644 index 13a1609755..0000000000 --- a/community/zoneminder/musl-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ZoneMinder-1.30.0/src/zm_comms.h -+++ ZoneMinder-1.30.0.musl/src/zm_comms.h -@@ -26,6 +26,8 @@ - #include <unistd.h> - #include <netdb.h> - #include <errno.h> -+#include <string.h> -+#include <sys/uio.h> - #include <sys/un.h> - - #include <set> ---- ZoneMinder-1.30.0/src/zm_logger.cpp -+++ ZoneMinder-1.30.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,8 @@ - va_list argPtr; - struct timeval timeVal; - -- const char * const file = basename(filepath); -+ char *path = strdup(filepath); -+ const char *file = basename(path); - - if ( level < PANIC || level > DEBUG9 ) - Panic( "Invalid logger level %d", level ); -@@ -617,6 +618,8 @@ - //priority |= LOG_DAEMON; - syslog( priority, "%s [%s]", classString, syslogStart ); - } -+ -+ free(path); - - if ( level <= FATAL ) - { |