View | Details | Raw Unified | Return to bug 227677 | Differences between
and this patch

Collapse All | Expand All

(-)net/kamailio/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	kamailio
4
PORTNAME=	kamailio
5
PORTVERSION=	5.1.2
5
PORTVERSION=	5.0.1
6
PORTREVISION=	1
6
PORTREVISION=	1
7
CATEGORIES=	net
7
CATEGORIES=	net
8
MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
8
MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
(-)net/kamailio/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524242380
1
TIMESTAMP = 1492762108
2
SHA256 (kamailio-5.1.2_src.tar.gz) = 6ec9cefa1fa0b7e2090e41f34172db511dafa27c0c11e2b8c2140bc875b16b5d
2
SHA256 (kamailio-5.0.1_src.tar.gz) = b26a719a3c1fccb717e6bb009601ccbad32c5c5b6569e2a322fe12cd7d5b7c00
3
SIZE (kamailio-5.1.2_src.tar.gz) = 12010615
3
SIZE (kamailio-5.0.1_src.tar.gz) = 11614011
(-)net/kamailio/files/patch-src_Makefile (-2 / +17 lines)
Lines 1-4 Link Here
1
--- src/Makefile.orig	2018-03-01 16:24:06 UTC
1
--- src/Makefile.orig	2017-04-21 12:46:05 UTC
2
+++ src/Makefile
2
+++ src/Makefile
3
@@ -34,7 +34,7 @@ err_fail?=1
3
@@ -34,7 +34,7 @@ err_fail?=1
4
 # whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default
4
 # whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default
Lines 9-15 Link Here
9
 
9
 
10
 #extra modules to exclude
10
 #extra modules to exclude
11
 skip_modules?=
11
 skip_modules?=
12
@@ -651,7 +651,7 @@ sunpkg:
12
@@ -649,7 +649,7 @@ sunpkg:
13
 .PHONY: install
13
 .PHONY: install
14
 install: mk_params="compile_for_install=yes"
14
 install: mk_params="compile_for_install=yes"
15
 install: install-bin install-every-module install-cfg \
15
 install: install-bin install-every-module install-cfg \
Lines 18-20 Link Here
18
 
18
 
19
 .PHONY: dbinstall
19
 .PHONY: dbinstall
20
 dbinstall:
20
 dbinstall:
21
@@ -764,10 +764,10 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
22
 				fi ; \
23
 			fi ; \
24
 			: ; done; true
25
-	@# radius dictionary
26
-	@$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME)
27
-	@$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
28
-	@echo "config files installed"
29
+	# radius dictionary
30
+	$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample
31
+	$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample
32
+	echo "config files installed"
33
 
34
 install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
35
 	$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
(-)net/kamailio/files/patch-src_Makefile.defs (-4 / +4 lines)
Lines 1-4 Link Here
1
--- src/Makefile.defs.orig	2018-03-01 16:24:11 UTC
1
--- src/Makefile.defs.orig	2017-04-21 13:52:06 UTC
2
+++ src/Makefile.defs
2
+++ src/Makefile.defs
3
@@ -208,7 +208,7 @@ YACC := $(shell echo "$${YACC}")
3
@@ -208,7 +208,7 @@ YACC := $(shell echo "$${YACC}")
4
 
4
 
Lines 18-24 Link Here
18
 	RPAREN=)
18
 	RPAREN=)
19
 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
19
 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
20
 				sed  -e 's/([^$(RPAREN)]*)//g' \
20
 				sed  -e 's/([^$(RPAREN)]*)//g' \
21
@@ -390,7 +390,7 @@ LIBDIR ?=
21
@@ -386,7 +386,7 @@ LIBDIR ?=
22
 ifeq ($(LIBDIR),)
22
 ifeq ($(LIBDIR),)
23
 ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
23
 ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
24
 ifeq ($(ARCHBSZ),64b)
24
 ifeq ($(ARCHBSZ),64b)
Lines 27-33 Link Here
27
 else
27
 else
