Index: head/net/asterisk13/Makefile =================================================================== --- head/net/asterisk13/Makefile (revision 441291) +++ head/net/asterisk13/Makefile (revision 441292) @@ -1,302 +1,301 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.15.0 -PORTREVISION= 1 +PORTVERSION= 13.15.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ asterisk/old-releases/ \ sounds/releases/:g729 PKGNAMESUFFIX= 13 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 armv6 USES= bison cpe gmake iconv libedit localbase \ shebangfix sqlite ssl ncurses USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ --with-ilbc=internal \ --with-crypto=${OPENSSLBASE} \ --with-ssl=${OPENSSLBASE} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OSVERSION=${OSVERSION} \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" \ ASTLDFLAGS="${LDFLAGS}" MAKE_ARGS+= NOISY_BUILD=yes \ ASTDATADIR=${DATADIR} CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-11* OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \ MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \ SPANDSP SRTP SYSINFO XMPP OPTIONS_DEFAULT= CURL FREETDS GSM LUA MP3PLAYER NEWT ODBC MYSQL PGSQL PJSIP \ PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 VORBIS OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI BASE XMPP OPTIONS_DEFAULT_amd64= DAHDI BASE XMPP OPTIONS_DEFAULT_sparc64= DAHDI GCC XMPP OPTIONS_DEFAULT_powerpc= GCC XMPP OPTIONS_DEFAULT_armv6= BASE OPTIONS_GROUP= CODECS OPTIONS_GROUP_CODECS= GSM NEWG711 SPEEX VORBIS CODECS_DESC= Encoder/Decoder (Codec) Support OPTIONS_SINGLE= COMPILER OPTIONS_SINGLE_COMPILER= BASE GCC COMPILER_DESC= Compiler to use OPTIONS_GROUP+= DATABASE OPTIONS_GROUP_DATABASE= MYSQL ODBC PGSQL SQLITE2 DATABASE_DESC= Database Support OPTIONS_MULTI= MENU OPTIONS_MULTI_MENU= NCURSES NEWT MENU_DESC= Menuselect Interface Backend NEWT_DESC= Newt User Interface OPTIONS_GROUP+= SOUNDS OPTIONS_GROUP_SOUNDS= G729 SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files G729_DESC= Install G.729 format sounds ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz ASTERISK_MOH_G729_SOUNDS= asterisk-moh-opsound-g729-2.03.tar.gz G729_DISTFILES= ${ASTERISK_CORE_G729_SOUNDS}:g729 \ ${ASTERISK_MOH_G729_SOUNDS}:g729 ASTVERSION_DESC?= Install astversion (requires bash) BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo BASE_DESC= Use base compiler (experimental) DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support MP3PLAYER_DESC= Install MP3 Player for Music-On-Hold (mpg123) NEWG711_DESC?= New G711 Codec OOH323_DESC?= ooh323 support PJSIP_DESC?= Build the PJSIP based SIP channel SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes ASTVERSION_RUN_DEPENDS= bash:shells/bash BACKTRACE_CONFIGURE_WITH= execinfo BACKTRACE_USES= execinfo CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ libopenr2.so:misc/openr2 \ libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:databases/freetds GCC_USE= GCC=yes GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USES= mysql MP3PLAYER_RUN_DEPENDS= mpg123:audio/mpg123 NCURSES_USES= ncurses NEWT_LIB_DEPENDS= libnewt.so:devel/newt ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC \ libltdl.so:devel/libltdl OOH323_CPPFLAGS= -I${LOCALBASE}/include/openh323 OOH323_LIB_DEPENDS= libpt_r.so:devel/pwlib \ libh323_r.so:net/openh323 OOH323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323 PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject PJSIP_USES= pkgconfig PJSIP_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ libpkg.so:ports-mgmt/pkg SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:comms/spandsp \ libtiff.so:graphics/tiff SPEEX_CONFIGURE_WITH= speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SQLITE2_CONFIGURE_WITH= sqlite SQLITE2_LIB_DEPENDS= libsqlite.so:databases/sqlite2 SRTP_CONFIGURE_WITH= srtp SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libpj.so:net/pjsip-extsrtp .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libpj.so:net/pjsip .elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP} LIB_DEPENDS+= libsrtp.so:net/libsrtp .endif .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ ASTERISK_GROUP=${ASTERISK_GROUP} \ VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete post-extract-G729-on: ${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds ${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample post-patch-SYSINFO-on: @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile post-patch-SYSINFO-off: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${USER_MAKEOPTS_FILE} ${WRKSRC}/menuselect.makeopts .endif post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts post-configure-MYSQL-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts post-configure-OOH323-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts post-configure-NEWG711-on: @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts post-configure-OPTIMIZED_CFLAGS-off: @cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-* ${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ ${ECHO} "@owner" >> ${TMPPLIST} && \ ${ECHO} "@group" >> ${TMPPLIST}); post-install-ASTVERSION-off: @${RM} ${STAGEDIR}${PREFIX}/sbin/astversion .include Index: head/net/asterisk13/distinfo =================================================================== --- head/net/asterisk13/distinfo (revision 441291) +++ head/net/asterisk13/distinfo (revision 441292) @@ -1,7 +1,7 @@ -TIMESTAMP = 1491584566 -SHA256 (asterisk-13.15.0.tar.gz) = 8b8a55557d9c882f9b68f61b62f5f8af5c9ad68b6da6a1aa3506fa1894fb5844 -SIZE (asterisk-13.15.0.tar.gz) = 32851716 +TIMESTAMP = 1495231925 +SHA256 (asterisk-13.15.1.tar.gz) = 03d29bcb0e1791809fb21fa80c3a7e8ab2f521e1f4397f625d1fe982f64186e2 +SIZE (asterisk-13.15.1.tar.gz) = 32828857 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000 Index: head/net/pjsip/Makefile =================================================================== --- head/net/pjsip/Makefile (revision 441291) +++ head/net/pjsip/Makefile (revision 441292) @@ -1,111 +1,112 @@ # $FreeBSD$ PORTNAME= pjsip PORTVERSION= 2.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Multimedia communication library written in C language LICENSE= GPLv2+ LIB_DEPENDS= libportaudio.so:audio/portaudio CONFLICTS= pjsip-extsrtp-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-external-pa \ --disable-silk USES= gmake localbase pathfix ssl tar:bz2 PATHFIX_MAKEFILEIN= Makefile USE_LDCONFIG= yes PLIST_SUB= CONFIGURE_TARGET="${CONFIGURE_TARGET}" MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 \ OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \ SHARED SPEEX SPEEXAEC V4L SOUND VIDEO AMR EXTSRTP WEBRTC OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC G711_DESC= G.711 codec support G722_DESC= G.722 codec support G7221_DESC= G.722.1 codec support ILBC_DESC= iLBC codec support L16_DESC= Linear/L16 codec support OPENH264_DESC= OpenH264 support PJSUA_DESC= Command line SIP agent RESAMPLE_DESC= Enable resampling implementations RESAMPLEDLL_DESC= Build libresample as shared library SHARED_DESC= Build shared libraries (other ports may depend on this) SPEEXAEC_DESC= Speex Acoustic Echo Canceller/AEC V4L_DESC= Video4Linux2 support YUV_DESC= Libyuv support EXTSRTP_DESC= Use libsrtp port (needed to get SRTP support in asterisk13 pjsip backend) WEBRTC_DESC= Build linwebrtc OPTIONS_SUB= yes DEBUG_CFLAGS= -DNDEBUG=0 DEBUG_CFLAGS_OFF= -DNDEBUG=1 FFMPEG_CONFIGURE_ENABLE= ffmpeg FFMPEG_LIB_DEPENDS= libswresample.so:multimedia/ffmpeg G711_CONFIGURE_ENABLE= g711-codec G722_CONFIGURE_ENABLE= g722-codec G7221_CONFIGURE_ENABLE= g7221-codec GSM_CONFIGURE_ENABLE= gsm-codec GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ON= --with-external-gsm ILBC_CONFIGURE_ENABLE= ilbc-codec IPV6_CFLAGS= -DPJ_HAS_IPV6=1 IPV6_CFLAGS_OFF= -DPJ_HAS_IPV6=1 L16_CONFIGURE_ENABLE= l16-codec OPENH264_CONFIGURE_ENABLE= openh264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 RESAMPLE_CONFIGURE_ENABLE= resample RESAMPLEDLL_CONFIGURE_ENABLE= resample-dll SAMPLERATE_CONFIGURE_ENABLE= libsamplerate SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SDL_CONFIGURE_ENABLE= sdl SDL_USE= SDL=sdl SHARED_CONFIGURE_ENABLE= shared SPEEX_CONFIGURE_ENABLE= speex-codec SPEEX_CONFIGURE_ON= --with-external-speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp SPEEXAEC_CONFIGURE_ENABLE= speex-aec V4L_CONFIGURE_ENABLE= v4l2 V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l IPV6_CFLAGS= "-DPJ_HAS_IPV6=1" SOUND_CONFIGURE_ENABLE= sound VIDEO_CONFIGURE_ENABLE= video AMR_CONFIGURE_WITH= opencore-amr AMR_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr \ libvo-amrwbenc.so:audio/vo-amrwbenc EXTSRTP_CONFIGURE_WITH= external-srtp EXTSRTP_LIB_DEPENDS= libsrtp.so:net/libsrtp WEBRTC_CONFIGURE_OFF= --disable-libwebrtc post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/pkgconfig.py @${REINPLACE_CMD} -e 's/$$(APP_LDFLAGS) \{0,1\}//' \ -e 's/$$(OS_LDFLAGS)/$$(APP_LDFLAGS) &/' \ ${WRKSRC}/*/build/Makefile @${ECHO} "#include " > ${WRKSRC}/pjlib/include/pj/config_site.h @${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h post-install-SHARED-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-PJSUA-on: ${INSTALL_PROGRAM} \ ${WRKSRC}/pjsip-apps/bin/pjsua-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ ${STAGEDIR}${PREFIX}/bin/pjsua ${INSTALL_PROGRAM} \ ${WRKSRC}/pjsip-apps/bin/pjsystest-${ARCH}-portbld-${OPSYS:tl}${OSREL} \ ${STAGEDIR}${PREFIX}/bin/pjsystest .include Index: head/net/pjsip/files/patch-aconfigure =================================================================== --- head/net/pjsip/files/patch-aconfigure (revision 441291) +++ head/net/pjsip/files/patch-aconfigure (revision 441292) @@ -1,35 +1,35 @@ --- aconfigure.orig 2017-01-25 11:23:08 UTC +++ aconfigure -@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend. +@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend... null sound" ;; *) ac_pjmedia_snd=alsa - ac_pa_use_alsa=1 - - ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default" -if test "x$ac_cv_header_alsa_version_h" = xyes; then : - LIBS="$LIBS -lasound" -else ac_pa_use_alsa=0 -fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5 @@ -6941,7 +6934,7 @@ else FFMPEG_PREFIX=$with_ffmpeg { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5 $as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; } - export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig + export PKG_CONFIG_PATH=$FFMPEG_PREFIX/libdata/pkgconfig fi for ac_prog in pkg-config "python pkgconfig.py" -@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disab +@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6; ac_webrtc_instset=sse2 ac_webrtc_cflags="-msse2" ;; - *win32* | *w32* | *darwin* | *linux*) + *win32* | *w32* | *darwin* | *linux* | *amd64*freebsd* ) ac_webrtc_instset=sse2 ;; *) Index: head/net/pjsip/files/patch-build.mak.in =================================================================== --- head/net/pjsip/files/patch-build.mak.in (revision 441291) +++ head/net/pjsip/files/patch-build.mak.in (revision 441292) @@ -1,20 +1,20 @@ --- build.mak.in.orig 2016-08-25 01:36:33 UTC +++ build.mak.in -@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/t +@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib endif endif -ifneq ($(findstring pa,@ac_pjmedia_snd@),) +#ifneq ($(findstring pa,@ac_pjmedia_snd@),) ifeq (@ac_external_pa@,1) # External PA APP_THIRD_PARTY_EXT += -lportaudio @@ -119,7 +119,7 @@ APP_THIRD_PARTY_LIBS += -lportaudio APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX) endif endif -endif +#endif ifneq (@ac_no_yuv@,1) ifeq (@ac_external_yuv@,1) Index: head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c =================================================================== --- head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c (revision 441291) +++ head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c (revision 441292) @@ -1,47 +1,47 @@ --- pjlib/src/pj/ssl_sock_ossl.c.orig 2017-01-24 05:41:05 UTC +++ pjlib/src/pj/ssl_sock_ossl.c @@ -54,7 +54,7 @@ #include #include -#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL +#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) # include -@@ -112,7 +112,7 @@ static unsigned get_nid_from_cid(unsigne +@@ -112,7 +112,7 @@ static unsigned get_nid_from_cid(unsigned cid) #endif -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) # define OPENSSL_NO_SSL2 /* seems to be removed in 1.1.0 */ # define M_ASN1_STRING_data(x) ASN1_STRING_get0_data(x) # define M_ASN1_STRING_length(x) ASN1_STRING_length(x) @@ -452,7 +452,7 @@ static pj_status_t init_openssl(void) SSL_set_session(ssl, SSL_SESSION_new()); -#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL +#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) openssl_curves_num = SSL_get_shared_curve(ssl,-1); if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves)) openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves); -@@ -1069,7 +1069,7 @@ static pj_status_t set_cipher_list(pj_ss +@@ -1069,7 +1069,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc static pj_status_t set_curves_list(pj_ssl_sock_t *ssock) { -#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL +#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) int ret; int curves[PJ_SSL_SOCK_MAX_CURVES]; unsigned cnt; -@@ -1100,7 +1100,7 @@ static pj_status_t set_curves_list(pj_ss +@@ -1100,7 +1100,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock) { -#if OPENSSL_VERSION_NUMBER >= 0x1000200fL +#if OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(LIBRESSL_VERSION_NUMBER) int ret; if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) { Index: head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in =================================================================== --- head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (revision 441291) +++ head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in (revision 441292) @@ -1,53 +1,53 @@ --- pjmedia/build/os-auto.mak.in.orig 2016-08-25 01:36:33 UTC +++ pjmedia/build/os-auto.mak.in -@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc +@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src endif endif - -# -# MacOSX specific -# -ifneq ($(findstring coreaudio,$(AC_PJMEDIA_SND)),) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_COREAUDIO=1 \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# Unix specific -# -ifneq ($(findstring alsa,$(AC_PJMEDIA_SND)),) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_ALSA=1 \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# Windows specific -# -ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1 \ - -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -else export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# Null sound device -# -ifeq ($(AC_PJMEDIA_SND),null) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif - -# -# External sound device -# -ifeq ($(AC_PJMEDIA_SND),external) -export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 \ - -DPJMEDIA_AUDIO_DEV_HAS_WMME=0 -endif # # QT video device Index: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c =================================================================== --- head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c (nonexistent) +++ head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c (revision 441292) @@ -0,0 +1,25 @@ +--- pjsip/src/pjsip/sip_multipart.c.orig 2017-01-24 05:59:05 UTC ++++ pjsip/src/pjsip/sip_multipart.c +@@ -646,13 +646,15 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_ + + end_body = curptr; + +- /* The newline preceeding the delimiter is conceptually part of +- * the delimiter, so trim it from the body. +- */ +- if (*(end_body-1) == '\n') +- --end_body; +- if (*(end_body-1) == '\r') +- --end_body; ++ if (end_body > start_body) { ++ /* The newline preceeding the delimiter is conceptually part of ++ * the delimiter, so trim it from the body. ++ */ ++ if (*(end_body-1) == '\n') ++ --end_body; ++ if (*(end_body-1) == '\r') ++ --end_body; ++ } + + /* Now that we have determined the part's boundary, parse it + * to get the header and body part of the part. Property changes on: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c =================================================================== --- head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c (nonexistent) +++ head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c (revision 441292) @@ -0,0 +1,12 @@ +--- pjsip/src/pjsip/sip_transaction.c.orig 2016-02-22 13:36:31 UTC ++++ pjsip/src/pjsip/sip_transaction.c +@@ -288,7 +288,8 @@ static pj_status_t create_tsx_key_2543( pj_pool_t *poo + host = &rdata->msg_info.via->sent_by.host; + + /* Calculate length required. */ +- len_required = 9 + /* CSeq number */ ++ len_required = method->name.slen + /* Method */ ++ 9 + /* CSeq number */ + rdata->msg_info.from->tag.slen + /* From tag. */ + rdata->msg_info.cid->id.slen + /* Call-ID */ + host->slen + /* Via host. */ Property changes on: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/pjsip/files/patch-third__party_build_os-auto.mak.in =================================================================== --- head/net/pjsip/files/patch-third__party_build_os-auto.mak.in (revision 441291) +++ head/net/pjsip/files/patch-third__party_build_os-auto.mak.in (revision 441292) @@ -1,12 +1,12 @@ --- third_party/build/os-auto.mak.in.orig 2016-12-22 09:33:55 UTC +++ third_party/build/os-auto.mak.in -@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc +@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),) else # Generic fixed point WEBRTC_SRC = \ modules/audio_processing/aecm/aecm_core_c.o \ - modules/audio_processing/ns/nsx_core_c.o \ - common_audio/signal_processing/complex_fft.o + modules/audio_processing/ns/nsx_core_c.o endif endif endif