Attachment #111865 for bug #153191

Lines 7-12 Link Here

(-)Makefile (+1 lines)
7		7
8	PORTNAME= freeswitch-core	8	PORTNAME= freeswitch-core
9	PORTVERSION= 201044	9	PORTVERSION= 201044
		10	PORTREVERSION= 1
10	CATEGORIES= net	11	CATEGORIES= net
11	MASTER_SITES= ftp://ftp.secure-computing.net/pub/freeswitch/ \	12	MASTER_SITES= ftp://ftp.secure-computing.net/pub/freeswitch/ \
12	ftp://ftp2.secure-computing.net/pub/freeswitch/ \	13	ftp://ftp2.secure-computing.net/pub/freeswitch/ \

Added Link Here

(-)files/patch-libs-freetdm-Makefile.am (+9 lines)
1	--- libs/freetdm/Makefile.am
2	+++ libs/freetdm/Makefile.am
3	@@ -320,5 +320,5 @@ mod_freetdm-clean:
4	install-data-local:
5	$(mkinstalldirs) $(DESTDIR)$(PREFIX)
6	$(mkinstalldirs) $(DESTDIR)@confdir@
7	- @[ -f "$(DESTDIR)@confdir@/freetdm.conf" ] \|\| ( cp conf/*.conf $(DESTDIR)@confdir@)
8	+ @for i in conf/.conf; do cp $$i $$i.sample; done; cp -f conf/.conf.sample $(DESTDIR)@confdir@
9	@echo FreeTDM Installed




--- libs/freetdm/mod_freetdm/Makefile.in
+++ libs/freetdm/mod_freetdm/Makefile.in
@@ -15,8 +15,7 @@ $(FTLA): $(FT_DIR)/.update
 
 local_install:
 	cd $(FT_DIR) && $(MAKE) install
-	[ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] || cp -f $(FT_DIR)/conf/freetdm.conf.xml  $(DESTDIR)@confdir@/autoload_configs
-
+	@for i in $(FT_DIR)/conf/*.xml; do cp $$i $$i.sample; done; cp  -f $(FT_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs
 local_clean:
 	cd $(FT_DIR) && $(MAKE) clean
 




--- libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
+++ libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
@@ -52,38 +52,38 @@ static struct {
  * \brief General IOCTL codes
  */
 struct ioctl_codes {
-    int GET_BLOCKSIZE;
-    int SET_BLOCKSIZE;
-    int FLUSH;
-    int SYNC;
-    int GET_PARAMS;
-    int SET_PARAMS;
-    int HOOK;
-    int GETEVENT;
-    int IOMUX;
-    int SPANSTAT;
-    int MAINT;
-    int GETCONF;
-    int SETCONF;
-    int CONFLINK;
-    int CONFDIAG;
-    int GETGAINS;
-    int SETGAINS;
-    int SPANCONFIG;
-    int CHANCONFIG;
-    int SET_BUFINFO;
-    int GET_BUFINFO;
-    int AUDIOMODE;
-    int ECHOCANCEL;
-    int HDLCRAWMODE;
-    int HDLCFCSMODE;
-    int SPECIFY;
-    int SETLAW;
-    int SETLINEAR;
-    int GETCONFMUTE;
-    int ECHOTRAIN;
-    int SETTXBITS;
-    int GETRXBITS;
+    long GET_BLOCKSIZE;
+    long SET_BLOCKSIZE;
+    long FLUSH;
+    long SYNC;
+    long GET_PARAMS;
+    long SET_PARAMS;
+    long HOOK;
+    long GETEVENT;
+    long IOMUX;
+    long SPANSTAT;
+    long MAINT;
+    long GETCONF;
+    long SETCONF;
+    long CONFLINK;
+    long CONFDIAG;
+    long GETGAINS;
+    long SETGAINS;
+    long SPANCONFIG;
+    long CHANCONFIG;
+    long SET_BUFINFO;
+    long GET_BUFINFO;
+    long AUDIOMODE;
+    long ECHOCANCEL;
+    long HDLCRAWMODE;
+    long HDLCFCSMODE;
+    long SPECIFY;
+    long SETLAW;
+    long SETLINEAR;
+    long GETCONFMUTE;
+    long ECHOTRAIN;
+    long SETTXBITS;
+    long GETRXBITS;
 };
 
 /**

Return to bug 153191

Added Link Here

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

Added Link Here

(-)files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c (+73 lines)
1	--- libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
2	+++ libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
3	@@ -52,38 +52,38 @@ static struct {
4	* \brief General IOCTL codes
5	*/
6	struct ioctl_codes {
7	- int GET_BLOCKSIZE;
8	- int SET_BLOCKSIZE;
9	- int FLUSH;
10	- int SYNC;
11	- int GET_PARAMS;
12	- int SET_PARAMS;
13	- int HOOK;
14	- int GETEVENT;
15	- int IOMUX;
16	- int SPANSTAT;
17	- int MAINT;
18	- int GETCONF;
19	- int SETCONF;
20	- int CONFLINK;
21	- int CONFDIAG;
22	- int GETGAINS;
23	- int SETGAINS;
24	- int SPANCONFIG;
25	- int CHANCONFIG;
26	- int SET_BUFINFO;
27	- int GET_BUFINFO;
28	- int AUDIOMODE;
29	- int ECHOCANCEL;
30	- int HDLCRAWMODE;
31	- int HDLCFCSMODE;
32	- int SPECIFY;
33	- int SETLAW;
34	- int SETLINEAR;
35	- int GETCONFMUTE;
36	- int ECHOTRAIN;
37	- int SETTXBITS;
38	- int GETRXBITS;
39	+ long GET_BLOCKSIZE;
40	+ long SET_BLOCKSIZE;
41	+ long FLUSH;
42	+ long SYNC;
43	+ long GET_PARAMS;
44	+ long SET_PARAMS;
45	+ long HOOK;
46	+ long GETEVENT;
47	+ long IOMUX;
48	+ long SPANSTAT;
49	+ long MAINT;
50	+ long GETCONF;
51	+ long SETCONF;
52	+ long CONFLINK;
53	+ long CONFDIAG;
54	+ long GETGAINS;
55	+ long SETGAINS;
56	+ long SPANCONFIG;
57	+ long CHANCONFIG;
58	+ long SET_BUFINFO;
59	+ long GET_BUFINFO;
60	+ long AUDIOMODE;
61	+ long ECHOCANCEL;
62	+ long HDLCRAWMODE;
63	+ long HDLCFCSMODE;
64	+ long SPECIFY;
65	+ long SETLAW;
66	+ long SETLINEAR;
67	+ long GETCONFMUTE;
68	+ long ECHOTRAIN;
69	+ long SETTXBITS;
70	+ long GETRXBITS;
71	};
72
73	/**