28
 	LIBDIR = lib
28
 	LIBDIR = lib
29
 endif
29
 endif
30
@@ -464,7 +464,7 @@ doxygen_dir=doc/doxygen
30
@@ -460,7 +460,7 @@ doxygen_dir=doc/doxygen
31
 
31
 
32
 BASEDIR ?= $(DESTDIR)
32
 BASEDIR ?= $(DESTDIR)
33
 basedir = $(BASEDIR)
33
 basedir = $(BASEDIR)
Lines 36-42 Link Here
36
 runbasedir = $(RUNBASEDIR)
36
 runbasedir = $(RUNBASEDIR)
37
 
37
 
38
 # install location
38
 # install location
39
@@ -1743,7 +1743,7 @@ ifeq ($(YACC),)
39
@@ -1722,7 +1722,7 @@ ifeq ($(YACC),)
40
 endif
40
 endif
41
 YACC_FLAGS=-d -b core/cfg
41
 YACC_FLAGS=-d -b core/cfg
42
 # on solaris add -lxnet (e.g. LIBS= -lxnet)
42
 # on solaris add -lxnet (e.g. LIBS= -lxnet)
(-)net/kamailio/files/patch-src_core_ip__addr.h (-5 / +5 lines)
Lines 1-6 Link Here
1
--- src/core/ip_addr.h.orig	2018-03-01 16:24:06 UTC
1
--- src/core/ip_addr.h.orig	2017-04-21 12:46:05 UTC
2
+++ src/core/ip_addr.h
2
+++ src/core/ip_addr.h
3
@@ -49,6 +49,10 @@ enum sip_protos { PROTO_NONE, PROTO_UDP,
3
@@ -49,6 +49,10 @@ enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PR
4
 enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ };
4
 enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ };
5
 #endif
5
 #endif
6
 
6
 
Lines 8-13 Link Here
8
+#define INADDR_LOOPBACK         (u_int32_t)0x7f000001
8
+#define INADDR_LOOPBACK         (u_int32_t)0x7f000001
9
+#endif
9
+#endif
10
+
10
+
11
 typedef struct ip_addr {
11
 struct ip_addr{
12
 	unsigned int af;	/* address family: AF_INET6 or AF_INET */
12
 	unsigned int af; /* address family: AF_INET6 or AF_INET */
13
 	unsigned int len;	/* address len, 16 or 4 */
13
 	unsigned int len;    /* address len, 16 or 4 */
(-)net/kamailio/files/patch-src_main.c (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/main.c.orig	2018-03-01 16:24:07 UTC
1
--- src/main.c.orig	2017-04-21 12:46:05 UTC
2
+++ src/main.c
2
+++ src/main.c
3
@@ -362,7 +362,7 @@ int received_dns = 0;
3
@@ -362,7 +362,7 @@ int received_dns = 0;
4
 int sr_auto_aliases=1;
4
 int sr_auto_aliases=1;
(-)net/kamailio/files/patch-src_modules_ctl_ctl.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/modules/ctl/ctl.c.orig	2018-03-01 16:24:09 UTC
1
--- src/modules/ctl/ctl.c.orig	2017-04-21 13:48:39 UTC
2
+++ src/modules/ctl/ctl.c
2
+++ src/modules/ctl/ctl.c
3
@@ -240,8 +240,7 @@ static int mod_init(void)
3
@@ -238,8 +238,7 @@ static int mod_init(void)
4
 				return -1;
4
 				return -1;
5
 			}
5
 			}
6
 			strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO);
6
 			strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO);
(-)net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/modules/ctl/ctl_defaults.h.orig	2018-03-01 16:24:09 UTC
1
--- src/modules/ctl/ctl_defaults.h.orig	2017-04-21 12:46:05 UTC
2
+++ src/modules/ctl/ctl_defaults.h
2
+++ src/modules/ctl/ctl_defaults.h
3
@@ -13,7 +13,7 @@
3
@@ -13,7 +13,7 @@
4
 #define DEFAULT_CTL_SOCKET_NAME NAME "_ctl"
