Date: Sat, 8 Aug 2015 13:04:50 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393727 - in head: Mk net/asterisk11 net/asterisk11/files net/asterisk13 net/asterisk13/files Message-ID: <201508081304.t78D4o8R045428@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Aug 8 13:04:49 2015 New Revision: 393727 URL: https://svnweb.freebsd.org/changeset/ports/393727 Log: - Update net/asterisk11 to 11.19.0 - Update net/asterisk13 to 13.5.0 - Add SQLITE2 option default description - Rename SQLITE option to SQLITE2, which better describes what it really does - Clean up Makefile and sort option helpers [1] - Add missed dependencies on openssl, ncurses and iconv [1] - Add back shabangfix for sample agi scripts - Make build log verbose [1] - Regenerated some patches Suggested by: koobs (thanks!) [1] Modified: head/Mk/bsd.options.desc.mk head/net/asterisk11/Makefile head/net/asterisk11/distinfo head/net/asterisk11/files/patch-Makefile head/net/asterisk11/files/patch-agi__Makefile head/net/asterisk11/files/patch-channels-chan_dahdi.c head/net/asterisk11/files/patch-channels__Makefile head/net/asterisk11/files/patch-channels__sip__include__sip.h head/net/asterisk11/files/patch-channels_h323_Makefile.in head/net/asterisk11/files/patch-configure head/net/asterisk11/files/patch-include-asterisk-astobj2.h head/net/asterisk11/files/patch-include-asterisk-config.h head/net/asterisk11/files/patch-main__asterisk.exports.in head/net/asterisk11/files/patch-main__http.c head/net/asterisk11/files/patch-main__utils.c head/net/asterisk11/pkg-plist head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/asterisk13/files/patch-Makefile head/net/asterisk13/files/patch-channels-chan_dahdi.c head/net/asterisk13/files/patch-configure head/net/asterisk13/files/patch-include-asterisk-config.h head/net/asterisk13/files/patch-main__http.c head/net/asterisk13/files/patch-main__utils.c head/net/asterisk13/pkg-plist Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Sat Aug 8 12:55:24 2015 (r393726) +++ head/Mk/bsd.options.desc.mk Sat Aug 8 13:04:49 2015 (r393727) @@ -430,6 +430,7 @@ SPDY_DESC?= SPDY network protocol suppo SPEEX_DESC?= Speex audio format support SQL_DESC?= SQL database support SQLITE_DESC?= SQLite database support +SQLITE2_DESC?= SQLite 2 database support SQLITE3_DESC?= SQLite 3 database support SSE_DESC?= Use SSE optimized routines SSH_DESC?= SSH protocol support Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/Makefile Sat Aug 8 13:04:49 2015 (r393727) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.18.0 -PORTREVISION= 1 +PORTVERSION= 11.19.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -20,106 +19,132 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mp ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -CFLAGS+= -I${LOCALBASE}/include USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes -USES= bison cpe gmake +USE_OPENSSL= yes +USES= bison cpe gmake iconv localbase ncurses shebangfix CPE_VENDOR= digium USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ - OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" +MAKE_ARGS+= NOISY_BUILD=YES +CONFIGURE_ARGS+= --with-crypto=${OPENSSLBASE} \ + --with-ssl=${OPENSSLBASE} + +SHEBANG_FILES= agi/agi-test.agi \ + agi/jukebox.agi CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-13* -OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ - CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID SYSINFO -OPTIONS_SINGLE= COMPILER -OPTIONS_SINGLE_COMPILER= GCC BASE -OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ - XMPP GSM SQLITE CURL LUA UUID GCC - -OPTIONS_DEFINE_i386= DAHDI -OPTIONS_DEFINE_amd64= DAHDI -OPTIONS_DEFINE_sparc64= DAHDI +OPTIONS_DEFINE= CURL EXCHANGE FREETDS GSM LDAP LUA MYSQL NEWG711 \ + ODBC OOH323 PGSQL RADIUS SNMP SPANDSP SQLITE2 SRTP \ + SYSINFO UUID VORBIS XMPP +OPTIONS_SINGLE= COMPILER +OPTIONS_SINGLE_COMPILER= BASE GCC +OPTIONS_DEFAULT= CURL FREETDS GCC GSM LUA ODBC PGSQL RADIUS SNMP \ + SQLITE2 UUID VORBIS XMPP + +OPTIONS_DEFINE_i386= DAHDI +OPTIONS_DEFINE_amd64= DAHDI +OPTIONS_DEFINE_sparc64= DAHDI -OPTIONS_DEFAULT_i386= DAHDI -OPTIONS_DEFAULT_amd64= DAHDI +OPTIONS_DEFAULT_i386= DAHDI +OPTIONS_DEFAULT_amd64= DAHDI OPTIONS_DEFAULT_sparc64= DAHDI +BASE_DESC= Use base compiler (experimental) +DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support +GCC_DESC= Use gcc from ports NEWG711_DESC?= New G711 codec -SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support -DAHDI_DESC?= DAHDI support -XMPP_DESC?= XMPP/GTALK support -UUID_DESC?= libuuid support (required for ICE and TURN in RTP) +SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information -GCC_DESC= Use gcc from ports -BASE_DESC= Use base compiler (experimental) +UUID_DESC?= libuuid support (required for ICE and TURN in RTP) +XMPP_DESC?= XMPP/GTALK support + +OPTIONS_SUB= yes + +CURL_CONFIGURE_ON= --with-libcurl +CURL_CONFIGURE_OFF= --with-libcurl=no +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -OPTIONS_SUB= yes -OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ - libh323_r.so:${PORTSDIR}/net/openh323 DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ libopenr2.so:${PORTSDIR}/misc/openr2 + +EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 +EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon + +FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} +FREETDS_CONFIGURE_OFF= --without-tds +FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds + +GCC_USE= GCC=yes + +GSM_CONFIGURE_WITH= gsm +GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/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_USE= MYSQL=yes + ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ libltdl.so:${PORTSDIR}/devel/libltdl -FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} -FREETDS_CONFIGURE_OFF= --without-tds -FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds + +OOH323_CPPFLAGS= -I${LOCALBASE}/include/openh323 +OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ + libh323_r.so:${PORTSDIR}/net/openh323 +OOH323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323 + PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql -MYSQL_CONFIGURE_WITH= mysqlclient -MYSQL_USE= MYSQL=yes -VORBIS_CONFIGURE_WITH= ogg -VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis + RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient + SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -XMPP_CONFIGURE_WITH= iksemel -XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel -SQLITE_CONFIGURE_WITH= sqlite -SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 -GSM_CONFIGURE_WITH= gsm -GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm -CURL_CONFIGURE_ON= --with-libcurl -CURL_CONFIGURE_OFF= --with-libcurl=no -CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp -EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 -EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon + +SQLITE2_CONFIGURE_WITH= sqlite +SQLITE2_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 + SRTP_CONFIGURE_WITH= srtp SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp -LUA_CONFIGURE_WITH= lua -LUA_USES= lua:51 -LUA_CFLAGS= -I${LUA_INCDIR} -LUA_LDFLAGS= -L${LUA_LIBDIR} -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes + +SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo + UUID_LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid UUID_CONFIGURE_ON= --with-uuid=${LOCALBASE} UUID_CONFIGURE_OFF= --disable-uuid UUID_CONFLICTS= ossp-uuid-[0-9]* -SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo -GCC_USE= GCC=yes + +VORBIS_CONFIGURE_WITH= ogg +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis + +XMPP_CONFIGURE_WITH= iksemel +XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk @@ -136,9 +161,9 @@ VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} -PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} -PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} -PLIST_SUB+= VARDIR=${VARDIR} +PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ + ASTERISK_GROUP=${ASTERISK_GROUP} \ + VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete Modified: head/net/asterisk11/distinfo ============================================================================== --- head/net/asterisk11/distinfo Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/distinfo Sat Aug 8 13:04:49 2015 (r393727) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.18.0.tar.gz) = 605b823e2362c543512a0af7427db123c3b846edf45bed722232cc35c8824b10 -SIZE (asterisk-11.18.0.tar.gz) = 34831035 +SHA256 (asterisk-11.19.0.tar.gz) = 339f82f75dd15144a8de6f29aa5aa91e8e6a789dbfbd6c1283f345391505dc1e +SIZE (asterisk-11.19.0.tar.gz) = 34852510 Modified: head/net/asterisk11/files/patch-Makefile ============================================================================== --- head/net/asterisk11/files/patch-Makefile Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-Makefile Sat Aug 8 13:04:49 2015 (r393727) @@ -1,4 +1,4 @@ ---- Makefile.orig 2014-10-31 16:40:55 UTC +--- Makefile.orig 2015-07-24 22:06:05 UTC +++ Makefile @@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y @@ -9,7 +9,7 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -202,7 +202,7 @@ endif +@@ -209,7 +209,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -18,7 +18,7 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) # flag to tell 'ldconfig' to only process specified directories LDCONFIG_FLAGS=-m -@@ -456,8 +456,12 @@ datafiles: _all doc/core-en_US.xml +@@ -466,8 +466,12 @@ datafiles: _all doc/core-en_US.xml $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -32,7 +32,7 @@ done $(MAKE) -C sounds install -@@ -537,7 +541,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) +@@ -547,7 +551,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ @@ -41,7 +41,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -606,7 +610,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -616,7 +620,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -50,7 +50,7 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -615,21 +619,7 @@ install: badshell bininstall datafiles +@@ -625,21 +629,7 @@ install: badshell bininstall datafiles @echo " + YOU MUST READ THE SECURITY DOCUMENT +" @echo " + +" @echo " + Asterisk has successfully been installed. +" @@ -72,7 +72,7 @@ @echo " +-------------------------------------------+" @$(MAKE) -s oldmodcheck -@@ -648,45 +638,30 @@ adsi: +@@ -658,45 +648,30 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ Modified: head/net/asterisk11/files/patch-agi__Makefile ============================================================================== --- head/net/asterisk11/files/patch-agi__Makefile Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-agi__Makefile Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- ./agi/Makefile.orig 2010-07-23 15:26:41.000000000 +0200 -+++ ./agi/Makefile 2010-11-06 14:54:36.000000000 +0100 -@@ -16,7 +16,9 @@ +--- agi/Makefile.orig 2015-07-24 22:06:05 UTC ++++ agi/Makefile +@@ -16,7 +16,9 @@ ASTTOPDIR?=.. .PHONY: clean all uninstall Modified: head/net/asterisk11/files/patch-channels-chan_dahdi.c ============================================================================== --- head/net/asterisk11/files/patch-channels-chan_dahdi.c Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-channels-chan_dahdi.c Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- channels/chan_dahdi.c.orig 2010-11-09 11:18:39.000000000 +0100 -+++ channels/chan_dahdi.c 2010-11-09 11:22:15.000000000 +0100 -@@ -4688,6 +4688,8 @@ +--- channels/chan_dahdi.c.orig 2015-07-24 22:06:05 UTC ++++ channels/chan_dahdi.c +@@ -5030,6 +5030,8 @@ static void dahdi_enable_ec(struct dahdi return; } if (p->echocancel.head.tap_length) { @@ -9,7 +9,7 @@ #if defined(HAVE_PRI) || defined(HAVE_SS7) switch (p->sig) { #if defined(HAVE_PRI) -@@ -4718,7 +4720,9 @@ +@@ -5060,7 +5062,9 @@ static void dahdi_enable_ec(struct dahdi break; } #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ @@ -20,7 +20,7 @@ if (res) { ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); } else { -@@ -4752,8 +4756,9 @@ +@@ -5094,8 +5098,9 @@ static void dahdi_disable_ec(struct dahd if (p->echocanon) { struct dahdi_echocanparams ecp = { .tap_length = 0 }; Modified: head/net/asterisk11/files/patch-channels__Makefile ============================================================================== --- head/net/asterisk11/files/patch-channels__Makefile Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-channels__Makefile Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- ./channels/Makefile.orig 2010-06-07 22:04:42.000000000 +0200 -+++ ./channels/Makefile 2010-11-06 14:54:36.000000000 +0100 -@@ -27,9 +27,10 @@ +--- channels/Makefile.orig 2015-07-24 22:06:05 UTC ++++ channels/Makefile +@@ -27,9 +27,10 @@ ifeq ($(OSARCH),linux-gnu) endif ifeq ($(OSARCH),FreeBSD) @@ -13,7 +13,7 @@ endif ifeq ($(OSARCH),NetBSD) -@@ -86,9 +87,13 @@ +@@ -86,9 +87,13 @@ chan_h323.so: chan_h323.o h323/libchanh3 else chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" Modified: head/net/asterisk11/files/patch-channels__sip__include__sip.h ============================================================================== --- head/net/asterisk11/files/patch-channels__sip__include__sip.h Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-channels__sip__include__sip.h Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- ./channels/sip/include/sip.h.orig 2010-11-08 04:46:46.000000000 +0100 -+++ ./channels/sip/include/sip.h 2010-11-08 04:47:07.000000000 +0100 -@@ -180,7 +180,7 @@ +--- channels/sip/include/sip.h.orig 2015-07-24 22:06:05 UTC ++++ channels/sip/include/sip.h +@@ -190,7 +190,7 @@ #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ #define DEFAULT_MOHSUGGEST "" #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ Modified: head/net/asterisk11/files/patch-channels_h323_Makefile.in ============================================================================== --- head/net/asterisk11/files/patch-channels_h323_Makefile.in Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-channels_h323_Makefile.in Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- ./channels/h323/Makefile.in.orig 2010-06-03 16:48:09.000000000 +0200 -+++ ./channels/h323/Makefile.in 2010-11-06 14:54:36.000000000 +0100 -@@ -13,7 +13,7 @@ +--- channels/h323/Makefile.in.orig 2015-07-24 22:06:05 UTC ++++ channels/h323/Makefile.in +@@ -13,7 +13,7 @@ STDCCFLAGS = -DNDEBUG STDCCFLAGS += -I../../include -include ../../include/asterisk/autoconfig.h STDCCFLAGS += -fPIC #OPTCCFLAGS += Modified: head/net/asterisk11/files/patch-configure ============================================================================== --- head/net/asterisk11/files/patch-configure Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-configure Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- configure.orig 2014-06-21 01:14:52.000000000 +0200 -+++ configure 2014-07-29 23:59:12.060900744 +0200 -@@ -4616,9 +4616,9 @@ +--- configure.orig 2015-07-24 22:06:05 UTC ++++ configure +@@ -4619,9 +4619,9 @@ astheaderdir='${includedir}/asterisk' astlibdir='${libdir}' astmoddir='${libdir}/asterisk/modules' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4641,8 +4641,6 @@ +@@ -4644,8 +4644,6 @@ esac case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,7 +21,7 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -18084,6 +18082,8 @@ +@@ -18202,6 +18200,8 @@ $as_echo_n "checking if \"struct ifaddrs cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30,7 +30,7 @@ #include <ifaddrs.h> int main () -@@ -26385,7 +26385,7 @@ +@@ -26503,7 +26503,7 @@ $as_echo "${OPENH323_BUILD}" >&6; } fi @@ -39,7 +39,7 @@ if test "${HAS_OPENH323:-unset}" != "unset"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 -@@ -26483,13 +26483,13 @@ +@@ -26601,13 +26601,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh` @@ -56,7 +56,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -26531,18 +26531,18 @@ +@@ -26649,18 +26649,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -78,7 +78,7 @@ if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then : LUA_HEADER_FOUND=1 else -@@ -26595,13 +26595,13 @@ +@@ -26713,13 +26713,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` @@ -95,7 +95,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -26643,18 +26643,18 @@ +@@ -26761,18 +26761,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then Modified: head/net/asterisk11/files/patch-include-asterisk-astobj2.h ============================================================================== --- head/net/asterisk11/files/patch-include-asterisk-astobj2.h Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-include-asterisk-astobj2.h Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- include/asterisk/astobj2.h.orig 2013-07-02 12:30:02.000000000 +0200 -+++ include/asterisk/astobj2.h 2013-07-02 12:31:39.000000000 +0200 -@@ -1472,5 +1472,7 @@ +--- include/asterisk/astobj2.h.orig 2015-07-24 22:06:05 UTC ++++ include/asterisk/astobj2.h +@@ -1520,5 +1520,7 @@ void __ao2_cleanup_debug(void *obj, cons #else #define ao2_cleanup(obj) __ao2_cleanup(obj) #endif Modified: head/net/asterisk11/files/patch-include-asterisk-config.h ============================================================================== --- head/net/asterisk11/files/patch-include-asterisk-config.h Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-include-asterisk-config.h Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- include/asterisk/config.h.orig 2013-07-02 12:26:35.000000000 +0200 -+++ include/asterisk/config.h 2013-07-02 12:29:07.000000000 +0200 -@@ -481,6 +481,8 @@ +--- include/asterisk/config.h.orig 2015-07-24 22:06:05 UTC ++++ include/asterisk/config.h +@@ -491,6 +491,8 @@ struct ast_variable *ast_variables_rever * This function frees a list of variables. */ void ast_variables_destroy(struct ast_variable *var); Modified: head/net/asterisk11/files/patch-main__asterisk.exports.in ============================================================================== --- head/net/asterisk11/files/patch-main__asterisk.exports.in Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-main__asterisk.exports.in Sat Aug 8 13:04:49 2015 (r393727) @@ -1,5 +1,5 @@ ---- main/asterisk.exports.in.orig 2013-08-22 10:22:39.000000000 +0200 -+++ main/asterisk.exports.in 2013-10-27 13:38:56.825678450 +0100 +--- main/asterisk.exports.in.orig 2015-07-24 22:06:05 UTC ++++ main/asterisk.exports.in @@ -65,6 +65,8 @@ */ Modified: head/net/asterisk11/files/patch-main__http.c ============================================================================== --- head/net/asterisk11/files/patch-main__http.c Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-main__http.c Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- main/http.c.orig 2013-12-17 23:42:58.982720307 +0100 -+++ main/http.c 2013-12-17 23:43:16.054863909 +0100 -@@ -1024,7 +1024,7 @@ +--- main/http.c.orig 2015-07-24 22:06:05 UTC ++++ main/http.c +@@ -1072,7 +1072,7 @@ static int __ast_http_load(int reload) struct http_uri_redirect *redirect; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; uint32_t bindport = DEFAULT_PORT; Modified: head/net/asterisk11/files/patch-main__utils.c ============================================================================== --- head/net/asterisk11/files/patch-main__utils.c Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/files/patch-main__utils.c Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- ./main/utils.c.orig 2010-08-06 20:57:10.000000000 +0200 -+++ ./main/utils.c 2010-11-06 14:54:37.000000000 +0100 -@@ -990,8 +990,8 @@ +--- main/utils.c.orig 2015-07-24 22:06:05 UTC ++++ main/utils.c +@@ -1242,8 +1242,8 @@ int ast_pthread_create_stack(pthread_t * pthread_attr_init(attr); } Modified: head/net/asterisk11/pkg-plist ============================================================================== --- head/net/asterisk11/pkg-plist Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk11/pkg-plist Sat Aug 8 13:04:49 2015 (r393727) @@ -299,7 +299,7 @@ lib/asterisk/modules/res_clialiases.so %%CURL%%lib/asterisk/modules/res_curl.so %%CURL%%lib/asterisk/modules/res_config_curl.so %%LDAP%%lib/asterisk/modules/res_config_ldap.so -%%SQLITE%%lib/asterisk/modules/res_config_sqlite.so +%%SQLITE2%%lib/asterisk/modules/res_config_sqlite.so lib/asterisk/modules/res_config_sqlite3.so lib/asterisk/modules/res_format_attr_celt.so lib/asterisk/modules/res_format_attr_h263.so Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/Makefile Sat Aug 8 13:04:49 2015 (r393727) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.4.0 +PORTVERSION= 13.5.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -19,110 +19,140 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mp ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -CFLAGS+= -I${LOCALBASE}/include USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes -USES= bison cpe gmake iconv +USE_OPENSSL= yes +USES= bison cpe gmake iconv localbase ncurses shebangfix CPE_VENDOR= digium USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ - OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ - NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" -CONFIGURE_ARGS+= --datarootdir=${DATADIR} +MAKE_ARGS+= NOISY_BUILD=YES +CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ + --with-crypto=${OPENSSLBASE} \ + --with-ssl=${OPENSSLBASE} + +SHEBANG_FILES= agi/agi-test.agi \ + agi/jukebox.agi CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-11* -OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ - CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX \ - SYSINFO PORTAUDIO -OPTIONS_SINGLE= COMPILER -OPTIONS_SINGLE_COMPILER= GCC BASE -OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ - XMPP GSM SQLITE3 CURL LUA PJSIP SPEEX PORTAUDIO GCC - -OPTIONS_DEFINE_i386= DAHDI -OPTIONS_DEFINE_amd64= DAHDI -OPTIONS_DEFINE_sparc64= DAHDI +OPTIONS_DEFINE= CURL EXCHANGE FREETDS GSM LDAP LUA MYSQL \ + NEWG711 ODBC OOH323 PGSQL PJSIP PORTAUDIO \ + RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP \ + SYSINFO VORBIS XMPP + +OPTIONS_SINGLE= COMPILER +OPTIONS_SINGLE_COMPILER= BASE GCC +OPTIONS_DEFAULT= CURL FREETDS GCC GSM LUA ODBC PGSQL PJSIP \ + PORTAUDIO RADIUS SNMP SPEEX SQLITE2 VORBIS \ + XMPP + +OPTIONS_DEFINE_i386= DAHDI +OPTIONS_DEFINE_amd64= DAHDI +OPTIONS_DEFINE_sparc64= DAHDI -OPTIONS_DEFAULT_i386= DAHDI -OPTIONS_DEFAULT_amd64= DAHDI +OPTIONS_DEFAULT_i386= DAHDI +OPTIONS_DEFAULT_amd64= DAHDI OPTIONS_DEFAULT_sparc64= DAHDI +BASE_DESC= Use base compiler (experimental) +DAHDI_DESC?= DAHDI support EXCHANGE_DESC?= Exchange calendar support +GCC_DESC= Use gcc from ports NEWG711_DESC?= New G711 Codec -SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support -DAHDI_DESC?= DAHDI support -XMPP_DESC?= XMPP/GTALK support PJSIP_DESC?= Build the PJSIP based SIP channel +SRTP_DESC?= SecureRTP support SYSINFO_DESC?= Use devel/libsysinfo to get system information -GCC_DESC= Use gcc from ports -BASE_DESC= Use base compiler (experimental) +XMPP_DESC?= XMPP/GTALK support + +OPTIONS_SUB= yes + +CURL_CONFIGURE_ON= --with-libcurl +CURL_CONFIGURE_OFF= --with-libcurl=no +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -OPTIONS_SUB= yes -OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ - libh323_r.so:${PORTSDIR}/net/openh323 DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ libopenr2.so:${PORTSDIR}/misc/openr2 -ODBC_CONFIGURE_WITH= unixodbc -ODBC_CONFIGURE_ON= --with-ltdl -ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ - libltdl.so:${PORTSDIR}/devel/libltdl + +EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 +EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon + FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds -PGSQL_CONFIGURE_WITH= postgres -PGSQL_USES= pgsql -MYSQL_CONFIGURE_WITH= mysqlclient -MYSQL_USE= MYSQL=yes -VORBIS_CONFIGURE_WITH= ogg -VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis -RADIUS_CONFIGURE_WITH= radius -RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient -SNMP_CONFIGURE_WITH= netsnmp -SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -XMPP_CONFIGURE_WITH= iksemel -XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel -SQLITE_CONFIGURE_WITH= sqlite -SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 + +GCC_USE= GCC=yes + GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm -CURL_CONFIGURE_ON= --with-libcurl -CURL_CONFIGURE_OFF= --with-libcurl=no -CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -SPANDSP_CONFIGURE_WITH= spandsp -SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp -EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 -EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon -SRTP_CONFIGURE_WITH= srtp + +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} -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes + +MYSQL_CONFIGURE_WITH= mysqlclient +MYSQL_USE= MYSQL=yes + +ODBC_CONFIGURE_WITH= unixodbc +ODBC_CONFIGURE_ON= --with-ltdl +ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ + libltdl.so:${PORTSDIR}/devel/libltdl + +OOH323_CPPFLAGS= -I${LOCALBASE}/include/openh323 +OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ + libh323_r.so:${PORTSDIR}/net/openh323 +OOH323_MAKE_ENV= OPENH323DIR=${LOCALBASE}/share/openh323 + +PGSQL_CONFIGURE_WITH= postgres +PGSQL_USES= pgsql + PJSIP_CONFIGURE_WITH= pjproject PJSIP_USES= pkgconfig + PORTAUDIO_CONFIGURE_WITH= portaudio PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio + +RADIUS_CONFIGURE_WITH= radius +RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient + +SNMP_CONFIGURE_WITH= netsnmp +SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp + +SPANDSP_CONFIGURE_WITH= spandsp +SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp + SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_WITH= speex + +SQLITE2_CONFIGURE_WITH= sqlite +SQLITE2_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 + +SRTP_CONFIGURE_WITH= srtp + SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo -GCC_USE= GCC=yes + +VORBIS_CONFIGURE_WITH= ogg +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis + +XMPP_CONFIGURE_WITH= iksemel +XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk @@ -154,9 +184,9 @@ VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} -PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} -PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} -PLIST_SUB+= VARDIR=${VARDIR} +PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} \ + ASTERISK_GROUP=${ASTERISK_GROUP} \ + VARDIR=${VARDIR} post-extract: @${FIND} ${WRKSRC} -name '*.d' -delete Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk13/distinfo Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/distinfo Sat Aug 8 13:04:49 2015 (r393727) @@ -1,2 +1,2 @@ -SHA256 (asterisk-13.4.0.tar.gz) = 2049012665e99d2967b18d1594ae752307db7e967235877f1e058e6fb5b4c045 -SIZE (asterisk-13.4.0.tar.gz) = 32009886 +SHA256 (asterisk-13.5.0.tar.gz) = e8b8d071f783edea82de510194dd272070ffbb7cdb2f5f6b020be5d15b67e8b9 +SIZE (asterisk-13.5.0.tar.gz) = 32107014 Modified: head/net/asterisk13/files/patch-Makefile ============================================================================== --- head/net/asterisk13/files/patch-Makefile Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/files/patch-Makefile Sat Aug 8 13:04:49 2015 (r393727) @@ -1,4 +1,4 @@ ---- Makefile.orig 2014-10-19 17:07:50 UTC +--- Makefile.orig 2015-07-24 22:20:17 UTC +++ Makefile @@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y @@ -16,9 +16,9 @@ -DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d +# DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d - # If the file .asterisk.makeopts is present in your home directory, you can - # include all of your favorite menuselect options so that every time you download -@@ -207,7 +207,7 @@ endif + # This Makefile previously contained a note about the ability to use .asterisk.makeopts + # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect. +@@ -214,7 +214,7 @@ endif ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -27,7 +27,7 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) # flag to tell 'ldconfig' to only process specified directories LDCONFIG_FLAGS=-m -@@ -461,8 +461,12 @@ datafiles: _all doc/core-en_US.xml +@@ -471,8 +471,12 @@ datafiles: _all doc/core-en_US.xml $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -41,7 +41,7 @@ done $(MAKE) -C sounds install find rest-api -name "*.json" | while read x; do \ -@@ -556,7 +560,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) +@@ -566,7 +570,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ @@ -51,7 +51,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -592,10 +597,10 @@ bininstall: _all installdirs $(SUBDIRS_I +@@ -602,10 +607,10 @@ bininstall: _all installdirs $(SUBDIRS_I if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi @@ -66,7 +66,7 @@ $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -628,7 +633,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) +@@ -638,7 +643,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -75,7 +75,7 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -670,29 +675,16 @@ adsi: +@@ -680,29 +685,16 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ @@ -108,7 +108,7 @@ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -705,15 +697,15 @@ samples: adsi +@@ -715,15 +707,15 @@ samples: adsi -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ Modified: head/net/asterisk13/files/patch-channels-chan_dahdi.c ============================================================================== --- head/net/asterisk13/files/patch-channels-chan_dahdi.c Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/files/patch-channels-chan_dahdi.c Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- channels/chan_dahdi.c.orig 2014-07-25 16:47:17 UTC +--- channels/chan_dahdi.c.orig 2015-07-24 22:20:17 UTC +++ channels/chan_dahdi.c -@@ -4596,6 +4596,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p +@@ -4598,6 +4598,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p return; } if (p->echocancel.head.tap_length) { @@ -9,7 +9,7 @@ #if defined(HAVE_PRI) || defined(HAVE_SS7) switch (p->sig) { #if defined(HAVE_PRI) -@@ -4626,7 +4628,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p +@@ -4628,7 +4630,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p break; } #endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */ @@ -20,7 +20,7 @@ if (res) { ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); } else { -@@ -4660,8 +4664,9 @@ void dahdi_ec_disable(struct dahdi_pvt * +@@ -4662,8 +4666,9 @@ void dahdi_ec_disable(struct dahdi_pvt * if (p->echocanon) { struct dahdi_echocanparams ecp = { .tap_length = 0 }; Modified: head/net/asterisk13/files/patch-configure ============================================================================== --- head/net/asterisk13/files/patch-configure Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/files/patch-configure Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- configure.orig 2014-10-19 17:07:50 UTC +--- configure.orig 2015-07-24 22:20:17 UTC +++ configure -@@ -4667,9 +4667,9 @@ astheaderdir='${includedir}/asterisk' +@@ -4684,9 +4684,9 @@ astheaderdir='${includedir}/asterisk' astlibdir='${libdir}' astmoddir='${libdir}/asterisk/modules' astmandir='${mandir}' @@ -12,7 +12,7 @@ astkeydir='${astvarlibdir}' astspooldir='${localstatedir}/spool/asterisk' astlogdir='${localstatedir}/log/asterisk' -@@ -4692,8 +4692,6 @@ esac +@@ -4709,8 +4709,6 @@ esac case "${host_os}" in freebsd*) ac_default_prefix=/usr/local @@ -21,7 +21,7 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -19052,6 +19050,8 @@ $as_echo_n "checking if \"struct ifaddrs +@@ -19297,6 +19295,8 @@ $as_echo_n "checking if \"struct ifaddrs cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30,7 +30,7 @@ #include <ifaddrs.h> int main () -@@ -27599,7 +27599,7 @@ $as_echo "${OPENH323_BUILD}" >&6; } +@@ -28158,7 +28158,7 @@ $as_echo "${OPENH323_BUILD}" >&6; } fi @@ -39,7 +39,7 @@ if test "${HAS_OPENH323:-unset}" != "unset"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 -@@ -27697,13 +27697,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ +@@ -28256,13 +28256,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh` @@ -56,7 +56,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -27745,18 +27745,18 @@ fi +@@ -28304,18 +28304,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -78,7 +78,7 @@ if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then : LUA_HEADER_FOUND=1 else -@@ -27809,13 +27809,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ +@@ -28368,13 +28368,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_ ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh` @@ -95,7 +95,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -27857,18 +27857,18 @@ fi +@@ -28416,18 +28416,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then Modified: head/net/asterisk13/files/patch-include-asterisk-config.h ============================================================================== --- head/net/asterisk13/files/patch-include-asterisk-config.h Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/files/patch-include-asterisk-config.h Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- include/asterisk/config.h.orig 2014-10-16 17:30:39 UTC +--- include/asterisk/config.h.orig 2015-07-24 22:20:17 UTC +++ include/asterisk/config.h -@@ -674,6 +674,8 @@ struct ast_variable *ast_variables_rever +@@ -714,6 +714,8 @@ struct ast_variable *ast_variables_rever * This function frees a list of variables. */ void ast_variables_destroy(struct ast_variable *var); Modified: head/net/asterisk13/files/patch-main__http.c ============================================================================== --- head/net/asterisk13/files/patch-main__http.c Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/files/patch-main__http.c Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- main/http.c.orig 2014-07-07 01:10:55 UTC +--- main/http.c.orig 2015-07-24 22:20:17 UTC +++ main/http.c -@@ -2032,7 +2032,7 @@ static int __ast_http_load(int reload) +@@ -2080,7 +2080,7 @@ static int __ast_http_load(int reload) struct http_uri_redirect *redirect; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; uint32_t bindport = DEFAULT_PORT; Modified: head/net/asterisk13/files/patch-main__utils.c ============================================================================== --- head/net/asterisk13/files/patch-main__utils.c Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/files/patch-main__utils.c Sat Aug 8 13:04:49 2015 (r393727) @@ -1,6 +1,6 @@ ---- main/utils.c.orig 2014-09-18 19:22:39 UTC +--- main/utils.c.orig 2015-07-24 22:20:17 UTC +++ main/utils.c -@@ -1220,8 +1220,8 @@ int ast_pthread_create_stack(pthread_t * +@@ -1256,8 +1256,8 @@ int ast_pthread_create_stack(pthread_t * pthread_attr_init(attr); } Modified: head/net/asterisk13/pkg-plist ============================================================================== --- head/net/asterisk13/pkg-plist Sat Aug 8 12:55:24 2015 (r393726) +++ head/net/asterisk13/pkg-plist Sat Aug 8 13:04:49 2015 (r393727) @@ -390,7 +390,7 @@ lib/asterisk/modules/res_clialiases.so %%CURL%%lib/asterisk/modules/res_curl.so %%CURL%%lib/asterisk/modules/res_config_curl.so %%LDAP%%lib/asterisk/modules/res_config_ldap.so -%%SQLITE%%lib/asterisk/modules/res_config_sqlite.so +%%SQLITE2%%lib/asterisk/modules/res_config_sqlite.so lib/asterisk/modules/res_config_sqlite3.so lib/asterisk/modules/res_format_attr_celt.so lib/asterisk/modules/res_format_attr_h263.so @@ -453,6 +453,7 @@ lib/asterisk/modules/res_realtime.so lib/asterisk/modules/res_sorcery_astdb.so lib/asterisk/modules/res_sorcery_config.so lib/asterisk/modules/res_sorcery_memory.so +lib/asterisk/modules/res_sorcery_memory_cache.so lib/asterisk/modules/res_sorcery_realtime.so %%SRTP%%lib/asterisk/modules/res_srtp.so lib/asterisk/modules/res_stasis.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508081304.t78D4o8R045428>