svn commit: r385408 - in head: . net/pjsip

[Guido Falsi]

Author: madpilot
Date: Mon May  4 14:32:15 2015
New Revision: 385408
URL: https://svnweb.freebsd.org/changeset/ports/385408

Log:
  Modify asterisk UPDATING entry to reflect the present situation.
  
  While here also modify misleading and stale comment in the net/pjsip
  port EXTSRTP option.
  
  Thanks to mat@ for making me notice these.

Modified:
  head/UPDATING
  head/net/pjsip/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon May  4 14:13:01 2015	(r385407)
+++ head/UPDATING	Mon May  4 14:32:15 2015	(r385408)
@@ -124,17 +124,25 @@ AUTHOR: ohauer at FreeBSD.org
   Due to conflicts between base OpenSSL and ports provided OpenSSL
   library, which is required by net/libsrtp, the srtp support has
   to be removed from the default asterisk13 port configuration,
-  otherwise a a not working binary would be generated.
+  otherwise a not working binary would be generated.
 
-  To get SRTP support working in the asterisk ports it is needed
-  to build all other required ports with WITH_OPENSSL_PORT=yes. For
-  asterisk13 it is also needed to enable the EXTSRTP option in the
-  pjsip port.
+  To get SRTP support working in the asterisk ports make sure all
+  dependencies are linked against the same SSL library implementation
+  to avoid runtime conflicts. On 10.1 everything will work fine
+  unless ports SSL libraries are explicitly installed. On older OS
+  versions(10.0 and earlier) you will need to compile all ports
+  with WITH_OPENSSL_PORT=yes.
+
+  To get working SRTP support in asterisk13 with the pjsip backend
+  it is also needed to enable the EXTSRTP option in the pjsip port.
 
   If the CURL option is enabled also make sure the ftp/curl port
-  is using one of the HEIMDAL_PORT or KRB5_PORT options, otherwise
-  the curl module will cause asterisk to fail on startup due to
-  mixing calls to OpenSSL from base and from ports.
+  is using a GSSAPI implementation linking to the same SSL
+  implementation the other ports are using (BASE or NONE if you're
+  using base OpenSSL, GSSAPI_HEIMDAL GSSAPI_MIT otherwise). If an
+  incompatible option is being used the curl module will cause
+  asterisk to fail on startup due to mixing calls to OpenSSL from
+  base and from ports.
 
 20150322:
   AFFECTS: Users of security/openssh-portable

Modified: head/net/pjsip/Makefile
==============================================================================
--- head/net/pjsip/Makefile	Mon May  4 14:13:01 2015	(r385407)
+++ head/net/pjsip/Makefile	Mon May  4 14:32:15 2015	(r385408)
@@ -40,7 +40,7 @@ SHARED_DESC=	Build shared libraries (oth
 SPEEXAEC_DESC=	Speex Acoustic Echo Canceller/AEC
 V4L_DESC=	Video4Linux2 support
 YUV_DESC=	Libyuv support
-EXTSRTP_DESC=	Use libsrtp port (needs all ports compiled with WITH_OPENSSL_PORT=yes)
+EXTSRTP_DESC=	Use libsrtp port (needed to get SRTP support in asterisk13 pjsip backend)
 
 OPTIONS_SUB=	yes