Attachment #163494 for bug #204773

Lines 2-11 Link Here

(-)opensips/Makefile (-35 / +21 lines)
2	# $FreeBSD: head/net/opensips/Makefile 398368 2015-10-01 16:34:41Z pi $	2	# $FreeBSD: head/net/opensips/Makefile 398368 2015-10-01 16:34:41Z pi $
3		3
4	PORTNAME= opensips	4	PORTNAME= opensips
5	PORTVERSION= 2.1.0	5	PORTVERSION= 2.1.1
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://opensips.org/pub/opensips/${PORTVERSION}/src/	7	MASTER_SITES= http://opensips.org/pub/opensips/${PORTVERSION}/src/
8	# DISTNAME= opensips-${PORTVERSION}
9		8
10	MAINTAINER= euan@potensol.com	9	MAINTAINER= euan@potensol.com
11	COMMENT= Open SIP Server	10	COMMENT= Open SIP Server
Lines 31-39 Link Here
31	${LOCALBASE}/bin/python2:${PORTSDIR}/lang/python2 \	30	${LOCALBASE}/bin/python2:${PORTSDIR}/lang/python2 \
32	${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep	31	${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep
33		32
34	#CFLAGS+= -I${LOCALBASE}/include/json-c
35	#CPPFLAGS+= -I${LOCALBASE}/include/json-c
36
37	GINSTALL= ginstall	33	GINSTALL= ginstall
38		34
39	WRKSRC= ${WRKDIR}/opensips-${PORTVERSION}	35	WRKSRC= ${WRKDIR}/opensips-${PORTVERSION}
Lines 44-49 Link Here
44	USES= gmake perl5 pkgconfig shebangfix	40	USES= gmake perl5 pkgconfig shebangfix
45	USE_GCC= yes	41	USE_GCC= yes
46		42
		43	NOPRECIOUSMAKEVARS= yes
		44
47	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL PGSQL RADIUS TESTS TLS UNIXODBC	45	OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL PGSQL RADIUS TESTS TLS UNIXODBC
48	OPTIONS_DEFAULT= DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS	46	OPTIONS_DEFAULT= DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
49	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
Lines 113-155 Link Here
113		111
114	.include <bsd.port.options.mk>	112	.include <bsd.port.options.mk>
115		113
116	.if ${PORT_OPTIONS:MGEOIP}	114	GEOIP-on:
117	EXTRA_MODULES+= mmgeoip	115	EXTRA_MODULES+= mmgeoip
118	.endif
119		116
120	.if ${PORT_OPTIONS:MHTTP}	117	HTTP-on:
121	EXTRA_MODULES+= httpd	118	EXTRA_MODULES+= httpd
122	.endif
123		119
124	.if ${PORT_OPTIONS:MLDAP}	120	LDAP-on:
125	EXTRA_MODULES+= ldap h350	121	EXTRA_MODULES+= ldap h350
126	.endif
127		122
128	.if ${PORT_OPTIONS:MMEMCACHED}	123	MEMCACHED-on:
129	EXTRA_MODULES+= cachedb_memcached	124	EXTRA_MODULES+= cachedb_memcached
130	.endif
131		125
132	.if ${PORT_OPTIONS:MMYSQL}	126	MYSQL-on:
133	EXTRA_MODULES+= db_mysql	127	EXTRA_MODULES+= db_mysql
134	.endif
135		128
136	.if ${PORT_OPTIONS:MPGSQL}	129	PGSQL-on:
137	#USES+= pgsql
138	EXTRA_MODULES+= db_postgres	130	EXTRA_MODULES+= db_postgres
139	.endif
140		131
141	.if ${PORT_OPTIONS:MRADIUS}	132	RADIUS-on:
142	EXTRA_MODULES+= aaa_radius	133	EXTRA_MODULES+= aaa_radius
143	.endif
144		134
145	.if ${PORT_OPTIONS:MUNIXODBC}	135	UNIXODBC-on:
146	EXTRA_MODULES+= db_unixodbc	136	EXTRA_MODULES+= db_unixodbc
147	.endif	137
		138	TLS-on:
		139	EXTRA_MODULES+= proto_tls
148		140
149	OPENSIPS_MAKE_ENV= CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"	141	OPENSIPS_MAKE_ENV= CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
150		142
151	do-configure:	143	do-configure:
152	(cp files/Makefile.conf ${WRKSRC})	144	@(cp files/Makefile.conf ${WRKSRC})
153		145
154	@${REINPLACE_CMD} -e "s\|_PREFIX_\|${PREFIX}\|" ${WRKSRC}/Makefile.conf	146	@${REINPLACE_CMD} -e "s\|_PREFIX_\|${PREFIX}\|" ${WRKSRC}/Makefile.conf
155	@${REINPLACE_CMD} -e "s\|_STAGE_DIR_\|${STAGEDIR}\|" ${WRKSRC}/Makefile.conf	147	@${REINPLACE_CMD} -e "s\|_STAGE_DIR_\|${STAGEDIR}\|" ${WRKSRC}/Makefile.conf
Lines 158-171 Link Here
158	@${REINPLACE_CMD} -e "s/$^include_modules=.*$/\1 ${i}/" ${WRKSRC}/Makefile.conf	150	@${REINPLACE_CMD} -e "s/$^include_modules=.*$/\1 ${i}/" ${WRKSRC}/Makefile.conf
159	.endfor	151	.endfor
160		152
161	.if ${PORT_OPTIONS:MTLS}	153	do-configure-DEBUG-off:
162	@${REINPLACE_CMD} -e "s/^#DEFS+= -DUSE_TLS/DEFS+= -DUSE_TLS/" ${WRKSRC}/Makefile.conf
163	@${ECHO_CMD} "TLS=1" >> ${WRKSRC}/Makefile.conf
164	.endif
165
166	.if ! ${PORT_OPTIONS:MDEBUG}
167	@${REINPLACE_CMD} -e "s/^#DEFS+= -DNO_DEBUG/DEFS+= -DNO_DEBUG/" ${WRKSRC}/Makefile.conf	154	@${REINPLACE_CMD} -e "s/^#DEFS+= -DNO_DEBUG/DEFS+= -DNO_DEBUG/" ${WRKSRC}/Makefile.conf
168	.endif
169		155
170	do-build:	156	do-build:
171	cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} ${ALL_TARGET}	157	cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} ${ALL_TARGET}
Lines 173-185 Link Here
173	do-install:	159	do-install:
174	cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}	160	cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
175		161
176	.if ${PORT_OPTIONS:MTESTS}	162	do-install-TESTS-on:
177	(cp -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/opensips)	163	(cp -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/opensips)
178	.endif
179		164
180	.if ${PORT_OPTIONS:MEXAMPLES}	165	do-install-EXAMPLES-on:
181	(cp -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/opensips)	166	(cp -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/opensips)
182	.endif
183		167
184	post-stage:	168	post-stage:
185	@${REINPLACE_CMD} -e "s\|^# MD5=.*\|MD5=\"md5\"\|" ${STAGEDIR}${PREFIX}/etc/opensips/opensipsctlrc.sample	169	@${REINPLACE_CMD} -e "s\|^# MD5=.*\|MD5=\"md5\"\|" ${STAGEDIR}${PREFIX}/etc/opensips/opensipsctlrc.sample
Lines 187-192 Link Here
187	@${REINPLACE_CMD} -e "s\|^# MD5=.*\|MD5=\"md5\"\|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample	171	@${REINPLACE_CMD} -e "s\|^# MD5=.*\|MD5=\"md5\"\|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample
188	@${REINPLACE_CMD} -e "s\|^# GREP=.*\|GREP=\"${LOCALBASE}/bin/egrep\"\|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample	172	@${REINPLACE_CMD} -e "s\|^# GREP=.*\|GREP=\"${LOCALBASE}/bin/egrep\"\|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample
189	(cp ${FILESDIR}/opensips.cfg.sample ${STAGEDIR}${ETCDIR}/opensips.cfg.sample)	173	(cp ${FILESDIR}/opensips.cfg.sample ${STAGEDIR}${ETCDIR}/opensips.cfg.sample)
		174	post-stage-RADIUS-on:
		175	(mv ${STAGEDIR}${ETCDIR}/dictionary.opensips ${STAGEDIR}${ETCDIR}/dictionary.opensips.sample)
