View | Details | Raw Unified | Return to bug 148693
Collapse All | Expand All

(-)Makefile (-25 / +29 lines)
Lines 7-17 Link Here
7 

          7
          

        

        

          8
          
PORTNAME=	freeswitch-core

          8
          
PORTNAME=	freeswitch-core

        

        

          9
          
PORTVERSION=	1.0.6

          9
          
PORTVERSION=	1.0.6

        

          
            

              10
              
PORTREVISION=	2


              10
              
PORTREVISION=	3

            

        

          11
          
CATEGORIES=	net

          11
          
CATEGORIES=	net

        

        

          12
          
MASTER_SITES=	http://files.freeswitch.org/:1 \

          12
          
MASTER_SITES=	http://files.freeswitch.org/:1 \

        

        

          13
          
		http://files.freeswitch.org/downloads/libs/:2

          13
          
		http://files.freeswitch.org/downloads/libs/:2

        

          
            

              14
              
DISTFILES=	freeswitch-${PORTVERSION}.tar.gz:1 \


              14
              
DISTFILES=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz:1 \

            

        

          15
          
		celt-0.7.1.tar.gz:2 \

          15
          
		celt-0.7.1.tar.gz:2 \

        

        

          16
          
		flite-1.3.99-latest.tar.gz:2 \

          16
          
		flite-1.3.99-latest.tar.gz:2 \

        

        

          17
          
		json-c-0.9.tar.gz \

          17
          
		json-c-0.9.tar.gz \

        

  

    
      
            Lines 24-30
          
      
      
        Link Here
      
    
  

        

          24
          
		soundtouch-1.3.1.tar.gz:2 \

          24
          
		soundtouch-1.3.1.tar.gz:2 \

        

        

          25
          
		sphinxbase-0.4.99-20091212.tar.gz:2 \

          25
          
		sphinxbase-0.4.99-20091212.tar.gz:2 \

        

        

          26
          
		communicator_semi_6000_20080321.tar.gz:2

          26
          
		communicator_semi_6000_20080321.tar.gz:2

        

          
            

              27
              
EXTRACT_ONLY=	freeswitch-${PORTVERSION}.tar.gz


              27
              
EXTRACT_ONLY=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz

            

        

          28
          

          28
          

        

        

          29
          
MAINTAINER=	ecrist@secure-computing.net

          29
          
MAINTAINER=	ecrist@secure-computing.net

        

        

          30
          
COMMENT=	FreeSwitch SoftSwitch Port

          30
          
COMMENT=	FreeSwitch SoftSwitch Port

        

  

    
      
            Lines 49-59
          
      
      
        Link Here
      
    
  

        

          49
          
VARBASE?=	/var

          49
          
VARBASE?=	/var

        

        

          50
          
CONFIGURE_ARGS=	--prefix=${PREFIX} \

          50
          
CONFIGURE_ARGS=	--prefix=${PREFIX} \

        

        

          51
          
		--bindir=${PREFIX}/bin \

          51
          
		--bindir=${PREFIX}/bin \

        

          
            

              52
              
		--sysconfdir=${PREFIX}/etc/${PORTNAME}/conf \


              52
              
		--sysconfdir=${PREFIX}/etc/${BASE_PORTNAME}/conf \

            

            

              53
              
		--includedir=${PREFIX}/include/${PORTNAME} \


              53
              
		--includedir=${PREFIX}/include/${BASE_PORTNAME} \

            

            

              54
              
		--libdir=${PREFIX}/lib/${PORTNAME}/lib \


              54
              
		--libdir=${PREFIX}/lib/${BASE_PORTNAME}/lib \

            

            

              55
              
		--with-modinstdir=${PREFIX}/lib/${PORTNAME}/mod \


              55
              
		--with-modinstdir=${PREFIX}/lib/${BASE_PORTNAME}/mod \

            

            

              56
              
		--with-rundir=${VARBASE}/run/freeswitch \


              56
              
		--with-rundir=${VARBASE}/run/${BASE_PORTNAME} \

            

        

          57
          
		--with-libgnutls-prefix=${LOCALBASE} \

          57
          
		--with-libgnutls-prefix=${LOCALBASE} \

        

        

          58
          
		--with-ogg=${LOCALBASE} \

          58
          
		--with-ogg=${LOCALBASE} \

        

        

          59
          
		--with-ogg-libraries=${LOCALBASE}/lib \

          59
          
		--with-ogg-libraries=${LOCALBASE}/lib \

        

  

    
      
            Lines 64-75
          
      
      
        Link Here
      
    
  

        

          64
          
USE_LDCONFIG=	yes

          64
          
USE_LDCONFIG=	yes

        

        

          65
          
CPPFLAGS+=	-I${PREFIX}/include

          65
          
CPPFLAGS+=	-I${PREFIX}/include

        

        

          66
          

          66
          

        

            

              67
              
.if ${OSVERSION} < 700000

              
              
            

            

              68
              
IGNORE=		freeswitch is only supported on FreeBSD 7 or newer

            

            

              69
              
.endif

            

            

              70
              

            

        

          71
          
FREESWITCH_USER=	freeswitch

          67
          
FREESWITCH_USER=	freeswitch

        

        

          72
          
FREESWITCH_GROUP=	${FREESWITCH_USER}

          68
          
FREESWITCH_GROUP=	${FREESWITCH_USER}

        

            

              
              
              69
              
BASE_PORTNAME=	${FREESWITCH_USER}

            

        

          73
          

          70
          

        

        

          74
          
SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP}

          71
          
SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP}

        

        

          75
          

          72
          

        

  

    
      
            Lines 122-127
          
      
      
        Link Here
      
    
  

        

          122
          

          119
          

        

        

          123
          
.include <bsd.port.options.mk>

          120
          
.include <bsd.port.options.mk>

        

        

          124
          

          121
          

        

            

              
              
              122
              
.if ${OSVERSION} < 700000

            

            

              123
              
BROKEN=	Does not compile on FreeBSD < 7.0

            

            

              124
              
.endif

            

            

              125
              

            

        

          125
          
.if ${ARCH} == "amd64"

          126
          
.if ${ARCH} == "amd64"

        

        

          126
          
CFLAGS+=	-fPIC

          127
          
CFLAGS+=	-fPIC

        

        

          127
          
.endif

          128
          
.endif

        

  

    
      
            Lines 141-146
          
      
      
        Link Here
      
    
  

        

          141
          
.if !defined(WITH_MODOPENZAP)

          142
          
.if !defined(WITH_MODOPENZAP)

        

        

          142
          
PLIST_SUB+=	WITH_MODOPENZAP="@comment "

          143
          
PLIST_SUB+=	WITH_MODOPENZAP="@comment "

        

        

          143
          
.else

          144
          
.else

        

            

              
              
              145
              
.if ${OSVERSION} < ${OSVERSION} < 800108)

            

            

              146
              
IGNORE=		sorry you can not use mod_openzap on this version of freebsd please update

            

            

              147
              
.endif

            

        

          144
          
