Index: head/net/asterisk13/Makefile =================================================================== --- head/net/asterisk13/Makefile (revision 445591) +++ head/net/asterisk13/Makefile (revision 445592) @@ -1,302 +1,302 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.16.0 +PORTVERSION= 13.17.0 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 BROKEN_armv6= fails to configure: the SPANDSP installation appears to be missing or broken ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc sparc64 EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} 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 .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif 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 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 445591) +++ head/net/asterisk13/distinfo (revision 445592) @@ -1,7 +1,7 @@ -TIMESTAMP = 1496177063 -SHA256 (asterisk-13.16.0.tar.gz) = bcc81856ef5c624b591d5c11beeb68587cc7b3872cf41f728663b623a28cf865 -SIZE (asterisk-13.16.0.tar.gz) = 32886977 +TIMESTAMP = 1499871944 +SHA256 (asterisk-13.17.0.tar.gz) = c4a89386d7db58520391fcbd3202902584b4434289094ca2e4a6b8dada1e90a4 +SIZE (asterisk-13.17.0.tar.gz) = 32908945 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/asterisk13/files/patch-main_tcptls.c =================================================================== --- head/net/asterisk13/files/patch-main_tcptls.c (revision 445591) +++ head/net/asterisk13/files/patch-main_tcptls.c (nonexistent) @@ -1,18 +0,0 @@ ---- main/tcptls.c.orig 2017-04-12 21:06:16 UTC -+++ main/tcptls.c -@@ -400,13 +400,13 @@ static int tcptls_stream_close(void *cookie) - SSL_get_error(stream->ssl, res)); - } - --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if (!SSL_is_server(stream->ssl)) { - #else - if (!stream->ssl->server) { - #endif - /* For client threads, ensure that the error stack is cleared */ --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L - ERR_remove_thread_state(NULL); - #else Property changes on: head/net/asterisk13/files/patch-main_tcptls.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk13/files/patch-main_crypt.c =================================================================== --- head/net/asterisk13/files/patch-main_crypt.c (revision 445591) +++ head/net/asterisk13/files/patch-main_crypt.c (nonexistent) @@ -1,11 +0,0 @@ ---- main/crypt.c.orig 2016-07-21 14:54:02 UTC -+++ main/crypt.c -@@ -31,7 +31,7 @@ - ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - - #include --#if defined(HAVE_CRYPT_R) -+#if defined(HAVE_CRYPT_R) && !defined(__FreeBSD__) - #include - #endif - Property changes on: head/net/asterisk13/files/patch-main_crypt.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/asterisk13/files/patch-main_libasteriskssl.c =================================================================== --- head/net/asterisk13/files/patch-main_libasteriskssl.c (revision 445591) +++ head/net/asterisk13/files/patch-main_libasteriskssl.c (nonexistent) @@ -1,20 +0,0 @@ ---- main/libasteriskssl.c.orig 2017-04-12 21:07:31 UTC -+++ main/libasteriskssl.c -@@ -74,7 +74,7 @@ static void ssl_lock(int mode, int n, const char *file - } - } - --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - int SSL_library_init(void) - { - #if defined(AST_DEVMODE) -@@ -129,7 +129,7 @@ void ERR_free_strings(void) - int ast_ssl_init(void) - { - #if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \ -- OPENSSL_VERSION_NUMBER < 0x10100000L -+ (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - unsigned int i; - int (*real_SSL_library_init)(void); - void (*real_CRYPTO_set_id_callback)(unsigned long (*)(void)); Property changes on: head/net/asterisk13/files/patch-main_libasteriskssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property