Attachment #124363 for bug #167872




# $FreeBSD: ports/net/freeswitch-core/Makefile,v 1.25 2012/02/06 12:25:45 miwi Exp $
#

PORTNAME=	freeswitch
DISTVERSION=	1.2.rc2
PORTEPOCH=	1
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://files.freeswitch.org/ \
		http://files.freeswitch.org/downloads/libs/:2 \
		http://download.zeromq.org/:3
PKGNAMESUFFIX=	-core
DISTFILES=	${PORTNAME}-${DISTVERSION}.tar.bz2 \
		opus-0.9.0.tar.gz:2 \
		celt-0.10.0.tar.gz:2 \
		flite-1.5.4-current.tar.bz2:2 \
		json-c-0.9.tar.gz:2 \
		lame-3.98.4.tar.gz:2 \
		libmemcached-0.32.tar.gz:2 \

		soundtouch-1.6.0.tar.gz:2 \
		sphinxbase-0.7.tar.gz:2 \
		communicator_semi_6000_20080321.tar.gz:2 \
		zeromq-2.1.11.tar.gz:3
DIST_SUBDIR=    ${PORTNAME}
EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.tar.bz2

MAINTAINER=	r.neese@gmail.com
COMMENT=	FreeSwitch SoftSwitch Port

		tiff:${PORTSDIR}/graphics/tiff \
		odbc:${PORTSDIR}/databases/unixODBC

WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}

USE_AUTOTOOLS=	autoconf:env automake:env libtool:env

USE_PERL5_BUILD=yes
USE_BISON=	both
USE_GMAKE=	yes
SUB_FILES=	pkg-install
USE_RC_SUBR=	freeswitch
HAS_CONFIGURE=	yes
USE_LDCONFIG=	yes
LDFLAGS+=       -L${LOCALBASE}/lib
INCLUDES=	-I${LOCALBASE}/include
CONFIGURE_ARGS+=--prefix=${PREFIX} \
		--bindir=${PREFIX}/bin \
		--datadir=${VARBASE}/db/${PORTNAME} \
		--includedir=${PREFIX}/include/${PORTNAME} \
		--libdir=${PREFIX}/lib/${PORTNAME}/lib \
		--localstatedir=${VARBASE} \
		--sysconfdir=${PREFIX}/etc/${PORTNAME}/conf \
		--with-htdocsdir=${PREFIX}/www/${PORTNAME}/htdocs \
		--with-soundsdir=${PREFIX}/share/${PORTNAME}/sounds \
		--with-grammardir=${PREFIX}/etc/${PORTNAME}/grammar \
		--with-scriptdir=${PREFIX}/etc/${PORTNAME}/scripts \
		--with-modinstdir=${PREFIX}/lib/${PORTNAME}/mod \
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
		--with-storagedir=${VARBASE}/${PORTNAME} \
		--with-recordingsdir=${VARBASE}/${PORTNAME}/recordings \
		--with-ogg=${LOCALBASE} \
		--with-ogg-libraries=${LOCALBASE}/lib \
		--with-ogg-includes=${LOCALBASE}/include

CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
		INCLUDES="${INCLUDES}" \
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"



BASE_PORTNAME=	${FREESWITCH_USER}

VARBASE=	/var
ETCDIR=	${PREFIX}/etc/${PORTNAME}
WWWDIR=	${PREFIX}/www/${PORTNAME}

SAMPLESDIR=     conf conf/autoload_configs

OPTIONS=	REBOOTSTRAP     	"Rebootstrap freeswitch build" on \
		MODABSTRACTION		"Simplify/Standarize API" on \
		MODAVMD			"Detects voicemail generalized approach" on \
		MODCALLCENTER		"Call queuing application" on \
		MODCIDLOOKUP		"Lookup CID via database, url" on\
		MODBLACKLIST		"Blacklisk phone numbers" on \
		MODCURL			"Allows scripts to make HTTP requests" off \
		MODDISTRIBUTOR		"Simple round-robin style distributions" on \
		MODEASYROUTE		"DID Database lookup" off \
		MODFSK			"FSK (Frequency-Shift Keying) data transfer" on \
		MODHTTAPI		"HTTP API" on \
		MODHTTPCACHE		"HTTP GET with caching" off \
		MODDIRECTORY		"Dial by name directory" on \
 		MODLADSPA		"use Auto-tune on your call" off \
		MODLCR			"Least Cost Routing" off \
		MODMEMCACHE		"Memcached API" off \
		MODNIBBLEBILL		"Billing Module" off \
		MODRSS			"RSS feed text to speech" on \
		MODSNOM			"Controlling softkeys on Snom phones" on \
		MODSPY			"Extension/Call Spy tool" on \
		MODSOUNDTOUCH		"Pitch shifting audio effects" on \
		MODSTRESS		"Detect Stress in voice" off \
		MODSNAPSHOT		"Audio/Disk Snapshot Tool" off \
		MODVMD			"Voicemail Beep Detection" on \
		MODVOICEMAILIVR		"IVR Based Voicemail(NEW)" on \
		MODAMRWB		"GSM-AMRWB (ARM Wide Band) codec" on \
		MODCELT			"Celt ultra-low delay audio codec" on \
		MODCODEC2		"Freeswitch Codec2 Module" on \
		MODISAC			"Isac Codec (New Codec)" on \
		MODOPUS			"OPUS ultra-low delay audio codec" on \
		MODSILK			"Skype Silk Codec (Broken/BUILD ISSUES)" off \
		MODDPASTERISK		"Asterisk Dialplan (Old School Dialplan)" off \
		MODDPDIRECTORY		"obtain dialplan from a directory resource" off \
		MODDINGALING		"Jabber/Google Talk integration module" on \
		MODFREETDM		"Interface to Zaptel hardware End Points" off \
		MODPORTAUDIO		"Portaudio API" on \
		MODRTMP			"Real time media protocol" on \
		MODSKINNY		"Skinny/SCCP" on \
		MODFLITE		"Free open source Text to Speech" on \
		MODPOCKETSPHINX		"Free open source Speech Recognition" on \
		MODTTSCMDLINE		"Play Sounds via commandline" on \
		MODUNIMRCP		"Open MRCP implementation ASR/Text" off \
		MODCDRPGCSV		"Asterisk Compatible CDR PostgreSQL" off \
		MODERLANGEVENT		"send/receive events/commands in Erlang" off \
		MODMULTICAST		"Broadcasts events to netmask" on \
		MODEVENTZMQ		"Zeroconf config socket" off \
		MODSNMP			"SNMP AgentX module" off \
		MODVLC			"Play local mp3 files any rate(NEW Testing)" off \
		MODPASTREAM		"PortAudio Streaming Module" on \
		MODSHELLSTREAM		"Stream audio via shell command" on \
		MODSHOUT		"Play local mp3 files any rate(Build Error)" off \
		MODMANAGED		"Common Language Infrastructure API" off \
		MODPERL			"Perl Lang Support" on \
		MODPYTHON		"Python Lang Suppot" on \
		MODPOSIXTIMER		"Posix timer (New/Testing)" on \
		MODXMLCURL		"XML dynamically control of FreeSWITCH" on \
		MODXMLODBC		"XML ODBC Module" on \
		MODXMLRPC		"XML Remote Procedure Calls" on \
		MODSAYDE		"German Voice Prompts" off \
		MODSAYES		"Spanish Voice Prompts" off \
		MODSAYEN		"English Voice Prompts" on \
		MODSAYFR		"French Voice Prompts" off \
		MODSAYHE		"Hebrew Voice Prompts" off \
		MODSAYHU		"Hungarian Voice Propmts" off \
		MODSAYIT		"Italian Voice Propmts" off \
		MODSAYNL		"Dutch Voice Propmts" off \
		MODSAYPT		"Portuguese Voice Propmts" off \
		MODSAYRU		"Russian Voice Propmts" off \
		MODSAYTH		"Thai Voice Propmts" off \
		MODSAYZH		"Chinese Voice Propmts" off

.include <bsd.port.options.mk>


CFLAGS+=	-fPIC
.endif

