Attachment #179666 for bug #216627

Lines 3-9 Link Here

(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/Makefile (-2 / +5 lines)
3	PORTNAME= zoneminder	3	PORTNAME= zoneminder
4	PORTVERSION= 1.30.0	4	PORTVERSION= 1.30.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8		8
9	MAINTAINER= bsd@abinet.ru	9	MAINTAINER= bsd@abinet.ru
Lines 11-16 Link Here
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
		14	CONFLICTS= zoneminder-h264
		15
14	ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \	16	ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \
15	p5-DBD-mysql>=0:databases/p5-DBD-mysql \	17	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
16	p5-Date-Manip>=0:devel/p5-Date-Manip \	18	p5-Date-Manip>=0:devel/p5-Date-Manip \
Lines 27-32 Link Here
27	BUILD_DEPENDS= ${ZM_DEPENDS}	29	BUILD_DEPENDS= ${ZM_DEPENDS}
28	RUN_DEPENDS= ${ZM_DEPENDS} \	30	RUN_DEPENDS= ${ZM_DEPENDS} \
29	sudo:security/sudo \	31	sudo:security/sudo \
		32	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
30	zip:archivers/zip	33	zip:archivers/zip
31		34
32	USE_GITHUB= yes	35	USE_GITHUB= yes
Lines 35-41 Link Here
35		38
36	USES= cmake jpeg mysql perl5 php shebangfix ssl	39	USES= cmake jpeg mysql perl5 php shebangfix ssl
37	USE_RC_SUBR= zoneminder	40	USE_RC_SUBR= zoneminder
38	USE_PHP= json pdo_mysql session gd sockets	41	USE_PHP= json pdo_mysql session gd sockets ctype
39		42
40	ONLY_FOR_ARCHS= amd64 i386	43	ONLY_FOR_ARCHS= amd64 i386
41		44




--- src/zm_monitor.cpp.orig	2016-07-28 01:45:26 UTC
+++ src/zm_monitor.cpp
@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect()
       return( false );
     }
     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-    if ( mem_ptr < 0 )
+    if ( mem_ptr < (void *)0 )
     {
       Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
       connected = false;
@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect()
     connected = false;
 
 #if ZM_MEM_MAPPED
-    if ( mem_ptr > 0 )
+    if ( mem_ptr > (void *)0 )
     {
       msync( mem_ptr, mem_size, MS_ASYNC );
       munmap( mem_ptr, mem_size );
@@ -558,7 +558,7 @@ bool Monitor::connect() {
     exit( -1 );
   }
   mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-  if ( mem_ptr < 0 )
+  if ( mem_ptr < (void *)0 )
   {
     Error( "Can't shmat: %s", strerror(errno));
     exit( -1 );

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zmf.cpp (+11 lines)
	1	--- src/zmf.cpp.orig 2016-07-28 01:45:26 UTC
	2	+++ src/zmf.cpp
	3	@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
	4	Debug( 1, "Got image, writing to %s", path );
	5
	6	FILE *fd = 0;
	7	- if ( (fd = fopen( path, "w" )) < 0 )
	8	+ if ( (fd = fopen( path, "w" )) == NULL )
	9	{
	10	Error( "Can't fopen '%s': %s", path, strerror(errno) );
	11	exit( -1 );

Return to bug 216627

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zm__monitor.cpp (+29 lines)
	1	--- src/zm_monitor.cpp.orig 2016-07-28 01:45:26 UTC
	2	+++ src/zm_monitor.cpp
	3	@@ -160,7 +160,7 @@ bool Monitor::MonitorLink::connect()
	4	return( false );
	5	}
	6	mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
	7	- if ( mem_ptr < 0 )
	8	+ if ( mem_ptr < (void *)0 )
	9	{
	10	Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
	11	connected = false;
	12	@@ -194,7 +194,7 @@ bool Monitor::MonitorLink::disconnect()
	13	connected = false;
	14
	15	#if ZM_MEM_MAPPED
	16	- if ( mem_ptr > 0 )
	17	+ if ( mem_ptr > (void *)0 )
	18	{
	19	msync( mem_ptr, mem_size, MS_ASYNC );
	20	munmap( mem_ptr, mem_size );
	21	@@ -558,7 +558,7 @@ bool Monitor::connect() {
	22	exit( -1 );
	23	}
	24	mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
	25	- if ( mem_ptr < 0 )
	26	+ if ( mem_ptr < (void *)0 )
	27	{
	28	Error( "Can't shmat: %s", strerror(errno));
	29	exit( -1 );