190		176
191	# Strip binaries in sbin	177	# Strip binaries in sbin
192	@${ECHO_CMD} "Stripping binaries in ${STAGEDIR}${PREFIX}/sbin/"	178	@${ECHO_CMD} "Stripping binaries in ${STAGEDIR}${PREFIX}/sbin/"
Lines 219-225 Link Here
219	sms.so speeddial.so sst.so statistics.so stun.so textops.so tlsops.so tm.so uac.so \	205	sms.so speeddial.so sst.so statistics.so stun.so textops.so tlsops.so tm.so uac.so \
220	uac_auth.so uac_redirect.so uac_registrant.so uri.so userblacklist.so usrloc.so \	206	uac_auth.so uac_redirect.so uac_registrant.so uri.so userblacklist.so usrloc.so \
221	xcap.so xcap_client.so xmpp.so topology_hiding.so fraud_detection.so rtpengine.so \	207	xcap.so xcap_client.so xmpp.so topology_hiding.so fraud_detection.so rtpengine.so \
222	proto_ws.so	208	proto_ws.so proto_tls.so cachedb_redis.so
223	@if [ -e ${STAGEDIR}${PREFIX}/lib/opensips/modules/${i} ]; then \	209	@if [ -e ${STAGEDIR}${PREFIX}/lib/opensips/modules/${i} ]; then \
224	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opensips/modules/${i}; \	210	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opensips/modules/${i}; \
225	fi	211	fi