.for i in  ${OPTIONS:Non:Noff:C/".*"//}
.if defined(WITH_${i})
PLIST_SUB+=	${i}=""
	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM 	MODSILK MODUNIMRCP \
	MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2 MODFSK MODOPUS \
	MODDPASTERISK MODRTMP SAMPLECONFIGS MODBLACKLIST MODHTTPCACHE MODEVENTZMQ
.if !defined(WITH_${i})
PLIST_SUB+=	WITH_${i}="@comment "
.else
PLIST_SUB+=	${i}="@comment "
.endif
.endfor

.if defined(WITH_MODFREETDM)
PLIST_SUB+=	 WITH_MODFREETDM="@comment "
.else
.if ${OSVERSION} < 703000 || (${OSVERSION} >= 800000 && ${OSVERSION} < 800108)
IGNORE=	sorry you can not use mod_freetdm on this version of freebsd ( dahdi support broken ) please update
.else
PLIST_SUB+=	WITH_MODFREETDM=""
CONFIGURE_ARGS+=	--with-libpri=${LOCALBASE}
BUILD_DEPENDS+=	${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
		${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
LIB_DEPENDS+=	pri:${PORTSDIR}/misc/libpri
RUN_DEPENDS+=	${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
.endif
.endif

.if defined(WITH_MODSHOUT)
PLIST_SUB+=	WITH_MODSHOUT="@comment "
.else
PLIST_SUB+=	WITH_MODSHOUT=""
LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
.endif

.if defined(WITH_MODPERL)
PLIST_SUB+=	WITH_MODPERL="@comment "
.else
PLIST_SUB+=	WITH_MODPERL=""
LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm \
		db:${PORTSDIR}/databases/db42
.endif

.if defined(WITH_MODERLANGEVENT)
PLIST_SUB+=	WITH_MODERLANGEVENT="@comment "
.else
PLIST_SUB+=	WITH_MODERLANGEVENT=""
BUILD_DEPENDS+=	${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite
.endif

.if defined(WITH_MODPYTHON)
PLIST_SUB+=	WITH_MODPYTHON="@comment "
.else
PLIST_SUB+=	WITH_MODPYTHON=""
USE_PYTHON=	yes
.endif

.if defined(WITH_MODCDRPGCSV)
PLIST_SUB+=	WITH_MODCDRPGCSV="@comment "
.else
PLIST_SUB+=	WITH_MODCDRPGCSV=""
USE_PGSQL=	yes
#WITH_PGSQL_VER=	90
.endif

.if defined(WITH_MODSNMP)
PLIST_SUB+=	WITH_MODSNMP="@comment "
.else
PLIST_SUB+=	WITH_MODSNMP=""
BUILD_DEPENDS+=	${LOCALBASE}/include/net-snmp/definitions.h:${PORTSDIR}/net-mgmt/net-snmp
RUN_DEPENDS+=	${LOCALBASE}/include/net-snmp/definitions.h:${PORTSDIR}/net-mgmt/net-snmp
.endif

.if defined(WITH_MODLADSPA)
PLIST_SUB+=	WITH_MODLADSPA="@comment "
.else
PLIST_SUB+=	WITH_MODLADSPA=""
BUILD_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa \
		${LOCALBASE}/lib/ladspa/tap_autopan.so:${PORTSDIR}/audio/tap-plugins \
		${LOCALBASE}/lib/ladspa/cmt.so:${PORTSDIR}/audio/cmt \

		${LOCALBASE}/lib/ladspa/autotalent.so:${PORTSDIR}/audio/autotalent
.endif

.if defined(WITH_MODVLC)
LIB_DEPENDS+=	vlc:/${PORTSDIR}/multimedia/vlc
RUN_DEPENDS+=	vlc:/${PORTSDIR}/multimedia/vlc
.endif

# FreeBSD 7 doesn't have lrintl, but lrint will do the trick just fine
# It's quite cryptic as to why the reinplace doesn't work; there's no mention
# of lrintl anywhere in any source....
.if ${OSVERSION} < 800012
#	${REINPLACE_CMD} -e 's/lrintl/lrint/' \
#	    ${WRKSRC}/libs/spandsp/src/spandsp/saturated.h
BROKEN=	Requires lrintl, which is not present on FreeBSD 7
.endif

post-extract:
.for file in ${DISTFILES:M*\:[23]:C/\:[23]//}
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKSRC}/libs/
.endfor

pre-configure:
	@${REINPLACE_CMD} -e 's|base=http://files.freeswitch.org/downloads/libs/|base=file://${DISTDIR}/${DIST_SUBDIR}/|g' ${WRKSRC}/build/getlib.sh.in
	@${REINPLACE_CMD} -e 's|2.1.9|2.1.11|g' ${WRKSRC}/src/mod/event_handlers/mod_event_zmq/Makefile
	@${REINPLACE_CMD} -e 's|\$$(MAKE) samples-conf|##\$$(MAKE) samples-conf|g' ${WRKSRC}/Makefile.am
.if defined(WITH_REBOOTSTRAP)
	cd ${WRKSRC} && ./rebootstrap.sh
.endif
	cd ${WRKSRC} && ./bootstrap.sh

post-configure:
.for i in mod_unimrcp mod_flite mod_pocketsphinx

.endif
.for i in mod_cidlookup mod_easyroute mod_lcr mod_soundtouch mod_rss mod_snom \
	mod_vmd mod_avmd mod_spy mod_curl mod_nibblebill mod_memcache mod_directory mod_distributor \
	mod_snapshot mod_callcenter mod_fsk mod_ladspa mod_blacklist mod_http_cache mod_abstraction \
	mod_voicemail_ivr mod_httapi
.if defined(WITH_${i:C/_//g:U})
	@${REINPLACE_CMD} -e 's|#\(applications/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
.endfor
.for i in mod_amrwb mod_celt mod_silk mod_codec2 mod_opus mod_isac
.if defined(WITH_${i:C/_//g:U})
	@${REINPLACE_CMD} -e 's|#\(codecs/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
.endfor
.for i in  mod_shell_stream mod_shout mod_vlc
.if defined(WITH_${i:C/_//g:U})
	@${REINPLACE_CMD} -e 's|#\(formats/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif

.if defined(WITH_MODPASTREAM)
	@${REINPLACE_CMD} -e 's|#formats/mod_portaudio_stream|formats/mod_portaudio_stream|g' ${WRKSRC}/modules.conf
.endif
.for i in mod_say_de mod_say_es mod_say_en mod_say_fr mod_say_he mod_say_hu mod_say_it mod_say_nl mod_say_pt mod_say_ru mod_say_th mod_say_zh
.if defined(WITH_${i:C/_//g:U})
	@${REINPLACE_CMD} -e 's|#\(say/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif

	@${REINPLACE_CMD} -e 's|#\(languages/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
.endfor
.for i in mod_skinny mod_portaudio mod_dingaling mod_rtmp mod_khomp
.if defined(WITH_${i:C/_//g:U})
	@${REINPLACE_CMD} -e 's|#\(endpoints/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif

.if defined(WITH_MODEVENTZMQ)
	@${REINPLACE_CMD} -e 's|#event_handlers/mod_event_zmq|event_handlers/mod_event_zmq|g' ${WRKSRC}/modules.conf
.endif
.if defined(WITH_MODXMLODBC)
	@${REINPLACE_CMD} -e 's|#../../contrib/mod/xml_int/mod_xml_odbc|../../contrib/mod/xml_int/mod_xml_odbc|g' ${WRKSRC}/modules.conf
.endif
.if defined(WITH_MODPOSIXTIMER)
	@${REINPLACE_CMD} -e 's|#timers/mod_posix_timer|timers/mod_posix_timer|g' ${WRKSRC}/modules.conf
.endif

pre-install:
	@${CHMOD} 664 ${WRKSRC}/libs/freetdm/conf/*
	@${MKDIR} ${ETCDIR}/conf
.if defined(WITH_MODFREETDM)
	@${MKDIR} ${ETCDIR}/conf/autoload_configs
.endif
	@${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/. -type d | ${XARGS} ${CHMOD} 770

post-install:
	@${SETENV} PKG_PREFIX=${PREFIX} \
	    ${SH} ${PKGINSTALL} ${BASE_PORTNAME} POST-INSTALL
	@${FIND} ${ETCDIR}/. -type d | ${XARGS} ${CHMOD} 770
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/skinny_profiles
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/sip_profiles/internal
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/sip_profiles/external
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/sip_profiles
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/mrcp_profiles
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru/vm
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru/dir
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru/demo
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he/vm
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he/dir
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he/demo
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr/vm
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr/dir
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr/demo
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/vm
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/ivr
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/dir
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/demo
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/de/vm
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/de/demo
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/de
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/jingle_profiles
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/ivr_menus
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory/default
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/skinny-patterns
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/public
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/default
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/autoload_configs
.endif
.if !defined(WITH_EXTENSIONS)
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory/default
.endif
	@${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/. -type d | ${XARGS} ${CHMOD} 774
	@${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
	@${CHMOD} -R 770 ${PREFIX}/share/${BASE_PORTNAME}
	@${INSTALL} -o ${FREESWITCH_USER} -g ${FREESWITCH_GROUP} -m 664 ${WRKSRC}/conf/freeswitch.xml ${ETCDIR}/conf/freeswitch.xml.sample
	@for i in $$(${FIND} ${ETCDIR}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
#	@for i in $$(${FIND} ${WWWDIR}/htdocs/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
	@${FIND} ${ETCDIR}/. -type f | ${XARGS} ${CHMOD} 660
	@${FIND} ${WWWDIR}/. -type f | ${XARGS} ${CHMOD} 660

.include <bsd.port.mk>




SHA256 (freeswitch/freeswitch-1.2.rc2.tar.bz2) = bbf9b3f6e7a7569b9594b5852d1b8a95266ef3276df222776ac84667adb6cc08
SIZE (freeswitch/freeswitch-1.2.rc2.tar.bz2) = 38075354
SHA256 (freeswitch/opus-0.9.0.tar.gz) = b2f75c4ac5ab837845eb028413fae2a28754bfb0a6d76416e2af1441ef447649
SIZE (freeswitch/opus-0.9.0.tar.gz) = 1255227
SHA256 (freeswitch/celt-0.10.0.tar.gz) = 147c5bc8c6a37b2ad2c8b8af17c91cb35494421ec9b68110018a4bcec72e45dc
SIZE (freeswitch/celt-0.10.0.tar.gz) = 435953
SHA256 (freeswitch/flite-1.5.4-current.tar.bz2) = e98c54307954f406ef59a354f9ec274436b95be53f785e27191f19569af0ed7e
SIZE (freeswitch/flite-1.5.4-current.tar.bz2) = 14740774
SHA256 (freeswitch/json-c-0.9.tar.gz) = 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f
SIZE (freeswitch/json-c-0.9.tar.gz) = 328935
SHA256 (freeswitch/lame-3.98.4.tar.gz) = ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8

SIZE (freeswitch/sphinxbase-0.7.tar.gz) = 3291922
SHA256 (freeswitch/communicator_semi_6000_20080321.tar.gz) = dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18
SIZE (freeswitch/communicator_semi_6000_20080321.tar.gz) = 5595694
SHA256 (freeswitch/zeromq-2.1.11.tar.gz) = e1cd4abbe353d3d72df42a2ee05593047915987024a4baf965745d29832eb214
SIZE (freeswitch/zeromq-2.1.11.tar.gz) = 1891038




@unexec for i in $(find %D/etc/freeswitch/conf/ -type f -name \*.xml -o -name \*.ttml -o -name \*.tpl -o -name \*.conf -o -name \*.types); do if cmp "$i" "${i}.sample"; then rm "$i"; fi; done
bin/freeswitch
bin/fs_cli
bin/fs_encode

bin/fsxs
bin/gentls_cert
bin/tone2wav
%%ETCDIR%%/conf/freeswitch.xml.sample
%%MODFREETDM%%%%ETCDIR%%/conf/autoload_configs/freetdm.conf.xml.sample
%%MODFREETDM%%%%ETCDIR%%/conf/freetdm.conf.sample
%%MODFREETDM%%%%ETCDIR%%/conf/pika.conf.sample
%%MODFREETDM%%%%ETCDIR%%/conf/wanpipe.conf.sample
%%MODFREETDM%%%%ETCDIR%%/conf/zt.conf.sample
@exec for i in $(find %D/%%ETCDIR%%/conf/ -type f -name *.sample); do if [ ! -f ${i%%.sample} ]; then cp -rp $i ${i%%.sample}; fi; done
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/default.dic
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/COPYING
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/feat.params
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/mdef
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/means
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/noisedict
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/sendump
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/transition_matrices
%%MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/variances
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/distributor.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/easyroute.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/enum.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/erlang_event.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/event_multicast.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/event_socket.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/fax.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/fifo.conf.xml.sample
%%WITH_MODFREETDM%%etc/freeswitch/conf/autoload_configs/freetdm.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/hash.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/http_cache.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/ivr.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/java.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/lcr.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/local_stream.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/logfile.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/lua.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/memcache.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/modules.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/mongo.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/nibblebill.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/opal.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/osp.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/perl.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/portaudio.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/post_load_modules.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/presence_map.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/python.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/redis.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/rtmp.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/rss.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/sangoma_codec.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/shout.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/skinny.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/sofia.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/spandsp.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/spidermonkey.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/switch.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/syslog.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/timezones.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/tts_commandline.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/unicall.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/unimrcp.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/voicemail.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/xml_cdr.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/xml_curl.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/xml_rpc.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/zeroconf.conf.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/chatplan/default.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/00_ladspa.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/00_pizza_demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/01_example.com.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/01_Talking_Clock.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/features.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/public.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/public/00_inbound_did.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/20-Demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/20-Local_extension.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/90-External.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/99-Default_Drop.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/directory/default.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1000.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1001.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1002.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1003.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1004.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1005.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1006.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1007.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1008.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1009.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1010.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1011.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1012.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1013.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1014.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1015.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1016.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1017.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1018.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1019.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/brian.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/default.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/example.com.xml.sample
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/skinny-example.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/extensions.conf.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/freeswitch.xml.sample
%%WITH_MODFREETDM%%etc/freeswitch/conf/freetdm.conf.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/fur_elise.ttml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/ivr_menus/demo_ivr.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/jingle_profiles/client.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/jingle_profiles/server.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/de.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/demo/demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/vm/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/vm/tts.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/demo/demo-ivr.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/demo/demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/dir/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/dir/tts.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/en.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/ivr/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/vm/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/vm/tts.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/demo/demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/dir/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/dir/tts.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/fr.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/vm/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/demo/demo-ivr.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/demo/demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/dir/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/he.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/vm/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/demo/demo-ivr.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/demo/demo.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/dir/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/dir/tts.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/ru.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/vm/sounds.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/vm/tts.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mime.types.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/notify-voicemail.tpl.sample
%%WITH_MODFREETDM%%etc/freeswitch/conf/pika.conf.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/external.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/external/example.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/internal-ipv6.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/internal.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/internal/example.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/skinny_profiles/internal.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/tetris.ttml.sample
%%WITH_MODFREETDM%%etc/freeswitch/conf/tones.conf.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/vars.xml.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/voicemail.tpl.sample
%%WITH_MODFREETDM%%etc/freeswitch/conf/wanpipe.conf.sample
%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/web-vm.tpl.sample
%%WITH_MODFREETDM%%etc/freeswitch/conf/zt.conf.sample
%%WITH_SAMPLECONFIGS%%@exec for i in $(find %D/etc/freeswitch/conf/ -type f -name *.sample); do if [ ! -f ${i%%.sample} ]; then cp -rp $i ${i%%.sample}; fi; done
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/default.dic
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/COPYING
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/feat.params
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/mdef
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/means
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/noisedict
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/sendump
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/transition_matrices
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/variances
include/freeswitch/libteletone.h
include/freeswitch/libteletone_detect.h
include/freeswitch/libteletone_generate.h

include/freeswitch/switch_utils.h
include/freeswitch/switch_xml.h
include/freeswitch/switch_xml_config.h
%%MODFREETDM%%include/freetdm.h
%%MODFREETDM%%include/ftdm_declare.h
%%MODFREETDM%%include/ftdm_dso.h
%%MODFREETDM%%include/ftdm_os.h
%%MODFREETDM%%include/ftdm_threadmutex.h
lib/freeswitch/lib/libfreeswitch.a
lib/freeswitch/lib/libfreeswitch.la
lib/freeswitch/lib/libfreeswitch.so
lib/freeswitch/lib/libfreeswitch.so.1
%%MODFREETDM%%lib/freeswitch/lib/libfreetdm.a
%%MODFREETDM%%lib/freeswitch/lib/libfreetdm.la
%%MODFREETDM%%lib/freeswitch/lib/libfreetdm.so
%%MODFREETDM%%lib/freeswitch/lib/libfreetdm.so.1
lib/freeswitch/lib/libjs.a
lib/freeswitch/lib/libjs.la
lib/freeswitch/lib/libjs.so

lib/freeswitch/lib/libplc4.so.1
lib/freeswitch/lib/libplds4.a
lib/freeswitch/lib/libplds4.so.1
%%MODFREETDM%%lib/freeswitch/mod/ftmod_analog.la
%%MODFREETDM%%lib/freeswitch/mod/ftmod_analog.so
%%MODFREETDM%%lib/freeswitch/mod/ftmod_analog_em.la
%%MODFREETDM%%lib/freeswitch/mod/ftmod_analog_em.so
%%MODFREETDM%%lib/freeswitch/mod/ftmod_libpri.la
%%MODFREETDM%%lib/freeswitch/mod/ftmod_libpri.so
%%MODFREETDM%%lib/freeswitch/mod/ftmod_skel.a
%%MODFREETDM%%lib/freeswitch/mod/ftmod_skel.la
%%MODFREETDM%%lib/freeswitch/mod/ftmod_skel.so
%%MODFREETDM%%lib/freeswitch/mod/ftmod_zt.la
%%MODFREETDM%%lib/freeswitch/mod/ftmod_zt.so
%%MODABSTRACTION%%lib/freeswitch/mod/mod_abstraction.la
%%MODABSTRACTION%%lib/freeswitch/mod/mod_abstraction.so
lib/freeswitch/mod/mod_amr.la
lib/freeswitch/mod/mod_amr.so
%%MODAMRWB%%lib/freeswitch/mod/mod_amrwb.la
%%MODAMRWB%%lib/freeswitch/mod/mod_amrwb.so
%%MODAVMD%%lib/freeswitch/mod/mod_avmd.la
%%MODAVMD%%lib/freeswitch/mod/mod_avmd.so
lib/freeswitch/mod/mod_blacklist.la
lib/freeswitch/mod/mod_blacklist.so
lib/freeswitch/mod/mod_bv.la
lib/freeswitch/mod/mod_bv.so
%%MODCALLCENTER%%lib/freeswitch/mod/mod_callcenter.la
%%MODCALLCENTER%%lib/freeswitch/mod/mod_callcenter.so
lib/freeswitch/mod/mod_cdr_csv.la
lib/freeswitch/mod/mod_cdr_csv.so
%%MODCDRPGCSV%%lib/freeswitch/mod/mod_cdr_pg_csv.la
%%MODCDRPGCSV%%lib/freeswitch/mod/mod_cdr_pg_csv.so
lib/freeswitch/mod/mod_cdr_sqlite.la
lib/freeswitch/mod/mod_cdr_sqlite.so
%%MODCELT%%lib/freeswitch/mod/mod_celt.la
%%MODCELT%%lib/freeswitch/mod/mod_celt.so
%%MODCIDLOOKUP%%lib/freeswitch/mod/mod_cidlookup.la
%%MODCIDLOOKUP%%lib/freeswitch/mod/mod_cidlookup.so
lib/freeswitch/mod/mod_cluechoo.la
lib/freeswitch/mod/mod_cluechoo.so
%%MODCODEC2%%lib/freeswitch/mod/mod_codec2.la
%%MODCODEC2%%lib/freeswitch/mod/mod_codec2.so
lib/freeswitch/mod/mod_commands.la
lib/freeswitch/mod/mod_commands.so
lib/freeswitch/mod/mod_conference.la
lib/freeswitch/mod/mod_conference.so
lib/freeswitch/mod/mod_console.la
lib/freeswitch/mod/mod_console.so
%%MODCURL%%lib/freeswitch/mod/mod_curl.la
%%MODCURL%%lib/freeswitch/mod/mod_curl.so
lib/freeswitch/mod/mod_db.la
lib/freeswitch/mod/mod_db.so
%%MODDPASTERISK%%lib/freeswitch/mod/mod_dialplan_asterisk.la
%%MODDPASTERISK%%lib/freeswitch/mod/mod_dialplan_asterisk.so
%%MODDPDIRECTORY%%lib/freeswitch/mod/mod_dialplan_directory.la
%%MODDPDIRECTORY%%lib/freeswitch/mod/mod_dialplan_directory.so
lib/freeswitch/mod/mod_dialplan_xml.la
lib/freeswitch/mod/mod_dialplan_xml.so
%%MODDINGALING%%lib/freeswitch/mod/mod_dingaling.la
%%MODDINGALING%%lib/freeswitch/mod/mod_dingaling.so
%%MODDIRECTORY%%lib/freeswitch/mod/mod_directory.la
%%MODDIRECTORY%%lib/freeswitch/mod/mod_directory.so
%%MODDISTRIBUTOR%%lib/freeswitch/mod/mod_distributor.la
%%MODDISTRIBUTOR%%lib/freeswitch/mod/mod_distributor.so
lib/freeswitch/mod/mod_dptools.la
lib/freeswitch/mod/mod_dptools.so
%%MODEASYROUTE%%lib/freeswitch/mod/mod_easyroute.la
%%MODEASYROUTE%%lib/freeswitch/mod/mod_easyroute.so
lib/freeswitch/mod/mod_enum.la
lib/freeswitch/mod/mod_enum.so
%%MODERLANGEVENT%%lib/freeswitch/mod/mod_erlang_event.la
%%MODERLANGEVENT%%lib/freeswitch/mod/mod_erlang_event.so
lib/freeswitch/mod/mod_esf.la
lib/freeswitch/mod/mod_esf.so
%%MODMULTICAST%%lib/freeswitch/mod/mod_event_multicast.la
%%MODMULTICAST%%lib/freeswitch/mod/mod_event_multicast.so
lib/freeswitch/mod/mod_event_socket.la
lib/freeswitch/mod/mod_event_socket.so
%%MODEVENTZMQ%%lib/freeswitch/mod/mod_event_zmq.la
%%MODEVENTZMQ%%lib/freeswitch/mod/mod_event_zmq.so
lib/freeswitch/mod/mod_expr.la
lib/freeswitch/mod/mod_expr.so
lib/freeswitch/mod/mod_fifo.la
lib/freeswitch/mod/mod_fifo.so
%%MODFLITE%%lib/freeswitch/mod/mod_flite.la
%%MODFLITE%%lib/freeswitch/mod/mod_flite.so
%%MODFREETDM%%lib/freeswitch/mod/mod_freetdm.la
%%MODFREETDM%%lib/freeswitch/mod/mod_freetdm.so
%%MODFSK%%lib/freeswitch/mod/mod_fsk.la
%%MODFSK%%lib/freeswitch/mod/mod_fsk.so
lib/freeswitch/mod/mod_fsv.la
lib/freeswitch/mod/mod_fsv.so
lib/freeswitch/mod/mod_g723_1.la

lib/freeswitch/mod/mod_h26x.so
lib/freeswitch/mod/mod_hash.la
lib/freeswitch/mod/mod_hash.so
%%MODHTTAPI%%lib/freeswitch/mod/mod_httapi.la
%%MODHTTAPI%%lib/freeswitch/mod/mod_httapi.so
%%MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.la
%%MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.so
lib/freeswitch/mod/mod_ilbc.la
lib/freeswitch/mod/mod_ilbc.so
%%MODISAC%%lib/freeswitch/mod/mod_isac.la
%%MODISAC%%lib/freeswitch/mod/mod_isac.so
%%MODLADSPA%%lib/freeswitch/mod/mod_ladspa.la
%%MODLADSPA%%lib/freeswitch/mod/mod_ladspa.so
%%MODLCR%%lib/freeswitch/mod/mod_lcr.la
%%MODLCR%%lib/freeswitch/mod/mod_lcr.so
lib/freeswitch/mod/mod_local_stream.la
lib/freeswitch/mod/mod_local_stream.so
lib/freeswitch/mod/mod_logfile.la

lib/freeswitch/mod/mod_loopback.so
lib/freeswitch/mod/mod_lua.la
lib/freeswitch/mod/mod_lua.so
%%MODMEMCACHE%%lib/freeswitch/mod/mod_memcache.la
%%MODMEMCACHE%%lib/freeswitch/mod/mod_memcache.so
lib/freeswitch/mod/mod_native_file.la
lib/freeswitch/mod/mod_native_file.so
%%MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.la
%%MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.so
%%MODOPUS%%lib/freeswitch/mod/mod_opus.la
%%MODOPUS%%lib/freeswitch/mod/mod_opus.so
%%MODPERL%%lib/freeswitch/mod/mod_perl.la
%%MODPERL%%lib/freeswitch/mod/mod_perl.so
%%MODPOCKETSPHINX%%lib/freeswitch/mod/mod_pocketsphinx.la
%%MODPOCKETSPHINX%%lib/freeswitch/mod/mod_pocketsphinx.so
%%MODPORTAUDIO%%lib/freeswitch/mod/mod_portaudio.la
%%MODPORTAUDIO%%lib/freeswitch/mod/mod_portaudio.so
%%MODPASTREAM%%lib/freeswitch/mod/mod_portaudio_stream.la
%%MODPASTREAM%%lib/freeswitch/mod/mod_portaudio_stream.so
%%MODPOSIXTIMER%%lib/freeswitch/mod/mod_posix_timer.la
%%MODPOSIXTIMER%%lib/freeswitch/mod/mod_posix_timer.so
%%MODPYTHON%%lib/freeswitch/mod/mod_python.la
%%MODPYTHON%%lib/freeswitch/mod/mod_python.so
%%MODRSS%%lib/freeswitch/mod/mod_rss.la
%%MODRSS%%lib/freeswitch/mod/mod_rss.so
%%MODRTMP%%lib/freeswitch/mod/mod_rtmp.la
%%MODRTMP%%lib/freeswitch/mod/mod_rtmp.so
%%MODSAYDE%%lib/freeswitch/mod/mod_say_de.la
%%MODSAYDE%%lib/freeswitch/mod/mod_say_de.so
%%MODSAYEN%%lib/freeswitch/mod/mod_say_en.la
%%MODSAYEN%%lib/freeswitch/mod/mod_say_en.so
%%MODSAYES%%lib/freeswitch/mod/mod_say_es.la
%%MODSAYES%%lib/freeswitch/mod/mod_say_es.so
%%MODSAYFR%%lib/freeswitch/mod/mod_say_fr.la
%%MODSAYFR%%lib/freeswitch/mod/mod_say_fr.so
%%MODSAYHE%%lib/freeswitch/mod/mod_say_he.la
%%MODSAYHE%%lib/freeswitch/mod/mod_say_he.so
%%MODSAYHU%%lib/freeswitch/mod/mod_say_hu.la
%%MODSAYHU%%lib/freeswitch/mod/mod_say_hu.so
%%MODSAYIT%%lib/freeswitch/mod/mod_say_it.la
%%MODSAYIT%%lib/freeswitch/mod/mod_say_it.so
%%MODSAYNL%%lib/freeswitch/mod/mod_say_nl.la
%%MODSAYNL%%lib/freeswitch/mod/mod_say_nl.so
%%MODSAYPT%%lib/freeswitch/mod/mod_say_pt.la
%%MODSAYPT%%lib/freeswitch/mod/mod_say_pt.so
%%MODSAYRU%%lib/freeswitch/mod/mod_say_ru.la
%%MODSAYRU%%lib/freeswitch/mod/mod_say_ru.so
%%MODSAYTH%%lib/freeswitch/mod/mod_say_th.la
%%MODSAYTH%%lib/freeswitch/mod/mod_say_th.so
%%MODSAYZH%%lib/freeswitch/mod/mod_say_zh.la
%%MODSAYZH%%lib/freeswitch/mod/mod_say_zh.so
%%MODSHELLSTREAM%%lib/freeswitch/mod/mod_shell_stream.la
%%MODSHELLSTREAM%%lib/freeswitch/mod/mod_shell_stream.so
%%MODSHOUT%%lib/freeswitch/mod/mod_shout.la
%%MODSHOUT%%lib/freeswitch/mod/mod_shout.so
%%MODSILK%%lib/freeswitch/mod/mod_silk.la
%%MODSILK%%lib/freeswitch/mod/mod_silk.so
lib/freeswitch/mod/mod_siren.la
lib/freeswitch/mod/mod_siren.so
%%MODSKINNY%%lib/freeswitch/mod/mod_skinny.la
%%MODSKINNY%%lib/freeswitch/mod/mod_skinny.so
lib/freeswitch/mod/mod_sms.la
lib/freeswitch/mod/mod_sms.so
%%MODSNAPSHOT%%lib/freeswitch/mod/mod_snapshot.la
%%MODSNAPSHOT%%lib/freeswitch/mod/mod_snapshot.so
lib/freeswitch/mod/mod_sndfile.la
lib/freeswitch/mod/mod_sndfile.so
%%MODSNMP%%lib/freeswitch/mod/mod_snmp.la
%%MODSNMP%%lib/freeswitch/mod/mod_snmp.so
%%MODSNOM%%lib/freeswitch/mod/mod_snom.la
%%MODSNOM%%lib/freeswitch/mod/mod_snom.so
lib/freeswitch/mod/mod_sofia.la
lib/freeswitch/mod/mod_sofia.so
%%MODSOUNDTOUCH%%lib/freeswitch/mod/mod_soundtouch.la
%%MODSOUNDTOUCH%%lib/freeswitch/mod/mod_soundtouch.so
lib/freeswitch/mod/mod_spandsp.la
lib/freeswitch/mod/mod_spandsp.so
lib/freeswitch/mod/mod_speex.la

lib/freeswitch/mod/mod_spidermonkey_socket.so
lib/freeswitch/mod/mod_spidermonkey_teletone.la
lib/freeswitch/mod/mod_spidermonkey_teletone.so
%%MODSPY%%lib/freeswitch/mod/mod_spy.la
%%MODSPY%%lib/freeswitch/mod/mod_spy.so
lib/freeswitch/mod/mod_syslog.la
lib/freeswitch/mod/mod_syslog.so
lib/freeswitch/mod/mod_tone_stream.la
lib/freeswitch/mod/mod_tone_stream.so
%%MODTTSCMDLINE%%lib/freeswitch/mod/mod_tts_commandline.la
%%MODTTSCMDLINE%%lib/freeswitch/mod/mod_tts_commandline.so
%%MODUNIMRCP%%lib/freeswitch/mod/mod_unimrcp.la
%%MODUNIMRCP%%lib/freeswitch/mod/mod_unimrcp.so
lib/freeswitch/mod/mod_valet_parking.la
lib/freeswitch/mod/mod_valet_parking.so
%%MODVLC%%lib/freeswitch/mod_vlc.la
%%MODVLC%%lib/freeswitch/mod_vlc.so
%%MODVMD%%lib/freeswitch/mod/mod_vmd.la
%%MODVMD%%lib/freeswitch/mod/mod_vmd.so
lib/freeswitch/mod/mod_voicemail.la
lib/freeswitch/mod/mod_voicemail.so
%%MODVOICEMAILIVR%%lib/freeswitch/mod/mod_voicemail_ivr.la
%%MODVOICEMAILIVR%%lib/freeswitch/mod/mod_voicemail_ivr.so
lib/freeswitch/mod/mod_xml_cdr.la
lib/freeswitch/mod/mod_xml_cdr.so
%%MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.la
%%MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.so
lib/freeswitch/mod/mod_xml_rpc.la
lib/freeswitch/mod/mod_xml_rpc.so
%%MODPYTHON%%lib/python2.7/site-packages/freeswitch.py
libdata/pkgconfig/freeswitch.pc
%%MODFREETDM%%libdata/pkgconfig/freetdm.pc
%%MODPERL%%perl/freeswitch.la
%%MODPERL%%perl/freeswitch.pm
%%MODPERL%%perl/freeswitch.so
www/freeswitch/htdocs/license.txt.sample
www/freeswitch/htdocs/slim.swf.sample
www/freeswitch/htdocs/slimtest.htm.sample
@dirrm www/freeswitch/htdocs
@dirrm www/freeswitch
@dirrmtry share/freeswitch/sounds
@dirrmtry share/freeswitch
%%MODPERL%%@dirrm perl
@dirrm lib/freeswitch/mod
@dirrm lib/freeswitch/lib
@dirrm lib/freeswitch
@dirrm include/freeswitch
@dirrm %%ETCDIR%%/scripts
%%MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model/communicator
%%MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model
@dirrm %%ETCDIR%%/grammar
@dirrmtry %%ETCDIR%%/conf/directory/default
@dirrmtry %%ETCDIR%%/conf/directory/
@dirrmtry %%ETCDIR%%/conf/autoload_configs
@dirrmtry %%ETCDIR%%/conf
@dirrmtry %%ETCDIR%%
@dirrm etc/freeswitch/conf/lang/ru/vm
@dirrm etc/freeswitch/conf/lang/ru/dir
@dirrm etc/freeswitch/conf/lang/ru/demo
@dirrm etc/freeswitch/conf/lang/ru
@dirrm etc/freeswitch/conf/lang/he/vm
@dirrm etc/freeswitch/conf/lang/he/dir
@dirrm etc/freeswitch/conf/lang/he/demo
@dirrm etc/freeswitch/conf/lang/he
@dirrm etc/freeswitch/conf/lang/fr/vm
@dirrm etc/freeswitch/conf/lang/fr/dir
@dirrm etc/freeswitch/conf/lang/fr/demo
@dirrm etc/freeswitch/conf/lang/fr
@dirrm etc/freeswitch/conf/lang/en/vm
@dirrm etc/freeswitch/conf/lang/en/ivr
@dirrm etc/freeswitch/conf/lang/en/dir
@dirrm etc/freeswitch/conf/lang/en/demo
@dirrm etc/freeswitch/conf/lang/en
@dirrm etc/freeswitch/conf/lang/de/vm
@dirrm etc/freeswitch/conf/lang/de/demo
@dirrm etc/freeswitch/conf/lang/de
@dirrm etc/freeswitch/conf/lang
@dirrm etc/freeswitch/conf/jingle_profiles
@dirrm etc/freeswitch/conf/ivr_menus
@dirrm etc/freeswitch/conf/directory/default
@dirrm etc/freeswitch/conf/directory
@dirrm etc/freeswitch/conf/dialplan/skinny-patterns
@dirrm etc/freeswitch/conf/dialplan/public
@dirrm etc/freeswitch/conf/dialplan/default
@dirrm etc/freeswitch/conf/dialplan
@dirrm etc/freeswitch/conf/chatplan
@dirrm etc/freeswitch/conf/autoload_configs
@dirrm etc/freeswitch/conf
@dirrm etc/freeswitch
@cwd /var
@dirrmtry spool/freeswitch/voicemail
@dirrmtry spool/freeswitch
@dirrmtry log/freeswitch/xml_cdr
@dirrmtry log/freeswitch
@dirrmtry freeswitch/recordings

Lines 15-21 Link Here

(-)files/freeswitch.in (-1 / +5 lines)
15	. /etc/rc.subr	15	. /etc/rc.subr
16		16
17	name=freeswitch	17	name=freeswitch
18	rcvar=freeswitch_enable	18	rcvar=`set_rcvar`
19		19
20	load_rc_config $name	20	load_rc_config $name
21		21
Lines 27-32 Link Here
27	command=%%PREFIX%%/bin/freeswitch	27	command=%%PREFIX%%/bin/freeswitch
28	command_args="-u ${freeswitch_user} -g ${freeswitch_group}"	28	command_args="-u ${freeswitch_user} -g ${freeswitch_group}"
29		29
		30	umask 002
		31
30	pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}	32	pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}
31		33
32	start_precmd="${name}_prestart"	34	start_precmd="${name}_prestart"
Lines 40-45 Link Here
40		42
41	freeswitch_prestart () {	43	freeswitch_prestart () {
42	install -d -o ${freeswitch_user} -m755 /var/run/${name}	44	install -d -o ${freeswitch_user} -m755 /var/run/${name}
		45	sleep 7.7
		46	%%PREFIX%%/bin/fs_cli -x "sofia recover"
43	}	47	}
44		48
45	run_rc_command "$1"	49	run_rc_command "$1"




--- Makefile.am
+++ Makefile.am
@@ -485,8 +485,8 @@ vm-sync:
 	test -d $(DESTDIR)$(sysconfdir)/lang/en || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en
 	test -d $(DESTDIR)$(sysconfdir)/lang/en/demo || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo
 	test -d $(DESTDIR)$(sysconfdir)/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm
-	$(INSTALL) -m 644 $(switch_srcdir)/conf/vanilla/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
-	$(INSTALL) -m 644 $(switch_srcdir)/conf/vanilla/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
+	$(INSTALL) -m 664 $(switch_srcdir)/conf/vanilla/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm/$$filename.sample
+	$(INSTALL) -m 664 $(switch_srcdir)/conf/vanilla/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo/$$filename.sample
+	done
 
 config-%:
 	test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -496,7 +496,7 @@ config-%:
 		dir=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|/[^/]*$$||'`; \
 		filename=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|^.*/||'`; \
 		test -d $(DESTDIR)$(sysconfdir)$$dir || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \
 		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename || \
 		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload || \
-			$(INSTALL) -m 644 $(switch_srcdir)/conf/$*/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
+			$(INSTALL) -m 664 $(switch_srcdir)/conf/$*/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir/$$filename.sample; \
 	done
 
 samples-conf: config-vanilla
@@ -507,21 +507,19 @@ samples-htdocs:
 		dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \
 		filename=`echo $$htdocsfile | sed -e 's|^.*/||'`; \
 		test -d $(DESTDIR)$(htdocsdir)$$dir || $(mkinstalldirs) $(DESTDIR)$(htdocsdir)$$dir ; \
-		test -f $(DESTDIR)$(htdocsdir)$$dir/$$filename || $(INSTALL) -m 644 $(switch_srcdir)/htdocs/$$dir/$$filename $(DESTDIR)$(htdocsdir)$$dir 2>/dev/null;  \
+		test -f $(DESTDIR)$(htdocsdir)$$dir/$$filename || $(INSTALL) -m 664 $(switch_srcdir)/htdocs/$$dir/$$filename $(DESTDIR)$(htdocsdir)$$dir/$$filename.sample 2>/dev/null; \
 	done
 
-
 samples: samples-conf samples-htdocs
 
 install-exec-local:
 	$(mkinstalldirs) $(DESTDIR)$(modulesdir)
 
 install-data-local:
-	@echo Installing $(NAME)
-	@for x in $(modulesdir) $(runtimedir) $(dbdir) $(logfiledir) $(logfiledir)/xml_cdr $(bindir) $(scriptdir) $(recordingsdir) $(grammardir); do \
+	@for x in $(bindir) $(modulesdir) $(runtimedir) $(logfiledir) $(logfiledir)/xml_cdr $(dbdir) $(grammardir) $(scriptdir) $(storagedir) $(recordingsdir) ; do \
 		$(mkinstalldirs) $(DESTDIR)$$x ; \
-	 done
-	test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf

Lines 1-18 Link Here

(-)files/patch-build-getlib.sh.in (-12 / +10 lines)
1	--- build/getlib.sh.in 2010-12-22 12:39:49.000000000 -0500	1	--- build/getlib.sh.in.orig 2011-11-03 00:15:31.000000000 -0400
2	+++ build/getlib.sh.in.orig 2010-12-22 12:34:04.000000000 -0500	2	+++ build/getlib.sh.in 2011-11-03 02:05:01.000000000 -0400
3	@@ -5,11 +5,11 @@	3	@@ -7,10 +7,10 @@
4	WGET=@WGET@	4	WGET=@WGET@
5	CURL=@CURL@	5	CURL=@CURL@
6		6
7	-if [ -f "$WGET" ] ; then	7	-if [ -f "$WGET" ]; then
8	- DOWNLOAD_CMD=$WGET	8	- DOWNLOAD_CMD=$WGET
9	-else	9	-elif [ -f "$CURL" ]; then
10	- if [ -f "$CURL" ] ; then	10	+if [ -f "$CURL" ]; then
11	+if [ -f "$CURL" ] ; then	11	DOWNLOAD_CMD="$CURL -O"
12	DOWNLOAD_CMD="$CURL -O"	12	+elif [ -f "$WGET" ]; then
13	+else	13	+ DOWNLOAD_CMD=$WGET
14	+ if [ -f "$WGET" ] ; then
15	+ DOWNLOAD_CMD=$WGET
16	fi
17	fi	14	fi
18		15
		16	if [ -n "`echo $1 \| grep '://'`" ]; then

Added Link Here

(-)files/patch-build-modules.conf.in (+10 lines)
1	--- build/modules.conf.in.orig 2012-05-13 13:32:34.000000000 -0400
2	+++ build/modules.conf.in 2012-05-13 13:33:30.000000000 -0400
3	@@ -89,6 +89,7 @@
4	#event_handlers/mod_event_zmq
5	#event_handlers/mod_radius_cdr
6	#event_handlers/mod_snmp
7	+#formats/mod_vlc
8	formats/mod_local_stream
9	formats/mod_native_file
10	#formats/mod_portaudio_stream

Removed Link Here

(-)files/patch-conf-autoload_configs-voicemail.conf.xml (-11 lines)
1	--- conf/autoload_configs/voicemail.conf.xml 2010-06-22 17:19:31.000000000 -0400
2	+++ conf/autoload_configs/voicemail.conf.xml 2010-06-29 11:10:26.000000000 -0400
3	@@ -57,7 +57,7 @@
4	<param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/>
5	<param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
6	</email>
7	- <!--<param name="storage-dir" value="/tmp"/>-->
8	+ <!--<param name="voicemail-dir" value="/tmp"/>-->
9	<!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
10	<!--<param name="record-comment" value="Your Comment"/>-->
11	<!--<param name="record-title" value="Your Title"/>-->

Added Link Here

(-)files/patch-conf-vanilla-autoload_configs-switch.conf.xml (+10 lines)
1	--- conf/vanilla/autoload_configs/switch.conf.xml 2010-06-22 17:19:31.000000000 -0400
2	+++ conf/vanilla/autoload_configs/switch.conf.xml 2010-06-29 11:06:18.000000000 -0400
3	@@ -71,6 +71,7 @@
4	-->
5	<param name="mailer-app" value="sendmail"/>
6	<param name="mailer-app-args" value="-t"/>
7	+ <!--<param name="storage-dir" value="/tmp"/>-->
8	<param name="dump-cores" value="yes"/>
9	<!--RTP port range -->
10	<!--<param name="rtp-start-port" value="16384"/>-->




--- conf/vanilla/sip_profiles/external.xml
+++ conf/banilla/sip_profiles/external.xml
@@ -91,5 +91,8 @@
     <!-- TLS version ("sslv23" (default), "tlsv1"). NOTE: Phones may not work with TLSv1 -->
     <param name="tls-version" value="$${sip_tls_version}"/>
 
+    <!-- Enable call revovery -->
+    <param name="track-calls" value="true"/>
+
   </settings>
 </profile>
 




--- conf/vanilla/sip_profiles/internal.xml
+++ conf/vanilla/sip_profiles/internal.xml
@@ -379,7 +379,10 @@
 	     It's probably not what you want so stick with the default unless you really need to change this.
 	-->
 	<!--<param name="renegotiate-codec-on-hold" value="true"/>-->
-    
+
+	<!-- Enable call revovery -->
+	<param name="track-calls" value="true"/>    
+
   </settings>
 </profile>
 




--- configure.in.orig	2012-05-11 17:16:05.000000000 -0400
+++ configure.in	2012-05-11 17:31:04.000000000 -0400
@@ -1,4 +1,5 @@
-#                                               -*- Autoconf -*-
+
+#                      -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 # Must change all of the below together
@@ -32,19 +33,27 @@
 AC_SUBST(switch_srcdir)
 AC_SUBST(switch_builddir)
 
-# Where to install the modules
-AC_ARG_WITH([modinstdir],
-	[AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
-AC_SUBST(modulesdir)
-AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
+#Where to put freeswitch config files
+if test "$sysconfdir" = "\${prefix}/etc" ; then
+	confdir="${prefix}/conf"
+else
+	confdir="${sysconfdir}"
+fi
+
+sysconfdir="$confdir"
+
+AC_SUBST(confdir)
+AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
 
+#Where to put freswitch logfiles and runtime PID;
 if test "$localstatedir" = "\${prefix}/var" ; then
-    rundir="$prefix/run"
-    logdir="${prefix}/log"
+	rundir="${prefix}/run"
+	logdir="${prefix}/log"
 else
-    rundir="$localstatedir/run/freeswitch"
-    logdir="$localstatedir/log/freeswitch"
+	rundir="$localstatedir/run/freeswitch"
+	logdir="$localstatedir/log/freeswitch"
 fi
+
 # Where to put pidfile
 AC_ARG_WITH([rundir],
 	[AS_HELP_STRING([--with-rundir=DIR], [Put pidfile into this location (default: $prefix/run)])], [runtimedir="$withval"], [runtimedir="$rundir"])
@@ -56,51 +65,60 @@
 AC_SUBST(logfiledir)
 AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
 
-AC_ARG_WITH([dbdir],
-	[AS_HELP_STRING([--with-dbdir=DIR], [Put database files into this location (default: $prefix/db)])], [dbdir="$withval"], [dbdir="$prefix/db"])
-AC_SUBST(dbdir)
-AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
+#Where to put Freeswitch database;
+if test "$datadir" = "\${prefix}/var" ; then
+        dbdir="${prefix}/db"
+else
+        dbdir="${datadir}"
+fi
 
-AC_ARG_WITH([htdocsdir],
-	[AS_HELP_STRING([--with-htdocsdir=DIR], [Put html files into this location (default: $prefix/htdocs)])], [htdocsdir="$withval"], [htdocsdir="$prefix/htdocs"])
-AC_SUBST(htdocsdir)
-AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
+datadir="$dbdir"
 
-AC_ARG_WITH([soundsdir],
-	[AS_HELP_STRING([--with-soundsdir=DIR], [Put sound files into this location (default: $prefix/sounds)])], [soundsdir="$withval"], [soundsdir="$prefix/sounds"])
-AC_SUBST(soundsdir)
-AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])
+AC_SUBST(dbdir)
+AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to store freeswitch database files])
 
+#Where to put grammar files
 AC_ARG_WITH([grammardir],
-	[AS_HELP_STRING([--with-grammardir=DIR], [Put grammar files into this location (default: $prefix/grammar)])], [grammardir="$withval"], [grammardir="$prefix/grammar"])
+	[AS_HELP_STRING([--with-grammardir=DIR], [Put grammar files into this location (default: $prefix/grammar)])], [grammardir="$withval"], [grammardir="${prefix}/grammar"])
 AC_SUBST(grammardir)
-AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
+AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put freeswitch grammar files])
-scriptdir="${prefix}/scripts"
+scriptdir="${prefix}/etc/freeswitch/scripts"
 AC_SUBST(scriptdir)
 AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
 
-AC_ARG_WITH([scriptdir],
-	[AS_HELP_STRING([--with-scriptdir=DIR], [Put script files into this location (default: $prefix/scripts)])], [scriptdir="$withval"], [scriptdir="$prefix/scripts"])
-AC_SUBST(scriptdir)
-AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
+AC_ARG_WITH([htdocsdir],
+        [AS_HELP_STRING([--with-htdocsdir=DIR], [Put html files into this location (default: $prefix/htdocs)])], [htdocsdir="$withval"], [htdocsdir="$prefix/htdocs"])
+AC_SUBST(htdocsdir)
+AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
+
+# Where to install the modules
+AC_ARG_WITH([modinstdir],
+	[AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
+AC_SUBST(modulesdir)
+AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
 
+#Where to put Custom Recordings
 AC_ARG_WITH([recordingsdir],
-	[AS_HELP_STRING([--with-recordingsdir=DIR], [Put recordings files into this location (default: $prefix/recordings)])], [recordingsdir="$withval"], [recordingsdir="$prefix/recordings"])
+	[AS_HELP_STRING([--with-recordingsdir=DIR], [Put recordings files into this location (default: $prefix/recordings)])], [recordingsdir="$withval"], [recordingsdir="${PREFIX}/recordings"])
 AC_SUBST(recordingsdir)
-AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
+AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to putfreeswitch custom recording files])
 
-if test "$sysconfdir" = "\${prefix}/etc" ; then
-    confdir="$prefix/conf"
-else
 else
-    confdir="$sysconfdir"
-fi
-
-sysconfdir="$confdir"
+#Where to put custom scripts
+AC_ARG_WITH([scriptdir],
+	[AS_HELP_STRING([--with-scriptdir=DIR], [Put script files into this location (default: $prefix/scripts)])], [scriptdir="$withval"], [scriptdir="${prefix}/scripts"])
+AC_SUBST(scriptdir)
+AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put freeswitch & custom script files])
 
-AC_SUBST(confdir)
-AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
+#Where to put freeswitch sounds and moh
+AC_ARG_WITH([soundsdir],
+	[AS_HELP_STRING([--with-soundsdir=DIR], [Put freeswitch sound files into this location (default: $prefix/sounds)])], [soundsdir="$withval"], [soundsdir="${prefix}/sounds"])
+AC_SUBST(soundsdir)
+AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put freeswitch sounds files])
 
-AC_SUBST(libdir)
-AC_SUBST(bindir)
-AC_SUBST(includedir)
+#Freeswitch dir for storage.
+AC_ARG_WITH([storagedir],
+	[AS_HELP_STRING([--with-storagedir=DIR], [Store files in this location (default: $prefix/storage)])],  [storagedir="$withval"], [storagedir="${prefix}/storage"])
+AC_SUBST(storagedir)
+AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files & faxes])
 
+#Where to put pkgconfig file
 AC_ARG_WITH([pkgconfigdir],
 	[AS_HELP_STRING([--with-pkgconfigdir=DIR], [Installation directory for pkgconfig file (default: ${libdir}/pkgconfig)])],
 	[case "${withval}" in
@@ -112,6 +130,13 @@
 )
 AC_SUBST([pkgconfigdir])
 
+AC_SUBST(confdir)
+AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
+
+AC_SUBST(libdir)
+AC_SUBST(bindir)
+AC_SUBST(includedir)
+
 #Set default language
 AC_LANG_C
 # Checks for programs.
@@ -1143,7 +1168,11 @@
 echo "      libdir:          ${libdir}"
 echo "      modulesdir:      ${modulesdir}"
 echo "      sysconfdir:      ${sysconfdir}"
-echo "      runtimedir:      ${runtimedir}"
-echo "      logfiledir:      ${logfiledir}"
+echo "      dbdir:           ${datadir}"
+echo "      soundsdir:       ${soundsdir}"
+echo "      storgredir:      ${storagedir}" 		
+echo "	    recordingsdir:   ${recordingsdir}"	
+echo "      htdocdir:	     ${htdocsdir}"
+echo "	    logdir:          ${logfiledir}"
 echo ""
 echo "------------------------------------------------------------------------------"

Lines 6-12 Link Here

(-)files/patch-libs-freetdm-mod_freetdm-Makefile.in (-1 / +1 lines)
6	cd $(FT_DIR) && $(MAKE) install	6	cd $(FT_DIR) && $(MAKE) install
7	- [ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] \|\| cp -f $(FT_DIR)/conf/freetdm.conf.xml $(DESTDIR)@confdir@/autoload_configs	7	- [ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] \|\| cp -f $(FT_DIR)/conf/freetdm.conf.xml $(DESTDIR)@confdir@/autoload_configs
8	-	8	-
9	+ @for i in $(FT_DIR)/conf/.xml; do cp -p $$i $$i.sample; done; cp -f -p $(FT_DIR)/conf/.xml.sample $(DESTDIR)@confdir@/autoload_configs	9	+ @for i in $(FT_DIR)/conf/*.xml; do cp -p $$i $$i.sample; done; [ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml.sample ] \|\| cp -f -p $(FT_DIR)/conf/freetdm.conf.xml.sample $(DESTDIR)@confdir@/autoload_configs
10	local_clean:	10	local_clean:
11	cd $(FT_DIR) && $(MAKE) clean	11	cd $(FT_DIR) && $(MAKE) clean
12		12

Lines 9-19 Link Here

(-)files/patch-src-include-switch_types.h (-8 / +1 lines)
9	#ifdef WIN32	9	#ifdef WIN32
10	#define SWITCH_PATH_SEPARATOR "\\"	10	#define SWITCH_PATH_SEPARATOR "\\"
11	#else	11	#else
12	@@ -409,6 +409,7 @@	12
13	char *storage_dir;
14	char *recordings_dir;
15	char *sounds_dir;
16	+ char *voicemail_dir;
17	};
18
19	typedef struct switch_directories switch_directories;

Removed Link Here

(-)files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c (-11 lines)
1	--- src/mod/applications/mod_ladspa/mod_ladspa.c.orig 2011-07-05 22:23:14.000000000 -0400
2	+++ src/mod/applications/mod_ladspa/mod_ladspa.c 2011-07-05 22:24:32.000000000 -0400
3	@@ -634,6 +634,8 @@
4	setenv("LADSPA_PATH", "/usr/lib64/ladspa/:/usr/local/lib/ladspa", 1);
5	} else if (switch_directory_exists("/usr/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
6	setenv("LADSPA_PATH", "/usr/lib/ladspa/:/usr/local/lib/ladspa", 1);
7	+ } else if (switch_directory_exists("/usr/local/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
8	+ putenv("LADSPA_PATH=/usr/local/lib/ladspa");
9	}
10	}
11




--- src/mod/applications/mod_voicemail/mod_voicemail.c	2010-06-22 17:19:34.000000000 -0400
+++ src/mod/applications/mod_voicemail/mod_voicemail.c	2010-07-02 13:03:12.000000000 -0400
@@ -119,7 +119,7 @@
 	char *operator_ext;
 	char *vmain_ext;
 	char *tone_spec;
-	char *storage_dir;
+	char *voicemail_dir;
 	char *callback_dialplan;
 	char *callback_context;
 	char *email_body;
@@ -539,8 +539,8 @@
 
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "tone-spec", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
 						   &profile->tone_spec, "%(1000, 0, 640)", &profile->config_str_pool, NULL, NULL);
-	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "storage-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-						   &profile->storage_dir, "", &profile->config_str_pool, NULL, NULL);
+	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "voicemail-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+						   &profile->voicemail_dir, "", &profile->config_str_pool, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-dialplan", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
 						   &profile->callback_dialplan, "XML", &profile->config_str_pool, NULL, NULL);
 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-context", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
@@ -1706,7 +1706,7 @@
 	char *vm_email = NULL, *email_addr = NULL;
 	char *convert_cmd = profile->convert_cmd;
 	char *convert_ext = profile->convert_ext;
-	char *vm_storage_dir = NULL;
+	char *vm_voicemail_dir = NULL;
 	char global_buf[2] = "";
 	switch_input_args_t args = { 0 };
 	const char *caller_id_name = NULL;
@@ -2149,8 +2149,8 @@
 						convert_cmd = switch_core_session_strdup(session, val);
 					} else if (!strcasecmp(var, "vm-convert-ext")) {
 						convert_ext = switch_core_session_strdup(session, val);
-					} else if (!strcasecmp(var, "storage-dir")) {
-						vm_storage_dir = switch_core_session_strdup(session, val);
+					} else if (!strcasecmp(var, "voicemail-dir")) {
+						vm_voicemail_dir = switch_core_session_strdup(session, val);
 
 					} else if (!strcasecmp(var, "timezone")) {
 						switch_channel_set_variable(channel, var, val);
@@ -2211,14 +2211,14 @@
 
 				if (auth) {
 					if (!dir_path) {
-						if (!zstr(vm_storage_dir)) {
-							dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
-						} else if (!zstr(profile->storage_dir)) {
+						if (!zstr(vm_voicemail_dir)) {
+							dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
+						} else if (!zstr(profile->voicemail_dir)) {
 							dir_path =
-								switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name,
+								switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name,
 															SWITCH_PATH_SEPARATOR, myid);
 						} else {
-							dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
+							dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
 																   SWITCH_PATH_SEPARATOR,
 																   SWITCH_PATH_SEPARATOR,
 																   profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
@@ -2293,7 +2293,7 @@
 	int send_notify = 0;
 	int insert_db = 1;
 	int email_attach = 0;
-	char *vm_storage_dir = NULL;
+	char *vm_voicemail_dir = NULL;
 	char *myfolder = "inbox";
 	int priority = 3;
 	const char *tmp;
@@ -2366,12 +2366,12 @@
 
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deliver VM to %s@%s\n", myid, domain_name);
 
-	if (!zstr(vm_storage_dir)) {
-		dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
-	} else if (!zstr(profile->storage_dir)) {
-		dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
+	if (!zstr(vm_voicemail_dir)) {
+		dir_path = switch_mprintf("%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
+	} else if (!zstr(profile->voicemail_dir)) {
+		dir_path = switch_mprintf("%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
 	} else {
-		dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
+		dir_path = switch_mprintf("%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
 								  SWITCH_PATH_SEPARATOR,
 								  SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
 	}
@@ -2822,7 +2822,7 @@
 	char date[80] = "";
 	switch_size_t retsize;
 	switch_time_t ts = switch_micro_time_now();
-	char *vm_storage_dir = NULL;
+	char *vm_voicemail_dir = NULL;
 	char *record_macro = VM_RECORD_MESSAGE_MACRO;
 	int send_main = 0;
 	int send_notify = 0;
@@ -2876,8 +2876,8 @@
 						email_addr = switch_core_session_strdup(session, val);
 					} else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
 						send_mail++;
-					} else if (!strcasecmp(var, "storage-dir")) {
-						vm_storage_dir = switch_core_session_strdup(session, val);
+					} else if (!strcasecmp(var, "voicemail-dir")) {
+						vm_voicemail_dir = switch_core_session_strdup(session, val);
 					} else if (!strcasecmp(var, "vm-notify-email-all-messages") && (send_notify = switch_true(val))) {
 						send_mail++;
 					} else if (!strcasecmp(var, "vm-keep-local-after-email")) {
@@ -2933,12 +2933,12 @@
 		}
 	}
 
-	if (!zstr(vm_storage_dir)) {
-		dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id);
-	} else if (!zstr(profile->storage_dir)) {
-		dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
+	if (!zstr(vm_voicemail_dir)) {
+		dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, id);
+	} else if (!zstr(profile->voicemail_dir)) {
+		dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
 	} else {
-		dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
+		dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
 											   SWITCH_PATH_SEPARATOR,
 											   SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
 	}




--- src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -1356,16 +1356,16 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
 			if (switch_test_flag(listener, LFLAG_LINGER)) {
 				char disco_buf[512] = "";
 				
-				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session), SWITCH_LOG_DEBUG, "%s Socket Linger %"TIME_T_FMT"\n", 
-								  switch_channel_get_name(channel), listener->linger_timeout);
+				switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session), SWITCH_LOG_DEBUG, "%s Socket Linger %d\n", 
+								  switch_channel_get_name(channel), (int)listener->linger_timeout);
 				
 				switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\n"
 								"Controlled-Session-UUID: %s\n"
 								"Content-Disposition: linger\n" 
 								"Channel-Name: %s\n"
-								"Linger-Time: %"TIME_T_FMT"\n"
+								"Linger-Time: %d\n"
 								"Content-Length: 0\n\n", 
-								switch_core_session_get_uuid(listener->session), switch_channel_get_name(channel), listener->linger_timeout);
+								switch_core_session_get_uuid(listener->session), switch_channel_get_name(channel), (int)listener->linger_timeout);
 
 
 				if (listener->linger_timeout != (time_t) -1) {


Removed Link Here

(-)files/patch-src-mod-loggers-mod_logfile-mod_logfile.c (-11 lines)
1	--- src/mod/loggers/mod_logfile/mod_logfile.c.orig 2011-02-02 11:08:44.000000000 -0500
2	+++ src/mod/loggers/mod_logfile/mod_logfile.c 2011-02-02 11:09:38.000000000 -0500
3	@@ -94,7 +94,7 @@
4	flags \|= SWITCH_FOPEN_WRITE;
5	flags \|= SWITCH_FOPEN_APPEND;
6
7	- stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD \| SWITCH_FPROT_UWRITE \| SWITCH_FPROT_WREAD, module_pool);
8	+ stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD \| SWITCH_FPROT_UWRITE \| SWITCH_FPROT_GREAD \| SWITCH_FPROT_WREAD, module_pool);
9	if (stat != SWITCH_STATUS_SUCCESS) {
10	return SWITCH_STATUS_FALSE;
11	}




--- src/switch_core.c
+++ src/switch_core.c
@@ -646,6 +646,7 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
 #endif
 	}
 
+	if (!SWITCH_GLOBAL_dirs.voicemail_dir && (SWITCH_GLOBAL_dirs.voicemail_dir = (char *) malloc(BUFSIZE))) {
+#ifdef SWITCH_VOICEMAIL_DIR
+		switch_snprintf(SWITCH_GLOBAL_dirs.voicemail_dir, BUFSIZE, "%s", SWITCH_VOICEMAIL_DIR);
+#else
+		switch_snprintf(SWITCH_GLOBAL_dirs.voicemail_dir, BUFSIZE, "%s%svoicemail", storage_dir, SWITCH_PATH_SEPARATOR);
+#endif
+	}
+
 	if (!SWITCH_GLOBAL_dirs.db_dir && (SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(BUFSIZE))) {
 #ifdef SWITCH_DB_DIR
 		switch_snprintf(SWITCH_GLOBAL_dirs.db_dir, BUFSIZE, "%s", SWITCH_DB_DIR);
@@ -566,6 +574,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
 	switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);
 	switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);
 	switch_assert(SWITCH_GLOBAL_dirs.temp_dir);
+	switch_assert(SWITCH_GLOBAL_dirs.storage_dir);
+	switch_assert(SWITCH_GLOBAL_dirs.voicemail_dir);
 }
 
 
@@ -1450,7 +1451,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.sounds_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
-
+	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
+	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.voicemail_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
 
 
 	switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
 
@@ -1488,6 +1489,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
 	switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET6);
 	switch_core_set_variable("local_ip_v6", guess_ip);
 	switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);
+	switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);
 	switch_core_set_variable("recordings_dir", SWITCH_GLOBAL_dirs.recordings_dir);
+	switch_core_set_variable("voicemail_dir", SWITCH_GLOBAL_dirs.voicemail_dir);
 	switch_core_set_variable("sound_prefix", SWITCH_GLOBAL_dirs.sounds_dir);
 	switch_core_set_variable("sounds_dir", SWITCH_GLOBAL_dirs.sounds_dir);
@@ -1728,6 +1730,8 @@ static void switch_load_core_config(const char *file)
@@ -1448,6 +1462,8 @@ static void switch_load_core_config(const char *file)
 					switch_set_flag((&runtime), SCF_EARLY_HANGUP);
 				} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {
 					runtime.colorize_console = SWITCH_TRUE;
+				} else if (!strcasecmp(var, "storage-dir") && !zstr(val)) {
+					runtime.storage_dir = switch_core_strdup(runtime.memory_pool, val);
 				} else if (!strcasecmp(var, "core-db-pre-trans-execute") && !zstr(val)) {
 					runtime.core_db_pre_trans_execute = switch_core_strdup(runtime.memory_pool, val);
 				} else if (!strcasecmp(var, "core-db-post-trans-execute") && !zstr(val)) {
@@ -1932,6 +1948,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
 	switch_safe_free(SWITCH_GLOBAL_dirs.htdocs_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.grammar_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.storage_dir);
+	switch_safe_free(SWITCH_GLOBAL_dirs.voicemail_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.recordings_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.sounds_dir);
 	switch_safe_free(SWITCH_GLOBAL_dirs.run_dir);




	do chown %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
done

find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 770 {} +
find ${PKG_PREFIX}/etc/freeswitch/ -type f -exec chmod 660 {} +

chmod 775 ${PKG_PREFIX}/share/freeswitch

@cwd /var

for dir in \
    db/freeswitch \
    freeswitch/recordings \
    log/freeswitch/xml_cdr 
    spool/freeswitch/voicemail
	do install -d -m 775 -o %%FREESWITCH_USER%% -g %%FREESWITCH_GROUP%% /var/$dir
done

echo "This port chown -R various directories %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%%"
echo "This port chmod -R 770 various directories"
echo" This port chmod -R 660 various files"
echo "This is for security reasons.  In the event something should"
echo "stop working, please take the time to check the following dirs:"
echo " /var/log/freeswitch /var/freeswitch"

exit 0





*****************************************************
*		Please read			    *
*****************************************************
		FreeBSD 7.x		
There are some known issues with FreeBSD's libpthread 
implementation and APR that can affect throughput at 
high volume. A possible fix is to use libmap.conf to 
remap FreeSWITCH. and its libraries to use libthr 
(the better performance threading library)

/etc/libmap.conf

[freeswitch]
libc_r.so.5 libthr.so.2
libc_r.so.6 libthr.so.2
libpthread.so.1 libthr.so.2
libpthread.so.2 libthr.so.2



Return to bug 167872

Lines 1-11 Link Here

(-)distinfo (-6 / +6 lines)
1	SHA256 (freeswitch/freeswitch-1.0.7.1.tar.gz) = 180db5eb11bc35d383a143ee17ed15092ca1f0651afe93fe6fc2b7f7c35e4dbb	1	SHA256 (freeswitch/freeswitch-1.2.rc2.tar.bz2) = bbf9b3f6e7a7569b9594b5852d1b8a95266ef3276df222776ac84667adb6cc08
2	SIZE (freeswitch/freeswitch-1.0.7.1.tar.gz) = 36116764	2	SIZE (freeswitch/freeswitch-1.2.rc2.tar.bz2) = 38075354
3	SHA256 (freeswitch/opus-0.9.0.tar.gz) = b2f75c4ac5ab837845eb028413fae2a28754bfb0a6d76416e2af1441ef447649	3	SHA256 (freeswitch/opus-0.9.0.tar.gz) = b2f75c4ac5ab837845eb028413fae2a28754bfb0a6d76416e2af1441ef447649
4	SIZE (freeswitch/opus-0.9.0.tar.gz) = 1255227	4	SIZE (freeswitch/opus-0.9.0.tar.gz) = 1255227
5	SHA256 (freeswitch/celt-0.10.0.tar.gz) = 147c5bc8c6a37b2ad2c8b8af17c91cb35494421ec9b68110018a4bcec72e45dc	5	SHA256 (freeswitch/celt-0.10.0.tar.gz) = 147c5bc8c6a37b2ad2c8b8af17c91cb35494421ec9b68110018a4bcec72e45dc
6	SIZE (freeswitch/celt-0.10.0.tar.gz) = 435953	6	SIZE (freeswitch/celt-0.10.0.tar.gz) = 435953
7	SHA256 (freeswitch/flite-1.5.1-current.tar.bz2) = 91dab10909efcc1ba1f6869e52f480226284467cf520abc75c725d6173caede2	7	SHA256 (freeswitch/flite-1.5.4-current.tar.bz2) = e98c54307954f406ef59a354f9ec274436b95be53f785e27191f19569af0ed7e
8	SIZE (freeswitch/flite-1.5.1-current.tar.bz2) = 15054556	8	SIZE (freeswitch/flite-1.5.4-current.tar.bz2) = 14740774
9	SHA256 (freeswitch/json-c-0.9.tar.gz) = 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f	9	SHA256 (freeswitch/json-c-0.9.tar.gz) = 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f
10	SIZE (freeswitch/json-c-0.9.tar.gz) = 328935	10	SIZE (freeswitch/json-c-0.9.tar.gz) = 328935
11	SHA256 (freeswitch/lame-3.98.4.tar.gz) = ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8	11	SHA256 (freeswitch/lame-3.98.4.tar.gz) = ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8
Lines 26-30 Link Here
26	SIZE (freeswitch/sphinxbase-0.7.tar.gz) = 3291922	26	SIZE (freeswitch/sphinxbase-0.7.tar.gz) = 3291922
27	SHA256 (freeswitch/communicator_semi_6000_20080321.tar.gz) = dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18	27	SHA256 (freeswitch/communicator_semi_6000_20080321.tar.gz) = dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18
28	SIZE (freeswitch/communicator_semi_6000_20080321.tar.gz) = 5595694	28	SIZE (freeswitch/communicator_semi_6000_20080321.tar.gz) = 5595694
29	SHA256 (freeswitch/zeromq-2.1.10.tar.gz) = c6727ee334b572b25269c7fed24a926cde236b3655e22f21c057aad4df5a4b79	29	SHA256 (freeswitch/zeromq-2.1.11.tar.gz) = e1cd4abbe353d3d72df42a2ee05593047915987024a4baf965745d29832eb214
30	SIZE (freeswitch/zeromq-2.1.10.tar.gz) = 1879075	30	SIZE (freeswitch/zeromq-2.1.11.tar.gz) = 1891038

Lines 1-35 Link Here

(-)files/patch-Makefile.am (-18 / +26 lines)
1	--- Makefile.am.orig	1	--- Makefile.am
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -453,8 +453,9 @@ vm-sync:	3	@@ -485,8 +485,8 @@ vm-sync:
4	test -d $(DESTDIR)$(sysconfdir)/lang/en \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en	4	test -d $(DESTDIR)$(sysconfdir)/lang/en \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en
5	test -d $(DESTDIR)$(sysconfdir)/lang/en/demo \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo	5	test -d $(DESTDIR)$(sysconfdir)/lang/en/demo \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo
6	test -d $(DESTDIR)$(sysconfdir)/lang/en/vm \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm	6	test -d $(DESTDIR)$(sysconfdir)/lang/en/vm \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm
7	- $(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm	7	- $(INSTALL) -m 644 $(switch_srcdir)/conf/vanilla/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
8	- $(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo	8	- $(INSTALL) -m 644 $(switch_srcdir)/conf/vanilla/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
9	+ $(INSTALL) -m 664 $(switch_srcdir)/conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm/$$filename.sample; \	9	+ $(INSTALL) -m 664 $(switch_srcdir)/conf/vanilla/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm/$$filename.sample
10	+ $(INSTALL) -m 664 $(switch_srcdir)/conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo/$$filename.sample; \	10	+ $(INSTALL) -m 664 $(switch_srcdir)/conf/vanilla/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo/$$filename.sample
11	+ done
12		11
13	samples-conf:	12	config-%:
14	test -d $(DESTDIR)$(sysconfdir) \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)	13	test -d $(DESTDIR)$(sysconfdir) \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
15	@@ -462,9 +463,7 @@ samples-conf:	14	@@ -496,7 +496,7 @@ config-%:
16	dir=`echo $$conffile \| sed -e 's\|^\.\|\|' \| sed -e 's\|/[^/]*$$\|\|'`; \
17	filename=`echo $$conffile \| sed -e 's\|^\.\|\|' \| sed -e 's\|^.*/\|\|'`; \
18	test -d $(DESTDIR)$(sysconfdir)$$dir \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \	15	test -d $(DESTDIR)$(sysconfdir)$$dir \|\| $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \
19	- test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename \|\| \	16	test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename \|\| \
20	- test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload \|\| \	17	test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload \|\| \
21	- $(INSTALL) -m 644 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \	18	- $(INSTALL) -m 644 $(switch_srcdir)/conf/$*/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
22	+ $(INSTALL) -m 664 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir/$$filename.sample; \	19	+ $(INSTALL) -m 664 $(switch_srcdir)/conf/$*/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir/$$filename.sample; \
		20	done
		21
		22	samples-conf: config-vanilla
		23	@@ -507,21 +507,19 @@ samples-htdocs:
		24	dir=`echo $$htdocsfile \| sed -e 's\|/[^/]*$$\|\|'`; \
		25	filename=`echo $$htdocsfile \| sed -e 's\|^.*/\|\|'`; \
		26	test -d $(DESTDIR)$(htdocsdir)$$dir \|\| $(mkinstalldirs) $(DESTDIR)$(htdocsdir)$$dir ; \
		27	- test -f $(DESTDIR)$(htdocsdir)$$dir/$$filename \|\| $(INSTALL) -m 644 $(switch_srcdir)/htdocs/$$dir/$$filename $(DESTDIR)$(htdocsdir)$$dir 2>/dev/null; \
		28	+ test -f $(DESTDIR)$(htdocsdir)$$dir/$$filename \|\| $(INSTALL) -m 664 $(switch_srcdir)/htdocs/$$dir/$$filename $(DESTDIR)$(htdocsdir)$$dir/$$filename.sample 2>/dev/null; \
23	done	29	done
24		30
25	samples-htdocs:	31	-
26	@@ -482,11 +481,10 @@ install-exec-local:	32	samples: samples-conf samples-htdocs
		33
		34	install-exec-local:
27	$(mkinstalldirs) $(DESTDIR)$(modulesdir)	35	$(mkinstalldirs) $(DESTDIR)$(modulesdir)
28		36
29	install-data-local:	37	install-data-local:
30	- @echo Installing $(NAME)	38	- @echo Installing $(NAME)
31	- @for x in $(modulesdir) $(runtimedir) $(dbdir) $(logfiledir) $(logfiledir)/xml_cdr $(bindir) $(scriptdir) $(recordingsdir) $(grammardir); do \	39	- @for x in $(modulesdir) $(runtimedir) $(dbdir) $(logfiledir) $(logfiledir)/xml_cdr $(bindir) $(scriptdir) $(recordingsdir) $(grammardir); do \
32	+ @for x in $(bindir) $(modulesdir) $(runtimedir) $(logfiledir) $(logfiledir)/xml_cdr $(dbdir) $(grammardir) $(scriptdir) $(storagedir) $(recordingsdir) $(voicemaildir) ; do \	40	+ @for x in $(bindir) $(modulesdir) $(runtimedir) $(logfiledir) $(logfiledir)/xml_cdr $(dbdir) $(grammardir) $(scriptdir) $(storagedir) $(recordingsdir) ; do \
33	$(mkinstalldirs) $(DESTDIR)$$x ; \	41	$(mkinstalldirs) $(DESTDIR)$$x ; \
34	- done	42	- done
35	- test -d $(DESTDIR)$(sysconfdir) \|\| $(MAKE) samples-conf	43	- test -d $(DESTDIR)$(sysconfdir) \|\| $(MAKE) samples-conf

Added Link Here

(-)files/patch-conf-vanilla-sip_profiles-external.xml (+12 lines)
1	--- conf/vanilla/sip_profiles/external.xml
2	+++ conf/banilla/sip_profiles/external.xml
3	@@ -91,5 +91,8 @@
4	<!-- TLS version ("sslv23" (default), "tlsv1"). NOTE: Phones may not work with TLSv1 -->
5	<param name="tls-version" value="$${sip_tls_version}"/>
6
7	+ <!-- Enable call revovery -->
8	+ <param name="track-calls" value="true"/>
9	+
10	</settings>
11	</profile>
12

Added Link Here

(-)files/patch-conf-vanilla-sip_profiles-internal.xml (+14 lines)
1	--- conf/vanilla/sip_profiles/internal.xml
2	+++ conf/vanilla/sip_profiles/internal.xml
3	@@ -379,7 +379,10 @@
4	It's probably not what you want so stick with the default unless you really need to change this.
5	-->
6	<!--<param name="renegotiate-codec-on-hold" value="true"/>-->
7	-
8	+
9	+ <!-- Enable call revovery -->
10	+ <param name="track-calls" value="true"/>
11	+
12	</settings>
13	</profile>
14

Lines 1-77 Link Here

(-)files/patch-configure.in (-58 / +148 lines)
1	--- configure.in	1	--- configure.in.orig 2012-05-11 17:16:05.000000000 -0400
2	+++ configure.in	2	+++ configure.in 2012-05-11 17:31:04.000000000 -0400
3	@@ -38,12 +38,12 @@ AC_ARG_WITH([modinstdir],	3	@@ -1,4 +1,5 @@
4	AC_SUBST(modulesdir)	4	-# -- Autoconf --
5	AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])	5	+
		6	+# -- Autoconf --
		7	# Process this file with autoconf to produce a configure script.
		8
		9	# Must change all of the below together
		10	@@ -32,19 +33,27 @@
		11	AC_SUBST(switch_srcdir)
		12	AC_SUBST(switch_builddir)
		13
		14	-# Where to install the modules
		15	-AC_ARG_WITH([modinstdir],
		16	- [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
		17	-AC_SUBST(modulesdir)
		18	-AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
		19	+#Where to put freeswitch config files
		20	+if test "$sysconfdir" = "\${prefix}/etc" ; then
		21	+ confdir="${prefix}/conf"
		22	+else
		23	+ confdir="${sysconfdir}"
		24	+fi
		25	+
		26	+sysconfdir="$confdir"
		27	+
		28	+AC_SUBST(confdir)
		29	+AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
6		30
7	-if test "$localstatedir" = "\${prefix}/var" ; then	31	+#Where to put freswitch logfiles and runtime PID;
		32	if test "$localstatedir" = "\${prefix}/var" ; then
8	- rundir="$prefix/run"	33	- rundir="$prefix/run"
9	+if test "${localstatedir}" = "\${prefix}/var" ; then	34	- logdir="${prefix}/log"
10	+ rundir="${prefix}/run"	35	+ rundir="${prefix}/run"
11	logfiledir="${prefix}/log"	36	+ logdir="${prefix}/log"
12	else	37	else
13	- rundir="$localstatedir/run/freeswitch"	38	- rundir="$localstatedir/run/freeswitch"
14	- logfiledir="$localstatedir/log/freeswitch"	39	- logdir="$localstatedir/log/freeswitch"
15	+ rundir="${localstatedir}/run/freeswitch"	40	+ rundir="$localstatedir/run/freeswitch"
16	+ logfiledir="${localstatedir}/log/freeswitch"	41	+ logdir="$localstatedir/log/freeswitch"
17	fi	42	fi
		43	+
18	# Where to put pidfile	44	# Where to put pidfile
19	AC_ARG_WITH([rundir],	45	AC_ARG_WITH([rundir],
20	@@ -54,34 +54,34 @@ AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])	46	[AS_HELP_STRING([--with-rundir=DIR], [Put pidfile into this location (default: $prefix/run)])], [runtimedir="$withval"], [runtimedir="$rundir"])
		47	@@ -56,51 +65,60 @@
21	AC_SUBST(logfiledir)	48	AC_SUBST(logfiledir)
22	AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])	49	AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
23		50
24	-dbdir="${prefix}/db"	51	-AC_ARG_WITH([dbdir],
25	+dbdir="${localstatedir}/db/freeswitch"	52	- [AS_HELP_STRING([--with-dbdir=DIR], [Put database files into this location (default: $prefix/db)])], [dbdir="$withval"], [dbdir="$prefix/db"])
26	AC_SUBST(dbdir)	53	-AC_SUBST(dbdir)
27	AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])	54	-AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
28		55	+#Where to put Freeswitch database;
29	-htdocsdir="${prefix}/htdocs"	56	+if test "$datadir" = "\${prefix}/var" ; then
30	+htdocsdir="${prefix}/www/freeswitch/htdocs"	57	+ dbdir="${prefix}/db"
31	AC_SUBST(htdocsdir)	58	+else
32	AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])	59	+ dbdir="${datadir}"
33		60	+fi
34	-soundsdir="${prefix}/sounds"	61
35	+soundsdir="${prefix}/share/freeswitch/sounds"	62	-AC_ARG_WITH([htdocsdir],
36	AC_SUBST(soundsdir)	63	- [AS_HELP_STRING([--with-htdocsdir=DIR], [Put html files into this location (default: $prefix/htdocs)])], [htdocsdir="$withval"], [htdocsdir="$prefix/htdocs"])
37	AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])	64	-AC_SUBST(htdocsdir)
38		65	-AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
39	-grammardir="${prefix}/grammar"	66	+datadir="$dbdir"
40	+grammardir="${prefix}/etc/freeswitch/grammar"	67
		68	-AC_ARG_WITH([soundsdir],
		69	- [AS_HELP_STRING([--with-soundsdir=DIR], [Put sound files into this location (default: $prefix/sounds)])], [soundsdir="$withval"], [soundsdir="$prefix/sounds"])
		70	-AC_SUBST(soundsdir)
		71	-AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])
		72	+AC_SUBST(dbdir)
		73	+AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to store freeswitch database files])
		74
		75	+#Where to put grammar files
		76	AC_ARG_WITH([grammardir],
		77	- [AS_HELP_STRING([--with-grammardir=DIR], [Put grammar files into this location (default: $prefix/grammar)])], [grammardir="$withval"], [grammardir="$prefix/grammar"])
		78	+ [AS_HELP_STRING([--with-grammardir=DIR], [Put grammar files into this location (default: $prefix/grammar)])], [grammardir="$withval"], [grammardir="${prefix}/grammar"])
