svn commit: r475455 - in head/multimedia: zoneminder zoneminder-h264 zoneminder-h264/files zoneminder/files
Alexander Leidinger
netchild at FreeBSD.org
Fri Jul 27 18:34:40 UTC 2018
Author: netchild
Date: Fri Jul 27 18:34:37 2018
New Revision: 475455
URL: https://svnweb.freebsd.org/changeset/ports/475455
Log:
Improve zoneminder ports:
- add patch to make it compile with a recent clang (from -current)
- add missing fcgiwrap config option to the FreeBSD readme
- sync pkg-descr and highlight difference between the ports in pkg-descr and COMMENT
Approved by: maintainer
Added:
head/multimedia/zoneminder-h264/files/patch-src_zm__stream.cpp (contents, props changed)
head/multimedia/zoneminder/files/patch-src_zm__stream.cpp (contents, props changed)
Modified:
head/multimedia/zoneminder-h264/Makefile
head/multimedia/zoneminder-h264/files/README.FreeBSD
head/multimedia/zoneminder-h264/files/patch-src_zmf.cpp
head/multimedia/zoneminder-h264/pkg-descr
head/multimedia/zoneminder/Makefile
head/multimedia/zoneminder/files/README.FreeBSD
head/multimedia/zoneminder/files/patch-src_zmf.cpp
Modified: head/multimedia/zoneminder-h264/Makefile
==============================================================================
--- head/multimedia/zoneminder-h264/Makefile Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder-h264/Makefile Fri Jul 27 18:34:37 2018 (r475455)
@@ -2,11 +2,11 @@
PORTNAME= zoneminder-h264
PORTVERSION= 1.30.20170222
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MAINTAINER= bsd at abinet.ru
-COMMENT= Complete security camera solution, fully web based with image analysis
+COMMENT= Complete security camera solution, fully web based with image analysis, experimental h264 version
LICENSE= GPLv2
Modified: head/multimedia/zoneminder-h264/files/README.FreeBSD
==============================================================================
--- head/multimedia/zoneminder-h264/files/README.FreeBSD Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder-h264/files/README.FreeBSD Fri Jul 27 18:34:37 2018 (r475455)
@@ -82,6 +82,7 @@ the same server.
Enable and start FcgiWrap
sysrc fcgiwrap_enable="YES"
sysrc fcgiwrap_user="www"
+ sysrc fcgiwrap_socket_owner="www"
sysrc fcgiwrap_flags="-c 4"
1.4 PHP is installed as a dependency to ZoneMinder. However, you should
Added: head/multimedia/zoneminder-h264/files/patch-src_zm__stream.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/zoneminder-h264/files/patch-src_zm__stream.cpp Fri Jul 27 18:34:37 2018 (r475455)
@@ -0,0 +1,11 @@
+--- src/zm_stream.cpp.orig 2017-05-09 14:54:48 UTC
++++ src/zm_stream.cpp
+@@ -332,7 +332,7 @@ void StreamBase::openComms()
+
+ strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
+ loc_addr.sun_family = AF_UNIX;
+- if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
++ if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
+ {
+ Fatal( "Can't bind: %s", strerror(errno) );
+ }
Modified: head/multimedia/zoneminder-h264/files/patch-src_zmf.cpp
==============================================================================
--- head/multimedia/zoneminder-h264/files/patch-src_zmf.cpp Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder-h264/files/patch-src_zmf.cpp Fri Jul 27 18:34:37 2018 (r475455)
@@ -1,5 +1,14 @@
---- src/zmf.cpp.orig 2016-11-03 20:26:18 UTC
+--- src/zmf.cpp.orig 2017-05-09 14:54:48 UTC
+++ src/zmf.cpp
+@@ -92,7 +92,7 @@ int OpenSocket( int monitor_id )
+ strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
+ addr.sun_family = AF_UNIX;
+
+- if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
++ if ( ::bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+ {
+ Error( "Can't bind: %s", strerror(errno) );
+ exit( -1 );
@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
Debug( 1, "Got image, writing to %s", path );
Modified: head/multimedia/zoneminder-h264/pkg-descr
==============================================================================
--- head/multimedia/zoneminder-h264/pkg-descr Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder-h264/pkg-descr Fri Jul 27 18:34:37 2018 (r475455)
@@ -1,5 +1,5 @@
-Zoneminder is an all-in-one GPL'd security and surveillance camera
-solution. Fully web-based system for viewing and analyzing security
-camera feeds. This version has H.264 support.
+Zoneminder is an all-in-one GPL'd security and surveillance camera solution.
+Fully web-based system for viewing and analyzing security camera feeds.
+This is an experimental version which has H.264 support.
WWW: http://www.zoneminder.com/
Modified: head/multimedia/zoneminder/Makefile
==============================================================================
--- head/multimedia/zoneminder/Makefile Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder/Makefile Fri Jul 27 18:34:37 2018 (r475455)
@@ -2,7 +2,7 @@
PORTNAME= zoneminder
PORTVERSION= 1.30.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
MAINTAINER= bsd at abinet.ru
Modified: head/multimedia/zoneminder/files/README.FreeBSD
==============================================================================
--- head/multimedia/zoneminder/files/README.FreeBSD Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder/files/README.FreeBSD Fri Jul 27 18:34:37 2018 (r475455)
@@ -82,6 +82,7 @@ the same server.
Enable and start FcgiWrap
sysrc fcgiwrap_enable="YES"
sysrc fcgiwrap_user="www"
+ sysrc fcgiwrap_socket_owner="www"
sysrc fcgiwrap_flags="-c 4"
1.4 PHP is installed as a dependency to ZoneMinder. However, you should
Added: head/multimedia/zoneminder/files/patch-src_zm__stream.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/zoneminder/files/patch-src_zm__stream.cpp Fri Jul 27 18:34:37 2018 (r475455)
@@ -0,0 +1,11 @@
+--- src/zm_stream.cpp.orig 2017-05-09 14:54:48 UTC
++++ src/zm_stream.cpp
+@@ -332,7 +332,7 @@ void StreamBase::openComms()
+
+ strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
+ loc_addr.sun_family = AF_UNIX;
+- if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
++ if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1 ) < 0 )
+ {
+ Fatal( "Can't bind: %s", strerror(errno) );
+ }
Modified: head/multimedia/zoneminder/files/patch-src_zmf.cpp
==============================================================================
--- head/multimedia/zoneminder/files/patch-src_zmf.cpp Fri Jul 27 18:31:16 2018 (r475454)
+++ head/multimedia/zoneminder/files/patch-src_zmf.cpp Fri Jul 27 18:34:37 2018 (r475455)
@@ -1,5 +1,14 @@
---- src/zmf.cpp.orig 2016-07-28 01:45:26 UTC
+--- src/zmf.cpp.orig 2017-05-09 14:54:48 UTC
+++ src/zmf.cpp
+@@ -92,7 +92,7 @@ int OpenSocket( int monitor_id )
+ strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
+ addr.sun_family = AF_UNIX;
+
+- if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
++ if ( ::bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+ {
+ Error( "Can't bind: %s", strerror(errno) );
+ exit( -1 );
@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
Debug( 1, "Got image, writing to %s", path );
More information about the svn-ports-head
mailing list