Attachment 225748 Details for Bug 222718 – Patch for opensips 3.1.2

[patch] Patch for opensips 3.1.2

opensips-3.1.2.patch (text/plain), 6.55 KB, created by OlivierW on 2021-06-11 22:13:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: OlivierW

Created: 2021-06-11 22:13:44 UTC

Size: 6.55 KB

patch

obsolete

>--- Makefile.orig	2021-06-11 19:18:40.801159000 +0200
>+++ Makefile	2021-06-11 20:13:17.882539000 +0200
>@@ -17,15 +17,13 @@
> LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
> 		libcurl.so:ftp/curl \
> 		libexpat.so:textproc/expat2 \
>-		libhiredis.so:databases/hiredis \
> 		libjson-c.so:devel/json-c \
> 		libjwt.so:www/libjwt \
> 		libpcre.so:devel/pcre \
>-		librabbitmq.so:net/rabbitmq-c-devel \
> 		libuuid.so:misc/e2fsprogs-libuuid
> 
> USES=		gettext-runtime gmake gnome localbase:ldflags ncurses perl5 \
>-		pkgconfig python shebangfix ssl
>+		pkgconfig shebangfix ssl
> USE_GNOME=	libxml2
> SHEBANG_GLOB=	*.pl *.sh
> 
>@@ -47,19 +45,19 @@
> 		INSTALL_DOC="${INSTALL_DATA}" \
> 		INSTALL_MODULES="${INSTALL_PROGRAM}" \
> 		JSON_BUILDER="pkgconf json-c" \
>-		NICER=0 \
>-		PYTHON=${PYTHON_CMD}
>+		NICER=0
> 
> DOCSDIR=	share/doc/${PORTNAME}
> SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES HTTP LDAP MEMCACHED MYSQL PGSQL \
>-			RADIUS SQLITE TESTS TLS UNIXODBC
>-OPTIONS_DEFAULT=	HTTP LDAP MEMCACHED PGSQL RADIUS TLS
>+			PYTHON RABBITMQ RADIUS REDIS SQLITE TESTS TLS UNIXODBC
>+OPTIONS_DEFAULT=	HTTP LDAP MEMCACHED PGSQL PYTHON RABBITMQ RADIUS REDIS TLS
> OPTIONS_SUB=		yes
> 
> HTTP_DESC=	Enable HTTP transport via libmicrohttpd
> MEMCACHED_DESC=	Build with memcached support
>+RABBITMQ_DESC=	RabbitMQ/AMQP support
> TESTS_DESC=	Install smoke tests
> 
> HTTP_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
>@@ -69,7 +67,10 @@
> PGSQL_BUILD_DEPENDS=	p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
> PGSQL_USES=		pgsql
> WANT_PGSQL=		client
>+PYTHON_USES=	python
>+RABBITMQ_LIB_DEPENDS+=	librabbitmq.so:net/rabbitmq-c-devel
> RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
>+REDIS_LIB_DEPENDS+=	libhiredis.so:databases/hiredis
> SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
> UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
> 
>@@ -95,8 +96,21 @@
> EXTRA_MODULES+=	db_postgres
> .endif
> 
>+.if ${PORT_OPTIONS:MPYTHON}
>+EXTRA_MODULES+=	python
>+MAKE_ENV+=	PYTHON=${PYTHON_CMD}
>+.endif
>+
>+.if ${PORT_OPTIONS:MRABBITMQ}
>+EXTRA_MODULES+=	event_rabbitmq rabbitmq rabbitmq_consumer
>+.endif
>+
> .if ${PORT_OPTIONS:MRADIUS}
> EXTRA_MODULES+=	aaa_radius
>+.endif
>+
>+.if ${PORT_OPTIONS:MREDIS}
>+EXTRA_MODULES+=	cachedb_redis
> .endif
> 
> .if ${PORT_OPTIONS:MUNIXODBC}
>--- files/Makefile.conf.orig	2021-06-11 19:24:02.396600000 +0200
>+++ files/Makefile.conf	2021-06-11 19:37:09.171608000 +0200
>@@ -65,7 +65,7 @@
> 
> exclude_modules?= aaa_radius auth_jwt b2b_logic cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute cgrates compression cpl_c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_sqlite db_unixodbc dialplan emergency event_rabbitmq h350 httpd identity jabber json ldap lua mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml presence_dfks proto_sctp proto_tls proto_wss pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python regex rabbitmq rabbitmq_consumer rest_client rls siprec sngtc snmpstats stir_shaken tls_mgm uuid xcap xcap_client xml xmpp
> 
>-include_modules= auth_jwt b2b_logic cachedb_redis carrierroute cgrates compression cpl_c db_http db_perlvdb dialplan event_rabbitmq event_routing event_stream regex identity jabber json jsonrpc mi_html mi_xmlrpc_ng mid_registrar perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rabbitmq rabbitmq_consumer rest_client rls sip_i siprec stir_shaken tracer uuid xcap xcap_client xml xmpp
>+include_modules= auth_jwt b2b_logic carrierroute cgrates compression cpl_c db_http db_perlvdb dialplan event_routing event_stream regex identity jabber json jsonrpc mi_html mi_xmlrpc_ng mid_registrar perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rest_client rls sip_i siprec stir_shaken tracer uuid xcap xcap_client xml xmpp
> 
> DEFS+= -DPKG_MALLOC #Use a faster malloc
> DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory
>--- pkg-plist.orig	2021-06-11 19:25:04.617253000 +0200
>+++ pkg-plist	2021-06-11 19:38:14.915707000 +0200
>@@ -25,7 +25,7 @@
> %%LIBDIR%%/modules/benchmark.so
> %%LIBDIR%%/modules/cachedb_local.so
> %%MEMCACHED%%%%LIBDIR%%/modules/cachedb_memcached.so
>-%%LIBDIR%%/modules/cachedb_redis.so
>+%%REDIS%%%%LIBDIR%%/modules/cachedb_redis.so
> %%LIBDIR%%/modules/cachedb_sql.so
> %%LIBDIR%%/modules/call_center.so
> %%LIBDIR%%/modules/call_control.so
>@@ -57,7 +57,7 @@
> %%LIBDIR%%/modules/enum.so
> %%LIBDIR%%/modules/event_datagram.so
> %%LIBDIR%%/modules/event_flatstore.so
>-%%LIBDIR%%/modules/event_rabbitmq.so
>+%%RABBITMQ%%%%LIBDIR%%/modules/event_rabbitmq.so
> %%LIBDIR%%/modules/event_route.so
> %%LIBDIR%%/modules/event_routing.so
> %%LIBDIR%%/modules/event_stream.so
>@@ -117,11 +117,11 @@
> %%LIBDIR%%/modules/pua_mi.so
> %%LIBDIR%%/modules/pua_usrloc.so
> %%LIBDIR%%/modules/pua_xmpp.so
>-%%LIBDIR%%/modules/python.so
>+%%PYTHON%%%%LIBDIR%%/modules/python.so
> %%LIBDIR%%/modules/qos.so
> %%LIBDIR%%/modules/qrouting.so
>-%%LIBDIR%%/modules/rabbitmq.so
>-%%LIBDIR%%/modules/rabbitmq_consumer.so
>+%%RABBITMQ%%%%LIBDIR%%/modules/rabbitmq.so
>+%%RABBITMQ%%%%LIBDIR%%/modules/rabbitmq_consumer.so
> %%LIBDIR%%/modules/rate_cacher.so
> %%LIBDIR%%/modules/ratelimit.so
> %%LIBDIR%%/modules/regex.so
>@@ -203,7 +203,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.benchmark
> %%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local
> %%MEMCACHED%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_memcached
>-%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
>+%%REDIS%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
> %%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql
> %%PORTDOCS%%%%DOCSDIR%%/README.call_center
> %%PORTDOCS%%%%DOCSDIR%%/README.call_control
>@@ -235,7 +235,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.enum
> %%PORTDOCS%%%%DOCSDIR%%/README.event_datagram
> %%PORTDOCS%%%%DOCSDIR%%/README.event_flatstore
>-%%PORTDOCS%%%%DOCSDIR%%/README.event_rabbitmq
>+%%RABBITMQ%%%%PORTDOCS%%%%DOCSDIR%%/README.event_rabbitmq
> %%PORTDOCS%%%%DOCSDIR%%/README.event_route
> %%PORTDOCS%%%%DOCSDIR%%/README.event_routing
> %%PORTDOCS%%%%DOCSDIR%%/README.event_stream
>@@ -295,11 +295,11 @@
> %%PORTDOCS%%%%DOCSDIR%%/README.pua_mi
> %%PORTDOCS%%%%DOCSDIR%%/README.pua_usrloc
> %%PORTDOCS%%%%DOCSDIR%%/README.pua_xmpp
>-%%PORTDOCS%%%%DOCSDIR%%/README.python
>+%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/README.python
> %%PORTDOCS%%%%DOCSDIR%%/README.qos
> %%PORTDOCS%%%%DOCSDIR%%/README.qrouting
>-%%PORTDOCS%%%%DOCSDIR%%/README.rabbitmq
>-%%PORTDOCS%%%%DOCSDIR%%/README.rabbitmq_consumer
>+%%RABBITMQ%%%%PORTDOCS%%%%DOCSDIR%%/README.rabbitmq
>+%%RABBITMQ%%%%PORTDOCS%%%%DOCSDIR%%/README.rabbitmq_consumer
> %%PORTDOCS%%%%DOCSDIR%%/README.rate_cacher
> %%PORTDOCS%%%%DOCSDIR%%/README.ratelimit
> %%PORTDOCS%%%%DOCSDIR%%/README.regex

Actions: View | Diff

Attachments on bug 222718: 186831 | 190589 | 225748 | 227759