41	AC_SUBST(grammardir)	79	AC_SUBST(grammardir)
42	AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])	80	-AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
43		81	+AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put freeswitch grammar files])
44	-scriptdir="${prefix}/scripts"
45	+scriptdir="${prefix}/etc/freeswitch/scripts"
46	AC_SUBST(scriptdir)
47	AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
48		82
49	-recordingsdir="${prefix}/recordings"	83	-AC_ARG_WITH([scriptdir],
50	+recordingsdir="${localstatedir}/freeswitch/recordings"	84	- [AS_HELP_STRING([--with-scriptdir=DIR], [Put script files into this location (default: $prefix/scripts)])], [scriptdir="$withval"], [scriptdir="$prefix/scripts"])
		85	-AC_SUBST(scriptdir)
		86	-AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
		87	+AC_ARG_WITH([htdocsdir],
		88	+ [AS_HELP_STRING([--with-htdocsdir=DIR], [Put html files into this location (default: $prefix/htdocs)])], [htdocsdir="$withval"], [htdocsdir="$prefix/htdocs"])
		89	+AC_SUBST(htdocsdir)
		90	+AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
		91	+
		92	+# Where to install the modules
		93	+AC_ARG_WITH([modinstdir],
		94	+ [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
		95	+AC_SUBST(modulesdir)
		96	+AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
		97
		98	+#Where to put Custom Recordings
		99	AC_ARG_WITH([recordingsdir],
		100	- [AS_HELP_STRING([--with-recordingsdir=DIR], [Put recordings files into this location (default: $prefix/recordings)])], [recordingsdir="$withval"], [recordingsdir="$prefix/recordings"])
		101	+ [AS_HELP_STRING([--with-recordingsdir=DIR], [Put recordings files into this location (default: $prefix/recordings)])], [recordingsdir="$withval"], [recordingsdir="${PREFIX}/recordings"])
51	AC_SUBST(recordingsdir)	102	AC_SUBST(recordingsdir)
52	AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])	103	-AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
		104	+AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to putfreeswitch custom recording files])