4
 #define DEFAULT_CTL_SOCKET_NAME NAME "_ctl"
(-)net/kamailio/files/patch-src_modules_db__berkeley_Makefile (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/modules/db_berkeley/Makefile.orig	2018-03-01 16:24:09 UTC
1
--- src/modules/db_berkeley/Makefile.orig	2017-04-21 12:46:05 UTC
2
+++ src/modules/db_berkeley/Makefile
2
+++ src/modules/db_berkeley/Makefile
3
@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
3
@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
4
 # extra install for kamailio
4
 # extra install for kamailio
(-)net/kamailio/files/patch-src_modules_db__oracle_Makefile (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/modules/db_oracle/Makefile.orig	2018-03-01 16:24:09 UTC
1
--- src/modules/db_oracle/Makefile.orig	2017-04-21 12:46:05 UTC
2
+++ src/modules/db_oracle/Makefile
2
+++ src/modules/db_oracle/Makefile
3
@@ -19,7 +19,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
3
@@ -70,7 +70,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
4
 # extra install for kamailio
4
 # extra install for kamailio
5
 
5
 
6
 install-oracle-scripts: $(bin_prefix)/$(bin_dir)
6
 install-oracle-scripts: $(bin_prefix)/$(bin_dir)
(-)net/kamailio/files/patch-src_modules_db__sqlite_Makefile (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/modules/db_sqlite/Makefile.orig	2018-03-01 16:24:09 UTC
1
--- src/modules/db_sqlite/Makefile.orig	2017-04-21 12:46:06 UTC
2
+++ src/modules/db_sqlite/Makefile
2
+++ src/modules/db_sqlite/Makefile
3
@@ -22,7 +22,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
3
@@ -22,7 +22,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
4
 # extra install for kamailio
4
 # extra install for kamailio
(-)net/kamailio/files/patch-src_modules_tls_Makefile (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/modules/tls/Makefile.orig	2018-03-01 16:24:10 UTC
1
--- src/modules/tls/Makefile.orig	2017-04-21 12:46:06 UTC
2
+++ src/modules/tls/Makefile
2
+++ src/modules/tls/Makefile
3
@@ -8,6 +8,8 @@ include ../../Makefile.defs
3
@@ -8,6 +8,8 @@ include ../../Makefile.defs
4
 auto_gen=
4
 auto_gen=
(-)net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/modules/tls/sip-router_cert.sh.orig	2018-03-01 16:24:10 UTC
1
--- src/modules/tls/sip-router_cert.sh.orig	2017-04-21 12:46:06 UTC
2
+++ src/modules/tls/sip-router_cert.sh
2
+++ src/modules/tls/sip-router_cert.sh
3
@@ -197,5 +197,6 @@ if [ $? != 0 ] ; then
3
@@ -197,5 +197,6 @@ if [ $? != 0 ] ; then
4
 else
4
 else
(-)net/kamailio/files/patch-src_modules_websocket_ws__frame.c (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/modules/websocket/ws_frame.c.orig	2018-03-01 16:24:10 UTC
1
--- src/modules/websocket/ws_frame.c.orig	2017-04-21 12:46:06 UTC
2
+++ src/modules/websocket/ws_frame.c
2
+++ src/modules/websocket/ws_frame.c
3
@@ -29,7 +29,7 @@
3
@@ -29,7 +29,7 @@
4
 #ifdef EMBEDDED_UTF8_DECODE
4
 #ifdef EMBEDDED_UTF8_DECODE
(-)net/kamailio/files/patch-utils_kamctl_Makefile (-1 / +1 lines)
Lines 1-4 Link Here
1
--- utils/kamctl/Makefile.orig	2018-03-01 16:24:11 UTC
1
--- utils/kamctl/Makefile.orig	2017-04-21 12:46:06 UTC
2
+++ utils/kamctl/Makefile
2
+++ utils/kamctl/Makefile
3
@@ -8,6 +8,8 @@ else
3
@@ -8,6 +8,8 @@ else
4
 kamctltmpdir = $(basedir)
4
 kamctltmpdir = $(basedir)
(-)net/kamailio/pkg-plist (-9 / +3 lines)
Lines 2-11 sbin/kamailio Link Here
2
sbin/kamcmd
2
sbin/kamcmd
3
sbin/kamctl
3
sbin/kamctl
4
sbin/kamdbctl
4
sbin/kamdbctl
5
@sample etc/kamailio/dictionary.kamailio.sample
6
@sample etc/kamailio/kamailio-advanced.cfg.sample
7
@sample etc/kamailio/kamailio-basic.cfg.sample
5
@sample etc/kamailio/kamailio.cfg.sample
8
@sample etc/kamailio/kamailio.cfg.sample
6
@sample etc/kamailio/kamctlrc.sample
9
@sample etc/kamailio/kamctlrc.sample
7
%%TLS%%@sample etc/kamailio/tls.cfg.sample
10
%%TLS%%@sample etc/kamailio/tls.cfg.sample
8
%%ETCDIR%%/dictionary.kamailio
9
lib/kamailio/libprint.so
11
lib/kamailio/libprint.so
10
lib/kamailio/libprint.so.1
12
lib/kamailio/libprint.so.1
11
lib/kamailio/libsrdb1.so
13
lib/kamailio/libsrdb1.so
Lines 30-40 lib/kamailio/kamctl/kamdbctl.base Link Here
30
%%PGSQL%%lib/kamailio/kamctl/kamdbctl.pgsql
32
%%PGSQL%%lib/kamailio/kamctl/kamdbctl.pgsql
31
%%MYSQL%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py
33
%%MYSQL%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py
32
%%MYSQL%%lib/kamailio/modules/acc.so
34
%%MYSQL%%lib/kamailio/modules/acc.so
33
lib/kamailio/modules/acc_diameter.so
34
%%MYSQL%%lib/kamailio/modules/alias_db.so
35
%%MYSQL%%lib/kamailio/modules/alias_db.so
35
lib/kamailio/modules/app_jsdt.so
36
lib/kamailio/modules/app_jsdt.so
36
%%PERL%%lib/kamailio/modules/app_perl.so
37
%%PERL%%lib/kamailio/modules/app_perl.so
37
lib/kamailio/modules/app_sqlang.so
38
lib/kamailio/modules/async.so
38
lib/kamailio/modules/async.so
39
lib/kamailio/modules/auth.so
39
lib/kamailio/modules/auth.so
40
%%MYSQL%%lib/kamailio/modules/auth_db.so
40
%%MYSQL%%lib/kamailio/modules/auth_db.so
Lines 46-52 lib/kamailio/modules/avp.so Link Here
46
lib/kamailio/modules/benchmark.so
46
lib/kamailio/modules/benchmark.so
47
lib/kamailio/modules/blst.so
47
lib/kamailio/modules/blst.so
48
lib/kamailio/modules/call_control.so
48
lib/kamailio/modules/call_control.so
49
lib/kamailio/modules/call_obj.so
50
%%MYSQL%%lib/kamailio/modules/cfg_db.so
49
%%MYSQL%%lib/kamailio/modules/cfg_db.so
51
lib/kamailio/modules/cfg_rpc.so
50
lib/kamailio/modules/cfg_rpc.so
52
lib/kamailio/modules/cfgt.so
51
lib/kamailio/modules/cfgt.so
Lines 71-84 lib/kamailio/modules/dmq_usrloc.so Link Here
71
lib/kamailio/modules/domainpolicy.so
70
lib/kamailio/modules/domainpolicy.so
72
%%MYSQL%%lib/kamailio/modules/drouting.so
71
%%MYSQL%%lib/kamailio/modules/drouting.so
73
lib/kamailio/modules/enum.so
72
lib/kamailio/modules/enum.so
74
lib/kamailio/modules/evrexec.so
75
lib/kamailio/modules/exec.so
73
lib/kamailio/modules/exec.so
76
%%MYSQL%%lib/kamailio/modules/group.so
74
%%MYSQL%%lib/kamailio/modules/group.so
77
%%MYSQL%%lib/kamailio/modules/htable.so
75
%%MYSQL%%lib/kamailio/modules/htable.so
78
%%MYSQL%%lib/kamailio/modules/imc.so
76
%%MYSQL%%lib/kamailio/modules/imc.so
79
lib/kamailio/modules/ipops.so
77
lib/kamailio/modules/ipops.so
80
lib/kamailio/modules/jsonrpcs.so
78
lib/kamailio/modules/jsonrpcs.so
81
lib/kamailio/modules/keepalive.so
82
lib/kamailio/modules/kex.so
79
lib/kamailio/modules/kex.so
83
lib/kamailio/modules/log_custom.so
80
lib/kamailio/modules/log_custom.so
84
lib/kamailio/modules/malloc_test.so
81
lib/kamailio/modules/malloc_test.so
Lines 119-125 lib/kamailio/modules/sca.so Link Here
119
lib/kamailio/modules/sdpops.so
116
lib/kamailio/modules/sdpops.so
120
lib/kamailio/modules/seas.so
117
lib/kamailio/modules/seas.so
121
%%MYSQL%%lib/kamailio/modules/sipcapture.so
118
%%MYSQL%%lib/kamailio/modules/sipcapture.so
122
lib/kamailio/modules/sipdump.so
123
lib/kamailio/modules/sipt.so
119
lib/kamailio/modules/sipt.so
124
%%MYSQL%%lib/kamailio/modules/siptrace.so
120
%%MYSQL%%lib/kamailio/modules/siptrace.so
125
lib/kamailio/modules/siputils.so
121
lib/kamailio/modules/siputils.so
Lines 339-351 lib/kamailio/modules/xprint.so Link Here
339
%%PGSQL%%%%DATADIR%%/postgres/purple-create.sql
335
%%PGSQL%%%%DATADIR%%/postgres/purple-create.sql
340
%%PGSQL%%%%DATADIR%%/postgres/registrar-create.sql
336
%%PGSQL%%%%DATADIR%%/postgres/registrar-create.sql
341
%%PGSQL%%%%DATADIR%%/postgres/rls-create.sql
337
%%PGSQL%%%%DATADIR%%/postgres/rls-create.sql
342
%%PGSQL%%%%DATADIR%%/postgres/rtpengine-create.sql
343
%%PGSQL%%%%DATADIR%%/postgres/rtpproxy-create.sql
338
%%PGSQL%%%%DATADIR%%/postgres/rtpproxy-create.sql
344
%%PGSQL%%%%DATADIR%%/postgres/sca-create.sql
339
%%PGSQL%%%%DATADIR%%/postgres/sca-create.sql
345
%%PGSQL%%%%DATADIR%%/postgres/siptrace-create.sql
340
%%PGSQL%%%%DATADIR%%/postgres/siptrace-create.sql
346
%%PGSQL%%%%DATADIR%%/postgres/speeddial-create.sql
341
%%PGSQL%%%%DATADIR%%/postgres/speeddial-create.sql
347
%%PGSQL%%%%DATADIR%%/postgres/standard-create.sql
342
%%PGSQL%%%%DATADIR%%/postgres/standard-create.sql
348
%%PGSQL%%%%DATADIR%%/postgres/topos-create.sql
349
%%PGSQL%%%%DATADIR%%/postgres/uac-create.sql
343
%%PGSQL%%%%DATADIR%%/postgres/uac-create.sql
350
%%PGSQL%%%%DATADIR%%/postgres/uid_auth_db-create.sql
344
%%PGSQL%%%%DATADIR%%/postgres/uid_auth_db-create.sql
351
%%PGSQL%%%%DATADIR%%/postgres/uid_avp_db-create.sql
345
%%PGSQL%%%%DATADIR%%/postgres/uid_avp_db-create.sql

Return to bug 227677