Wed Feb 15 00:54:25 2017 UTC ()
Fix error checks. Bump revision.


(joerg)
diff -r1.30 -r1.31 pkgsrc/security/zoneminder/Makefile
diff -r1.8 -r1.9 pkgsrc/security/zoneminder/distinfo
diff -r0 -r1.1 pkgsrc/security/zoneminder/patches/patch-src_zm__monitor.cpp
diff -r0 -r1.1 pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp
cvs diff -r1.30 -r1.31 pkgsrc/security/zoneminder/Makefile (expand / switch to unified diff)

--- pkgsrc/security/zoneminder/Makefile 2017/01/16 23:45:16 1.30
+++ pkgsrc/security/zoneminder/Makefile 2017/02/15 00:54:25 1.31
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2017/01/16 23:45:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2017/02/15 00:54:25 joerg Exp $
2 2
3PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/} 3PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/}
4DISTNAME= ZoneMinder-1.28.1 4DISTNAME= ZoneMinder-1.28.1
5PKGREVISION= 10 5PKGREVISION= 11
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/}
8GITHUB_PROJECT= ZoneMinder 8GITHUB_PROJECT= ZoneMinder
9GITHUB_TYPE= tag 9GITHUB_TYPE= tag
10GITHUB_TAG= v${PKGVERSION_NOREV} 10GITHUB_TAG= v${PKGVERSION_NOREV}
11 11
12MAINTAINER= dsainty@NetBSD.org 12MAINTAINER= dsainty@NetBSD.org
13HOMEPAGE= http://www.zoneminder.com/ 13HOMEPAGE= http://www.zoneminder.com/
14COMMENT= Video camera security and surveillance solution 14COMMENT= Video camera security and surveillance solution
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17# NetBSD tar: Invalid header, starting valid header search. 17# NetBSD tar: Invalid header, starting valid header search.
18EXTRACT_USING= gtar 18EXTRACT_USING= gtar
cvs diff -r1.8 -r1.9 pkgsrc/security/zoneminder/distinfo (expand / switch to unified diff)

--- pkgsrc/security/zoneminder/distinfo 2015/11/04 01:18:12 1.8
+++ pkgsrc/security/zoneminder/distinfo 2017/02/15 00:54:25 1.9
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1$NetBSD: distinfo,v 1.8 2015/11/04 01:18:12 agc Exp $ 1$NetBSD: distinfo,v 1.9 2017/02/15 00:54:25 joerg Exp $
2 2
3SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2 3SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2
4RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1 4RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1
5SHA512 (ZoneMinder-1.28.1.tar.gz) = 0ae29870e12b7ad0852510a17439df49dd35245aa1486a5d0ff71e17dbf89840d08c65b4485c93739f1fbcc253599162e28e0382c28927aa84cd734248587ea1 5SHA512 (ZoneMinder-1.28.1.tar.gz) = 0ae29870e12b7ad0852510a17439df49dd35245aa1486a5d0ff71e17dbf89840d08c65b4485c93739f1fbcc253599162e28e0382c28927aa84cd734248587ea1
6Size (ZoneMinder-1.28.1.tar.gz) = 3864811 bytes 6Size (ZoneMinder-1.28.1.tar.gz) = 3864811 bytes
7SHA1 (patch-Makefile_am) = ae6f2f3c6825a44be019ad5dc0b45929c85d4ba9 7SHA1 (patch-Makefile_am) = ae6f2f3c6825a44be019ad5dc0b45929c85d4ba9
8SHA1 (patch-configure_ac) = 110a7a10506ba931369904d777dec5cc2185f556 8SHA1 (patch-configure_ac) = 110a7a10506ba931369904d777dec5cc2185f556
9SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568 9SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568
10SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66 10SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66
11SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43 11SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43
 12SHA1 (patch-src_zm__monitor.cpp) = dcc3816686a6a7c375d4716d3663b4c922c90439
12SHA1 (patch-src_zm__thread.h) = 67dbd1e9c19df63fd120344cc8a36d663a724409 13SHA1 (patch-src_zm__thread.h) = 67dbd1e9c19df63fd120344cc8a36d663a724409
13SHA1 (patch-src_zm__timer.h) = 38080d08b5834e3dae713e81488944887ce5848b 14SHA1 (patch-src_zm__timer.h) = 38080d08b5834e3dae713e81488944887ce5848b
14SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760 15SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
15SHA1 (patch-src_zm__utils.h) = dbda8ba527f08b0337f6d2afa155ce4adc733e1e 16SHA1 (patch-src_zm__utils.h) = dbda8ba527f08b0337f6d2afa155ce4adc733e1e
16SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7 17SHA1 (patch-src_zm_comms_cpp) = d40932a3d0ae4375a649f200d973995d56aa71c7
17SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e 18SHA1 (patch-src_zm_comms_h) = baeb73040ff3ba862f23ad6301de7daba182456e
18SHA1 (patch-src_zm_ffmpeg_camera_cpp) = 6ead5f9afbe984aab14fee337093fd0269c6e9d8 19SHA1 (patch-src_zm_ffmpeg_camera_cpp) = 6ead5f9afbe984aab14fee337093fd0269c6e9d8
19SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb 20SHA1 (patch-src_zm_logger_cpp) = 3b0373e9d648d25ef4e3e09429199f654f876ccb
20SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d 21SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d
21SHA1 (patch-src_zm_signal_cpp) = fa11938f55ccd50a1a9e949d6b58dd07773f2690 22SHA1 (patch-src_zm_signal_cpp) = fa11938f55ccd50a1a9e949d6b58dd07773f2690
22SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e 23SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e
23SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83 24SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83
 25SHA1 (patch-src_zmf.cpp) = a059b9ae068037c6f68c16dab861ed830dd1c7e2
24SHA1 (patch-web_Makefile.am) = ddb3815fa1b1799658034789302c8d3840f2b894 26SHA1 (patch-web_Makefile.am) = ddb3815fa1b1799658034789302c8d3840f2b894
25SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6 27SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6
File Added: pkgsrc/security/zoneminder/patches/patch-src_zm__monitor.cpp
$NetBSD: patch-src_zm__monitor.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $

--- src/zm_monitor.cpp.orig	2017-02-15 00:50:20.875646245 +0000
+++ src/zm_monitor.cpp
@@ -149,7 +149,7 @@ bool Monitor::MonitorLink::connect()
             return( false );
         }
         mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-        if ( mem_ptr < 0 )
+        if ( mem_ptr == (void *)-1 )
         {
             Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
             connected = false;
@@ -534,7 +534,7 @@ bool Monitor::connect() {
         exit( -1 );
     }
     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-    if ( mem_ptr < 0 )
+    if ( mem_ptr == (void *)-1 )
     {
         Error( "Can't shmat: %s", strerror(errno));
         exit( -1 );
File Added: pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp
$NetBSD: patch-src_zmf.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $

--- src/zmf.cpp.orig	2017-02-15 00:51:13.260940737 +0000
+++ src/zmf.cpp
@@ -293,7 +293,7 @@ int main( int argc, char *argv[] )
 		Debug( 1, "Got image, writing to %s", path );
 
 		FILE *fd = 0;
-		if ( (fd = fopen( path, "w" )) < 0 )
+		if ( (fd = fopen( path, "w" )) == 0 )
 		{
 			Error( "Can't fopen '%s': %s", path, strerror(errno) );
 			exit( -1 );