Attachment 230192 Details for Bug 260486 – Initial patch

[patch] Initial patch

0001-net-kamailio-update-to-5.5.3.patch (text/plain), 9.25 KB, created by Dustin Marquess on 2021-12-17 04:37:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dustin Marquess

Created: 2021-12-17 04:37:49 UTC

Size: 9.25 KB

patch

obsolete

>From 657d9e340353c1a5f5a70362d6aee8c110c2ec14 Mon Sep 17 00:00:00 2001
>From: JailBird <jailbird@fdf.net>
>Date: Thu, 16 Dec 2021 22:28:46 -0600
>Subject: net/kamailio: update to 5.5.3
>
>---
> net/kamailio/Makefile                        | 12 ++--
> net/kamailio/distinfo                        |  6 +-
> net/kamailio/files/patch-src_Makefile.groups | 13 ++++
> net/kamailio/pkg-plist                       | 62 ++++++++++++++++++--
> 4 files changed, 80 insertions(+), 13 deletions(-)
> create mode 100644 net/kamailio/files/patch-src_Makefile.groups
>
>diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
>index 7584c95bc..7c5588360 100644
>--- a/net/kamailio/Makefile
>+++ b/net/kamailio/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Oliver Mahmoudi <olivermahmoudi@gmail.com>
> 
> PORTNAME=	kamailio
>-PORTVERSION=	5.4.5
>+PORTVERSION=	5.5.3
> CATEGORIES=	net
> MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
> DISTNAME=	${PORTNAME}-${PORTVERSION}_src
>@@ -44,9 +44,9 @@ GROUPS=		${KAMAILIO_GROUP}
> 
> OPTIONS_DEFINE=			DATABASE DIALPLAN DOCS KEMIX PERL PRESENCE \
> 				RADIUS SCTP TLS WEBSOCKET
>-OPTIONS_DEFAULT=		MYSQL PRESENCE RADIUS TLS
>+OPTIONS_DEFAULT=		SQLITE PRESENCE RADIUS TLS
> OPTIONS_GROUP=			DATABASE_DRIVERS KEMI_LANGS
>-OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL UNIXODBC
>+OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL UNIXODBC SQLITE
> OPTIONS_GROUP_KEMI_LANGS=	LUAJIT PYTHON3
> OPTIONS_SUB=			YES
> 
>@@ -86,6 +86,10 @@ PGSQL_IMPLIES=	DATABASE
> PGSQL_USES=	pgsql
> PGSQL_VARS=	EXTRA_GROUPS+=postgres
> 
>+SQLITE_IMPLIES=	DATABASE
>+SQLITE_USES=	sqlite
>+SQLITE_VARS=	EXTRA_GROUPS+=sqlite
>+
> PRESENCE_VARS=	EXTRA_GROUPS+=presence
> 
> PYTHON3_IMPLIES=	KEMIX
>@@ -138,7 +142,7 @@ do-install:
> 	@(cd ${STAGEDIR}${ETCDIR}; for i in `${FIND} . -type f`; do ${MV} $$i $$i.sample; done)
> 
> post-install:
>-	@${RMDIR} ${STAGEDIR}${DATADIR} || true
>+	@${RM} -f ${STAGEDIR}${DATADIR} || true
> 	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so' -exec ${STRIP_CMD} {} +
> 	@${FIND} ${STAGEDIR}${PREFIX} -type f -name '*.so.1' -exec ${STRIP_CMD} {} +
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/kamailio
>diff --git a/net/kamailio/distinfo b/net/kamailio/distinfo
>index f9d87d573..6b07c125b 100644
>--- a/net/kamailio/distinfo
>+++ b/net/kamailio/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1618831304
>-SHA256 (kamailio-5.4.5_src.tar.gz) = d7203228e75fb6250f79e28ff79ac2aff5b2907d5b5cd94c3407c7099bef0551
>-SIZE (kamailio-5.4.5_src.tar.gz) = 12659887
>+TIMESTAMP = 1637759181
>+SHA256 (kamailio-5.5.3_src.tar.gz) = 6af30eabdbaa79dbbf7c21b1201f350a39c816010fca60e27cbb9de4589a4324
>+SIZE (kamailio-5.5.3_src.tar.gz) = 12782163
>diff --git a/net/kamailio/files/patch-src_Makefile.groups b/net/kamailio/files/patch-src_Makefile.groups
>new file mode 100644
>index 000000000..7a36430e5
>--- /dev/null
>+++ b/net/kamailio/files/patch-src_Makefile.groups
>@@ -0,0 +1,13 @@
>+--- src/Makefile.groups.orig	2021-11-24 13:06:16 UTC
>++++ src/Makefile.groups
>+@@ -307,6 +307,10 @@ module_group_mysql=$(module_group_mysql_driver) $(modu
>+ module_group_postgres_driver=$(mod_list_postgres)
>+ module_group_postgres=$(module_group_postgres_driver) $(module_group_db)
>+ 
>++# For sqlite
>++module_group_sqlite_driver=$(mod_list_sqlite)
>++module_group_sqlite=$(module_group_sqlite_driver) $(module_group_db)
>++
>+ # For radius
>+ module_group_radius=$(mod_list_radius)
>+ 
>diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
>index b5747a23a..1bd6a1787 100644
>--- a/net/kamailio/pkg-plist
>+++ b/net/kamailio/pkg-plist
>@@ -20,7 +20,7 @@
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/dr_groups
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/dr_gw_lists
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/dr_rules
>-%%DATABASE%%%%DATADIR%%/dbtext/kamailio/globalblacklist
>+%%DATABASE%%%%DATADIR%%/dbtext/kamailio/globalblocklist
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/grp
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/htable
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/imc_members
>@@ -64,7 +64,7 @@
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/uid_uri_attrs
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/uid_user_attrs
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/uri
>-%%DATABASE%%%%DATADIR%%/dbtext/kamailio/userblacklist
>+%%DATABASE%%%%DATADIR%%/dbtext/kamailio/userblocklist
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/usr_preferences
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/version
> %%DATABASE%%%%DATADIR%%/dbtext/kamailio/watchers
>@@ -101,7 +101,7 @@
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.sqlops
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.uac
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.uri_db
>-%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.userblacklist
>+%%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.userblocklist
> %%DATABASE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.usrloc
> %%DATABASE%%lib/kamailio/kamctl/dbtextdb/dbtextdb.py
> %%DATABASE%%lib/kamailio/kamctl/kamctl.dbtext
>@@ -140,7 +140,7 @@
> %%DATABASE%%lib/kamailio/modules/sqlops.so
> %%DATABASE%%lib/kamailio/modules/uac.so
> %%DATABASE%%lib/kamailio/modules/uri_db.so
>-%%DATABASE%%lib/kamailio/modules/userblacklist.so
>+%%DATABASE%%lib/kamailio/modules/userblocklist.so
> %%DATABASE%%lib/kamailio/modules/usrloc.so
> %%DIALPLAN%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.dialplan
> %%DIALPLAN%%lib/kamailio/modules/dialplan.so
>@@ -194,7 +194,7 @@
> %%MYSQL%%%%DATADIR%%/mysql/uid_gflags-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/uid_uri_db-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/uri_db-create.sql
>-%%MYSQL%%%%DATADIR%%/mysql/userblacklist-create.sql
>+%%MYSQL%%%%DATADIR%%/mysql/userblocklist-create.sql
> %%MYSQL%%%%DATADIR%%/mysql/usrloc-create.sql
> %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_mysql
> %%MYSQL%%lib/kamailio/kamctl/kamctl.mysql
>@@ -264,12 +264,60 @@
> %%PGSQL%%%%DATADIR%%/postgres/uid_gflags-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/uid_uri_db-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/uri_db-create.sql
>-%%PGSQL%%%%DATADIR%%/postgres/userblacklist-create.sql
>+%%PGSQL%%%%DATADIR%%/postgres/userblocklist-create.sql
> %%PGSQL%%%%DATADIR%%/postgres/usrloc-create.sql
> %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_postgres
> %%PGSQL%%lib/kamailio/kamctl/kamctl.pgsql
> %%PGSQL%%lib/kamailio/kamctl/kamdbctl.pgsql
> %%PGSQL%%lib/kamailio/modules/db_postgres.so
>+%%SQLITE%%%%DATADIR%%/db_sqlite/acc-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/alias_db-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/auth_db-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/avpops-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/carrierroute-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/cpl-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/dialog-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/dialplan-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/dispatcher-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/domain-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/domainpolicy-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/drouting-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/group-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/htable-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/imc-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/lcr-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/matrix-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/mohqueue-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/msilo-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/mtree-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/pdt-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/permissions-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/pipelimit-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/presence-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/purple-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/registrar-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/rls-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/rtpengine-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/rtpproxy-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/sca-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/secfilter-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/siptrace-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/speeddial-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/standard-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/topos-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uac-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_auth_db-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_avp_db-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_domain-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_gflags-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uid_uri_db-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/uri_db-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/userblocklist-create.sql
>+%%SQLITE%%%%DATADIR%%/db_sqlite/usrloc-create.sql
>+%%SQLITE%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.db_sqlite
>+%%SQLITE%%lib/kamailio/kamctl/kamctl.sqlite
>+%%SQLITE%%lib/kamailio/kamctl/kamdbctl.sqlite
>+%%SQLITE%%lib/kamailio/modules/db_sqlite.so
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.acc_diameter
>@@ -304,6 +352,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.keepalive
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.kex
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.log_custom
>+%%PORTDOCS%%%%DOCSDIR%%/modules/README.lrkproxy
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.malloc_test
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.mangler
> %%PORTDOCS%%%%DOCSDIR%%/modules/README.maxfwd
>@@ -461,6 +510,7 @@ lib/kamailio/modules/jsonrpcs.so
> lib/kamailio/modules/keepalive.so
> lib/kamailio/modules/kex.so
> lib/kamailio/modules/log_custom.so
>+lib/kamailio/modules/lrkproxy.so
> lib/kamailio/modules/malloc_test.so
> lib/kamailio/modules/mangler.so
> lib/kamailio/modules/maxfwd.so
>-- 
>2.32.0 (Apple Git-132)
>

Actions: View | Diff

Attachments on bug 260486: 230192 | 230745