Lines 1-2 Link Here

(-)opensips/distinfo (-2 / +2 lines)
1	SHA256 (opensips-2.1.0.tar.gz) = 9dffa61bcf91e17bc6d6d700f669516448875c61accf9c46a67731e260ad958c	1	SHA256 (opensips-2.1.1.tar.gz) = cf6604550a259adcf5a8fa292285aa7bc9f75def7c5b24d920fe5dc7692ce3f0
2	SIZE (opensips-2.1.0.tar.gz) = 8470358	2	SIZE (opensips-2.1.1.tar.gz) = 4734597

Lines 54-60 Link Here

(-)opensips/files/Makefile.conf (-1 / +1 lines)
54		54
55	exclude_modules= aaa_radius b2b_logic cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute compression cpl-c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_unixodbc dialplan emergency event_rabbitmq h350 regex identity jabber json ldap lua httpd mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml proto_sctp proto_tls pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls sngtc snmpstats xcap xcap_client xmpp	55	exclude_modules= aaa_radius b2b_logic cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute compression cpl-c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_unixodbc dialplan emergency event_rabbitmq h350 regex identity jabber json ldap lua httpd mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml proto_sctp proto_tls pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls sngtc snmpstats xcap xcap_client xmpp
56		56
57	include_modules= b2b_logic carrierroute cpl-c dialplan event_rabbitmq regex identity jabber json mi_xmlrpc_ng perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls xcap xcap_client xmpp	57	include_modules= b2b_logic cachedb_redis carrierroute cpl-c dialplan event_rabbitmq regex identity jabber json mi_xmlrpc_ng perl pi_http presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python rest_client rls xcap xcap_client xmpp
58		58
59	DEFS+= -DPKG_MALLOC #Uses a faster malloc (exclusive w/ USE_SHM_MEM)	59	DEFS+= -DPKG_MALLOC #Uses a faster malloc (exclusive w/ USE_SHM_MEM)
60	DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory	60	DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory




--- Makefile.orig	2015-08-27 15:06:47 UTC
+++ Makefile
@@ -46,7 +46,7 @@ auto_gen=lex.yy.c cfg.tab.c   #lexx, yac
 # whether or not to install opensips.cfg or just opensips.cfg.default
 # (opensips.cfg will never be overwritten by make install, this is useful
 #  when creating packages)
-skip_cfg_install?=
+skip_cfg_install=yes
 
 #extra modules to exclude
 skip_modules?=
@@ -509,27 +509,14 @@ install-cfg: $(cfg-prefix)/$(cfg-dir)
 		rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
 		chmod 600 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
 		chmod 700 $(cfg-prefix)/$(cfg-dir)