PLIST_SUB+=	WITH_MODOPENZAP=""

          148
          
PLIST_SUB+=	WITH_MODOPENZAP=""

        

        

          145
          
CONFIGURE_ARGS+=	--with-libpri

          149
          
CONFIGURE_ARGS+=	--with-libpri

        

        

          146
          
BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \

          150
          
BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \

        

  

    
      
            Lines 252-280
          
      
      
        Link Here
      
    
  

        

          252
          
.endif

          256
          
.endif

        

        

          253
          

          257
          

        

        

          254
          
pre-install:

          258
          
pre-install:

        

          
            

              255
              
	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL


              259
              
	@${SH} ${PKGINSTALL} ${BASE_PORTNAME} PRE-INSTALL

            

        

          256
          

          260
          

        

        

          257
          
.if !defined(WITH_EXTENSIONS)

          261
          
.if !defined(WITH_EXTENSIONS)

        

          
            

              258
              
	@${RM} ${WRKSRC}/conf/directory/default/*


              262
              
	@${FIND} ${WRKSRC}/conf/directory/default -type f -name '*.xml' -delete

            

        

          259
          
.endif

          263
          
.endif

        

        

          260
          

          264
          

        

        

          261
          
post-install:

          265
          
post-install:

        

        

          262
          
.if !defined(WITH_EXTENSIONS)

          266
          
.if !defined(WITH_EXTENSIONS)

        

          
            

              263
              
	@${MKDIR} ${PREFIX}/etc/${PORTNAME}/conf/directory/default


              267
              
	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory/default

            

        

          264
          
.endif

          268
          
.endif

        

          
            

              265
              
	@${MKDIR} ${PREFIX}/share/${PORTNAME}/sounds


              269
              
	@${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds

            

            

              266
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/etc/${PORTNAME}


              270
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/etc/${BASE_PORTNAME}

            

            

              267
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/share/${PORTNAME}


              271
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/share/${BASE_PORTNAME}

            

            

              268
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/db/${PORTNAME}


              272
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/db/${BASE_PORTNAME}

            

            

              269
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/log/${PORTNAME}


              273
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/log/${BASE_PORTNAME}

            

            

              270
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/${PORTNAME}


              274
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/${BASE_PORTNAME}

            

            

              271
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/run/${PORTNAME}


              275
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/run/${BASE_PORTNAME}

            

            

              272
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/spool/${PORTNAME}


              276
              
	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/spool/${BASE_PORTNAME}

            

            

              273
              
	@for i in $$(${FIND} ${PREFIX}/etc/${PORTNAME}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done


              277
              
	@for i in $$(${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done

            

        

          274
          
	@${CAT} ${PKGMESSAGE}

          278
          
	@${CAT} ${PKGMESSAGE}

        

        

          275
          
	@${ECHO_MSG} "This port chown -R various directories ${FREESWITCH_USER}:${FREESWITCH_GROUP} "

          279
          
	@${ECHO_MSG} "This port chown -R various directories ${FREESWITCH_USER}:${FREESWITCH_GROUP} "

        

        

          276
          
	@${ECHO_MSG} "this is for port security . in the event something should stop working."

          280
          
	@${ECHO_MSG} "this is for port security . in the event something should stop working."

        

        

          277
          
	@${ECHO_MSG} "Please take the time to check chownership of the dir's"

          281
          
	@${ECHO_MSG} "Please take the time to check chownership of the dir's"

        

          
            

              278
              
	@${ECHO_MSG} "${VARBASE}/db/${PORTNAME} ${VARBASE}/log/${PORTNAME} ${VARBAE}/${PORTNAME} ${PREFIX}/etc/${PORTNAME}"


              282
              
	@${ECHO_MSG} "${VARBASE}/db/${BASE_PORTNAME} ${VARBASE}/log/${BASE_PORTNAME} ${VARBASE}/${BASE_PORTNAME} ${PREFIX}/etc/${BASE_PORTNAME}"

            

        

          279
          

          283
          

        

        

          280
          
.include <bsd.port.mk>

          284
          
.include <bsd.port.mk>

        



(-)pkg-plist
      (-200 / +201 lines)




  

    
      
            Lines 4-165
          
      
      
        Link Here
      
    
  

        

          4
          
bin/fs_ivrd

          4
          
bin/fs_ivrd

        

        

          5
          
bin/fsxs

          5
          
bin/fsxs

        

        

          6
          
bin/gentls_cert

          6
          
bin/gentls_cert

        

          
            

              7
              
%%ETCDIR%%/conf/autoload_configs/acl.conf.xml.sample


              7
              
etc/freeswitch/conf/autoload_configs/acl.conf.xml.sample

            

            

              8
              
%%ETCDIR%%/conf/autoload_configs/alsa.conf.xml.sample


              8
              
etc/freeswitch/conf/autoload_configs/alsa.conf.xml.sample

            

            

              9
              
%%ETCDIR%%/conf/autoload_configs/cdr_csv.conf.xml.sample


              9
              
etc/freeswitch/conf/autoload_configs/cdr_csv.conf.xml.sample

            

            

              10
              
%%ETCDIR%%/conf/autoload_configs/cdr_pg_csv.conf.xml.sample


              10
              
etc/freeswitch/conf/autoload_configs/cdr_pg_csv.conf.xml.sample

            

            

              11
              
%%ETCDIR%%/conf/autoload_configs/cidlookup.conf.xml.sample


              11
              
etc/freeswitch/conf/autoload_configs/cidlookup.conf.xml.sample

            

            

              12
              
%%ETCDIR%%/conf/autoload_configs/conference.conf.xml.sample


              12
              
etc/freeswitch/conf/autoload_configs/conference.conf.xml.sample

            

            

              13
              
%%ETCDIR%%/conf/autoload_configs/console.conf.xml.sample


              13
              
etc/freeswitch/conf/autoload_configs/console.conf.xml.sample

            

            

              14
              
%%ETCDIR%%/conf/autoload_configs/dialplan_directory.conf.xml.sample


              14
              
etc/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml.sample

            

            

              15
              
%%ETCDIR%%/conf/autoload_configs/dingaling.conf.xml.sample


              15
              
etc/freeswitch/conf/autoload_configs/dingaling.conf.xml.sample

            

            

              16
              
%%ETCDIR%%/conf/autoload_configs/directory.conf.xml.sample


              16
              
etc/freeswitch/conf/autoload_configs/directory.conf.xml.sample

            

            

              17
              
%%ETCDIR%%/conf/autoload_configs/distributor.conf.xml.sample


              17
              
etc/freeswitch/conf/autoload_configs/distributor.conf.xml.sample

            

            

              18
              
%%ETCDIR%%/conf/autoload_configs/easyroute.conf.xml.sample


              18
              
etc/freeswitch/conf/autoload_configs/easyroute.conf.xml.sample

            

            

              19
              
%%ETCDIR%%/conf/autoload_configs/enum.conf.xml.sample


              19
              
etc/freeswitch/conf/autoload_configs/enum.conf.xml.sample

            

            

              20
              
%%ETCDIR%%/conf/autoload_configs/erlang_event.conf.xml.sample


              20
              
etc/freeswitch/conf/autoload_configs/erlang_event.conf.xml.sample

            

            

              21
              
%%ETCDIR%%/conf/autoload_configs/event_multicast.conf.xml.sample


              21
              
etc/freeswitch/conf/autoload_configs/event_multicast.conf.xml.sample

            

            

              22
              
%%ETCDIR%%/conf/autoload_configs/event_socket.conf.xml.sample


              22
              
etc/freeswitch/conf/autoload_configs/event_socket.conf.xml.sample

            

            

              23
              
%%ETCDIR%%/conf/autoload_configs/fax.conf.xml.sample


              23
              
etc/freeswitch/conf/autoload_configs/fax.conf.xml.sample

            

            

              24
              
%%ETCDIR%%/conf/autoload_configs/fifo.conf.xml.sample


              24
              
etc/freeswitch/conf/autoload_configs/fifo.conf.xml.sample

            

            

              25
              
%%ETCDIR%%/conf/autoload_configs/ivr.conf.xml.sample


              25
              
etc/freeswitch/conf/autoload_configs/ivr.conf.xml.sample

            

            

              26
              
%%ETCDIR%%/conf/autoload_configs/java.conf.xml.sample


              26
              
etc/freeswitch/conf/autoload_configs/java.conf.xml.sample

            

            

              27
              
%%ETCDIR%%/conf/autoload_configs/lcr.conf.xml.sample


              27
              
etc/freeswitch/conf/autoload_configs/lcr.conf.xml.sample

            

            

              28
              
%%ETCDIR%%/conf/autoload_configs/limit.conf.xml.sample


              28
              
etc/freeswitch/conf/autoload_configs/limit.conf.xml.sample

            

            

              29
              
%%ETCDIR%%/conf/autoload_configs/local_stream.conf.xml.sample


              29
              
etc/freeswitch/conf/autoload_configs/local_stream.conf.xml.sample

            

            

              30
              
%%ETCDIR%%/conf/autoload_configs/logfile.conf.xml.sample


              30
              
etc/freeswitch/conf/autoload_configs/logfile.conf.xml.sample

            

            

              31
              
%%ETCDIR%%/conf/autoload_configs/lua.conf.xml.sample


              31
              
etc/freeswitch/conf/autoload_configs/lua.conf.xml.sample

            

            

              32
              
%%ETCDIR%%/conf/autoload_configs/memcache.conf.xml.sample


              32
              
etc/freeswitch/conf/autoload_configs/memcache.conf.xml.sample

            

            

              33
              
%%ETCDIR%%/conf/autoload_configs/modules.conf.xml.sample


              33
              
etc/freeswitch/conf/autoload_configs/modules.conf.xml.sample

            

            

              34
              
%%ETCDIR%%/conf/autoload_configs/nibblebill.conf.xml.sample


              34
              
etc/freeswitch/conf/autoload_configs/nibblebill.conf.xml.sample

            

            

              35
              
%%ETCDIR%%/conf/autoload_configs/opal.conf.xml.sample


              35
              
etc/freeswitch/conf/autoload_configs/opal.conf.xml.sample

            

            

              36
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/autoload_configs/openzap.conf.xml.sample


              36
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/autoload_configs/openzap.conf.xml.sample

            

            

              37
              
%%ETCDIR%%/conf/autoload_configs/perl.conf.xml.sample


              37
              
etc/freeswitch/conf/autoload_configs/perl.conf.xml.sample

            

            

              38
              
%%ETCDIR%%/conf/autoload_configs/pocketsphinx.conf.xml.sample


              38
              
etc/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml.sample

            

            

              39
              
%%ETCDIR%%/conf/autoload_configs/portaudio.conf.xml.sample


              39
              
etc/freeswitch/conf/autoload_configs/portaudio.conf.xml.sample

            

            

              40
              
%%ETCDIR%%/conf/autoload_configs/post_load_modules.conf.xml.sample


              40
              
etc/freeswitch/conf/autoload_configs/post_load_modules.conf.xml.sample

            

            

              41
              
%%ETCDIR%%/conf/autoload_configs/python.conf.xml.sample


              41
              
etc/freeswitch/conf/autoload_configs/python.conf.xml.sample

            

            

              42
              
%%ETCDIR%%/conf/autoload_configs/rss.conf.xml.sample


              42
              
etc/freeswitch/conf/autoload_configs/rss.conf.xml.sample

            

            

              43
              
%%ETCDIR%%/conf/autoload_configs/sangoma_codec.conf.xml.sample


              43
              
etc/freeswitch/conf/autoload_configs/sangoma_codec.conf.xml.sample

            

            

              44
              
%%ETCDIR%%/conf/autoload_configs/shout.conf.xml.sample


              44
              
etc/freeswitch/conf/autoload_configs/shout.conf.xml.sample

            

            

              45
              
%%ETCDIR%%/conf/autoload_configs/skinny.conf.xml.sample


              45
              
etc/freeswitch/conf/autoload_configs/skinny.conf.xml.sample

            

            

              46
              
%%ETCDIR%%/conf/autoload_configs/sofia.conf.xml.sample


              46
              
etc/freeswitch/conf/autoload_configs/sofia.conf.xml.sample

            

            

              47
              
%%ETCDIR%%/conf/autoload_configs/spidermonkey.conf.xml.sample


              47
              
etc/freeswitch/conf/autoload_configs/spidermonkey.conf.xml.sample

            

            

              48
              
%%ETCDIR%%/conf/autoload_configs/switch.conf.xml.sample


              48
              
etc/freeswitch/conf/autoload_configs/switch.conf.xml.sample

            

            

              49
              
%%ETCDIR%%/conf/autoload_configs/syslog.conf.xml.sample


              49
              
etc/freeswitch/conf/autoload_configs/syslog.conf.xml.sample

            

            

              50
              
%%ETCDIR%%/conf/autoload_configs/timezones.conf.xml.sample


              50
              
etc/freeswitch/conf/autoload_configs/timezones.conf.xml.sample

            

            

              51
              
%%ETCDIR%%/conf/autoload_configs/tts_commandline.conf.xml.sample


              51
              
etc/freeswitch/conf/autoload_configs/tts_commandline.conf.xml.sample

            

            

              52
              
%%ETCDIR%%/conf/autoload_configs/unicall.conf.xml.sample


              52
              
etc/freeswitch/conf/autoload_configs/unicall.conf.xml.sample

            

            

              53
              
%%ETCDIR%%/conf/autoload_configs/unimrcp.conf.xml.sample


              53
              
etc/freeswitch/conf/autoload_configs/unimrcp.conf.xml.sample

            

            

              54
              
%%ETCDIR%%/conf/autoload_configs/voicemail.conf.xml.sample


              54
              
etc/freeswitch/conf/autoload_configs/voicemail.conf.xml.sample

            

            

              55
              
%%ETCDIR%%/conf/autoload_configs/xml_cdr.conf.xml.sample


              55
              
etc/freeswitch/conf/autoload_configs/xml_cdr.conf.xml.sample

            

            

              56
              
%%ETCDIR%%/conf/autoload_configs/xml_curl.conf.xml.sample


              56
              
etc/freeswitch/conf/autoload_configs/xml_curl.conf.xml.sample

            

            

              57
              
%%ETCDIR%%/conf/autoload_configs/xml_rpc.conf.xml.sample


              57
              
etc/freeswitch/conf/autoload_configs/xml_rpc.conf.xml.sample

            

            

              58
              
%%ETCDIR%%/conf/autoload_configs/zeroconf.conf.xml.sample


              58
              
etc/freeswitch/conf/autoload_configs/zeroconf.conf.xml.sample

            

            

              59
              
%%ETCDIR%%/conf/dialplan/default.xml.sample


              59
              
etc/freeswitch/conf/dialplan/default.xml.sample

            

            

              60
              
%%ETCDIR%%/conf/dialplan/default/00_pizza_demo.xml.sample


              60
              
etc/freeswitch/conf/dialplan/default/00_pizza_demo.xml.sample

            

            

              61
              
%%ETCDIR%%/conf/dialplan/default/01_example.com.xml.sample


              61
              
etc/freeswitch/conf/dialplan/default/01_example.com.xml.sample

            

            

              62
              
%%ETCDIR%%/conf/dialplan/default/99999_enum.xml.sample


              62
              
etc/freeswitch/conf/dialplan/default/99999_enum.xml.sample

            

            

              63
              
%%ETCDIR%%/conf/dialplan/features.xml.sample


              63
              
etc/freeswitch/conf/dialplan/features.xml.sample

            

            

              64
              
%%ETCDIR%%/conf/dialplan/public.xml.sample


              64
              
etc/freeswitch/conf/dialplan/public.xml.sample

            

            

              65
              
%%ETCDIR%%/conf/dialplan/public/00_inbound_did.xml.sample


              65
              
etc/freeswitch/conf/dialplan/public/00_inbound_did.xml.sample

            

            

              66
              
%%ETCDIR%%/conf/directory/default.xml.sample


              66
              
etc/freeswitch/conf/directory/default.xml.sample

            

            

              67
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1000.xml.sample


              67
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1000.xml.sample

            

            

              68
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1001.xml.sample


              68
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1001.xml.sample

            

            

              69
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1002.xml.sample


              69
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1002.xml.sample

            

            

              70
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1003.xml.sample


              70
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1003.xml.sample

            

            

              71
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1004.xml.sample


              71
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1004.xml.sample

            

            

              72
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1005.xml.sample


              72
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1005.xml.sample

            

            

              73
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1006.xml.sample


              73
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1006.xml.sample

            

            

              74
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1007.xml.sample


              74
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1007.xml.sample

            

            

              75
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1008.xml.sample


              75
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1008.xml.sample

            

            

              76
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1009.xml.sample


              76
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1009.xml.sample

            

            

              77
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1010.xml.sample


              77
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1010.xml.sample

            

            

              78
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1011.xml.sample


              78
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1011.xml.sample

            

            

              79
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1012.xml.sample


              79
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1012.xml.sample

            

            

              80
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1013.xml.sample


              80
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1013.xml.sample

            

            

              81
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1014.xml.sample


              81
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1014.xml.sample

            

            

              82
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1015.xml.sample


              82
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1015.xml.sample

            

            

              83
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1016.xml.sample


              83
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1016.xml.sample

            

            

              84
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1017.xml.sample


              84
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1017.xml.sample

            

            

              85
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1018.xml.sample


              85
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1018.xml.sample

            

            

              86
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1019.xml.sample


              86
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1019.xml.sample

            

            

              87
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/brian.xml.sample


              87
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/brian.xml.sample

            

            

              88
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/default.xml.sample


              88
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/default.xml.sample

            

            

              89
              
%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/example.com.xml.sample


              89
              
%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/example.com.xml.sample

            

            

              90
              
%%ETCDIR%%/conf/extensions.conf.sample


              90
              
etc/freeswitch/conf/extensions.conf.sample

            

            

              91
              
%%ETCDIR%%/conf/freeswitch.xml.sample


              91
              
etc/freeswitch/conf/freeswitch.xml.sample

            

            

              92
              
%%ETCDIR%%/conf/fur_elise.ttml.sample


              92
              
etc/freeswitch/conf/fur_elise.ttml.sample

            

            

              93
              
%%ETCDIR%%/conf/ivr_menus/demo_ivr.xml.sample


              93
              
etc/freeswitch/conf/ivr_menus/demo_ivr.xml.sample

            

            

              94
              
%%ETCDIR%%/conf/jingle_profiles/client.xml.sample


              94
              
etc/freeswitch/conf/jingle_profiles/client.xml.sample

            

            

              95
              
%%ETCDIR%%/conf/jingle_profiles/server.xml.sample


              95
              
etc/freeswitch/conf/jingle_profiles/server.xml.sample

            

            

              96
              
%%ETCDIR%%/conf/lang/de/de.xml.sample


              96
              
etc/freeswitch/conf/lang/de/de.xml.sample

            

            

              97
              
%%ETCDIR%%/conf/lang/de/demo/demo.xml.sample


              97
              
etc/freeswitch/conf/lang/de/demo/demo.xml.sample

            

            

              98
              
%%ETCDIR%%/conf/lang/de/vm/tts.xml.sample


              98
              
etc/freeswitch/conf/lang/de/vm/tts.xml.sample

            

            

              99
              
%%ETCDIR%%/conf/lang/en/demo/demo-ivr.xml.sample


              99
              
etc/freeswitch/conf/lang/en/demo/demo-ivr.xml.sample

            

            

              100
              
%%ETCDIR%%/conf/lang/en/demo/demo.xml.sample


              100
              
etc/freeswitch/conf/lang/en/demo/demo.xml.sample

            

            

              101
              
%%ETCDIR%%/conf/lang/en/dir/sounds.xml.sample


              101
              
etc/freeswitch/conf/lang/en/dir/sounds.xml.sample

            

            

              102
              
%%ETCDIR%%/conf/lang/en/dir/tts.xml.sample


              102
              
etc/freeswitch/conf/lang/en/dir/tts.xml.sample

            

            

              103
              
%%ETCDIR%%/conf/lang/en/en.xml.sample


              103
              
etc/freeswitch/conf/lang/en/en.xml.sample

            

            

              104
              
%%ETCDIR%%/conf/lang/en/vm/sounds.xml.sample


              104
              
etc/freeswitch/conf/lang/en/vm/sounds.xml.sample

            

            

              105
              
%%ETCDIR%%/conf/lang/en/vm/tts.xml.sample


              105
              
etc/freeswitch/conf/lang/en/vm/tts.xml.sample

            

            

              106
              
%%ETCDIR%%/conf/lang/fr/demo/demo.xml.sample


              106
              
etc/freeswitch/conf/lang/fr/demo/demo.xml.sample

            

            

              107
              
%%ETCDIR%%/conf/lang/fr/dir/sounds.xml.sample


              107
              
etc/freeswitch/conf/lang/fr/dir/sounds.xml.sample

            

            

              108
              
%%ETCDIR%%/conf/lang/fr/dir/tts.xml.sample


              108
              
etc/freeswitch/conf/lang/fr/dir/tts.xml.sample

            

            

              109
              
%%ETCDIR%%/conf/lang/fr/fr.xml.sample


              109
              
etc/freeswitch/conf/lang/fr/fr.xml.sample

            

            

              110
              
%%ETCDIR%%/conf/lang/fr/vm/sounds.xml.sample


              110
              
etc/freeswitch/conf/lang/fr/vm/sounds.xml.sample

            

            

              111
              
%%ETCDIR%%/conf/lang/ru/demo/demo-ivr.xml.sample


              111
              
etc/freeswitch/conf/lang/ru/demo/demo-ivr.xml.sample

            

            

              112
              
%%ETCDIR%%/conf/lang/ru/demo/demo.xml.sample


              112
              
etc/freeswitch/conf/lang/ru/demo/demo.xml.sample

            

            

              113
              
%%ETCDIR%%/conf/lang/ru/dir/sounds.xml.sample


              113
              
etc/freeswitch/conf/lang/ru/dir/sounds.xml.sample

            

            

              114
              
%%ETCDIR%%/conf/lang/ru/dir/tts.xml.sample


              114
              
etc/freeswitch/conf/lang/ru/dir/tts.xml.sample

            

            

              115
              
%%ETCDIR%%/conf/lang/ru/ru.xml.sample


              115
              
etc/freeswitch/conf/lang/ru/ru.xml.sample

            

            

              116
              
%%ETCDIR%%/conf/lang/ru/vm/sounds.xml.sample


              116
              
etc/freeswitch/conf/lang/ru/vm/sounds.xml.sample

            

            

              117
              
%%ETCDIR%%/conf/lang/ru/vm/tts.xml.sample


              117
              
etc/freeswitch/conf/lang/ru/vm/tts.xml.sample

            

            

              118
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/m3ua.conf.sample


              118
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/m3ua.conf.sample

            

            

              119
              
%%ETCDIR%%/conf/mime.types.sample


              119
              
etc/freeswitch/conf/mime.types.sample

            

            

              120
              
%%ETCDIR%%/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample


              120
              
etc/freeswitch/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample

            

            

              121
              
%%ETCDIR%%/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample


              121
              
etc/freeswitch/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample

            

            

              122
              
%%ETCDIR%%/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample


              122
              
etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample

            

            

              123
              
%%ETCDIR%%/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml.sample


              123
              
etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml.sample

            

            

              124
              
%%ETCDIR%%/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml.sample


              124
              
etc/freeswitch/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml.sample

            

            

              125
              
%%ETCDIR%%/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml.sample


              125
              
etc/freeswitch/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml.sample

            

            

              126
              
%%ETCDIR%%/conf/notify-voicemail.tpl.sample


              126
              
etc/freeswitch/conf/notify-voicemail.tpl.sample

            

            

              127
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/openzap.conf.sample


              127
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/openzap.conf.sample

            

            

              128
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/pika.conf.sample


              128
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/pika.conf.sample

            

            

              129
              
%%ETCDIR%%/conf/sip_profiles/external.xml.sample


              129
              
etc/freeswitch/conf/sip_profiles/external.xml.sample

            

            

              130
              
%%ETCDIR%%/conf/sip_profiles/external/example.xml.sample


              130
              
etc/freeswitch/conf/sip_profiles/external/example.xml.sample

            

            

              131
              
%%ETCDIR%%/conf/sip_profiles/internal-ipv6.xml.sample


              131
              
etc/freeswitch/conf/sip_profiles/internal-ipv6.xml.sample

            

            

              132
              
%%ETCDIR%%/conf/sip_profiles/internal.xml.sample


              132
              
etc/freeswitch/conf/sip_profiles/internal.xml.sample

            

            

              133
              
%%ETCDIR%%/conf/sip_profiles/internal/example.xml.sample


              133
              
etc/freeswitch/conf/sip_profiles/internal/example.xml.sample

            

            

              134
              
%%ETCDIR%%/conf/skinny_profiles/internal.xml.sample


              134
              
etc/freeswitch/conf/skinny_profiles/internal.xml.sample

            

            

              135
              
%%ETCDIR%%/conf/tetris.ttml.sample


              135
              
etc/freeswitch/conf/tetris.ttml.sample

            

            

              136
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/tones.conf.sample


              136
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/tones.conf.sample

            

            

              137
              
%%ETCDIR%%/conf/vars.xml.sample


              137
              
etc/freeswitch/conf/vars.xml.sample

            

            

              138
              
%%ETCDIR%%/conf/voicemail.tpl.sample


              138
              
etc/freeswitch/conf/voicemail.tpl.sample

            

            

              139
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/wanpipe.conf.sample


              139
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/wanpipe.conf.sample

            

            

              140
              
%%ETCDIR%%/conf/web-vm.tpl.sample


              140
              
etc/freeswitch/conf/web-vm.tpl.sample

            

            

              141
              
%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/zt.conf.sample


              141
              
%%WITH_MODOPENZAP%%etc/freeswitch/conf/zt.conf.sample

            

        

          142
          
@exec for i in $(find %D/etc/freeswitch/conf/ -type f -name *.sample); do if [ ! -f ${i%.sample} ]; then cp $i ${i%.sample}; fi; done

          142
          
@exec for i in $(find %D/etc/freeswitch/conf/ -type f -name *.sample); do if [ ! -f ${i%.sample} ]; then cp $i ${i%.sample}; fi; done

        

          
            

              143
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/default.dic


              143
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/default.dic

            

            

              144
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/COPYING


              144
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/COPYING

            

            

              145
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/feat.params


              145
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/feat.params

            

            

              146
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/mdef


              146
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/mdef

            

            

              147
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/means


              147
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/means

            

            

              148
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/noisedict


              148
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/noisedict

            

            

              149
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/sendump


              149
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/sendump

            

            

              150
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/transition_matrices


              150
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/transition_matrices

            

            

              151
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/variances


              151
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/variances

            

            

              152
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/Makefile


              152
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/Makefile

            

            

              153
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/Makefile.am


              153
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/Makefile.am

            

            

              154
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/Makefile.in


              154
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/Makefile.in

            

            

              155
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/feat.params


              155
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/feat.params

            

            

              156
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/kdtrees


              156
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/kdtrees

            

            

              157
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/mdef


              157
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/mdef

            

            

              158
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/means


              158
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/means

            

            

              159
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/noisedict


              159
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/noisedict

            

            

              160
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/sendump


              160
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/sendump

            

            

              161
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/transition_matrices


              161
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/transition_matrices

            

            

              162
              
%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/variances


              162
              
%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/variances

            

        

          163
          
%%WITH_MODOPENZAP%%include/freeswitch/fsk.h

          163
          
%%WITH_MODOPENZAP%%include/freeswitch/fsk.h

        

        

          164
          
%%WITH_MODOPENZAP%%include/freeswitch/g711.h

          164
          
%%WITH_MODOPENZAP%%include/freeswitch/g711.h

        

        

          165
          
%%WITH_MODOPENZAP%%include/freeswitch/hashtable.h

          165
          
%%WITH_MODOPENZAP%%include/freeswitch/hashtable.h

        

  

    
      
            Lines 429-484
          
      
      
        Link Here
      
    
  

        

          429
          
%%WITH_MODPERL%%perl/freeswitch.la

          429
          
%%WITH_MODPERL%%perl/freeswitch.la

        

        

          430
          
%%WITH_MODPERL%%perl/freeswitch.pm

          430
          
%%WITH_MODPERL%%perl/freeswitch.pm

        

        

          431
          
%%WITH_MODPERL%%perl/freeswitch.so

          431
          
%%WITH_MODPERL%%perl/freeswitch.so

        

          
            

              432
              
%%WWWDIR%%/htdocs/license.txt


              432
              
www/freeswitch/htdocs/license.txt

            

            

              433
              
%%WWWDIR%%/htdocs/slim.swf


              433
              
www/freeswitch/htdocs/slim.swf

            

            

              434
              
%%WWWDIR%%/htdocs/slimtest.htm


              434
              
www/freeswitch/htdocs/slimtest.htm

            

            

              435
              
@dirrm %%WWWDIR%%/htdocs


              435
              
@dirrm www/freeswitch/htdocs

            

            

              436
              
@dirrm %%WWWDIR%%


              436
              
@dirrm www/freeswitch

            

            

              437
              
@dirrm %%DATADIR%%/sounds


              437
              
@dirrm share/freeswitch/sounds

            

            

              438
              
@dirrm %%DATADIR%%


              438
              
@dirrm share/freeswitch

            

        

          439
          
%%WITH_MODPERL%%@dirrm perl

          439
          
%%WITH_MODPERL%%@dirrm perl

        

        

          440
          
@dirrm lib/freeswitch/mod

          440
          
@dirrm lib/freeswitch/mod

        

        

          441
          
@dirrm lib/freeswitch/lib

          441
          
@dirrm lib/freeswitch/lib

        

        

          442
          
@dirrm lib/freeswitch

          442
          
@dirrm lib/freeswitch

        

        

          443
          
@dirrm include/freeswitch

          443
          
@dirrm include/freeswitch

        

          
            

              444
              
@dirrm %%ETCDIR%%/scripts


              444
              
@dirrm etc/freeswitch/scripts

            

            

              445
              
%%WITH_MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model/wsj1


              445
              
%%WITH_MODPOCKETSPHINX%%@dirrm etc/freeswitch/grammar/model/wsj1

            

            

              446
              
%%WITH_MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model/communicator


              446
              
%%WITH_MODPOCKETSPHINX%%@dirrm etc/freeswitch/grammar/model/communicator

            

            

              447
              
%%WITH_MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model


              447
              
%%WITH_MODPOCKETSPHINX%%@dirrm etc/freeswitch/grammar/model

            

            

              448
              
@dirrm %%ETCDIR%%/grammar


              448
              
@dirrm etc/freeswitch/grammar

            

            

              449
              
@dirrm %%ETCDIR%%/conf/skinny_profiles


              449
              
@dirrm etc/freeswitch/conf/skinny_profiles

            

            

              450
              
@dirrm %%ETCDIR%%/conf/sip_profiles/internal


              450
              
@dirrm etc/freeswitch/conf/sip_profiles/internal

            

            

              451
              
@dirrm %%ETCDIR%%/conf/sip_profiles/external


              451
              
@dirrm etc/freeswitch/conf/sip_profiles/external

            

            

              452
              
@dirrm %%ETCDIR%%/conf/sip_profiles


              452
              
@dirrm etc/freeswitch/conf/sip_profiles

            

            

              453
              
@dirrm %%ETCDIR%%/conf/mrcp_profiles


              453
              
@dirrm etc/freeswitch/conf/mrcp_profiles

            

            

              454
              
@dirrm %%ETCDIR%%/conf/lang/ru/vm


              454
              
@dirrm etc/freeswitch/conf/lang/ru/vm

            

            

              455
              
@dirrm %%ETCDIR%%/conf/lang/ru/dir


              455
              
@dirrm etc/freeswitch/conf/lang/ru/dir

            

            

              456
              
@dirrm %%ETCDIR%%/conf/lang/ru/demo


              456
              
@dirrm etc/freeswitch/conf/lang/ru/demo

            

            

              457
              
@dirrm %%ETCDIR%%/conf/lang/ru


              457
              
@dirrm etc/freeswitch/conf/lang/ru

            

            

              458
              
@dirrm %%ETCDIR%%/conf/lang/fr/vm


              458
              
@dirrm etc/freeswitch/conf/lang/fr/vm

            

            

              459
              
@dirrm %%ETCDIR%%/conf/lang/fr/dir


              459
              
@dirrm etc/freeswitch/conf/lang/fr/dir

            

            

              460
              
@dirrm %%ETCDIR%%/conf/lang/fr/demo


              460
              
@dirrm etc/freeswitch/conf/lang/fr/demo

            

            

              461
              
@dirrm %%ETCDIR%%/conf/lang/fr


              461
              
@dirrm etc/freeswitch/conf/lang/fr

            

            

              462
              
@dirrm %%ETCDIR%%/conf/lang/en/vm


              462
              
@dirrm etc/freeswitch/conf/lang/en/vm

            

            

              463
              
@dirrm %%ETCDIR%%/conf/lang/en/dir


              463
              
@dirrm etc/freeswitch/conf/lang/en/dir

            

            

              464
              
@dirrm %%ETCDIR%%/conf/lang/en/demo


              464
              
@dirrm etc/freeswitch/conf/lang/en/demo

            

            

              465
              
@dirrm %%ETCDIR%%/conf/lang/en


              465
              
@dirrm etc/freeswitch/conf/lang/en

            

            

              466
              
@dirrm %%ETCDIR%%/conf/lang/de/vm


              466
              
@dirrm etc/freeswitch/conf/lang/de/vm

            

            

              467
              
@dirrm %%ETCDIR%%/conf/lang/de/demo


              467
              
@dirrm etc/freeswitch/conf/lang/de/demo

            

            

              468
              
@dirrm %%ETCDIR%%/conf/lang/de


              468
              
@dirrm etc/freeswitch/conf/lang/de

            

            

              469
              
@dirrm %%ETCDIR%%/conf/lang


              469
              
@dirrm etc/freeswitch/conf/lang

            

            

              470
              
@dirrm %%ETCDIR%%/conf/jingle_profiles


              470
              
@dirrm etc/freeswitch/conf/jingle_profiles

            

            

              471
              
@dirrm %%ETCDIR%%/conf/ivr_menus


              471
              
@dirrm etc/freeswitch/conf/ivr_menus

            

            

              472
              
@dirrm %%ETCDIR%%/conf/directory/default


              472
              
@dirrm etc/freeswitch/conf/directory/default

            

            

              473
              
@dirrm %%ETCDIR%%/conf/directory


              473
              
@dirrm etc/freeswitch/conf/directory

            

            

              474
              
@dirrm %%ETCDIR%%/conf/dialplan/public


              474
              
@dirrm etc/freeswitch/conf/dialplan/public

            

            

              475
              
@dirrm %%ETCDIR%%/conf/dialplan/default


              475
              
@dirrm etc/freeswitch/conf/dialplan/default

            

            

              476
              
@dirrm %%ETCDIR%%/conf/dialplan


              476
              
@dirrm etc/freeswitch/conf/dialplan

            

            

              477
              
@dirrm %%ETCDIR%%/conf/autoload_configs


              477
              
@dirrm etc/freeswitch/conf/autoload_configs

            

            

              478
              
@dirrm %%ETCDIR%%/conf


              478
              
@dirrm etc/freeswitch/conf

            

            

              479
              
@dirrm %%ETCDIR%%


              479
              
@dirrm etc/freeswitch

            

            

              480
              
@exec mkdir -p %D/%%ETCDIR%%/scripts


              480
              
@exec mkdir -p %D/etc/freeswitch/scripts

            

            

              481
              
@exec mkdir -p %D/%%DATADDIR%%/sounds


              481
              
@exec mkdir -p %D/share/freeswitch/sounds

            

        

          482
          
@cwd /var/

          482
          
@cwd /var/

        

        

          483
          
@dirrm spool/freeswitch/voicemail

          483
          
@dirrm spool/freeswitch/voicemail

        

        

          484
          
@dirrm log/freeswitch/xml_cdr

          484
          
@dirrm log/freeswitch/xml_cdr

        

  

    
      
            Lines 492-494
          
      
      
        Link Here
      
    
  

        

          492
          
@exec mkdir -p %D/freeswitch

          492
          
@exec mkdir -p %D/freeswitch

        

        

          493
          
@exec mkdir -p %D/freeswitch/recordings

          493
          
@exec mkdir -p %D/freeswitch/recordings

        

        

          494
          
@exec mkdir -p %D/db/freeswitch

          494
          
@exec mkdir -p %D/db/freeswitch

        

            

              
              
              495
              

            



(-)files/freeswitch.in
      (-1 / +1 lines)




  

    
      
            Lines 24-30
          
      
      
        Link Here
      
    
  

        

          24
          
rcvar=`set_rcvar`

          24
          
rcvar=`set_rcvar`

        

        

          25
          

          25
          

        

        

          26
          
command=%%PREFIX%%/bin/freeswitch

          26
          
command=%%PREFIX%%/bin/freeswitch

        

          
            

              27
              
command_args="${freeswitch_flags} ${freeswitch_user} -g ${freeswitch_group}"


              27
              
command_args="${freeswitch_flags} -u ${freeswitch_user} -g ${freeswitch_group}"

            

        

          28
          

          28
          

        

        

          29
          
pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}

          29
          
pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}

        

        

          30
          

          30
          

        



(-)files/patch-conf-autoload_configs-switch.conf.xml
      (+10 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- conf/autoload_configs/switch.conf.xml	2010-06-22 17:19:31.000000000 -0400

            

            

              2
              
+++ conf/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"/>-->

            



(-)files/patch-conf-autoload_configs-voicemail.conf.xml
      (+11 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              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"/>-->

            



(-)files/patch-configure.in
      (+52 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- configure.in	2010-06-22 17:19:37.000000000 -0400

            

            

              2
              
+++ configure.in	2010-06-29 12:01:43.000000000 -0400

            

            

              3
              
@@ -44,34 +44,42 @@

            

            

              4
              
 AC_SUBST(runtimedir)

            

            

              5
              
 AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])

            

            

              6
              
 

            

            

              7
              
-logfiledir="${prefix}/log"

            

            

              8
              
+logfiledir="/var/log/freeswitch"

            

            

              9
              
 AC_SUBST(logfiledir)

            

            

              10
              
 AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])

            

            

              11
              
 

            

            

              12
              
-dbdir="${prefix}/db"

            

            

              13
              
+dbdir="/var/db/freeswitch"

            

            

              14
              
 AC_SUBST(dbdir)

            

            

              15
              
 AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])

            

            

              16
              
 

            

            

              17
              
-htdocsdir="${prefix}/htdocs"

            

            

              18
              
+htdocsdir="${prefix}/www/freeswitch/htdocs"

            

            

              19
              
 AC_SUBST(htdocsdir)

            

            

              20
              
 AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])

            

            

              21
              
 

            

            

              22
              
-soundsdir="${prefix}/sounds"

            

            

              23
              
+soundsdir="${prefix}/share/freeswitch/sounds"

            

            

              24
              
 AC_SUBST(soundsdir)

            

            

              25
              
 AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])

            

            

              26
              
 

            

            

              27
              
-grammardir="${prefix}/grammar"

            

            

              28
              
+grammardir="${prefix}/etc/freeswitch/grammar"

            

            

              29
              
 AC_SUBST(grammardir)

            

            

              30
              
 AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])

            

            

              31
              
 

            

            

              32
              
-scriptdir="${prefix}/scripts"

            

            

              33
              
+scriptdir="${prefix}/etc/freeswitch/scripts"

            

            

              34
              
 AC_SUBST(scriptdir)

            

            

              35
              
 AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])

            

            

              36
              
 

            

            

              37
              
-recordingsdir="${prefix}/recordings"

            

            

              38
              
+recordingsdir="/var/freeswitch/recordings"

            

            

              39
              
 AC_SUBST(recordingsdir)

            

            

              40
              
 AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])

            

            

              41
              
 

            

            

              42
              
+storagedir="/var/freeswitch"

            

            

              43
              
+AC_SUBST(storagedir)

            

            

              44
              
+AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files])

            

            

              45
              
+

            

            

              46
              
+voicemaildir="/var/spool/freeswitch/voicemail"

            

            

              47
              
+AC_SUBST(voicemaildir)

            

            

              48
              
+AC_DEFINE_UNQUOTED([SWITCH_VOICEMAIL_DIR],"${voicemaildir}",[where to put voicemail])

            

            

              49
              
+

            

            

              50
              
 if test "$sysconfdir" = "\${prefix}/etc" ; then

            

            

              51
              
     confdir="$prefix/conf"

            

            

              52
              
 else

            



(-)files/patch-libs-openzap-Makefile.am
      (+18 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- libs/openzap/Makefile.am	2010-06-22 17:19:27.000000000 -0400

            

            

              2
              
+++ libs/openzap/Makefile.am	2010-06-28 21:10:25.000000000 -0400

            

            

              3
              
@@ -34,7 +34,7 @@

            

            

              4
              
 

            

            

              5
              
 moddir = @modinstdir@

            

            

              6
              
 libdir = @libdir@

            

            

              7
              
-library_includedir = $(PREFIX)/include

            

            

              8
              
+library_includedir = @includedir@

            

            

              9
              
 

            

            

              10
              
 INCS      = -I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include

            

            

              11
              
 if HAVE_SCTP

            

            

              12
              
@@ -268,5 +268,5 @@

            

            

              13
              
 install-data-local:

            

            

              14
              
 	$(mkinstalldirs) $(DESTDIR)$(PREFIX)

            

            

              15
              
 	$(mkinstalldirs) $(DESTDIR)@confdir@

            

            

              16
              
-	@[ -f "$(DESTDIR)@confdir@/openzap.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)

            

            

              17
              
+	@for i in conf/*.conf; do cp $$i $$i.sample; done; cp -f conf/*.conf.sample $(DESTDIR)@confdir@

            

            

              18
              
 	@echo OpenZAP Installed

            



(-)files/patch-libs-openzap-mod_openzap-Makefile.in
      (+11 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- libs/openzap/mod_openzap/Makefile.in	2010-06-22 17:19:26.000000000 -0400

            

            

              2
              
+++ libs/openzap/mod_openzap/Makefile.in	2010-06-25 12:31:28.000000000 -0400

            

            

              3
              
@@ -15,7 +15,7 @@

            

            

              4
              
 

            

            

              5
              
 local_install:

            

            

              6
              
 	cd $(OZ_DIR) && $(MAKE) install

            

            

              7
              
-	[ -f $(DESTDIR)@confdir@/autoload_configs/openzap.conf.xml ] || cp -f $(OZ_DIR)/conf/openzap.conf.xml  $(DESTDIR)@confdir@/autoload_configs

            

            

              8
              
+	@for i in $(OZ_DIR)/conf/*.xml; do cp $$i $$i.sample; done; cp  -f $(OZ_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs

            

            

              9
              
 

            

            

              10
              
 local_clean:

            

            

              11
              
 	cd $(OZ_DIR) && $(MAKE) clean

            



(-)files/patch-src-include-private-switch_core_pvt.h
      (+10 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- src/include/private/switch_core_pvt.h	2010-06-22 17:19:31.000000000 -0400

            

            

              2
              
+++ src/include/private/switch_core_pvt.h	2010-06-29 11:12:54.000000000 -0400

            

            

              3
              
@@ -209,6 +209,7 @@

            

            

              4
              
 	int32_t sps;

            

            

              5
              
 	int32_t sps_last;

            

            

              6
              
 	switch_log_level_t hard_log_level;

            

            

              7
              
+	char *storage_dir;

            

            

              8
              
 	char *mailer_app;

            

            

              9
              
 	char *mailer_app_args;

            

            

              10
              
 	uint32_t max_dtmf_duration;

            



(-)files/patch-src-include-switch_types.h
      (+10 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- src/include/switch_types.h	2010-06-22 17:19:31.000000000 -0400

            

            

              2
              
+++ src/include/switch_types.h	2010-06-29 11:16:17.000000000 -0400

            

            

              3
              
@@ -391,6 +391,7 @@

            

            

              4
              
 	char *storage_dir;

            

            

              5
              
 	char *recordings_dir;

            

            

              6
              
 	char *sounds_dir;

            

            

              7
              
+	char *voicemail_dir;

            

            

              8
              
 };

            

            

              9
              
 

            

            

              10
              
 typedef struct switch_directories switch_directories;

            



(-)files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
      (+127 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              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
              
 	}

            



(-)files/patch-src-switch_core.c
      (+63 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- src/switch_core.c	2010-06-22 17:19:36.000000000 -0400

            

            

              2
              
+++ src/switch_core.c	2010-06-29 11:42:43.000000000 -0400

            

            

              3
              
@@ -489,6 +489,14 @@

            

            

              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
              
@@ -546,6 +554,8 @@

            

            

              19
              
 	switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);

            

            

              20
              
 	switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);

            

            

              21
              
 	switch_assert(SWITCH_GLOBAL_dirs.temp_dir);

            

            

              22
              
+	switch_assert(SWITCH_GLOBAL_dirs.storage_dir);

            

            

              23
              
+	switch_assert(SWITCH_GLOBAL_dirs.voicemail_dir);

            

            

              24
              
 }

            

            

              25
              
 

            

            

              26
              
 SWITCH_DECLARE(int32_t) set_high_priority(void)

            

            

              27
              
@@ -1240,6 +1250,8 @@

            

            

              28
              
 	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);

            

            

              30
              
 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);

            

            

              31
              
+	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
              
 	switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);

            

            

              35
              
 

            

            

              36
              
@@ -1273,7 +1285,9 @@

            

            

              37
              
 	switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET6);

            

            

              38
              
 	switch_core_set_variable("local_ip_v6", guess_ip);

            

            

              39
              
 	switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);

            

            

              40
              
+	switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);

            

            

              41
              
 	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);

            

            

              44
              
 	switch_core_set_variable("sounds_dir", SWITCH_GLOBAL_dirs.sounds_dir);

            

            

              45
              
 	switch_core_set_serial();

            

            

              46
              
@@ -1417,6 +1431,8 @@

            

            

              47
              
 					switch_set_flag((&runtime), SCF_EARLY_HANGUP);

            

            

              48
              
 				} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {

            

            

              49
              
 					runtime.colorize_console = SWITCH_TRUE;

            

            

              50
              
+				} else if (!strcasecmp(var, "storage-dir") && !zstr(val)) {

            

            

              51
              
+					runtime.storage_dir = switch_core_strdup(runtime.memory_pool, val);

            

            

              52
              
 				} else if (!strcasecmp(var, "mailer-app") && !zstr(val)) {

            

            

              53
              
 					runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);

            

            

              54
              
 				} else if (!strcasecmp(var, "mailer-app-args") && val) {

            

            

              55
              
@@ -1867,6 +1883,8 @@

            

            

              56
              
 	switch_safe_free(SWITCH_GLOBAL_dirs.script_dir);

            

            

              57
              
 	switch_safe_free(SWITCH_GLOBAL_dirs.htdocs_dir);

            

            

              58
              
 	switch_safe_free(SWITCH_GLOBAL_dirs.grammar_dir);

            

            

              59
              
+	switch_safe_free(SWITCH_GLOBAL_dirs.storage_dir);

            

            

              60
              
+	switch_safe_free(SWITCH_GLOBAL_dirs.voicemail_dir);

            

            

              61
              
 	switch_safe_free(SWITCH_GLOBAL_dirs.recordings_dir);

            

            

              62
              
 	switch_safe_free(SWITCH_GLOBAL_dirs.sounds_dir);

            

            

              63
              
 	switch_safe_free(SWITCH_GLOBAL_dirs.temp_dir);

            






  

  Return to bug 148693