diff options
| -rw-r--r-- | security/zoneminder/Makefile | 4 | ||||
| -rw-r--r-- | security/zoneminder/distinfo | 4 | ||||
| -rw-r--r-- | security/zoneminder/patches/patch-src_zm__monitor.cpp | 22 | ||||
| -rw-r--r-- | security/zoneminder/patches/patch-src_zmf.cpp | 13 |
4 files changed, 40 insertions, 3 deletions
diff --git a/security/zoneminder/Makefile b/security/zoneminder/Makefile index d1eaf043c0d..ea5dffd5b77 100644 --- a/security/zoneminder/Makefile +++ b/security/zoneminder/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2017/01/16 23:45:16 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2017/02/15 00:54:25 joerg Exp $ PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/} DISTNAME= ZoneMinder-1.28.1 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/} GITHUB_PROJECT= ZoneMinder diff --git a/security/zoneminder/distinfo b/security/zoneminder/distinfo index 6eae2f8893e..85a08046377 100644 --- a/security/zoneminder/distinfo +++ b/security/zoneminder/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 01:18:12 agc Exp $ +$NetBSD: distinfo,v 1.9 2017/02/15 00:54:25 joerg Exp $ SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2 RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1 @@ -9,6 +9,7 @@ SHA1 (patch-configure_ac) = 110a7a10506ba931369904d777dec5cc2185f556 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = 841d897662958698a4dfcb95dd5bc43bb5fed568 SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66 SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43 +SHA1 (patch-src_zm__monitor.cpp) = dcc3816686a6a7c375d4716d3663b4c922c90439 SHA1 (patch-src_zm__thread.h) = 67dbd1e9c19df63fd120344cc8a36d663a724409 SHA1 (patch-src_zm__timer.h) = 38080d08b5834e3dae713e81488944887ce5848b SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760 @@ -21,5 +22,6 @@ SHA1 (patch-src_zm_remote_camera_h) = 0d4bd7dae0188df7e463586250ac2ed530230f3d 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-web_Makefile.am) = ddb3815fa1b1799658034789302c8d3840f2b894 SHA1 (patch-web_ajax_stream_php) = e8f811e63bedec03345b74db72c3d8014b3cc7f6 diff --git a/security/zoneminder/patches/patch-src_zm__monitor.cpp b/security/zoneminder/patches/patch-src_zm__monitor.cpp new file mode 100644 index 00000000000..5c77a884e68 --- /dev/null +++ b/security/zoneminder/patches/patch-src_zm__monitor.cpp @@ -0,0 +1,22 @@ +$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 ); diff --git a/security/zoneminder/patches/patch-src_zmf.cpp b/security/zoneminder/patches/patch-src_zmf.cpp new file mode 100644 index 00000000000..752ada9fd3e --- /dev/null +++ b/security/zoneminder/patches/patch-src_zmf.cpp @@ -0,0 +1,13 @@ +$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 ); |