Date: Mon, 15 Dec 2014 14:46:26 +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: r374749 - in head/net: . asterisk asterisk11 asterisk13 asterisk13/files Message-ID: <201412151446.sBFEkQj1019613@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Dec 15 14:46:25 2014 New Revision: 374749 URL: https://svnweb.freebsd.org/changeset/ports/374749 QAT: https://qat.redports.org/buildarchive/r374749/ Log: Add asterisk13 port. Fix CONFLICTS for asterisk ports and remove long deleted entries references. Upstream announce: http://blogs.digium.com/2014/10/28/asterisk-13-0-0-now-available/ Added: head/net/asterisk13/ - copied from r374747, head/net/asterisk11/ head/net/asterisk13/files/patch-channels_sip_include_route.h (contents, props changed) Modified: head/net/Makefile head/net/asterisk/Makefile head/net/asterisk11/Makefile head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/asterisk13/files/patch-Makefile head/net/asterisk13/files/patch-agi__Makefile head/net/asterisk13/files/patch-channels-chan_dahdi.c head/net/asterisk13/files/patch-channels__sip__include__sip.h head/net/asterisk13/files/patch-configure head/net/asterisk13/files/patch-include-asterisk-astobj2.h head/net/asterisk13/files/patch-include-asterisk-config.h head/net/asterisk13/files/patch-main__Makefile head/net/asterisk13/files/patch-main__asterisk.exports.in head/net/asterisk13/files/patch-main__http.c head/net/asterisk13/files/patch-main__lock.c head/net/asterisk13/files/patch-main__utils.c head/net/asterisk13/pkg-descr head/net/asterisk13/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Dec 15 14:42:32 2014 (r374748) +++ head/net/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -28,6 +28,7 @@ SUBDIR += aslookup SUBDIR += asterisk SUBDIR += asterisk11 + SUBDIR += asterisk13 SUBDIR += avahi SUBDIR += avahi-app SUBDIR += avahi-autoipd Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Mon Dec 15 14:42:32 2014 (r374748) +++ head/net/asterisk/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -3,6 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.32.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -44,7 +45,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-10* +CONFLICTS_INSTALL= asterisk*-11* asterisk*-13* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Dec 15 14:42:32 2014 (r374748) +++ head/net/asterisk11/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.14.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -38,7 +39,7 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* +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 Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk11/Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,30 +1,31 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.14.2 +PORTVERSION= 13.0.2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ -PKGNAMESUFFIX= 11 +PKGNAMESUFFIX= 13 MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit -LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ - libnewt.so:${PORTSDIR}/devel/newt \ - libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libsqlite3.so:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \ + libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ + libjansson.so:${PORTSDIR}/devel/jansson RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 +CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include USE_GCC= yes USE_GNOME= libxml2 -USES= bison cpe gmake +USE_LDCONFIG= yes +USES= bison cpe gmake iconv CPE_VENDOR= digium USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -36,14 +37,16 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLA NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" +CONFIGURE_ARGS+= --datarootdir=${DATADIR} +CONFLICTS= ossp-uuid-[0-9]* CONFLICTS_BUILD= linuxthreads-* -CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* +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 UUID + CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ - XMPP GSM SQLITE CURL LUA UUID + XMPP GSM SQLITE3 CURL LUA PJSIP SPEEX OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI @@ -59,7 +62,7 @@ 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) +PJSIP_DESC?= Build the PJSIP based SIP channel OPTIONS_SUB= yes OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ @@ -108,10 +111,11 @@ LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes -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]* +PJSIP_LIB_DEPENDS= libpj.so:${PORTSDIR}/net/pjsip +PJSIP_CONFIGURE_WITH= pjproject +PJSIP_USES= pkgconfig +SPEEX_LIB_DEPENDS= libspeexdsp.so:${PORTSDIR}/audio/speex +SPEEX_CONFIGURE_WITH= speex ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk @@ -136,7 +140,7 @@ post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample + ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk11/distinfo Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/distinfo Mon Dec 15 14:46:25 2014 (r374749) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.14.2.tar.gz) = c9a7a9cf4b4512333853a8f53ea243cd8b0bc62123a397b20e03835ad1497f7e -SIZE (asterisk-11.14.2.tar.gz) = 34967655 +SHA256 (asterisk-13.0.2.tar.gz) = dfaf9d4be3581dc9dfecdfe868b2f119809984743ea42a7abdabd6fa129430fc +SIZE (asterisk-13.0.2.tar.gz) = 56553665 Modified: head/net/asterisk13/files/patch-Makefile ============================================================================== --- head/net/asterisk11/files/patch-Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- Makefile.orig 2012-06-13 16:30:34.000000000 +0200 -+++ Makefile 2012-08-02 00:12:13.812569306 +0200 -@@ -123,7 +123,7 @@ +--- Makefile.orig 2014-10-19 17:07:50 UTC ++++ Makefile +@@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,16 +9,25 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -192,7 +192,7 @@ +@@ -152,7 +152,7 @@ LINKER_SYMBOL_PREFIX= + #_ASTCFLAGS+=-DOLD_DSP_ROUTINES + + # Default install directory for DAHDI hooks. +-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 ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. - BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) + BSDVERSION=$(OSVERSION) _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - endif - -@@ -425,8 +425,12 @@ + # flag to tell 'ldconfig' to only process specified directories + LDCONFIG_FLAGS=-m +@@ -461,8 +461,12 @@ datafiles: _all doc/core-en_US.xml $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -31,17 +40,33 @@ + $(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \ done $(MAKE) -C sounds install - -@@ -485,7 +489,7 @@ + find rest-api -name "*.json" | while read x; do \ +@@ -556,7 +560,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ - "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ -- "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" -+ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing" + "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ +- "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" ++ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ ++ "$(ASTSPOOLDIR)/outgoing" installdirs: @for i in $(INSTALLDIRS); do \ -@@ -552,7 +556,7 @@ +@@ -592,10 +597,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 +-ifeq ($(HAVE_DAHDI),1) +- $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR) +- $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk +-endif ++#ifeq ($(HAVE_DAHDI),1) ++# $(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR) ++# $(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk ++#endif + + $(SUBDIRS_INSTALL): + +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install +@@ -628,7 +633,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) @exit 1 endif @@ -50,17 +75,17 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -594,29 +598,18 @@ +@@ -670,29 +675,16 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ - $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ done samples: adsi @echo Installing other config files... - @for x in configs/*.sample; do \ + @for x in configs/samples/*.sample; do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ - if [ -f "$${dst}" ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ @@ -73,23 +98,32 @@ - echo "Skipping config file $$x"; \ - continue; \ - fi ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ - fi ; \ -- echo "Installing file $$x"; \ +- fi ; \ + echo "Installing file $$x"; \ - $(INSTALL) -m 644 "$$x" "$${dst}" ;\ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \ done - if [ "$(OVERWRITE)" = "y" ]; then \ + @if true; then \ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ -@@ -630,6 +623,7 @@ + -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ +@@ -705,15 +697,15 @@ samples: adsi + -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ - "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ -+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)-dist" ; \ + -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ +- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ +- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ ++ "$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ ++ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi ; \ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" + build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" + + @for x in phoneprov/*; do \ +- dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ ++ dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ + if [ -f "$${dst}" ]; then \ + if [ "$(OVERWRITE)" = "y" ]; then \ + if cmp -s "$${dst}" "$$x" ; then \ Modified: head/net/asterisk13/files/patch-agi__Makefile ============================================================================== --- head/net/asterisk11/files/patch-agi__Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-agi__Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2012-10-14 21:56:13 UTC ++++ agi/Makefile +@@ -16,7 +16,9 @@ ASTTOPDIR?=.. .PHONY: clean all uninstall Modified: head/net/asterisk13/files/patch-channels-chan_dahdi.c ============================================================================== --- head/net/asterisk11/files/patch-channels-chan_dahdi.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-channels-chan_dahdi.c Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2014-07-25 16:47:17 UTC ++++ channels/chan_dahdi.c +@@ -4596,6 +4596,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) -@@ -4718,7 +4720,9 @@ +@@ -4626,7 +4628,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 { -@@ -4752,8 +4756,9 @@ +@@ -4660,8 +4664,9 @@ void dahdi_ec_disable(struct dahdi_pvt * if (p->echocanon) { struct dahdi_echocanparams ecp = { .tap_length = 0 }; Modified: head/net/asterisk13/files/patch-channels__sip__include__sip.h ============================================================================== --- head/net/asterisk11/files/patch-channels__sip__include__sip.h Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-channels__sip__include__sip.h Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2014-07-24 17:47:29 UTC ++++ channels/sip/include/sip.h +@@ -192,7 +192,7 @@ #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ #define DEFAULT_MOHSUGGEST "" #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ Added: head/net/asterisk13/files/patch-channels_sip_include_route.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/asterisk13/files/patch-channels_sip_include_route.h Mon Dec 15 14:46:25 2014 (r374749) @@ -0,0 +1,11 @@ +--- channels/sip/include/route.h.orig 2014-02-10 18:28:35 UTC ++++ channels/sip/include/route.h +@@ -98,7 +98,7 @@ void sip_route_dump(const struct sip_rou + * \retval NULL on failure + */ + struct ast_str *sip_route_list(const struct sip_route *route, int formatcli, int skip) +- __attribute_malloc__ __attribute_warn_unused_result__; ++ __attribute__((__malloc__)) __attribute__((__warn_unused_result__)); + + /*! + * \brief Check if the route is strict Modified: head/net/asterisk13/files/patch-configure ============================================================================== --- head/net/asterisk11/files/patch-configure Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-configure Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2014-10-19 17:07:50 UTC ++++ configure +@@ -4667,9 +4667,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 @@ +@@ -4692,8 +4692,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 @@ +@@ -19052,6 +19050,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 @@ +@@ -27599,7 +27599,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 @@ +@@ -27697,13 +27697,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 @@ +@@ -27745,18 +27745,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 @@ +@@ -27809,13 +27809,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 @@ +@@ -27857,18 +27857,18 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then Modified: head/net/asterisk13/files/patch-include-asterisk-astobj2.h ============================================================================== --- head/net/asterisk11/files/patch-include-asterisk-astobj2.h Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-include-asterisk-astobj2.h Mon Dec 15 14:46:25 2014 (r374749) @@ -1,10 +1,11 @@ ---- 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 @@ - #else - #define ao2_cleanup(obj) __ao2_cleanup(obj) +--- include/asterisk/astobj2.h.orig 2014-07-18 17:55:38 UTC ++++ include/asterisk/astobj2.h +@@ -1546,6 +1546,8 @@ void ao2_container_unregister(const char + #define ao2_link_flags(container, obj, flags) __ao2_link((container), (obj), (flags)) + #endif +static inline void ao2_cleanup_cleanup(void *obj) + { ao2_cleanup(*(void **)obj); } - void ao2_iterator_cleanup(struct ao2_iterator *iter); - #endif /* _ASTERISK_ASTOBJ2_H */ + + int __ao2_link_debug(struct ao2_container *c, void *obj_new, int flags, const char *tag, const char *file, int line, const char *func); + int __ao2_link(struct ao2_container *c, void *obj_new, int flags); Modified: head/net/asterisk13/files/patch-include-asterisk-config.h ============================================================================== --- head/net/asterisk11/files/patch-include-asterisk-config.h Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-include-asterisk-config.h Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2014-10-16 17:30:39 UTC ++++ include/asterisk/config.h +@@ -674,6 +674,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__Makefile ============================================================================== --- head/net/asterisk11/files/patch-main__Makefile Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__Makefile Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- main/Makefile.orig 2013-02-26 20:19:51.000000000 +0100 -+++ main/Makefile 2014-05-16 11:48:55.545963341 +0200 -@@ -215,9 +215,9 @@ +--- main/Makefile.orig 2014-07-04 15:26:58 UTC ++++ main/Makefile +@@ -217,9 +217,9 @@ ifeq ($(GNU_LD),1) endif $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS) @@ -13,7 +13,7 @@ $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) $(LN) -sf $< $@ -@@ -266,9 +266,9 @@ +@@ -264,9 +264,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) # else # Darwin $(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/" endif Modified: head/net/asterisk13/files/patch-main__asterisk.exports.in ============================================================================== --- head/net/asterisk11/files/patch-main__asterisk.exports.in Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__asterisk.exports.in Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- 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 -@@ -65,6 +65,8 @@ +--- main/asterisk.exports.in.orig 2013-08-22 08:26:55 UTC ++++ main/asterisk.exports.in +@@ -68,6 +68,8 @@ */ LINKER_SYMBOL_PREFIX_IO_stdin_used; Modified: head/net/asterisk13/files/patch-main__http.c ============================================================================== --- head/net/asterisk11/files/patch-main__http.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__http.c Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2014-07-07 01:10:55 UTC ++++ main/http.c +@@ -2032,7 +2032,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__lock.c ============================================================================== --- head/net/asterisk11/files/patch-main__lock.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__lock.c Mon Dec 15 14:46:25 2014 (r374749) @@ -1,6 +1,6 @@ ---- ./main/lock.c.orig 2010-11-06 15:00:15.000000000 +0100 -+++ ./main/lock.c 2010-11-06 15:00:23.000000000 +0100 -@@ -679,10 +679,6 @@ +--- main/lock.c.orig 2014-03-25 15:47:17 UTC ++++ main/lock.c +@@ -691,10 +691,6 @@ int __ast_rwlock_init(int tracking, cons pthread_rwlockattr_init(&attr); Modified: head/net/asterisk13/files/patch-main__utils.c ============================================================================== --- head/net/asterisk11/files/patch-main__utils.c Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/files/patch-main__utils.c Mon Dec 15 14:46:25 2014 (r374749) @@ -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 2014-09-18 19:22:39 UTC ++++ main/utils.c +@@ -1220,8 +1220,8 @@ int ast_pthread_create_stack(pthread_t * pthread_attr_init(attr); } Modified: head/net/asterisk13/pkg-descr ============================================================================== --- head/net/asterisk11/pkg-descr Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/pkg-descr Mon Dec 15 14:46:25 2014 (r374749) @@ -2,4 +2,4 @@ Asterisk is an Open Source PBX and telep sense, middleware between Internet and telephony channels on the bottom, and Internet and telephony applications at the top. -WWW: http://www.asterisk.org +WWW: http://www.asteriskpbx.com Modified: head/net/asterisk13/pkg-plist ============================================================================== --- head/net/asterisk11/pkg-plist Mon Dec 15 14:26:05 2014 (r374747) +++ head/net/asterisk13/pkg-plist Mon Dec 15 14:46:25 2014 (r374749) @@ -1,442 +1,300 @@ -@unexec if cmp -s %D/%%ETCDIR%%/acl.conf %D/%%ETCDIR%%/acl.conf-dist; then rm -f %D/%%ETCDIR%%/acl.conf; fi -%%ETCDIR%%/acl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_adaptive_odbc.conf %D/%%ETCDIR%%/cdr_adaptive_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; fi -%%ETCDIR%%/cdr_adaptive_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_sqlite3_custom.conf %D/%%ETCDIR%%/cdr_sqlite3_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; fi -%%ETCDIR%%/cdr_sqlite3_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_syslog.conf %D/%%ETCDIR%%/cdr_syslog.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_syslog.conf; fi -%%ETCDIR%%/cdr_syslog.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli.conf %D/%%ETCDIR%%/cli.conf-dist; then rm -f %D/%%ETCDIR%%/cli.conf; fi -%%ETCDIR%%/cli.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli_aliases.conf %D/%%ETCDIR%%/cli_aliases.conf-dist; then rm -f %D/%%ETCDIR%%/cli_aliases.conf; fi -%%ETCDIR%%/cli_aliases.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cli_permissions.conf %D/%%ETCDIR%%/cli_permissions.conf-dist; then rm -f %D/%%ETCDIR%%/cli_permissions.conf; fi -%%ETCDIR%%/cli_permissions.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/confbridge.conf %D/%%ETCDIR%%/confbridge.conf-dist; then rm -f %D/%%ETCDIR%%/confbridge.conf; fi -%%ETCDIR%%/confbridge.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/config_test.conf %D/%%ETCDIR%%/config_test.conf-dist; then rm -f %D/%%ETCDIR%%/config_test.conf; fi -%%ETCDIR%%/config_test.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/console.conf %D/%%ETCDIR%%/console.conf-dist; then rm -f %D/%%ETCDIR%%/console.conf; fi -%%ETCDIR%%/console.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dbsep.conf %D/%%ETCDIR%%/dbsep.conf-dist; then rm -f %D/%%ETCDIR%%/dbsep.conf; fi -%%ETCDIR%%/dbsep.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dsp.conf %D/%%ETCDIR%%/dsp.conf-dist; then rm -f %D/%%ETCDIR%%/dsp.conf; fi -%%ETCDIR%%/dsp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.lua %D/%%ETCDIR%%/extensions.lua-dist; then rm -f %D/%%ETCDIR%%/extensions.lua; fi -%%ETCDIR%%/extensions.lua-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions_minivm.conf %D/%%ETCDIR%%/extensions_minivm.conf-dist; then rm -f %D/%%ETCDIR%%/extensions_minivm.conf; fi -%%ETCDIR%%/extensions_minivm.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/jingle.conf %D/%%ETCDIR%%/jingle.conf-dist; then rm -f %D/%%ETCDIR%%/jingle.conf; fi -%%ETCDIR%%/jingle.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/minivm.conf %D/%%ETCDIR%%/minivm.conf-dist; then rm -f %D/%%ETCDIR%%/minivm.conf; fi -%%ETCDIR%%/minivm.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/motif.conf %D/%%ETCDIR%%/motif.conf-dist; then rm -f %D/%%ETCDIR%%/motif.conf; fi -%%ETCDIR%%/motif.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/ooh323.conf %D/%%ETCDIR%%/ooh323.conf-dist; then rm -f %D/%%ETCDIR%%/ooh323.conf; fi -%%ETCDIR%%/ooh323.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/phoneprov.conf %D/%%ETCDIR%%/phoneprov.conf-dist; then rm -f %D/%%ETCDIR%%/phoneprov.conf; fi -%%ETCDIR%%/phoneprov.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/queuerules.conf %D/%%ETCDIR%%/queuerules.conf-dist; then rm -f %D/%%ETCDIR%%/queuerules.conf; fi -%%ETCDIR%%/queuerules.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_ldap.conf %D/%%ETCDIR%%/res_ldap.conf-dist; then rm -f %D/%%ETCDIR%%/res_ldap.conf; fi -%%ETCDIR%%/res_ldap.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/unistim.conf %D/%%ETCDIR%%/unistim.conf-dist; then rm -f %D/%%ETCDIR%%/unistim.conf; fi -%%ETCDIR%%/unistim.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/adsi.conf %D/%%ETCDIR%%/adsi.conf-dist; then rm -f %D/%%ETCDIR%%/adsi.conf; fi -%%ETCDIR%%/adsi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/agents.conf %D/%%ETCDIR%%/agents.conf-dist; then rm -f %D/%%ETCDIR%%/agents.conf; fi -%%ETCDIR%%/agents.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/alarmreceiver.conf %D/%%ETCDIR%%/alarmreceiver.conf-dist; then rm -f %D/%%ETCDIR%%/alarmreceiver.conf; fi -%%ETCDIR%%/alarmreceiver.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/alsa.conf %D/%%ETCDIR%%/alsa.conf-dist; then rm -f %D/%%ETCDIR%%/alsa.conf; fi -%%ETCDIR%%/alsa.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/asterisk.adsi %D/%%ETCDIR%%/asterisk.adsi-dist; then rm -f %D/%%ETCDIR%%/asterisk.adsi; fi -%%ETCDIR%%/asterisk.adsi-dist -@unexec if cmp -s %D/%%ETCDIR%%/asterisk.conf %D/%%ETCDIR%%/asterisk.conf-dist; then rm -f %D/%%ETCDIR%%/asterisk.conf; fi -%%ETCDIR%%/asterisk.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/calendar.conf %D/%%ETCDIR%%/calendar.conf-dist; then rm -f %D/%%ETCDIR%%/calendar.conf; fi -%%ETCDIR%%/calendar.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/ccss.conf %D/%%ETCDIR%%/ccss.conf-dist; then rm -f %D/%%ETCDIR%%/ccss.conf; fi -%%ETCDIR%%/ccss.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr.conf %D/%%ETCDIR%%/cdr.conf-dist; then rm -f %D/%%ETCDIR%%/cdr.conf; fi -%%ETCDIR%%/cdr.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_custom.conf %D/%%ETCDIR%%/cdr_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_custom.conf; fi -%%ETCDIR%%/cdr_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_manager.conf %D/%%ETCDIR%%/cdr_manager.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_manager.conf; fi -%%ETCDIR%%/cdr_manager.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_mysql.conf %D/%%ETCDIR%%/cdr_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_mysql.conf; fi -%%ETCDIR%%/cdr_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_odbc.conf %D/%%ETCDIR%%/cdr_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_odbc.conf; fi -%%ETCDIR%%/cdr_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_pgsql.conf %D/%%ETCDIR%%/cdr_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_pgsql.conf; fi -%%ETCDIR%%/cdr_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cdr_tds.conf %D/%%ETCDIR%%/cdr_tds.conf-dist; then rm -f %D/%%ETCDIR%%/cdr_tds.conf; fi -%%ETCDIR%%/cdr_tds.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel.conf %D/%%ETCDIR%%/cel.conf-dist; then rm -f %D/%%ETCDIR%%/cel.conf; fi -%%ETCDIR%%/cel.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_custom.conf %D/%%ETCDIR%%/cel_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cel_custom.conf; fi -%%ETCDIR%%/cel_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_odbc.conf %D/%%ETCDIR%%/cel_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/cel_odbc.conf; fi -%%ETCDIR%%/cel_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_pgsql.conf %D/%%ETCDIR%%/cel_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/cel_pgsql.conf; fi -%%ETCDIR%%/cel_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_sqlite3_custom.conf %D/%%ETCDIR%%/cel_sqlite3_custom.conf-dist; then rm -f %D/%%ETCDIR%%/cel_sqlite3_custom.conf; fi -%%ETCDIR%%/cel_sqlite3_custom.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/cel_tds.conf %D/%%ETCDIR%%/cel_tds.conf-dist; then rm -f %D/%%ETCDIR%%/cel_tds.conf; fi -%%ETCDIR%%/cel_tds.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/codecs.conf %D/%%ETCDIR%%/codecs.conf-dist; then rm -f %D/%%ETCDIR%%/codecs.conf; fi -%%ETCDIR%%/codecs.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dnsmgr.conf %D/%%ETCDIR%%/dnsmgr.conf-dist; then rm -f %D/%%ETCDIR%%/dnsmgr.conf; fi -%%ETCDIR%%/dnsmgr.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/dundi.conf %D/%%ETCDIR%%/dundi.conf-dist; then rm -f %D/%%ETCDIR%%/dundi.conf; fi -%%ETCDIR%%/dundi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/enum.conf %D/%%ETCDIR%%/enum.conf-dist; then rm -f %D/%%ETCDIR%%/enum.conf; fi -%%ETCDIR%%/enum.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extconfig.conf %D/%%ETCDIR%%/extconfig.conf-dist; then rm -f %D/%%ETCDIR%%/extconfig.conf; fi -%%ETCDIR%%/extconfig.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.ael %D/%%ETCDIR%%/extensions.ael-dist; then rm -f %D/%%ETCDIR%%/extensions.ael; fi -%%ETCDIR%%/extensions.ael-dist -@unexec if cmp -s %D/%%ETCDIR%%/extensions.conf %D/%%ETCDIR%%/extensions.conf-dist; then rm -f %D/%%ETCDIR%%/extensions.conf; fi -%%ETCDIR%%/extensions.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/features.conf %D/%%ETCDIR%%/features.conf-dist; then rm -f %D/%%ETCDIR%%/features.conf; fi -%%ETCDIR%%/features.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/festival.conf %D/%%ETCDIR%%/festival.conf-dist; then rm -f %D/%%ETCDIR%%/festival.conf; fi -%%ETCDIR%%/festival.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/iax.conf %D/%%ETCDIR%%/iax.conf-dist; then rm -f %D/%%ETCDIR%%/iax.conf; fi -%%ETCDIR%%/iax.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/iaxprov.conf %D/%%ETCDIR%%/iaxprov.conf-dist; then rm -f %D/%%ETCDIR%%/iaxprov.conf; fi -%%ETCDIR%%/iaxprov.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/indications.conf %D/%%ETCDIR%%/indications.conf-dist; then rm -f %D/%%ETCDIR%%/indications.conf; fi -%%ETCDIR%%/indications.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/logger.conf %D/%%ETCDIR%%/logger.conf-dist; then rm -f %D/%%ETCDIR%%/logger.conf; fi -%%ETCDIR%%/logger.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/manager.conf %D/%%ETCDIR%%/manager.conf-dist; then rm -f %D/%%ETCDIR%%/manager.conf; fi -%%ETCDIR%%/manager.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/meetme.conf %D/%%ETCDIR%%/meetme.conf-dist; then rm -f %D/%%ETCDIR%%/meetme.conf; fi -%%ETCDIR%%/meetme.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/mgcp.conf %D/%%ETCDIR%%/mgcp.conf-dist; then rm -f %D/%%ETCDIR%%/mgcp.conf; fi -%%ETCDIR%%/mgcp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/misdn.conf %D/%%ETCDIR%%/misdn.conf-dist; then rm -f %D/%%ETCDIR%%/misdn.conf; fi -%%ETCDIR%%/misdn.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/modules.conf %D/%%ETCDIR%%/modules.conf-dist; then rm -f %D/%%ETCDIR%%/modules.conf; fi -%%ETCDIR%%/modules.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/musiconhold.conf %D/%%ETCDIR%%/musiconhold.conf-dist; then rm -f %D/%%ETCDIR%%/musiconhold.conf; fi -%%ETCDIR%%/musiconhold.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/osp.conf %D/%%ETCDIR%%/osp.conf-dist; then rm -f %D/%%ETCDIR%%/osp.conf; fi -%%ETCDIR%%/osp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/oss.conf %D/%%ETCDIR%%/oss.conf-dist; then rm -f %D/%%ETCDIR%%/oss.conf; fi -%%ETCDIR%%/oss.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/phone.conf %D/%%ETCDIR%%/phone.conf-dist; then rm -f %D/%%ETCDIR%%/phone.conf; fi -%%ETCDIR%%/phone.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/queues.conf %D/%%ETCDIR%%/queues.conf-dist; then rm -f %D/%%ETCDIR%%/queues.conf; fi -%%ETCDIR%%/queues.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_mysql.conf %D/%%ETCDIR%%/res_config_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_mysql.conf; fi -%%ETCDIR%%/res_config_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_sqlite3.conf %D/%%ETCDIR%%/res_config_sqlite3.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_sqlite3.conf; fi -%%ETCDIR%%/res_config_sqlite3.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_corosync.conf %D/%%ETCDIR%%/res_corosync.conf-dist; then rm -f %D/%%ETCDIR%%/res_corosync.conf; fi -%%ETCDIR%%/res_corosync.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_pgsql.conf %D/%%ETCDIR%%/res_pgsql.conf-dist; then rm -f %D/%%ETCDIR%%/res_pgsql.conf; fi -%%ETCDIR%%/res_pgsql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_pktccops.conf %D/%%ETCDIR%%/res_pktccops.conf-dist; then rm -f %D/%%ETCDIR%%/res_pktccops.conf; fi -%%ETCDIR%%/res_pktccops.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_odbc.conf %D/%%ETCDIR%%/res_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/res_odbc.conf; fi -%%ETCDIR%%/res_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/rtp.conf %D/%%ETCDIR%%/rtp.conf-dist; then rm -f %D/%%ETCDIR%%/rtp.conf; fi -%%ETCDIR%%/rtp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sip.conf %D/%%ETCDIR%%/sip.conf-dist; then rm -f %D/%%ETCDIR%%/sip.conf; fi -%%ETCDIR%%/sip.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sip_notify.conf %D/%%ETCDIR%%/sip_notify.conf-dist; then rm -f %D/%%ETCDIR%%/sip_notify.conf; fi -%%ETCDIR%%/sip_notify.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/skinny.conf %D/%%ETCDIR%%/skinny.conf-dist; then rm -f %D/%%ETCDIR%%/skinny.conf; fi -%%ETCDIR%%/skinny.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/telcordia-1.adsi %D/%%ETCDIR%%/telcordia-1.adsi-dist; then rm -f %D/%%ETCDIR%%/telcordia-1.adsi; fi -%%ETCDIR%%/telcordia-1.adsi-dist -@unexec if cmp -s %D/%%ETCDIR%%/voicemail.conf %D/%%ETCDIR%%/voicemail.conf-dist; then rm -f %D/%%ETCDIR%%/voicemail.conf; fi -%%ETCDIR%%/voicemail.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/vpb.conf %D/%%ETCDIR%%/vpb.conf-dist; then rm -f %D/%%ETCDIR%%/vpb.conf; fi -%%ETCDIR%%/vpb.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/chan_dahdi.conf %D/%%ETCDIR%%/chan_dahdi.conf-dist; then rm -f %D/%%ETCDIR%%/chan_dahdi.conf; fi -%%ETCDIR%%/chan_dahdi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/chan_mobile.conf %D/%%ETCDIR%%/chan_mobile.conf-dist; then rm -f %D/%%ETCDIR%%/chan_mobile.conf; fi -%%ETCDIR%%/chan_mobile.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/udptl.conf %D/%%ETCDIR%%/udptl.conf-dist; then rm -f %D/%%ETCDIR%%/udptl.conf; fi -%%ETCDIR%%/udptl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/users.conf %D/%%ETCDIR%%/users.conf-dist; then rm -f %D/%%ETCDIR%%/users.conf; fi -%%ETCDIR%%/users.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/smdi.conf %D/%%ETCDIR%%/smdi.conf-dist; then rm -f %D/%%ETCDIR%%/smdi.conf; fi -%%ETCDIR%%/smdi.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/sla.conf %D/%%ETCDIR%%/sla.conf-dist; then rm -f %D/%%ETCDIR%%/sla.conf; fi -%%ETCDIR%%/sla.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/say.conf %D/%%ETCDIR%%/say.conf-dist; then rm -f %D/%%ETCDIR%%/say.conf; fi -%%ETCDIR%%/say.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_snmp.conf %D/%%ETCDIR%%/res_snmp.conf-dist; then rm -f %D/%%ETCDIR%%/res_snmp.conf; fi -%%ETCDIR%%/res_snmp.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_stun_monitor.conf %D/%%ETCDIR%%/res_stun_monitor.conf-dist; then rm -f %D/%%ETCDIR%%/res_stun_monitor.conf; fi -%%ETCDIR%%/res_stun_monitor.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/muted.conf %D/%%ETCDIR%%/muted.conf-dist; then rm -f %D/%%ETCDIR%%/muted.conf; fi -%%ETCDIR%%/muted.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/jabber.conf %D/%%ETCDIR%%/jabber.conf-dist; then rm -f %D/%%ETCDIR%%/jabber.conf; fi -%%ETCDIR%%/jabber.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/http.conf %D/%%ETCDIR%%/http.conf-dist; then rm -f %D/%%ETCDIR%%/http.conf; fi -%%ETCDIR%%/http.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/h323.conf %D/%%ETCDIR%%/h323.conf-dist; then rm -f %D/%%ETCDIR%%/h323.conf; fi -%%ETCDIR%%/h323.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/gtalk.conf %D/%%ETCDIR%%/gtalk.conf-dist; then rm -f %D/%%ETCDIR%%/gtalk.conf; fi -%%ETCDIR%%/gtalk.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/func_odbc.conf %D/%%ETCDIR%%/func_odbc.conf-dist; then rm -f %D/%%ETCDIR%%/func_odbc.conf; fi -%%ETCDIR%%/func_odbc.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/followme.conf %D/%%ETCDIR%%/followme.conf-dist; then rm -f %D/%%ETCDIR%%/followme.conf; fi -%%ETCDIR%%/followme.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/amd.conf %D/%%ETCDIR%%/amd.conf-dist; then rm -f %D/%%ETCDIR%%/amd.conf; fi -%%ETCDIR%%/amd.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/app_skel.conf %D/%%ETCDIR%%/app_skel.conf-dist; then rm -f %D/%%ETCDIR%%/app_skel.conf; fi -%%ETCDIR%%/app_skel.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/app_mysql.conf %D/%%ETCDIR%%/app_mysql.conf-dist; then rm -f %D/%%ETCDIR%%/app_mysql.conf; fi -%%ETCDIR%%/app_mysql.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_config_sqlite.conf %D/%%ETCDIR%%/res_config_sqlite.conf-dist; then rm -f %D/%%ETCDIR%%/res_config_sqlite.conf; fi -%%ETCDIR%%/res_config_sqlite.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_curl.conf %D/%%ETCDIR%%/res_curl.conf-dist; then rm -f %D/%%ETCDIR%%/res_curl.conf; fi -%%ETCDIR%%/res_curl.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/res_fax.conf %D/%%ETCDIR%%/res_fax.conf-dist; then rm -f %D/%%ETCDIR%%/res_fax.conf; fi -%%ETCDIR%%/res_fax.conf-dist -@unexec if cmp -s %D/%%ETCDIR%%/xmpp.conf %D/%%ETCDIR%%/xmpp.conf-dist; then rm -f %D/%%ETCDIR%%/xmpp.conf; fi -%%ETCDIR%%/xmpp.conf-dist -@exec if test ! -e %D/%%ETCDIR%%/acl.conf; then cp -p %D/%%ETCDIR%%/acl.conf-dist %D/%%ETCDIR%%/acl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; then cp -p %D/%%ETCDIR%%/cdr_adaptive_odbc.conf-dist %D/%%ETCDIR%%/cdr_adaptive_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_syslog.conf; then cp -p %D/%%ETCDIR%%/cdr_syslog.conf-dist %D/%%ETCDIR%%/cdr_syslog.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; then cp -p %D/%%ETCDIR%%/cdr_sqlite3_custom.conf-dist %D/%%ETCDIR%%/cdr_sqlite3_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cli.conf; then cp -p %D/%%ETCDIR%%/cli.conf-dist %D/%%ETCDIR%%/cli.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/confbridge.conf; then cp -p %D/%%ETCDIR%%/confbridge.conf-dist %D/%%ETCDIR%%/confbridge.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/config_test.conf; then cp -p %D/%%ETCDIR%%/config_test.conf-dist %D/%%ETCDIR%%/config_test.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/console.conf; then cp -p %D/%%ETCDIR%%/console.conf-dist %D/%%ETCDIR%%/console.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.lua; then cp -p %D/%%ETCDIR%%/extensions.lua-dist %D/%%ETCDIR%%/extensions.lua; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions_minivm.conf; then cp -p %D/%%ETCDIR%%/extensions_minivm.conf-dist %D/%%ETCDIR%%/extensions_minivm.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/jingle.conf; then cp -p %D/%%ETCDIR%%/jingle.conf-dist %D/%%ETCDIR%%/jingle.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/minivm.conf; then cp -p %D/%%ETCDIR%%/minivm.conf-dist %D/%%ETCDIR%%/minivm.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/motif.conf; then cp -p %D/%%ETCDIR%%/motif.conf-dist %D/%%ETCDIR%%/motif.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/ooh323.conf; then cp -p %D/%%ETCDIR%%/ooh323.conf-dist %D/%%ETCDIR%%/ooh323.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/phoneprov.conf; then cp -p %D/%%ETCDIR%%/phoneprov.conf-dist %D/%%ETCDIR%%/phoneprov.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/queuerules.conf; then cp -p %D/%%ETCDIR%%/queuerules.conf-dist %D/%%ETCDIR%%/queuerules.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_ldap.conf; then cp -p %D/%%ETCDIR%%/res_ldap.conf-dist %D/%%ETCDIR%%/res_ldap.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/unistim.conf; then cp -p %D/%%ETCDIR%%/unistim.conf-dist %D/%%ETCDIR%%/unistim.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/adsi.conf; then cp -p %D/%%ETCDIR%%/adsi.conf-dist %D/%%ETCDIR%%/adsi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/agents.conf; then cp -p %D/%%ETCDIR%%/agents.conf-dist %D/%%ETCDIR%%/agents.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/alarmreceiver.conf; then cp -p %D/%%ETCDIR%%/alarmreceiver.conf-dist %D/%%ETCDIR%%/alarmreceiver.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/alsa.conf; then cp -p %D/%%ETCDIR%%/alsa.conf-dist %D/%%ETCDIR%%/alsa.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/asterisk.adsi; then cp -p %D/%%ETCDIR%%/asterisk.adsi-dist %D/%%ETCDIR%%/asterisk.adsi; fi -@exec if test ! -e %D/%%ETCDIR%%/ccss.conf; then cp -p %D/%%ETCDIR%%/ccss.conf-dist %D/%%ETCDIR%%/ccss.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/calendar.conf; then cp -p %D/%%ETCDIR%%/calendar.conf-dist %D/%%ETCDIR%%/calendar.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/asterisk.conf; then cp -p %D/%%ETCDIR%%/asterisk.conf-dist %D/%%ETCDIR%%/asterisk.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr.conf; then cp -p %D/%%ETCDIR%%/cdr.conf-dist %D/%%ETCDIR%%/cdr.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_custom.conf; then cp -p %D/%%ETCDIR%%/cdr_custom.conf-dist %D/%%ETCDIR%%/cdr_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_mysql.conf; then cp -p %D/%%ETCDIR%%/cdr_mysql.conf-dist %D/%%ETCDIR%%/cdr_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_manager.conf; then cp -p %D/%%ETCDIR%%/cdr_manager.conf-dist %D/%%ETCDIR%%/cdr_manager.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_odbc.conf; then cp -p %D/%%ETCDIR%%/cdr_odbc.conf-dist %D/%%ETCDIR%%/cdr_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_pgsql.conf; then cp -p %D/%%ETCDIR%%/cdr_pgsql.conf-dist %D/%%ETCDIR%%/cdr_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_tds.conf; then cp -p %D/%%ETCDIR%%/cel_tds.conf-dist %D/%%ETCDIR%%/cel_tds.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_sqlite3_custom.conf; then cp -p %D/%%ETCDIR%%/cel_sqlite3_custom.conf-dist %D/%%ETCDIR%%/cel_sqlite3_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_pgsql.conf; then cp -p %D/%%ETCDIR%%/cel_pgsql.conf-dist %D/%%ETCDIR%%/cel_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_odbc.conf; then cp -p %D/%%ETCDIR%%/cel_odbc.conf-dist %D/%%ETCDIR%%/cel_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel_custom.conf; then cp -p %D/%%ETCDIR%%/cel_custom.conf-dist %D/%%ETCDIR%%/cel_custom.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cel.conf; then cp -p %D/%%ETCDIR%%/cel.conf-dist %D/%%ETCDIR%%/cel.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/cdr_tds.conf; then cp -p %D/%%ETCDIR%%/cdr_tds.conf-dist %D/%%ETCDIR%%/cdr_tds.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/codecs.conf; then cp -p %D/%%ETCDIR%%/codecs.conf-dist %D/%%ETCDIR%%/codecs.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/dnsmgr.conf; then cp -p %D/%%ETCDIR%%/dnsmgr.conf-dist %D/%%ETCDIR%%/dnsmgr.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/dundi.conf; then cp -p %D/%%ETCDIR%%/dundi.conf-dist %D/%%ETCDIR%%/dundi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/enum.conf; then cp -p %D/%%ETCDIR%%/enum.conf-dist %D/%%ETCDIR%%/enum.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extconfig.conf; then cp -p %D/%%ETCDIR%%/extconfig.conf-dist %D/%%ETCDIR%%/extconfig.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.ael; then cp -p %D/%%ETCDIR%%/extensions.ael-dist %D/%%ETCDIR%%/extensions.ael; fi -@exec if test ! -e %D/%%ETCDIR%%/extensions.conf; then cp -p %D/%%ETCDIR%%/extensions.conf-dist %D/%%ETCDIR%%/extensions.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/features.conf; then cp -p %D/%%ETCDIR%%/features.conf-dist %D/%%ETCDIR%%/features.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/festival.conf; then cp -p %D/%%ETCDIR%%/festival.conf-dist %D/%%ETCDIR%%/festival.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/iax.conf; then cp -p %D/%%ETCDIR%%/iax.conf-dist %D/%%ETCDIR%%/iax.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/iaxprov.conf; then cp -p %D/%%ETCDIR%%/iaxprov.conf-dist %D/%%ETCDIR%%/iaxprov.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/indications.conf; then cp -p %D/%%ETCDIR%%/indications.conf-dist %D/%%ETCDIR%%/indications.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/logger.conf; then cp -p %D/%%ETCDIR%%/logger.conf-dist %D/%%ETCDIR%%/logger.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/manager.conf; then cp -p %D/%%ETCDIR%%/manager.conf-dist %D/%%ETCDIR%%/manager.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/meetme.conf; then cp -p %D/%%ETCDIR%%/meetme.conf-dist %D/%%ETCDIR%%/meetme.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/mgcp.conf; then cp -p %D/%%ETCDIR%%/mgcp.conf-dist %D/%%ETCDIR%%/mgcp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/misdn.conf; then cp -p %D/%%ETCDIR%%/misdn.conf-dist %D/%%ETCDIR%%/misdn.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/modules.conf; then cp -p %D/%%ETCDIR%%/modules.conf-dist %D/%%ETCDIR%%/modules.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/musiconhold.conf; then cp -p %D/%%ETCDIR%%/musiconhold.conf-dist %D/%%ETCDIR%%/musiconhold.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/osp.conf; then cp -p %D/%%ETCDIR%%/osp.conf-dist %D/%%ETCDIR%%/osp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/oss.conf; then cp -p %D/%%ETCDIR%%/oss.conf-dist %D/%%ETCDIR%%/oss.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/phone.conf; then cp -p %D/%%ETCDIR%%/phone.conf-dist %D/%%ETCDIR%%/phone.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_fax.conf; then cp -p %D/%%ETCDIR%%/res_fax.conf-dist %D/%%ETCDIR%%/res_fax.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/xmpp.conf; then cp -p %D/%%ETCDIR%%/xmpp.conf-dist %D/%%ETCDIR%%/xmpp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_curl.conf; then cp -p %D/%%ETCDIR%%/res_curl.conf-dist %D/%%ETCDIR%%/res_curl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_mysql.conf; then cp -p %D/%%ETCDIR%%/res_config_mysql.conf-dist %D/%%ETCDIR%%/res_config_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_sqlite.conf; then cp -p %D/%%ETCDIR%%/res_config_sqlite.conf-dist %D/%%ETCDIR%%/res_config_sqlite.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_config_sqlite3.conf; then cp -p %D/%%ETCDIR%%/res_config_sqlite3.conf-dist %D/%%ETCDIR%%/res_config_sqlite3.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_corosync.conf; then cp -p %D/%%ETCDIR%%/res_corosync.conf-dist %D/%%ETCDIR%%/res_corosync.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/queues.conf; then cp -p %D/%%ETCDIR%%/queues.conf-dist %D/%%ETCDIR%%/queues.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_pktccops.conf; then cp -p %D/%%ETCDIR%%/res_pktccops.conf-dist %D/%%ETCDIR%%/res_pktccops.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_pgsql.conf; then cp -p %D/%%ETCDIR%%/res_pgsql.conf-dist %D/%%ETCDIR%%/res_pgsql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_odbc.conf; then cp -p %D/%%ETCDIR%%/res_odbc.conf-dist %D/%%ETCDIR%%/res_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/rtp.conf; then cp -p %D/%%ETCDIR%%/rtp.conf-dist %D/%%ETCDIR%%/rtp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sip.conf; then cp -p %D/%%ETCDIR%%/sip.conf-dist %D/%%ETCDIR%%/sip.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sip_notify.conf; then cp -p %D/%%ETCDIR%%/sip_notify.conf-dist %D/%%ETCDIR%%/sip_notify.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/skinny.conf; then cp -p %D/%%ETCDIR%%/skinny.conf-dist %D/%%ETCDIR%%/skinny.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/telcordia-1.adsi; then cp -p %D/%%ETCDIR%%/telcordia-1.adsi-dist %D/%%ETCDIR%%/telcordia-1.adsi; fi -@exec if test ! -e %D/%%ETCDIR%%/voicemail.conf; then cp -p %D/%%ETCDIR%%/voicemail.conf-dist %D/%%ETCDIR%%/voicemail.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/vpb.conf; then cp -p %D/%%ETCDIR%%/vpb.conf-dist %D/%%ETCDIR%%/vpb.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/chan_mobile.conf; then cp -p %D/%%ETCDIR%%/chan_mobile.conf-dist %D/%%ETCDIR%%/chan_mobile.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/chan_dahdi.conf; then cp -p %D/%%ETCDIR%%/chan_dahdi.conf-dist %D/%%ETCDIR%%/chan_dahdi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/udptl.conf; then cp -p %D/%%ETCDIR%%/udptl.conf-dist %D/%%ETCDIR%%/udptl.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/users.conf; then cp -p %D/%%ETCDIR%%/users.conf-dist %D/%%ETCDIR%%/users.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/smdi.conf; then cp -p %D/%%ETCDIR%%/smdi.conf-dist %D/%%ETCDIR%%/smdi.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/sla.conf; then cp -p %D/%%ETCDIR%%/sla.conf-dist %D/%%ETCDIR%%/sla.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/say.conf; then cp -p %D/%%ETCDIR%%/say.conf-dist %D/%%ETCDIR%%/say.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_stun_monitor.conf; then cp -p %D/%%ETCDIR%%/res_stun_monitor.conf-dist %D/%%ETCDIR%%/res_stun_monitor.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/res_snmp.conf; then cp -p %D/%%ETCDIR%%/res_snmp.conf-dist %D/%%ETCDIR%%/res_snmp.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/muted.conf; then cp -p %D/%%ETCDIR%%/muted.conf-dist %D/%%ETCDIR%%/muted.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/jabber.conf; then cp -p %D/%%ETCDIR%%/jabber.conf-dist %D/%%ETCDIR%%/jabber.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/http.conf; then cp -p %D/%%ETCDIR%%/http.conf-dist %D/%%ETCDIR%%/http.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/h323.conf; then cp -p %D/%%ETCDIR%%/h323.conf-dist %D/%%ETCDIR%%/h323.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/gtalk.conf; then cp -p %D/%%ETCDIR%%/gtalk.conf-dist %D/%%ETCDIR%%/gtalk.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/func_odbc.conf; then cp -p %D/%%ETCDIR%%/func_odbc.conf-dist %D/%%ETCDIR%%/func_odbc.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/followme.conf; then cp -p %D/%%ETCDIR%%/followme.conf-dist %D/%%ETCDIR%%/followme.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/app_mysql.conf; then cp -p %D/%%ETCDIR%%/app_mysql.conf-dist %D/%%ETCDIR%%/app_mysql.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/app_skel.conf; then cp -p %D/%%ETCDIR%%/app_skel.conf-dist %D/%%ETCDIR%%/app_skel.conf; fi -@exec if test ! -e %D/%%ETCDIR%%/amd.conf; then cp -p %D/%%ETCDIR%%/amd.conf-dist %D/%%ETCDIR%%/amd.conf; fi -include/asterisk/doxygen/architecture.h -include/asterisk/doxygen/asterisk-git-howto.h -include/asterisk/doxygen/commits.h -include/asterisk/doxygen/licensing.h -include/asterisk/doxygen/mantisworkflow.h -include/asterisk/doxygen/releases.h -include/asterisk/doxygen/reviewboard.h -include/asterisk/_private.h -include/asterisk/aoc.h -include/asterisk/ast_version.h -include/asterisk/autochan.h -include/asterisk/calendar.h -include/asterisk/ccss.h -include/asterisk/cel.h -include/asterisk/celt.h -include/asterisk/channel_internal.h -include/asterisk/channelstate.h -include/asterisk/config_options.h -include/asterisk/data.h -include/asterisk/event.h -include/asterisk/event_defs.h -include/asterisk/extconf.h -include/asterisk/frame_defs.h -include/asterisk/framehook.h -include/asterisk/format.h -include/asterisk/format_cap.h -include/asterisk/format_pref.h -include/asterisk/fskmodem_float.h -include/asterisk/fskmodem_int.h -include/asterisk/hashtab.h -include/asterisk/http_websocket.h -include/asterisk/message.h -include/asterisk/mod_format.h -include/asterisk/netsock2.h -include/asterisk/network.h -include/asterisk/optional_api.h -include/asterisk/pktccops.h -include/asterisk/presencestate.h -include/asterisk/pval.h -include/asterisk/res_fax.h -include/asterisk/res_srtp.h -include/asterisk/rtp_engine.h -include/asterisk/select.h -include/asterisk/security_events.h -include/asterisk/security_events_defs.h -include/asterisk/silk.h -include/asterisk/sip_api.h -include/asterisk/stun.h -include/asterisk/syslog.h -include/asterisk/tcptls.h +@sample %%ETCDIR%%/acl.conf.sample +@sample %%ETCDIR%%/adsi.conf.sample +@sample %%ETCDIR%%/agents.conf.sample +@sample %%ETCDIR%%/alarmreceiver.conf.sample +@sample %%ETCDIR%%/alsa.conf.sample +@sample %%ETCDIR%%/amd.conf.sample +@sample %%ETCDIR%%/app_mysql.conf.sample +@sample %%ETCDIR%%/app_skel.conf.sample +@sample %%ETCDIR%%/ari.conf.sample +@sample %%ETCDIR%%/asterisk.adsi.sample +@sample %%ETCDIR%%/asterisk.conf.sample +@sample %%ETCDIR%%/calendar.conf.sample +@sample %%ETCDIR%%/ccss.conf.sample +@sample %%ETCDIR%%/cdr.conf.sample +@sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample +@sample %%ETCDIR%%/cdr_custom.conf.sample +@sample %%ETCDIR%%/cdr_manager.conf.sample +@sample %%ETCDIR%%/cdr_mysql.conf.sample +@sample %%ETCDIR%%/cdr_odbc.conf.sample +@sample %%ETCDIR%%/cdr_pgsql.conf.sample +@sample %%ETCDIR%%/cdr_sqlite3_custom.conf.sample +@sample %%ETCDIR%%/cdr_syslog.conf.sample +@sample %%ETCDIR%%/cdr_tds.conf.sample +@sample %%ETCDIR%%/cel.conf.sample +@sample %%ETCDIR%%/cel_custom.conf.sample +@sample %%ETCDIR%%/cel_odbc.conf.sample +@sample %%ETCDIR%%/cel_pgsql.conf.sample +@sample %%ETCDIR%%/cel_sqlite3_custom.conf.sample +@sample %%ETCDIR%%/cel_tds.conf.sample +@sample %%ETCDIR%%/chan_dahdi.conf.sample +@sample %%ETCDIR%%/chan_mobile.conf.sample +@sample %%ETCDIR%%/cli.conf.sample +@sample %%ETCDIR%%/cli_aliases.conf.sample +@sample %%ETCDIR%%/cli_permissions.conf.sample +@sample %%ETCDIR%%/codecs.conf.sample +@sample %%ETCDIR%%/confbridge.conf.sample +@sample %%ETCDIR%%/config_test.conf.sample +@sample %%ETCDIR%%/console.conf.sample +@sample %%ETCDIR%%/dbsep.conf.sample +@sample %%ETCDIR%%/dnsmgr.conf.sample +@sample %%ETCDIR%%/dsp.conf.sample +@sample %%ETCDIR%%/dundi.conf.sample +@sample %%ETCDIR%%/enum.conf.sample +@sample %%ETCDIR%%/extconfig.conf.sample +@sample %%ETCDIR%%/extensions.ael.sample +@sample %%ETCDIR%%/extensions.conf.sample +@sample %%ETCDIR%%/extensions.lua.sample +@sample %%ETCDIR%%/extensions_minivm.conf.sample +@sample %%ETCDIR%%/features.conf.sample +@sample %%ETCDIR%%/festival.conf.sample +@sample %%ETCDIR%%/followme.conf.sample +@sample %%ETCDIR%%/func_odbc.conf.sample +@sample %%ETCDIR%%/hep.conf.sample +@sample %%ETCDIR%%/http.conf.sample +@sample %%ETCDIR%%/iax.conf.sample +@sample %%ETCDIR%%/iaxprov.conf.sample +@sample %%ETCDIR%%/indications.conf.sample +@sample %%ETCDIR%%/logger.conf.sample +@sample %%ETCDIR%%/manager.conf.sample +@sample %%ETCDIR%%/meetme.conf.sample +@sample %%ETCDIR%%/mgcp.conf.sample +@sample %%ETCDIR%%/minivm.conf.sample +@sample %%ETCDIR%%/misdn.conf.sample +@sample %%ETCDIR%%/modules.conf.sample +@sample %%ETCDIR%%/motif.conf.sample +@sample %%ETCDIR%%/musiconhold.conf.sample +@sample %%ETCDIR%%/muted.conf.sample +@sample %%ETCDIR%%/ooh323.conf.sample +@sample %%ETCDIR%%/osp.conf.sample +@sample %%ETCDIR%%/oss.conf.sample +@sample %%ETCDIR%%/phone.conf.sample +@sample %%ETCDIR%%/phoneprov.conf.sample +@sample %%ETCDIR%%/pjsip.conf.sample +@sample %%ETCDIR%%/pjsip_notify.conf.sample +@sample %%ETCDIR%%/queuerules.conf.sample +@sample %%ETCDIR%%/queues.conf.sample +@sample %%ETCDIR%%/res_config_mysql.conf.sample +@sample %%ETCDIR%%/res_config_sqlite.conf.sample +@sample %%ETCDIR%%/res_config_sqlite3.conf.sample +@sample %%ETCDIR%%/res_corosync.conf.sample +@sample %%ETCDIR%%/res_curl.conf.sample +@sample %%ETCDIR%%/res_fax.conf.sample +@sample %%ETCDIR%%/res_ldap.conf.sample +@sample %%ETCDIR%%/res_odbc.conf.sample +@sample %%ETCDIR%%/res_parking.conf.sample +@sample %%ETCDIR%%/res_pgsql.conf.sample +@sample %%ETCDIR%%/res_pktccops.conf.sample +@sample %%ETCDIR%%/res_snmp.conf.sample +@sample %%ETCDIR%%/res_stun_monitor.conf.sample +@sample %%ETCDIR%%/rtp.conf.sample +@sample %%ETCDIR%%/say.conf.sample +@sample %%ETCDIR%%/sip.conf.sample +@sample %%ETCDIR%%/sip_notify.conf.sample +@sample %%ETCDIR%%/skinny.conf.sample +@sample %%ETCDIR%%/sla.conf.sample *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412151446.sBFEkQj1019613>