diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2018-07-27 18:34:37 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2018-07-27 18:34:37 +0000 |
| commit | a52109fe7d3735fca1c5772db53f2a79cada7988 (patch) | |
| tree | ac99d6fe64eab9bdf4ada001d8524012f1b7a61e /multimedia/zoneminder | |
| parent | 3e1810b9870098dc43b29f1ecfcdae086ec19882 (diff) | |
| download | ports-a52109fe7d3735fca1c5772db53f2a79cada7988.tar.gz ports-a52109fe7d3735fca1c5772db53f2a79cada7988.zip | |
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
Notes
Notes:
svn path=/head/; revision=475455
Diffstat (limited to 'multimedia/zoneminder')
| -rw-r--r-- | multimedia/zoneminder/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/zoneminder/files/README.FreeBSD | 1 | ||||
| -rw-r--r-- | multimedia/zoneminder/files/patch-src_zm__stream.cpp | 11 | ||||
| -rw-r--r-- | multimedia/zoneminder/files/patch-src_zmf.cpp | 11 |
4 files changed, 23 insertions, 2 deletions
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 6561171bf80c..58e67c838c68 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -2,7 +2,7 @@ PORTNAME= zoneminder PORTVERSION= 1.30.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru diff --git a/multimedia/zoneminder/files/README.FreeBSD b/multimedia/zoneminder/files/README.FreeBSD index 97ab58fdb0a8..0a4c888a2608 100644 --- a/multimedia/zoneminder/files/README.FreeBSD +++ b/multimedia/zoneminder/files/README.FreeBSD @@ -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 diff --git a/multimedia/zoneminder/files/patch-src_zm__stream.cpp b/multimedia/zoneminder/files/patch-src_zm__stream.cpp new file mode 100644 index 000000000000..b36333a57371 --- /dev/null +++ b/multimedia/zoneminder/files/patch-src_zm__stream.cpp @@ -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) ); + } diff --git a/multimedia/zoneminder/files/patch-src_zmf.cpp b/multimedia/zoneminder/files/patch-src_zmf.cpp index e2b736ba06d3..874c1a595348 100644 --- a/multimedia/zoneminder/files/patch-src_zmf.cpp +++ b/multimedia/zoneminder/files/patch-src_zmf.cpp @@ -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 ); |