-			mv -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample \
-				$(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \
-		fi
 		# radius dictionary
 		if [ "$(RADIUSDEPON)" = "yes" ]; then \
 			$(INSTALL_TOUCH) \
 				$(cfg-prefix)/$(cfg-dir)/dictionary.opensips.sample ; \
 			$(INSTALL_CFG) etc/dictionary.opensips \
 				$(cfg-prefix)/$(cfg-dir)/dictionary.opensips.sample ; \
-			if [ ! -f $(cfg-prefix)/$(cfg-dir)/dictionary.opensips ]; then \
-				mv -f $(cfg-prefix)/$(cfg-dir)/dictionary.opensips.sample \
-					$(cfg-prefix)/$(cfg-dir)/dictionary.opensips; \
-			fi; \
 		fi
 		# opensipsctl config
 		$(INSTALL_TOUCH)   $(cfg-prefix)/$(cfg-dir)/opensipsctlrc.sample
 		$(INSTALL_CFG) scripts/opensipsctlrc \

-			mv -f $(cfg-prefix)/$(cfg-dir)/osipsconsolerc.sample \
-				$(cfg-prefix)/$(cfg-dir)/osipsconsolerc; \
-		fi
 
 install-console: $(bin-prefix)/$(bin-dir)
 		# install osipsconsole

Lines 1-4 Link Here

(-)opensips/files/patch-Makefile.defs (-1 / +1 lines)
1	--- Makefile.defs.orig 2015-05-07 16:45:43 UTC	1	--- Makefile.defs.orig 2015-08-27 15:06:47 UTC
2	+++ Makefile.defs	2	+++ Makefile.defs
3	@@ -118,6 +118,14 @@ ifeq ($(OS),solaris)	3	@@ -118,6 +118,14 @@ ifeq ($(OS),solaris)
4	ISSMP ?= yes	4	ISSMP ?= yes




--- io_wait.h.orig	2015-08-27 15:06:47 UTC
+++ io_wait.h
@@ -56,6 +56,9 @@
 
 #include <errno.h>
 #include <string.h>
+#if defined(__FreeBSD__)
+#include "ip_addr.h"
+#endif
 #ifdef HAVE_SIGIO_RT
 #define __USE_GNU /* or else F_SETSIG won't be included */
 #define _GNU_SOURCE /* define this as well */
@@ -348,19 +349,21 @@ inline static int io_watch_add(	io_wait_
 		goto error;
 	}
 	if (prio > h->max_prio) {
-		LM_BUG("[%s] priority %d requested (max is %d)\n",
+		LM_DBG("[%s] priority %d requested (max is %d)\n",
 			h->name, prio, h->max_prio);
 		goto error;
 	}
+#ifdef HAVE_EPOLL
 	LM_DBG("[%s] io_watch_add op (%d on %d) (%p, %d, %d, %p,%d), fd_no=%d/%d\n",
 			h->name,fd,h->epfd, h,fd,type,data,flags,h->fd_no,h->max_fd_no);
+#endif
 	//fd_array_print;
 	/*  hash sanity check */
 	e=get_fd_map(h, fd);
 
 	if (e->flags & flags){
 		if (e->data != data) {
-			LM_BUG("[%s] BUG trying to overwrite entry %d"
+			LM_DBG("[%s] BUG trying to overwrite entry %d"
 					" in the hash(%d, %d, %p,%d) with (%d, %d, %p,%d)\n",
 					h->name,fd, e->fd, e->type, e->data,e->flags, fd, type, data,flags);
 			goto error;

Line 0 Link Here

(-)opensips/files/patch-mem__shm_mem.h (+10 lines)
	1	--- mem/shm_mem.h.orig 2015-08-27 15:06:47 UTC
	2	+++ mem/shm_mem.h
	3	@@ -62,6 +62,7 @@
	4	#endif
	5	#endif
	6
	7	+#include "../error.h"
	8	#include "../dprint.h"
	9	#include "../lock_ops.h" /* we don't include locking.h on purpose */
	10	#include "common.h"

Line 0 Link Here

(-)opensips/files/patch-modules__proto_tls__proto_tls.c (+10 lines)
	1	--- modules/proto_tls/proto_tls.c.orig 2015-08-27 15:06:47 UTC
	2	+++ modules/proto_tls/proto_tls.c
	3	@@ -42,6 +42,7 @@
	4	#include <openssl/opensslv.h>
	5	#include <openssl/err.h>
	6
	7	+#include <netinet/in.h>
	8	#include <netinet/in_systm.h>
	9	#include <netinet/tcp.h>
	10	#include <netinet/ip.h>

Lines 1-10 Link Here

(-)opensips/files/patch-net__net_tcp.c (-10 lines)
1	--- net/net_tcp.c.orig 2015-04-22 08:20:03 UTC
2	+++ net/net_tcp.c
3	@@ -26,6 +26,7 @@
4
5	#include <sys/types.h>
6	#include <sys/socket.h>
7	+#include <netinet/in.h>
8	#include <netinet/in_systm.h>
9	#include <netinet/ip.h>
10	#include <netinet/tcp.h>

Lines 1-10 Link Here

(-)opensips/files/patch-net__net_tcp_proc.c (-10 lines)
1	--- net/net_tcp_proc.c.orig 2015-04-22 08:20:03 UTC
2	+++ net/net_tcp_proc.c
3	@@ -26,6 +26,7 @@
4
5	#include "../timer.h"
6	#include "../reactor.h"
7	+#include "../pt.h"
8	#include "tcp_conn.h"
9	#include "tcp_passfd.h"
10




@sample %%ETCDIR%%/opensips.cfg.sample
@sample %%ETCDIR%%/opensipsctlrc.sample
@sample %%ETCDIR%%/osipsconsolerc.sample
%%RADIUS%%@sample %%ETCDIR%%/dictionary.opensips.sample
lib/opensips/modules/acc.so
lib/opensips/modules/alias_db.so
lib/opensips/modules/auth.so

lib/opensips/modules/benchmark.so
lib/opensips/modules/cachedb_local.so
lib/opensips/modules/cachedb_sql.so
lib/opensips/modules/cachedb_redis.so
lib/opensips/modules/call_center.so
lib/opensips/modules/call_control.so
lib/opensips/modules/carrierroute.so

%%PGSQL%%lib/opensips/opensipsctl/opensipsdbctl.pgsql
%%RADIUS%%lib/opensips/modules/aaa_radius.so
%%UNIXODBC%%lib/opensips/modules/db_unixodbc.so
%%TLS%%lib/opensips/modules/proto_tls.so
lib/opensips/opensipsctl/dbtextdb/dbtextdb.py
lib/opensips/opensipsctl/opensipsctl.base
lib/opensips/opensipsctl/opensipsctl.ctlbase

%%PORTDOCS%%%%DOCSDIR%%/README.benchmark
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql
%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
%%PORTDOCS%%%%DOCSDIR%%/README.call_center
%%PORTDOCS%%%%DOCSDIR%%/README.call_control
%%PORTDOCS%%%%DOCSDIR%%/README.carrierroute

%%PORTDOCS%%%%DOCSDIR%%/README.xcap
%%PORTDOCS%%%%DOCSDIR%%/README.xcap_client
%%PORTDOCS%%%%DOCSDIR%%/README.xmpp
%%GEOIP%%%%PORTDOCS%%%%DOCSDIR%%/README.mmgeoip
%%HTTP%%%%PORTDOCS%%%%DOCSDIR%%/README.httpd
%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.h350
%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
%%MEMCACHED%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_memcached
%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/README.db_mysql
%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/README.db_postgres
%%RADIUS%%%%PORTDOCS%%%%DOCSDIR%%/README.aaa_radius
%%UNIXODBC%%%%PORTDOCS%%%%%DOCSDIR%%/README.db_unixodbc
%%TLS%%%%PORTDOCS%%%%DOCSDIR%%/README.proto_tls
%%DATADIR%%/dbtext/opensips/acc
%%DATADIR%%/dbtext/opensips/active_watchers
%%DATADIR%%/dbtext/opensips/address

%%DATADIR%%/pi_http/userblacklist-table
%%DATADIR%%/pi_http/usrloc-mod
%%DATADIR%%/pi_http/usrloc-table
%%MYSQL%%%%DATADIR%%/mysql/emergency-create.sql
%%MYSQL%%share/opensips/mysql/acc-create.sql
%%MYSQL%%share/opensips/mysql/alias_db-create.sql
%%MYSQL%%share/opensips/mysql/auth_db-create.sql

%%EXAMPLES%%share/examples/opensips/web_im/send_im.php
%%DATADIR%%/dbtext/opensips/dr_partitions
%%DATADIR%%/dbtext/opensips/fraud_detection
%%DATADIR%%/dbtext/opensips/emergency_report
%%DATADIR%%/dbtext/opensips/emergency_routing
%%DATADIR%%/pi_http/fraud_detection-mod
%%DATADIR%%/pi_http/fraud_detection-table
%%DATADIR%%/pi_http/emergency-mod
%%DATADIR%%/pi_http/emergency-table
%%PGSQL%%%%DATADIR%%/postgres/fraud_detection-create.sql
%%PGSQL%%%%DATADIR%%/postgres/emergency-create.sql
%%MYSQL%%%%DATADIR%%/mysql/fraud_detection-create.sql
%%TLS%%%%ETCDIR%%/tls/README
%%TLS%%%%ETCDIR%%/tls/ca.conf
%%TLS%%%%ETCDIR%%/tls/request.conf
%%TLS%%%%ETCDIR%%/tls/rootCA/cacert.pem
%%TLS%%%%ETCDIR%%/tls/rootCA/certs/01.pem
%%TLS%%%%ETCDIR%%/tls/rootCA/index.txt
%%TLS%%%%ETCDIR%%/tls/rootCA/private/cakey.pem
%%TLS%%%%ETCDIR%%/tls/rootCA/serial
%%TLS%%%%ETCDIR%%/tls/user.conf
%%TLS%%%%ETCDIR%%/tls/user/user-calist.pem
%%TLS%%%%ETCDIR%%/tls/user/user-cert.pem
%%TLS%%%%ETCDIR%%/tls/user/user-cert_req.pem
%%TLS%%%%ETCDIR%%/tls/user/user-privkey.pem

Return to bug 204773

Lines 1-15 Link Here

(-)opensips/files/patch-Makefile (-18 / +7 lines)
1	--- Makefile.orig 2015-04-22 08:20:03 UTC	1	--- Makefile.orig 2015-08-27 15:06:47 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -39,7 +39,7 @@ auto_gen=lex.yy.c cfg.tab.c #lexx, yac	3	@@ -46,7 +46,7 @@ auto_gen=lex.yy.c cfg.tab.c #lexx, yac
4	# whether or not to install opensips.cfg or just opensips.cfg.default	4	# whether or not to install opensips.cfg or just opensips.cfg.default
5	# (opensips.cfg will never be overwritten by make install, this is usefull	5	# (opensips.cfg will never be overwritten by make install, this is useful
6	# when creating packages)	6	# when creating packages)
7	-skip_cfg_install?=	7	-skip_cfg_install?=
8	+skip_cfg_install=yes	8	+skip_cfg_install=yes
9		9
10	#extra modules to exclude	10	#extra modules to exclude
11	skip_modules?=	11	skip_modules?=
12	@@ -540,38 +540,21 @@ install-cfg: $(cfg-prefix)/$(cfg-dir)	12	@@ -509,27 +509,14 @@ install-cfg: $(cfg-prefix)/$(cfg-dir)
13	rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0	13	rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
14	chmod 600 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample	14	chmod 600 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
15	chmod 700 $(cfg-prefix)/$(cfg-dir)	15	chmod 700 $(cfg-prefix)/$(cfg-dir)
Lines 18-34 Link Here
18	- mv -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample \	18	- mv -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample \
19	- $(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \	19	- $(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \
20	- fi	20	- fi
21	# radius dictionary
22	if [ "$(RADIUSDEPON)" = "yes" ]; then \
23	$(INSTALL_TOUCH) \
24	$(cfg-prefix)/$(cfg-dir)/dictionary.opensips.sample ; \
25	$(INSTALL_CFG) etc/dictionary.opensips \
26	$(cfg-prefix)/$(cfg-dir)/dictionary.opensips.sample ; \
27	- if [ ! -f $(cfg-prefix)/$(cfg-dir)/dictionary.opensips ]; then \
28	- mv -f $(cfg-prefix)/$(cfg-dir)/dictionary.opensips.sample \
29	- $(cfg-prefix)/$(cfg-dir)/dictionary.opensips; \
30	- fi; \
31	fi
32	# opensipsctl config	21	# opensipsctl config
33	$(INSTALL_TOUCH) $(cfg-prefix)/$(cfg-dir)/opensipsctlrc.sample	22	$(INSTALL_TOUCH) $(cfg-prefix)/$(cfg-dir)/opensipsctlrc.sample
34	$(INSTALL_CFG) scripts/opensipsctlrc \	23	$(INSTALL_CFG) scripts/opensipsctlrc \
Lines 45-50 Link Here
45	- mv -f $(cfg-prefix)/$(cfg-dir)/osipsconsolerc.sample \	34	- mv -f $(cfg-prefix)/$(cfg-dir)/osipsconsolerc.sample \
46	- $(cfg-prefix)/$(cfg-dir)/osipsconsolerc; \	35	- $(cfg-prefix)/$(cfg-dir)/osipsconsolerc; \
47	- fi	36	- fi
48	#$(INSTALL_CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir)	37
49	mkdir -p $(cfg-prefix)/$(cfg-dir)/tls ; \	38	install-console: $(bin-prefix)/$(bin-dir)
50	mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/rootCA ; \	39	# install osipsconsole

Lines 1-34 Link Here

(-)opensips/files/patch-io_wait.h (-26 / +4 lines)
1	--- io_wait.h.orig 2015-05-07 14:13:54 UTC	1	--- io_wait.h.orig 2015-08-27 15:06:47 UTC
2	+++ io_wait.h	2	+++ io_wait.h
3	@@ -56,6 +56,7 @@	3	@@ -56,6 +56,9 @@
4		4
5	#include <errno.h>	5	#include <errno.h>
6	#include <string.h>	6	#include <string.h>
		7	+#if defined(__FreeBSD__)
7	+#include "ip_addr.h"	8	+#include "ip_addr.h"
		9	+#endif
8	#ifdef HAVE_SIGIO_RT	10	#ifdef HAVE_SIGIO_RT
9	#define __USE_GNU /* or else F_SETSIG won't be included */	11	#define __USE_GNU /* or else F_SETSIG won't be included */
10	#define _GNU_SOURCE /* define this as well */	12	#define _GNU_SOURCE /* define this as well */
11	@@ -348,19 +349,21 @@ inline static int io_watch_add( io_wait_
12	goto error;
13	}
14	if (prio > h->max_prio) {
15	- LM_BUG("[%s] priority %d requested (max is %d)\n",
16	+ LM_DBG("[%s] priority %d requested (max is %d)\n",
17	h->name, prio, h->max_prio);
18	goto error;
19	}
20	+#ifdef HAVE_EPOLL
21	LM_DBG("[%s] io_watch_add op (%d on %d) (%p, %d, %d, %p,%d), fd_no=%d/%d\n",
22	h->name,fd,h->epfd, h,fd,type,data,flags,h->fd_no,h->max_fd_no);
23	+#endif
24	//fd_array_print;
25	/* hash sanity check */
26	e=get_fd_map(h, fd);
27
28	if (e->flags & flags){
29	if (e->data != data) {
30	- LM_BUG("[%s] BUG trying to overwrite entry %d"
31	+ LM_DBG("[%s] BUG trying to overwrite entry %d"
32	" in the hash(%d, %d, %p,%d) with (%d, %d, %p,%d)\n",
33	h->name,fd, e->fd, e->type, e->data,e->flags, fd, type, data,flags);
34	goto error;

Lines 1-7 Link Here

(-)opensips/pkg-plist (-16 / +36 lines)
1	@sample etc/opensips/opensips.cfg.sample	1	@sample %%ETCDIR%%/opensips.cfg.sample
2	@sample etc/opensips/opensipsctlrc.sample	2	@sample %%ETCDIR%%/opensipsctlrc.sample
3	@sample etc/opensips/osipsconsolerc.sample	3	@sample %%ETCDIR%%/osipsconsolerc.sample
4	%%RADIUS%%@sample etc/opensips/dictionary.opensips.sample	4	%%RADIUS%%@sample %%ETCDIR%%/dictionary.opensips.sample
5	lib/opensips/modules/acc.so	5	lib/opensips/modules/acc.so
6	lib/opensips/modules/alias_db.so	6	lib/opensips/modules/alias_db.so
7	lib/opensips/modules/auth.so	7	lib/opensips/modules/auth.so
Lines 14-19 Link Here
14	lib/opensips/modules/benchmark.so	14	lib/opensips/modules/benchmark.so
15	lib/opensips/modules/cachedb_local.so	15	lib/opensips/modules/cachedb_local.so
16	lib/opensips/modules/cachedb_sql.so	16	lib/opensips/modules/cachedb_sql.so
		17	lib/opensips/modules/cachedb_redis.so
17	lib/opensips/modules/call_center.so	18	lib/opensips/modules/call_center.so
18	lib/opensips/modules/call_control.so	19	lib/opensips/modules/call_control.so
19	lib/opensips/modules/carrierroute.so	20	lib/opensips/modules/carrierroute.so
Lines 126-131 Link Here
126	%%PGSQL%%lib/opensips/opensipsctl/opensipsdbctl.pgsql	127	%%PGSQL%%lib/opensips/opensipsctl/opensipsdbctl.pgsql
127	%%RADIUS%%lib/opensips/modules/aaa_radius.so	128	%%RADIUS%%lib/opensips/modules/aaa_radius.so
128	%%UNIXODBC%%lib/opensips/modules/db_unixodbc.so	129	%%UNIXODBC%%lib/opensips/modules/db_unixodbc.so
		130	%%TLS%%lib/opensips/modules/proto_tls.so
129	lib/opensips/opensipsctl/dbtextdb/dbtextdb.py	131	lib/opensips/opensipsctl/dbtextdb/dbtextdb.py
130	lib/opensips/opensipsctl/opensipsctl.base	132	lib/opensips/opensipsctl/opensipsctl.base
131	lib/opensips/opensipsctl/opensipsctl.ctlbase	133	lib/opensips/opensipsctl/opensipsctl.ctlbase
Lines 182-187 Link Here
182	%%PORTDOCS%%%%DOCSDIR%%/README.benchmark	184	%%PORTDOCS%%%%DOCSDIR%%/README.benchmark
183	%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local	185	%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_local
184	%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql	186	%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_sql
		187	%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_redis
185	%%PORTDOCS%%%%DOCSDIR%%/README.call_center	188	%%PORTDOCS%%%%DOCSDIR%%/README.call_center
186	%%PORTDOCS%%%%DOCSDIR%%/README.call_control	189	%%PORTDOCS%%%%DOCSDIR%%/README.call_control
187	%%PORTDOCS%%%%DOCSDIR%%/README.carrierroute	190	%%PORTDOCS%%%%DOCSDIR%%/README.carrierroute
Lines 281-295 Link Here
281	%%PORTDOCS%%%%DOCSDIR%%/README.xcap	284	%%PORTDOCS%%%%DOCSDIR%%/README.xcap
282	%%PORTDOCS%%%%DOCSDIR%%/README.xcap_client	285	%%PORTDOCS%%%%DOCSDIR%%/README.xcap_client
283	%%PORTDOCS%%%%DOCSDIR%%/README.xmpp	286	%%PORTDOCS%%%%DOCSDIR%%/README.xmpp
284	%%PORTDOCS%%%%GEOIP%%%%DOCSDIR%%/README.mmgeoip	287	%%GEOIP%%%%PORTDOCS%%%%DOCSDIR%%/README.mmgeoip
285	%%PORTDOCS%%%%HTTP%%%%DOCSDIR%%/README.httpd	288	%%HTTP%%%%PORTDOCS%%%%DOCSDIR%%/README.httpd
286	%%PORTDOCS%%%%LDAP%%%%DOCSDIR%%/README.h350	289	%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.h350
287	%%PORTDOCS%%%%LDAP%%%%DOCSDIR%%/README.ldap	290	%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
288	%%PORTDOCS%%%%MEMCACHED%%%%DOCSDIR%%/README.cachedb_memcached	291	%%MEMCACHED%%%%PORTDOCS%%%%DOCSDIR%%/README.cachedb_memcached
289	%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/README.db_mysql	292	%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/README.db_mysql
290	%%PORTDOCS%%%%PGSQL%%%%DOCSDIR%%/README.db_postgres	293	%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/README.db_postgres
291	%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/README.aaa_radius	294	%%RADIUS%%%%PORTDOCS%%%%DOCSDIR%%/README.aaa_radius
292	%%PORTDOCS%%%%UNIXODBC%%%%DOCSDIR%%/README.db_unixodbc	295	%%UNIXODBC%%%%PORTDOCS%%%%%DOCSDIR%%/README.db_unixodbc
		296	%%TLS%%%%PORTDOCS%%%%DOCSDIR%%/README.proto_tls
293	%%DATADIR%%/dbtext/opensips/acc	297	%%DATADIR%%/dbtext/opensips/acc
294	%%DATADIR%%/dbtext/opensips/active_watchers	298	%%DATADIR%%/dbtext/opensips/active_watchers
295	%%DATADIR%%/dbtext/opensips/address	299	%%DATADIR%%/dbtext/opensips/address
Lines 427-432 Link Here
427	%%DATADIR%%/pi_http/userblacklist-table	431	%%DATADIR%%/pi_http/userblacklist-table
428	%%DATADIR%%/pi_http/usrloc-mod	432	%%DATADIR%%/pi_http/usrloc-mod
429	%%DATADIR%%/pi_http/usrloc-table	433	%%DATADIR%%/pi_http/usrloc-table
		434	%%MYSQL%%%%DATADIR%%/mysql/emergency-create.sql
430	%%MYSQL%%share/opensips/mysql/acc-create.sql	435	%%MYSQL%%share/opensips/mysql/acc-create.sql
431	%%MYSQL%%share/opensips/mysql/alias_db-create.sql	436	%%MYSQL%%share/opensips/mysql/alias_db-create.sql
432	%%MYSQL%%share/opensips/mysql/auth_db-create.sql	437	%%MYSQL%%share/opensips/mysql/auth_db-create.sql
Lines 589-598 Link Here
589	%%EXAMPLES%%share/examples/opensips/web_im/send_im.php	594	%%EXAMPLES%%share/examples/opensips/web_im/send_im.php
590	%%DATADIR%%/dbtext/opensips/dr_partitions	595	%%DATADIR%%/dbtext/opensips/dr_partitions
591	%%DATADIR%%/dbtext/opensips/fraud_detection	596	%%DATADIR%%/dbtext/opensips/fraud_detection
		597	%%DATADIR%%/dbtext/opensips/emergency_report
		598	%%DATADIR%%/dbtext/opensips/emergency_routing
592	%%DATADIR%%/pi_http/fraud_detection-mod	599	%%DATADIR%%/pi_http/fraud_detection-mod
593	%%DATADIR%%/pi_http/fraud_detection-table	600	%%DATADIR%%/pi_http/fraud_detection-table
		601	%%DATADIR%%/pi_http/emergency-mod
		602	%%DATADIR%%/pi_http/emergency-table
594	%%PGSQL%%%%DATADIR%%/postgres/fraud_detection-create.sql	603	%%PGSQL%%%%DATADIR%%/postgres/fraud_detection-create.sql
		604	%%PGSQL%%%%DATADIR%%/postgres/emergency-create.sql
595	%%MYSQL%%%%DATADIR%%/mysql/fraud_detection-create.sql	605	%%MYSQL%%%%DATADIR%%/mysql/fraud_detection-create.sql
596	@dir %%ETCDIR%%/tls/rootCA/certs	606	%%TLS%%%%ETCDIR%%/tls/README
597	@dir %%ETCDIR%%/tls/rootCA/private	607	%%TLS%%%%ETCDIR%%/tls/ca.conf
598	@dir %%ETCDIR%%/tls/user	608	%%TLS%%%%ETCDIR%%/tls/request.conf
		609	%%TLS%%%%ETCDIR%%/tls/rootCA/cacert.pem
		610	%%TLS%%%%ETCDIR%%/tls/rootCA/certs/01.pem
		611	%%TLS%%%%ETCDIR%%/tls/rootCA/index.txt
		612	%%TLS%%%%ETCDIR%%/tls/rootCA/private/cakey.pem
		613	%%TLS%%%%ETCDIR%%/tls/rootCA/serial
		614	%%TLS%%%%ETCDIR%%/tls/user.conf
		615	%%TLS%%%%ETCDIR%%/tls/user/user-calist.pem
		616	%%TLS%%%%ETCDIR%%/tls/user/user-cert.pem
		617	%%TLS%%%%ETCDIR%%/tls/user/user-cert_req.pem
		618	%%TLS%%%%ETCDIR%%/tls/user/user-privkey.pem