CVS commit: pkgsrc/security/zoneminder

["Alexander Nasonov" <alnsn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   alnsn
Date:           Sat Sep  9 07:55:31 UTC 2017

Modified Files:
        pkgsrc/security/zoneminder: Makefile distinfo
Added Files:
        pkgsrc/security/zoneminder/patches: patch-src_zm__sdp.cpp

Log Message:
Add commit "Add IP6 address type to valid types for ConnInfo" to patches.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/security/zoneminder/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/zoneminder/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/zoneminder/patches/patch-src_zm__sdp.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/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.34 pkgsrc/security/zoneminder/Makefile:1.35
--- pkgsrc/security/zoneminder/Makefile:1.34    Wed Sep  6 09:03:04 2017
+++ pkgsrc/security/zoneminder/Makefile Sat Sep  9 07:55:31 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2017/09/06 09:03:04 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2017/09/09 07:55:31 alnsn Exp $
 
 PKGNAME=       ${DISTNAME:S/ZoneMinder-/zoneminder-/}
 DISTNAME=      ZoneMinder-1.28.1
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ZoneMinder/}
 GITHUB_PROJECT=        ZoneMinder

Index: pkgsrc/security/zoneminder/distinfo
diff -u pkgsrc/security/zoneminder/distinfo:1.9 pkgsrc/security/zoneminder/distinfo:1.10
--- pkgsrc/security/zoneminder/distinfo:1.9     Wed Feb 15 00:54:25 2017
+++ pkgsrc/security/zoneminder/distinfo Sat Sep  9 07:55:31 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2017/02/15 00:54:25 joerg Exp $
+$NetBSD: distinfo,v 1.10 2017/09/09 07:55:31 alnsn Exp $
 
 SHA1 (ZoneMinder-1.28.1.tar.gz) = 3e173ae1aac529b60d79a5fc668c107f0679d0a2
 RMD160 (ZoneMinder-1.28.1.tar.gz) = b3cc305656cb5b73d4ac0e21fe937c237467cdd1
@@ -10,6 +10,7 @@ SHA1 (patch-scripts_ZoneMinder_lib_ZoneM
 SHA1 (patch-scripts_zm_in) = 8f59085bb9293afa7aeb268000c75988e5371c66
 SHA1 (patch-src_Makefile_am) = 0f6571c9d5a3e688544f93d687d266e1b71f0f43
 SHA1 (patch-src_zm__monitor.cpp) = dcc3816686a6a7c375d4716d3663b4c922c90439
+SHA1 (patch-src_zm__sdp.cpp) = ed89bc14ae557281bb43baca9c90b78d801d8eb1
 SHA1 (patch-src_zm__thread.h) = 67dbd1e9c19df63fd120344cc8a36d663a724409
 SHA1 (patch-src_zm__timer.h) = 38080d08b5834e3dae713e81488944887ce5848b
 SHA1 (patch-src_zm__utils.cpp) = f6a109296146822014d57d39094390adcc5df760

Added files:

Index: pkgsrc/security/zoneminder/patches/patch-src_zm__sdp.cpp
diff -u /dev/null pkgsrc/security/zoneminder/patches/patch-src_zm__sdp.cpp:1.1
--- /dev/null   Sat Sep  9 07:55:32 2017
+++ pkgsrc/security/zoneminder/patches/patch-src_zm__sdp.cpp    Sat Sep  9 07:55:31 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_zm__sdp.cpp,v 1.1 2017/09/09 07:55:31 alnsn Exp $
+
+Commit f5ef721: Add IP6 address type to valid types for ConnInfo.
+
+--- src/zm_sdp.cpp.orig        2015-02-05 02:52:37.000000000 +0000
++++ src/zm_sdp.cpp
+@@ -112,7 +112,7 @@ SessionDescriptor::ConnInfo::ConnInfo( c
+     if ( mNetworkType != "IN" )
+         throw Exception( "Invalid SDP network type '"+mNetworkType+"' in connection info '"+connInfo+"'" );
+     mAddressType = tokens[1];
+-    if ( mAddressType != "IP4" )
++    if ( mAddressType != "IP4" && mAddressType != "IP6" )
+         throw Exception( "Invalid SDP address type '"+mAddressType+"' in connection info '"+connInfo+"'" );
+     StringVector addressTokens = split( tokens[2], "/" );
+     if ( addressTokens.size() < 1 )