Attachment #247544 for bug #276221

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




PORTNAME=	kamailio
PORTVERSION=	5.7.3
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
DISTNAME=	${PORTNAME}-${PORTVERSION}_src

USERS=		${KAMAILIO_USER}
GROUPS=		${KAMAILIO_GROUP}

OPTIONS_DEFINE=			DATABASE DIALPLAN DLGS DOCS EVAPI HTTP_CLIENT \
				JWT KAFKA LOST LWSC MQTT OUTBOUND PERL \
				PHONENUM POSOPS PRESENCE RADIUS SCTP SECSIPID \
				SIPREPO SLACK SWORKER TLS WEBSOCKET
OPTIONS_DEFAULT=		MYSQL PRESENCE RADIUS SQLITE TLS
OPTIONS_GROUP=			DATABASE_DRIVERS KEMI_LANGS
OPTIONS_GROUP_DATABASE_DRIVERS=	MYSQL PGSQL SQLITE UNIXODBC

DIALPLAN_DESC=		String translations based on rules
DLGS_DESC=		Lightweight, stateless dialog tracking and statistics
EVAPI_DESC=		Network event broadcast API
HTTP_CLIENT_DESC=	HTTP-client module
JWT_DESC=		JSON Web Token generation and validation
KAFKA_DESC=		Produces and sends messages to a Kafka server
KEMI_LANGS_DESC=	Kamailio Embedded Interface Interpreters

EVAPI_LIB_DEPENDS=	libev.so:devel/libev
EVAPI_VARS=		EXTRA_MODULES+=evapi

HTTP_CLIENT_LIB_DEPENDS=	libcurl.so:ftp/curl
HTTP_CLIENT_VARS=		EXTRA_MODULES+=http_client

JWT_LIB_DEPENDS=	libjwt.so:www/libjwt
JWT_VARS=		EXTRA_MODULES+=jwt


Lines 1-3 Link Here

(-)b/net/kamailio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1665134014	1	TIMESTAMP = 1702905644
2	SHA256 (kamailio-5.6.2_src.tar.gz) = ea3cd5d688c34208b92072c3844c8276b693e0ca2c688168ea0357978c76b32d	2	SHA256 (kamailio-5.7.3_src.tar.gz) = c7a620b03974e4e04d419e086a771fd0b7a8e269f3d69c19a1c66085a498fd8c
3	SIZE (kamailio-5.6.2_src.tar.gz) = 12921131	3	SIZE (kamailio-5.7.3_src.tar.gz) = 13128905




