cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to kamailio-5.5.4

Browse Source
This commit is contained in:
sthen 2022-05-13 14:48:15 +00:00
parent 88c869b5f7
commit 3f0e8bdc2b
11 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/kamailio/Makefile
View File

@ -1,7 +1,6 @@
COMMENT-main = mature and flexible open source SIP server
VERSION = 5.4.5
REVISION-main = 0
VERSION = 5.5.4
DISTNAME = kamailio-${VERSION}_src

4
telephony/kamailio/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kamailio-5.4.5_src.tar.gz) = 1yAyKOdftiUPeeKP95rCr/WykH1bXNlMNAfHCZvvBVE=
SIZE (kamailio-5.4.5_src.tar.gz) = 12659887
SHA256 (kamailio-5.5.4_src.tar.gz) = mR0IGrxu4u/b24Xuc5j4gS8r25qzDM+a4KzmVilDhgo=
SIZE (kamailio-5.5.4_src.tar.gz) = 12794910

85
telephony/kamailio/patches/patch-src_Makefile_defs
View File

@ -14,44 +14,57 @@ Index: src/Makefile.defs
alpha_macros= __alpha__ __alpha _M_ALPHA_
@@ -991,8 +991,8 @@ else # CC_NAME, gcc
@@ -946,8 +946,7 @@ $(call set_if_empty,CPUTYPE,generic)
CFLAGS+=-m32 -minline-all-stringops \
-falign-loops \
-ftree-vectorize \
- -fno-strict-overflow \
- -mtune=$(CPUTYPE)
+ -fno-strict-overflow
LDFLAGS+=-m32
else
#if gcc 4.0+
@@ -996,7 +995,7 @@ else # CC_NAME, gcc
ifeq ($(CC_NAME), clang)
$(call set_if_empty,CPUTYPE,athlon64)
C_DEFS+=-DCC_GCC_LIKE_ASM
- CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPUTYPE)
- LDFLAGS+=-m32
+ CFLAGS+=
+ LDFLAGS+=
- CFLAGS+=-m32 $(CC_OPT) -mtune=$(CPUTYPE)
+ CFLAGS+=-m32 $(CC_OPT)
LDFLAGS+=-m32
else # CC_NAME, clang
ifeq ($(CC_NAME), icc)
C_DEFS+=-DCC_GCC_LIKE_ASM
@@ -1073,9 +1073,8 @@ else # CC_NAME, gcc
ifeq ($(CC_NAME), clang)
$(call set_if_empty,CPUTYPE,opteron)
C_DEFS+=-DCC_GCC_LIKE_ASM
- CFLAGS+=-g -m64 \
- $(CC_OPT)
- LDFLAGS+=-m64
+ CFLAGS+=
+ LDFLAGS+=
else # CC_NAME, clang
ifeq ($(CC_NAME), icc)
C_DEFS+=-DCC_GCC_LIKE_ASM
@@ -1172,6 +1171,9 @@ endif #CC_SHORTVER, 4.x
endif #CC_SHORTVER, 9.0+ 8.0+ 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
else #CC_NAME, gcc
+ifeq ($(CC_NAME), clang)
+ C_DEFS+=-DCC_GCC_LIKE_ASM
+else # CC_NAME, clang
ifeq ($(CC_NAME), suncc)
C_DEFS+=-DCC_GCC_LIKE_ASM
C_DEFS+=-DSPARC64_MODE
@@ -1184,6 +1186,7 @@ else
#other compilers
$(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
endif #CC_NAME, suncc
+endif #CC_NAME, clang
endif #CC_NAME, gcc
endif #ARCH, sparc64
@@ -1028,8 +1027,7 @@ $(call set_if_empty,CPUTYPE,generic)
CFLAGS+=-m64 -minline-all-stringops \
-falign-loops \
-ftree-vectorize \
- -fno-strict-overflow \
- -mtune=$(CPUTYPE)
+ -fno-strict-overflow
LDFLAGS+=-m64
else
#if gcc 4.0+
@@ -1112,7 +1110,6 @@ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8
$(call set_if_empty,CPUTYPE,ultrasparc)
#use 32bit for now
CFLAGS+=-m64 -mcpu=ultrasparc \
- -mtune=$(CPUTYPE) \
-fno-strict-overflow \
-ftree-vectorize
# use -m64 to force 64 bit (but add it also to LDFLAGS and
@@ -1604,7 +1601,6 @@ ifeq ($(NOALTIVEC),)
CFLAGS += -ftree-vectorize
CFLAGS += -maltivec
CFLAGS += -fno-strict-overflow
- CFLAGS += -mtune=$(CPUTYPE)
endif
else
#if gcc 4.0+
@@ -1658,7 +1654,7 @@ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8
$(call set_if_empty,CPUTYPE,powerpc64)
CFLAGS+=-ftree-vectorize \
-fno-strict-overflow \
- -mtune=$(CPUTYPE) -maltivec
+ -maltivec
else
#if gcc 4.0+
ifeq ($(CC_SHORTVER), 4.x)

2
telephony/kamailio/patches/patch-src_core_tcp_read_c
View File

@ -1,7 +1,7 @@
Index: src/core/tcp_read.c
--- src/core/tcp_read.c.orig
+++ src/core/tcp_read.c
@@ -1678,6 +1678,14 @@ void release_tcpconn(struct tcp_connection* c, long st
@@ -1658,6 +1658,14 @@ void release_tcpconn(struct tcp_connection* c, long st
ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
LM_DBG("extra_data %p\n", c->extra_data);

2
telephony/kamailio/patches/patch-src_modules_auth_identity_auth_identity_c
View File

@ -1,7 +1,7 @@
Index: src/modules/auth_identity/auth_identity.c
--- src/modules/auth_identity/auth_identity.c.orig
+++ src/modules/auth_identity/auth_identity.c
@@ -591,7 +591,7 @@ static int check_date(struct sip_msg* msg, char* srt1,
@@ -595,7 +595,7 @@ static int check_date(struct sip_msg* msg, char* srt1,
}
if (tnow > tmsg + glb_iauthval) {

4
telephony/kamailio/patches/patch-src_modules_tls_tls_domain_c
View File

@ -1,7 +1,7 @@
Index: src/modules/tls/tls_domain.c
--- src/modules/tls/tls_domain.c.orig
+++ src/modules/tls/tls_domain.c
@@ -132,7 +132,7 @@ static void setup_dh(SSL_CTX *ctx)
@@ -146,7 +146,7 @@ static void setup_dh(SSL_CTX *ctx)
return;
}
@ -10,7 +10,7 @@ Index: src/modules/tls/tls_domain.c
/* libssl >= v1.1.0 */
DH_set0_pqg(dh, p, NULL, g);
#else
@@ -1028,7 +1028,7 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_dom
@@ -1059,7 +1059,7 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_dom
memset(d->ctx, 0, sizeof(SSL_CTX*) * procs_no);
for(i = 0; i < procs_no; i++) {

4
telephony/kamailio/pkg/PLIST-berkeley
View File

@ -27,7 +27,7 @@ share/kamailio/db_berkeley/kamailio/dr_gateways
share/kamailio/db_berkeley/kamailio/dr_groups
share/kamailio/db_berkeley/kamailio/dr_gw_lists
share/kamailio/db_berkeley/kamailio/dr_rules
share/kamailio/db_berkeley/kamailio/globalblacklist
share/kamailio/db_berkeley/kamailio/globalblocklist
share/kamailio/db_berkeley/kamailio/grp
share/kamailio/db_berkeley/kamailio/htable
share/kamailio/db_berkeley/kamailio/imc_members
@ -71,7 +71,7 @@ share/kamailio/db_berkeley/kamailio/uid_uri
share/kamailio/db_berkeley/kamailio/uid_uri_attrs
share/kamailio/db_berkeley/kamailio/uid_user_attrs
share/kamailio/db_berkeley/kamailio/uri
share/kamailio/db_berkeley/kamailio/userblacklist
share/kamailio/db_berkeley/kamailio/userblocklist
share/kamailio/db_berkeley/kamailio/usr_preferences
share/kamailio/db_berkeley/kamailio/version
share/kamailio/db_berkeley/kamailio/watchers

10
telephony/kamailio/pkg/PLIST-main
View File

@ -73,6 +73,7 @@ lib/kamailio/modules/
@so lib/kamailio/modules/lcr.so
@so lib/kamailio/modules/log_custom.so
@so lib/kamailio/modules/lost.so
@so lib/kamailio/modules/lrkproxy.so
@so lib/kamailio/modules/mangler.so
@so lib/kamailio/modules/matrix.so
@so lib/kamailio/modules/maxfwd.so
@ -146,7 +147,7 @@ lib/kamailio/modules/
@so lib/kamailio/modules/uid_gflags.so
@so lib/kamailio/modules/uid_uri_db.so
@so lib/kamailio/modules/uri_db.so
@so lib/kamailio/modules/userblacklist.so
@so lib/kamailio/modules/userblocklist.so
@so lib/kamailio/modules/usrloc.so
@so lib/kamailio/modules/utils.so
@so lib/kamailio/modules/websocket.so
@ -227,6 +228,7 @@ share/doc/kamailio/modules/README.kex
share/doc/kamailio/modules/README.lcr
share/doc/kamailio/modules/README.log_custom
share/doc/kamailio/modules/README.lost
share/doc/kamailio/modules/README.lrkproxy
share/doc/kamailio/modules/README.mangler
share/doc/kamailio/modules/README.matrix
share/doc/kamailio/modules/README.maxfwd
@ -300,7 +302,7 @@ share/doc/kamailio/modules/README.uid_domain
share/doc/kamailio/modules/README.uid_gflags
share/doc/kamailio/modules/README.uid_uri_db
share/doc/kamailio/modules/README.uri_db
share/doc/kamailio/modules/README.userblacklist
share/doc/kamailio/modules/README.userblocklist
share/doc/kamailio/modules/README.usrloc
share/doc/kamailio/modules/README.utils
share/doc/kamailio/modules/README.websocket
@ -344,7 +346,7 @@ share/kamailio/dbtext/kamailio/dr_gateways
share/kamailio/dbtext/kamailio/dr_groups
share/kamailio/dbtext/kamailio/dr_gw_lists
share/kamailio/dbtext/kamailio/dr_rules
share/kamailio/dbtext/kamailio/globalblacklist
share/kamailio/dbtext/kamailio/globalblocklist
share/kamailio/dbtext/kamailio/grp
share/kamailio/dbtext/kamailio/htable
share/kamailio/dbtext/kamailio/imc_members
@ -388,7 +390,7 @@ share/kamailio/dbtext/kamailio/uid_uri
share/kamailio/dbtext/kamailio/uid_uri_attrs
share/kamailio/dbtext/kamailio/uid_user_attrs
share/kamailio/dbtext/kamailio/uri
share/kamailio/dbtext/kamailio/userblacklist
share/kamailio/dbtext/kamailio/userblocklist
share/kamailio/dbtext/kamailio/usr_preferences
share/kamailio/dbtext/kamailio/version
share/kamailio/dbtext/kamailio/watchers

2
telephony/kamailio/pkg/PLIST-mysql
View File

@ -49,5 +49,5 @@ share/kamailio/mysql/uid_domain-create.sql
share/kamailio/mysql/uid_gflags-create.sql
share/kamailio/mysql/uid_uri_db-create.sql
share/kamailio/mysql/uri_db-create.sql
share/kamailio/mysql/userblacklist-create.sql
share/kamailio/mysql/userblocklist-create.sql
share/kamailio/mysql/usrloc-create.sql

2
telephony/kamailio/pkg/PLIST-postgresql
View File

@ -45,5 +45,5 @@ share/kamailio/postgres/uid_domain-create.sql
share/kamailio/postgres/uid_gflags-create.sql
share/kamailio/postgres/uid_uri_db-create.sql
share/kamailio/postgres/uri_db-create.sql
share/kamailio/postgres/userblacklist-create.sql
share/kamailio/postgres/userblocklist-create.sql
share/kamailio/postgres/usrloc-create.sql

4
telephony/kamailio/pkg/PLIST-xml
View File

@ -96,7 +96,7 @@ share/kamailio/xhttp_pi/uid_uri_db-mod
share/kamailio/xhttp_pi/uid_uri_db-table
share/kamailio/xhttp_pi/uri_db-mod
share/kamailio/xhttp_pi/uri_db-table
share/kamailio/xhttp_pi/userblacklist-mod
share/kamailio/xhttp_pi/userblacklist-table
share/kamailio/xhttp_pi/userblocklist-mod
share/kamailio/xhttp_pi/userblocklist-table
share/kamailio/xhttp_pi/usrloc-mod
share/kamailio/xhttp_pi/usrloc-table