53		105
54	if test "$sysconfdir" = "\${prefix}/etc" ; then	106	-if test "$sysconfdir" = "\${prefix}/etc" ; then
55	- confdir="$prefix/conf"	107	- confdir="$prefix/conf"
56	+ confdir="${prefix}/conf"	108	-else
57	else
58	- confdir="$sysconfdir"	109	- confdir="$sysconfdir"
59	+ confdir="${sysconfdir}"	110	-fi
60	fi	111	-
		112	-sysconfdir="$confdir"
		113	+#Where to put custom scripts
		114	+AC_ARG_WITH([scriptdir],
		115	+ [AS_HELP_STRING([--with-scriptdir=DIR], [Put script files into this location (default: $prefix/scripts)])], [scriptdir="$withval"], [scriptdir="${prefix}/scripts"])
		116	+AC_SUBST(scriptdir)
		117	+AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put freeswitch & custom script files])
		118
		119	-AC_SUBST(confdir)
		120	-AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
		121	+#Where to put freeswitch sounds and moh
		122	+AC_ARG_WITH([soundsdir],
		123	+ [AS_HELP_STRING([--with-soundsdir=DIR], [Put freeswitch sound files into this location (default: $prefix/sounds)])], [soundsdir="$withval"], [soundsdir="${prefix}/sounds"])
		124	+AC_SUBST(soundsdir)
		125	+AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put freeswitch sounds files])
		126
		127	-AC_SUBST(libdir)
		128	-AC_SUBST(bindir)
		129	-AC_SUBST(includedir)
		130	+#Freeswitch dir for storage.
		131	+AC_ARG_WITH([storagedir],
		132	+ [AS_HELP_STRING([--with-storagedir=DIR], [Store files in this location (default: $prefix/storage)])], [storagedir="$withval"], [storagedir="${prefix}/storage"])
		133	+AC_SUBST(storagedir)
		134	+AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files & faxes])