--- src/core/cfg.y.orig	(revision 2cebd46f8f2dc3f87c9cfd2054976e347aa75ace)
+++ src/core/cfg.y
@@ -2045,14 +2045,38 @@
 module_stm:
 	LOADMODULE STRING {
 		LM_DBG("loading module %s\n", $2);
-			if (load_module($2)!=0) {
+			if (ksr_load_module($2, NULL)!=0) {
+				yyerror("failed to load module");
+			}
+	}
+	| LOADMODULE LPAREN STRING RPAREN {
+		LM_DBG("loading module %s\n", $3);
+			if (ksr_load_module($3, NULL)!=0) {
+				yyerror("failed to load module");
+			}
+	}
+	| LOADMODULE LPAREN STRING COMMA STRING RPAREN {
+		LM_DBG("loading module %s opts %s\n", $3, $5);
+			if (ksr_load_module($3, $5)!=0) {
 				yyerror("failed to load module");
 			}
 	}
 	| LOADMODULE error	{ yyerror("string expected"); }
 	| LOADMODULEX STRING {
 		LM_DBG("loading module %s\n", $2);
-			if (load_modulex($2)!=0) {
+			if (ksr_load_modulex($2, NULL)!=0) {
+				yyerror("failed to load module");
+			}
+	}
+	| LOADMODULEX LPAREN STRING RPAREN {
+		LM_DBG("loading module %s\n", $3);
+			if (ksr_load_modulex($3, NULL)!=0) {
+				yyerror("failed to load module");
+			}
+	}
+	| LOADMODULEX LPAREN STRING COMMA STRING RPAREN {
+		LM_DBG("loading module %s opts %s\n", $3, $5);
+			if (ksr_load_modulex($3, $5)!=0) {
 				yyerror("failed to load module");
 			}
 	}




--- src/core/sr_module.c.orig	(revision 43f764cae870b15a96b8ca88f1eb195d4ceb8455)
+++ src/core/sr_module.c
@@ -525,6 +525,7 @@
 	return -1;
 }
 
+
 /**
  * \brief load a sr module
  *
@@ -537,9 +538,10 @@
  * absolute path (not starting with '/') then will try:
  * \<MODS_DIR\>/mod_path
  * @param mod_path path or module name
+ * @param opts options string
  * @return 0 on success , <0 on error
  */
-int load_module(char* mod_path)
+int ksr_load_module(char* mod_path, char *opts)
 {
 	void* handle;
 	char* error;
@@ -553,11 +555,16 @@
 	str expref;
 	char exbuf[64];
 	char* mdir;
+	char *p;
 
 #ifndef RTLD_NOW
 /* for openbsd */
 #define RTLD_NOW DL_LAZY
 #endif
+#ifndef RTLD_GLOBAL
+/* Unsupported! */
+#define RTLD_GLOBAL 0
+#endif
 
 	if(ksr_locate_module(mod_path, &path)<0) {
 		return -1;
@@ -567,6 +574,17 @@
 
 	retries=2;
 	dlflags=RTLD_NOW;
+
+	if(opts!=NULL) {
+		for(p=opts; *p!='\0'; p++) {
+			if(*p=='G' || *p=='g') {
+				dlflags |= RTLD_GLOBAL;
+			} else {
+				LM_INFO("unknown option: %c\n", *p);
+			}
+		}
+	}
+
 reload:
 	handle=dlopen(path, dlflags); /* resolve all symbols now */
 	if (handle==0){
@@ -653,10 +671,11 @@
 	return -1;
 }
 
+
 /**
  *
  */
-int load_modulex(char* mod_path)
+int ksr_load_modulex(char* mod_path, char *opts)
 {
 	str seval;
 	str sfmt;
@@ -679,7 +698,7 @@
 		}
 	}
 
-	return load_module(emod);
+	return ksr_load_module(emod, opts);
 }
 
 /**




--- src/core/sr_module.h.orig	(revision 43f764cae870b15a96b8ca88f1eb195d4ceb8455)
+++ src/core/sr_module.h
@@ -336,8 +336,8 @@
 extern int mod_response_cbk_no; /**< size of reponse callbacks array */
 
 int register_builtin_modules(void);
-int load_module(char* path);
-int load_modulex(char* path);
+int ksr_load_module(char* path, char* opts);
+int ksr_load_modulex(char* path, char* opts);
 ksr_cmd_export_t* find_export_record(char* name, int param_no, int flags);
 cmd_function find_export(char* name, int param_no, int flags);
 cmd_function find_mod_export(char* mod, char* name, int param_no, int flags);

Removed Link Here

(-)a/net/kamailio/files/patch-src_main.c (-11 lines)
1	--- src/main.c.orig (revision 43f764cae870b15a96b8ca88f1eb195d4ceb8455)
2	+++ src/main.c
3	@@ -2446,7 +2446,7 @@
4	fprintf(stderr, "bad load module parameter\n");
5	goto error;
6	}
7	- if (load_module(optarg)!=0) {
8	+ if (ksr_load_module(optarg, NULL)!=0) {
9	LM_ERR("failed to load the module: %s\n", optarg);
10	goto error;
11	}

Return to bug 276221

Lines 1-6 Link Here

(-)b/net/kamailio/Makefile (-6 / +9 lines)
1	PORTNAME= kamailio	1	PORTNAME= kamailio
2	PORTVERSION= 5.6.2	2	PORTVERSION= 5.7.3
3	PORTREVISION= 1
4	CATEGORIES= net	3	CATEGORIES= net
5	MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/	4	MASTER_SITES= http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
6	DISTNAME= ${PORTNAME}-${PORTVERSION}_src	5	DISTNAME= ${PORTNAME}-${PORTVERSION}_src
Lines 39-48 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Link Here
39	USERS= ${KAMAILIO_USER}	38	USERS= ${KAMAILIO_USER}
40	GROUPS= ${KAMAILIO_GROUP}	39	GROUPS= ${KAMAILIO_GROUP}
41		40
42	OPTIONS_DEFINE= DATABASE DIALPLAN DLGS DOCS EVAPI JWT KAFKA \	41	OPTIONS_DEFINE= DATABASE DIALPLAN DLGS DOCS EVAPI HTTP_CLIENT \
43	LOST LWSC MQTT OUTBOUND PERL PHONENUM POSOPS \	42	JWT KAFKA LOST LWSC MQTT OUTBOUND PERL \
44	PRESENCE RADIUS SCTP SECSIPID SIPREPO SLACK \	43	PHONENUM POSOPS PRESENCE RADIUS SCTP SECSIPID \
45	SWORKER TLS WEBSOCKET	44	SIPREPO SLACK SWORKER TLS WEBSOCKET
46	OPTIONS_DEFAULT= MYSQL PRESENCE RADIUS SQLITE TLS	45	OPTIONS_DEFAULT= MYSQL PRESENCE RADIUS SQLITE TLS
47	OPTIONS_GROUP= DATABASE_DRIVERS KEMI_LANGS	46	OPTIONS_GROUP= DATABASE_DRIVERS KEMI_LANGS
48	OPTIONS_GROUP_DATABASE_DRIVERS= MYSQL PGSQL SQLITE UNIXODBC	47	OPTIONS_GROUP_DATABASE_DRIVERS= MYSQL PGSQL SQLITE UNIXODBC
Lines 54-59 DATABASE_DRIVERS_DESC= Database drivers Link Here
54	DIALPLAN_DESC= String translations based on rules	53	DIALPLAN_DESC= String translations based on rules
55	DLGS_DESC= Lightweight, stateless dialog tracking and statistics	54	DLGS_DESC= Lightweight, stateless dialog tracking and statistics
56	EVAPI_DESC= Network event broadcast API	55	EVAPI_DESC= Network event broadcast API
		56	HTTP_CLIENT_DESC= HTTP-client module
57	JWT_DESC= JSON Web Token generation and validation	57	JWT_DESC= JSON Web Token generation and validation
58	KAFKA_DESC= Produces and sends messages to a Kafka server	58	KAFKA_DESC= Produces and sends messages to a Kafka server
59	KEMI_LANGS_DESC= Kamailio Embedded Interface Interpreters	59	KEMI_LANGS_DESC= Kamailio Embedded Interface Interpreters
Lines 83-88 DLGS_VARS= EXTRA_MODULES+=dlgs Link Here
83	EVAPI_LIB_DEPENDS= libev.so:devel/libev	83	EVAPI_LIB_DEPENDS= libev.so:devel/libev
84	EVAPI_VARS= EXTRA_MODULES+=evapi	84	EVAPI_VARS= EXTRA_MODULES+=evapi
85		85
		86	HTTP_CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl
		87	HTTP_CLIENT_VARS= EXTRA_MODULES+=http_client
		88
86	JWT_LIB_DEPENDS= libjwt.so:www/libjwt	89	JWT_LIB_DEPENDS= libjwt.so:www/libjwt
87	JWT_VARS= EXTRA_MODULES+=jwt	90	JWT_VARS= EXTRA_MODULES+=jwt
88		91

Removed Link Here

(-)a/net/kamailio/files/patch-src_core_cfg.y (-43 lines)
1	--- src/core/cfg.y.orig (revision 2cebd46f8f2dc3f87c9cfd2054976e347aa75ace)
2	+++ src/core/cfg.y
3	@@ -2045,14 +2045,38 @@
4	module_stm:
5	LOADMODULE STRING {
6	LM_DBG("loading module %s\n", $2);
7	- if (load_module($2)!=0) {
8	+ if (ksr_load_module($2, NULL)!=0) {
9	+ yyerror("failed to load module");
10	+ }
11	+ }
12	+ \| LOADMODULE LPAREN STRING RPAREN {
13	+ LM_DBG("loading module %s\n", $3);
14	+ if (ksr_load_module($3, NULL)!=0) {
15	+ yyerror("failed to load module");
16	+ }
17	+ }
18	+ \| LOADMODULE LPAREN STRING COMMA STRING RPAREN {
19	+ LM_DBG("loading module %s opts %s\n", $3, $5);
20	+ if (ksr_load_module($3, $5)!=0) {
21	yyerror("failed to load module");
22	}
23	}
24	\| LOADMODULE error { yyerror("string expected"); }
25	\| LOADMODULEX STRING {
26	LM_DBG("loading module %s\n", $2);
27	- if (load_modulex($2)!=0) {
28	+ if (ksr_load_modulex($2, NULL)!=0) {
29	+ yyerror("failed to load module");
30	+ }
31	+ }
32	+ \| LOADMODULEX LPAREN STRING RPAREN {
33	+ LM_DBG("loading module %s\n", $3);
34	+ if (ksr_load_modulex($3, NULL)!=0) {
35	+ yyerror("failed to load module");
36	+ }
37	+ }
38	+ \| LOADMODULEX LPAREN STRING COMMA STRING RPAREN {
39	+ LM_DBG("loading module %s opts %s\n", $3, $5);
40	+ if (ksr_load_modulex($3, $5)!=0) {
41	yyerror("failed to load module");
42	}
43	}

Removed Link Here

(-)a/net/kamailio/files/patch-src_core_sr__module.c (-79 lines)
1	--- src/core/sr_module.c.orig (revision 43f764cae870b15a96b8ca88f1eb195d4ceb8455)
2	+++ src/core/sr_module.c
3	@@ -525,6 +525,7 @@
4	return -1;
5	}
6
7	+
8	/**
9	* \brief load a sr module
10	*
11	@@ -537,9 +538,10 @@
12	* absolute path (not starting with '/') then will try:
13	* \<MODS_DIR\>/mod_path
14	* @param mod_path path or module name
15	+ * @param opts options string
16	* @return 0 on success , <0 on error
17	*/
18	-int load_module(char* mod_path)
19	+int ksr_load_module(char* mod_path, char *opts)
20	{
21	void* handle;
22	char* error;
23	@@ -553,11 +555,16 @@
24	str expref;
25	char exbuf[64];
26	char* mdir;
27	+ char *p;
28
29	#ifndef RTLD_NOW
30	/* for openbsd */
31	#define RTLD_NOW DL_LAZY
32	#endif
33	+#ifndef RTLD_GLOBAL
34	+/* Unsupported! */
35	+#define RTLD_GLOBAL 0
36	+#endif
37
38	if(ksr_locate_module(mod_path, &path)<0) {
39	return -1;
40	@@ -567,6 +574,17 @@
41
42	retries=2;
43	dlflags=RTLD_NOW;
44	+
45	+ if(opts!=NULL) {
46	+ for(p=opts; *p!='\0'; p++) {
47	+ if(p=='G' \|\| p=='g') {
48	+ dlflags \|= RTLD_GLOBAL;
49	+ } else {
50	+ LM_INFO("unknown option: %c\n", *p);
51	+ }
52	+ }
53	+ }
54	+
55	reload:
56	handle=dlopen(path, dlflags); /* resolve all symbols now */
57	if (handle==0){
58	@@ -653,10 +671,11 @@
59	return -1;
60	}
61
62	+
63	/**
64	*
65	*/
66	-int load_modulex(char* mod_path)
67	+int ksr_load_modulex(char* mod_path, char *opts)
68	{
69	str seval;
70	str sfmt;
71	@@ -679,7 +698,7 @@
72	}
73	}
74
75	- return load_module(emod);
76	+ return ksr_load_module(emod, opts);
77	}
78
79	/**

Removed Link Here

(-)a/net/kamailio/files/patch-src_core_sr__module.h (-13 lines)
1	--- src/core/sr_module.h.orig (revision 43f764cae870b15a96b8ca88f1eb195d4ceb8455)
2	+++ src/core/sr_module.h
3	@@ -336,8 +336,8 @@
4	extern int mod_response_cbk_no; /*< size of reponse callbacks array /
5
6	int register_builtin_modules(void);
7	-int load_module(char* path);
8	-int load_modulex(char* path);
9	+int ksr_load_module(char* path, char* opts);
10	+int ksr_load_modulex(char* path, char* opts);
11	ksr_cmd_export_t* find_export_record(char* name, int param_no, int flags);
12	cmd_function find_export(char* name, int param_no, int flags);
13	cmd_function find_mod_export(char* mod, char* name, int param_no, int flags);

Lines 148-153 Link Here

(-)b/net/kamailio/pkg-plist (+4 lines)
148	%%DLGS%%lib/kamailio/modules/dlgs.so	148	%%DLGS%%lib/kamailio/modules/dlgs.so
149	%%EVAPI%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.evapi	149	%%EVAPI%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.evapi
150	%%EVAPI%%lib/kamailio/modules/evapi.so	150	%%EVAPI%%lib/kamailio/modules/evapi.so
		151	%%HTTP_CLIENT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.http_connect
		152	%%HTTP_CLIENT%%lib/kamailio/modules/http_client.so
151	%%JWT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.jwt	153	%%JWT%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.jwt
152	%%JWT%%lib/kamailio/modules/jwt.so	154	%%JWT%%lib/kamailio/modules/jwt.so
153	%%KAFKA%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.kafka	155	%%KAFKA%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.kafka
Lines 323-328 Link Here
323	%%PORTDOCS%%%%DOCSDIR%%/modules/README.log_custom	325	%%PORTDOCS%%%%DOCSDIR%%/modules/README.log_custom
324	%%PORTDOCS%%%%DOCSDIR%%/modules/README.lrkproxy	326	%%PORTDOCS%%%%DOCSDIR%%/modules/README.lrkproxy
325	%%PORTDOCS%%%%DOCSDIR%%/modules/README.mangler	327	%%PORTDOCS%%%%DOCSDIR%%/modules/README.mangler
		328	%%PORTDOCS%%%%DOCSDIR%%/modules/README.math
326	%%PORTDOCS%%%%DOCSDIR%%/modules/README.maxfwd	329	%%PORTDOCS%%%%DOCSDIR%%/modules/README.maxfwd
327	%%PORTDOCS%%%%DOCSDIR%%/modules/README.mediaproxy	330	%%PORTDOCS%%%%DOCSDIR%%/modules/README.mediaproxy
328	%%PORTDOCS%%%%DOCSDIR%%/modules/README.misctest	331	%%PORTDOCS%%%%DOCSDIR%%/modules/README.misctest
Lines 540-545 lib/kamailio/modules/kex.so Link Here
540	lib/kamailio/modules/log_custom.so	543	lib/kamailio/modules/log_custom.so
541	lib/kamailio/modules/lrkproxy.so	544	lib/kamailio/modules/lrkproxy.so
542	lib/kamailio/modules/mangler.so	545	lib/kamailio/modules/mangler.so
		546	lib/kamailio/modules/math.so
543	lib/kamailio/modules/maxfwd.so	547	lib/kamailio/modules/maxfwd.so
544	lib/kamailio/modules/mediaproxy.so	548	lib/kamailio/modules/mediaproxy.so
545	lib/kamailio/modules/misctest.so	549	lib/kamailio/modules/misctest.so