CVS commit: pkgsrc/security/zoneminder

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 19 22:23:19 UTC 2019

Modified Files:
        pkgsrc/security/zoneminder: distinfo
        pkgsrc/security/zoneminder/patches: patch-src_zmf.cpp
Added Files:
        pkgsrc/security/zoneminder/patches: patch-src_zm__stream.cpp

Log Message:
Deal with bind vs std::bind conflict.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/zoneminder/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/zoneminder/patches/patch-src_zm__stream.cpp
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/zoneminder/distinfo
diff -u pkgsrc/security/zoneminder/distinfo:1.12 pkgsrc/security/zoneminder/distinfo:1.13
--- pkgsrc/security/zoneminder/distinfo:1.12    Sat Jul 14 15:03:57 2018
+++ pkgsrc/security/zoneminder/distinfo Thu Dec 19 22:23:19 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2018/07/14 15:03:57 gdt Exp $
+$NetBSD: distinfo,v 1.13 2019/12/19 22:23:19 joerg Exp $
 
 SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2
 RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1
@@ -13,6 +13,7 @@ SHA1 (patch-src_zm__event.cpp) = 5258e89
 SHA1 (patch-src_zm__monitor.cpp) = dcc3816686a6a7c375d4716d3663b4c922c90439
 SHA1 (patch-src_zm__rtp__source.cpp) = 5341938eefe5def49dc8f3e3b760d86cabd17772
 SHA1 (patch-src_zm__sdp.cpp) = ed89bc14ae557281bb43baca9c90b78d801d8eb1
+SHA1 (patch-src_zm__stream.cpp) = 64655550ff36576377cfdea918fe85253428e227
 SHA1 (patch-src_zm__thread.h) = 67dbd1e9c19df63fd120344cc8a36d663a724409
 SHA1 (patch-src_zm__timer.h) = 38080d08b5834e3dae713e81488944887ce5848b
 SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760
@@ -25,7 +26,7 @@ SHA1 (patch-src_zm_remote_camera_h) = 0d
 SHA1 (patch-src_zm_signal_cpp) = fa11938f55ccd50a1a9e949d6b58dd07773f2690
 SHA1 (patch-src_zm_thread_cpp) = c5f64697c3024c6c382f9ae2c5dbe9c21b529b6e
 SHA1 (patch-src_zmc_cpp) = d1046ddfad3a88bdd30501237834ec9e9fbc4c83
-SHA1 (patch-src_zmf.cpp) = a059b9ae068037c6f68c16dab861ed830dd1c7e2
+SHA1 (patch-src_zmf.cpp) = 162f84029cec11203de8216ff0802b65bdfdd714
 SHA1 (patch-src_zmu.cpp) = c83283c1ac38e7c39201f72099b9830d84566c41
 SHA1 (patch-web_Makefile.am) = ddb3815fa1b1799658034789302c8d3840f2b894
 SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6

Index: pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp
diff -u pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp:1.1 pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp:1.2
--- pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp:1.1    Wed Feb 15 00:54:25 2017
+++ pkgsrc/security/zoneminder/patches/patch-src_zmf.cpp        Thu Dec 19 22:23:19 2019
@@ -1,7 +1,19 @@
-$NetBSD: patch-src_zmf.cpp,v 1.1 2017/02/15 00:54:25 joerg Exp $
+$NetBSD: patch-src_zmf.cpp,v 1.2 2019/12/19 22:23:19 joerg Exp $
 
---- src/zmf.cpp.orig   2017-02-15 00:51:13.260940737 +0000
+bind can be found in namespace std too.
+Fix error handling.
+
+--- src/zmf.cpp.orig   2015-02-05 02:52:37.000000000 +0000
 +++ src/zmf.cpp
+@@ -59,7 +59,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 );
 @@ -293,7 +293,7 @@ int main( int argc, char *argv[] )
                Debug( 1, "Got image, writing to %s", path );
  

Added files:

Index: pkgsrc/security/zoneminder/patches/patch-src_zm__stream.cpp
diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__stream.cpp:1.1
--- /dev/null   Thu Dec 19 22:23:19 2019
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__stream.cpp Thu Dec 19 22:23:19 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zm__stream.cpp,v 1.1 2019/12/19 22:23:19 joerg Exp $
+
+bind can be found in namespace std too.
+
+--- src/zm_stream.cpp.orig     2019-12-19 14:24:09.345342211 +0000
++++ src/zm_stream.cpp
+@@ -297,7 +297,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)) < 0 )
++        if ( ::bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)) < 0 )
+         {
+             Fatal( "Can't bind: %s", strerror(errno) );
+         }