61		135
62	sysconfdir="$confdir"	136	+#Where to put pkgconfig file
63	@@ -89,6 +89,14 @@ sysconfdir="$confdir"	137	AC_ARG_WITH([pkgconfigdir],
64	AC_SUBST(confdir)	138	[AS_HELP_STRING([--with-pkgconfigdir=DIR], [Installation directory for pkgconfig file (default: ${libdir}/pkgconfig)])],
65	AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])	139	[case "${withval}" in
		140	@@ -112,6 +130,13 @@
		141	)
		142	AC_SUBST([pkgconfigdir])
66		143
67	+storagedir="${localstatedir}/freeswitch"	144	+AC_SUBST(confdir)
68	+AC_SUBST(storagedir)	145	+AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
69	+AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files])	146	+
		147	+AC_SUBST(libdir)
		148	+AC_SUBST(bindir)
		149	+AC_SUBST(includedir)
70	+	150	+
71	+voicemaildir="${localstatedir}/spool/freeswitch/voicemail"	151	#Set default language
72	+AC_SUBST(voicemaildir)	152	AC_LANG_C
73	+AC_DEFINE_UNQUOTED([SWITCH_VOICEMAIL_DIR],"${voicemaildir}",[where to put voicemail])	153	# Checks for programs.
74	+	154	@@ -1143,7 +1168,11 @@
75	AC_SUBST(libdir)	155	echo " libdir: ${libdir}"
76	AC_SUBST(bindir)	156	echo " modulesdir: ${modulesdir}"
77	AC_SUBST(includedir)	157	echo " sysconfdir: ${sysconfdir}"
		158	-echo " runtimedir: ${runtimedir}"
		159	-echo " logfiledir: ${logfiledir}"
		160	+echo " dbdir: ${datadir}"
		161	+echo " soundsdir: ${soundsdir}"
		162	+echo " storgredir: ${storagedir}"
		163	+echo " recordingsdir: ${recordingsdir}"
		164	+echo " htdocdir: ${htdocsdir}"
		165	+echo " logdir: ${logfiledir}"
		166	echo ""
		167	echo "------------------------------------------------------------------------------"

Removed Link Here

(-)files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c (-127 lines)
1	--- src/mod/applications/mod_voicemail/mod_voicemail.c 2010-06-22 17:19:34.000000000 -0400
2	+++ src/mod/applications/mod_voicemail/mod_voicemail.c 2010-07-02 13:03:12.000000000 -0400
3	@@ -119,7 +119,7 @@
4	char *operator_ext;
5	char *vmain_ext;
6	char *tone_spec;
7	- char *storage_dir;
8	+ char *voicemail_dir;
9	char *callback_dialplan;
10	char *callback_context;
11	char *email_body;
12	@@ -539,8 +539,8 @@
13
14	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "tone-spec", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
15	&profile->tone_spec, "%(1000, 0, 640)", &profile->config_str_pool, NULL, NULL);
16	- SWITCH_CONFIG_SET_ITEM(profile->config[i++], "storage-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
17	- &profile->storage_dir, "", &profile->config_str_pool, NULL, NULL);
18	+ SWITCH_CONFIG_SET_ITEM(profile->config[i++], "voicemail-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
19	+ &profile->voicemail_dir, "", &profile->config_str_pool, NULL, NULL);
20	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-dialplan", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
21	&profile->callback_dialplan, "XML", &profile->config_str_pool, NULL, NULL);
22	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-context", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
23	@@ -1706,7 +1706,7 @@
24	char vm_email = NULL, email_addr = NULL;
25	char *convert_cmd = profile->convert_cmd;
26	char *convert_ext = profile->convert_ext;
27	- char *vm_storage_dir = NULL;
28	+ char *vm_voicemail_dir = NULL;
29	char global_buf[2] = "";
30	switch_input_args_t args = { 0 };
31	const char *caller_id_name = NULL;
32	@@ -2149,8 +2149,8 @@
33	convert_cmd = switch_core_session_strdup(session, val);
34	} else if (!strcasecmp(var, "vm-convert-ext")) {
35	convert_ext = switch_core_session_strdup(session, val);
36	- } else if (!strcasecmp(var, "storage-dir")) {
37	- vm_storage_dir = switch_core_session_strdup(session, val);
38	+ } else if (!strcasecmp(var, "voicemail-dir")) {
39	+ vm_voicemail_dir = switch_core_session_strdup(session, val);
40
41	} else if (!strcasecmp(var, "timezone")) {
42	switch_channel_set_variable(channel, var, val);
43	@@ -2211,14 +2211,14 @@
44
45	if (auth) {
46	if (!dir_path) {
47	- if (!zstr(vm_storage_dir)) {
48	- dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
49	- } else if (!zstr(profile->storage_dir)) {
50	+ if (!zstr(vm_voicemail_dir)) {
51	+ dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
52	+ } else if (!zstr(profile->voicemail_dir)) {
53	dir_path =
54	- switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name,
55	+ switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name,
56	SWITCH_PATH_SEPARATOR, myid);
57	} else {
58	- dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
59	+ dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
60	SWITCH_PATH_SEPARATOR,
61	SWITCH_PATH_SEPARATOR,
62	profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
63	@@ -2293,7 +2293,7 @@
64	int send_notify = 0;
65	int insert_db = 1;
66	int email_attach = 0;
67	- char *vm_storage_dir = NULL;
68	+ char *vm_voicemail_dir = NULL;
69	char *myfolder = "inbox";
70	int priority = 3;
71	const char *tmp;
72	@@ -2366,12 +2366,12 @@
73
74	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deliver VM to %s@%s\n", myid, domain_name);
75
76	- if (!zstr(vm_storage_dir)) {
77	- dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
78	- } else if (!zstr(profile->storage_dir)) {
79	- dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
80	+ if (!zstr(vm_voicemail_dir)) {
81	+ dir_path = switch_mprintf("%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
82	+ } else if (!zstr(profile->voicemail_dir)) {
83	+ dir_path = switch_mprintf("%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
84	} else {
85	- dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
86	+ dir_path = switch_mprintf("%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
87	SWITCH_PATH_SEPARATOR,
88	SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
89	}
90	@@ -2822,7 +2822,7 @@
91	char date[80] = "";
92	switch_size_t retsize;
93	switch_time_t ts = switch_micro_time_now();
94	- char *vm_storage_dir = NULL;
95	+ char *vm_voicemail_dir = NULL;
96	char *record_macro = VM_RECORD_MESSAGE_MACRO;
97	int send_main = 0;
98	int send_notify = 0;
99	@@ -2876,8 +2876,8 @@
100	email_addr = switch_core_session_strdup(session, val);
101	} else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
102	send_mail++;
103	- } else if (!strcasecmp(var, "storage-dir")) {
104	- vm_storage_dir = switch_core_session_strdup(session, val);
105	+ } else if (!strcasecmp(var, "voicemail-dir")) {
106	+ vm_voicemail_dir = switch_core_session_strdup(session, val);
107	} else if (!strcasecmp(var, "vm-notify-email-all-messages") && (send_notify = switch_true(val))) {
108	send_mail++;
109	} else if (!strcasecmp(var, "vm-keep-local-after-email")) {
110	@@ -2933,12 +2933,12 @@
111	}
112	}
113
114	- if (!zstr(vm_storage_dir)) {
115	- dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id);
116	- } else if (!zstr(profile->storage_dir)) {
117	- dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
118	+ if (!zstr(vm_voicemail_dir)) {
119	+ dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, id);
120	+ } else if (!zstr(profile->voicemail_dir)) {
121	+ dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
122	} else {
123	- dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
124	+ dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
125	SWITCH_PATH_SEPARATOR,
126	SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
127	}

Added Link Here

(-)files/patch-src-mod-event_handlers-mod_event_socket-mod_event_socket.c (+24 lines)
1	--- src/mod/event_handlers/mod_event_socket/mod_event_socket.c
2	+++ src/mod/event_handlers/mod_event_socket/mod_event_socket.c
3	@@ -1356,16 +1356,16 @@ static switch_status_t read_packet(listener_t listener, switch_event_t *event,
4	if (switch_test_flag(listener, LFLAG_LINGER)) {
5	char disco_buf[512] = "";
6
7	- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session), SWITCH_LOG_DEBUG, "%s Socket Linger %"TIME_T_FMT"\n",
8	- switch_channel_get_name(channel), listener->linger_timeout);
9	+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session), SWITCH_LOG_DEBUG, "%s Socket Linger %d\n",
10	+ switch_channel_get_name(channel), (int)listener->linger_timeout);
11
12	switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\n"
13	"Controlled-Session-UUID: %s\n"
14	"Content-Disposition: linger\n"
15	"Channel-Name: %s\n"
16	- "Linger-Time: %"TIME_T_FMT"\n"
17	+ "Linger-Time: %d\n"
18	"Content-Length: 0\n\n",
19	- switch_core_session_get_uuid(listener->session), switch_channel_get_name(channel), listener->linger_timeout);
20	+ switch_core_session_get_uuid(listener->session), switch_channel_get_name(channel), (int)listener->linger_timeout);
21
22
23	if (listener->linger_timeout != (time_t) -1) {
24

Lines 1-62 Link Here

(-)files/patch-src-switch_core.c (-36 / +10 lines)
1	--- src/switch_core.c	1	--- src/switch_core.c
2	+++ src/switch_core.c	2	+++ src/switch_core.c
3	@@ -509,6 +509,14 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)	3	@@ -646,6 +646,7 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
4	#endif
5	}
6
7	+ if (!SWITCH_GLOBAL_dirs.voicemail_dir && (SWITCH_GLOBAL_dirs.voicemail_dir = (char *) malloc(BUFSIZE))) {
8	+#ifdef SWITCH_VOICEMAIL_DIR
9	+ switch_snprintf(SWITCH_GLOBAL_dirs.voicemail_dir, BUFSIZE, "%s", SWITCH_VOICEMAIL_DIR);
10	+#else
11	+ switch_snprintf(SWITCH_GLOBAL_dirs.voicemail_dir, BUFSIZE, "%s%svoicemail", storage_dir, SWITCH_PATH_SEPARATOR);
12	+#endif
13	+ }
14	+
15	if (!SWITCH_GLOBAL_dirs.db_dir && (SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(BUFSIZE))) {
16	#ifdef SWITCH_DB_DIR
17	switch_snprintf(SWITCH_GLOBAL_dirs.db_dir, BUFSIZE, "%s", SWITCH_DB_DIR);
18	@@ -566,6 +574,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
19	switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);	4	switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);
20	switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);	5	switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);
21	switch_assert(SWITCH_GLOBAL_dirs.temp_dir);	6	switch_assert(SWITCH_GLOBAL_dirs.temp_dir);
22	+ switch_assert(SWITCH_GLOBAL_dirs.storage_dir);	7	+ switch_assert(SWITCH_GLOBAL_dirs.storage_dir);
23	+ switch_assert(SWITCH_GLOBAL_dirs.voicemail_dir);
24	}	8	}
25		9
26	SWITCH_DECLARE(int32_t) set_high_priority(void)	10
27	@@ -1261,6 +1271,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc	11	@@ -1450,7 +1451,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
28	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);	12	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
29	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.sounds_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);	13	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.sounds_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
30	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);	14	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
		15	-
31	+ switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);	16	+ switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
32	+ switch_dir_make_recursive(SWITCH_GLOBAL_dirs.voicemail_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
33
34		17
35	switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);	18	switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
36	@@ -1296,7 +1308,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc	19
		20	@@ -1488,6 +1489,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
37	switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET6);	21	switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET6);
38	switch_core_set_variable("local_ip_v6", guess_ip);	22	switch_core_set_variable("local_ip_v6", guess_ip);
39	switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);	23	switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);
40	+ switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);	24	+ switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);
41	switch_core_set_variable("recordings_dir", SWITCH_GLOBAL_dirs.recordings_dir);	25	switch_core_set_variable("recordings_dir", SWITCH_GLOBAL_dirs.recordings_dir);
42	+ switch_core_set_variable("voicemail_dir", SWITCH_GLOBAL_dirs.voicemail_dir);
43	switch_core_set_variable("sound_prefix", SWITCH_GLOBAL_dirs.sounds_dir);	26	switch_core_set_variable("sound_prefix", SWITCH_GLOBAL_dirs.sounds_dir);
44	switch_core_set_variable("sounds_dir", SWITCH_GLOBAL_dirs.sounds_dir);	27	switch_core_set_variable("sounds_dir", SWITCH_GLOBAL_dirs.sounds_dir);
45	switch_core_set_serial();	28	@@ -1728,6 +1730,8 @@ static void switch_load_core_config(const char *file)
46	@@ -1448,6 +1462,8 @@ static void switch_load_core_config(const char *file)
47	switch_set_flag((&runtime), SCF_EARLY_HANGUP);	29	switch_set_flag((&runtime), SCF_EARLY_HANGUP);
48	} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {	30	} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {
49	runtime.colorize_console = SWITCH_TRUE;	31	runtime.colorize_console = SWITCH_TRUE;
50	+ } else if (!strcasecmp(var, "storage-dir") && !zstr(val)) {	32	+ } else if (!strcasecmp(var, "storage-dir") && !zstr(val)) {
51	+ runtime.storage_dir = switch_core_strdup(runtime.memory_pool, val);	33	+ runtime.storage_dir = switch_core_strdup(runtime.memory_pool, val);
52	} else if (!strcasecmp(var, "mailer-app") && !zstr(val)) {	34	} else if (!strcasecmp(var, "core-db-pre-trans-execute") && !zstr(val)) {
53	runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);	35	runtime.core_db_pre_trans_execute = switch_core_strdup(runtime.memory_pool, val);
54	} else if (!strcasecmp(var, "mailer-app-args") && val) {	36	} else if (!strcasecmp(var, "core-db-post-trans-execute") && !zstr(val)) {
55	@@ -1932,6 +1948,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
56	switch_safe_free(SWITCH_GLOBAL_dirs.htdocs_dir);
57	switch_safe_free(SWITCH_GLOBAL_dirs.grammar_dir);
58	switch_safe_free(SWITCH_GLOBAL_dirs.storage_dir);
59	+ switch_safe_free(SWITCH_GLOBAL_dirs.voicemail_dir);
60	switch_safe_free(SWITCH_GLOBAL_dirs.recordings_dir);
61	switch_safe_free(SWITCH_GLOBAL_dirs.sounds_dir);
62	switch_safe_free(SWITCH_GLOBAL_dirs.run_dir);

Lines 17-39 Link Here

(-)files/pkg-install.in (-6 / +8 lines)
17	do chown %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir	17	do chown %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
18	done	18	done
19		19
20	find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 755 {} +	20	find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 770 {} +
		21	find ${PKG_PREFIX}/etc/freeswitch/ -type f -exec chmod 660 {} +
		22
21	chmod 775 ${PKG_PREFIX}/share/freeswitch	23	chmod 775 ${PKG_PREFIX}/share/freeswitch
22		24
23	# @cwd /var	25	@cwd /var
24		26
25	for dir in \	27	for dir in \
26	db/freeswitch \	28	db/freeswitch \
27	freeswitch/recordings \	29	freeswitch/recordings \
28	log/freeswitch/xml_cdr \	30	log/freeswitch/xml_cdr
29	spool/freeswitch/voicemail
30	do install -d -m 775 -o %%FREESWITCH_USER%% -g %%FREESWITCH_GROUP%% /var/$dir	31	do install -d -m 775 -o %%FREESWITCH_USER%% -g %%FREESWITCH_GROUP%% /var/$dir
31	done	32	done
32		33
33	echo "This port chown -R various directories %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%%"	34	echo "This port chown -R various directories %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%%"
34	echo "This port chmod -R 775 various directories"	35	echo "This port chmod -R 770 various directories"
		36	echo" This port chmod -R 660 various files"
35	echo "This is for security reasons. In the event something should"	37	echo "This is for security reasons. In the event something should"
36	echo "stop working, please take the time to check the following dirs:"	38	echo "stop working, please take the time to check the following dirs:"
37	echo "/var/spool/freeswitch /var/log/freeswitch /var/freeswitch"	39	echo " /var/log/freeswitch /var/freeswitch"
38		40
39	exit 0	41	exit 0

Removed Link Here

(-)files/pkg-message.in (-20 lines)
1
2	*****************************************************
3	* Please read *
4	*****************************************************
5	FreeBSD 7.x
6	There are some known issues with FreeBSD's libpthread
7	implementation and APR that can affect throughput at
8	high volume. A possible fix is to use libmap.conf to
9	remap FreeSWITCH. and its libraries to use libthr
10	(the better performance threading library)
11
12	/etc/libmap.conf
13
14	[freeswitch]
15	libc_r.so.5 libthr.so.2
16	libc_r.so.6 libthr.so.2
17	libpthread.so.1 libthr.so.2
18	libpthread.so.2 libthr.so.2
19
20