svn commit: r402407 - in head/net/opensips: . files
Kurt Jaeger
pi at FreeBSD.org
Wed Nov 25 19:28:03 UTC 2015
Author: pi
Date: Wed Nov 25 19:28:00 2015
New Revision: 402407
URL: https://svnweb.freebsd.org/changeset/ports/402407
Log:
net/opensips: 2.1.0 -> 2.1.1
Changes:
http://opensips.org/pub/opensips/2.1.1/ChangeLog
PR: 204773
Submitted by: Euan Thoms <euan at potensol.com> (maintainer)
Added:
head/net/opensips/files/patch-mem__shm_mem.h (contents, props changed)
head/net/opensips/files/patch-modules__proto_tls__proto_tls.c (contents, props changed)
Deleted:
head/net/opensips/files/patch-net__net_tcp.c
head/net/opensips/files/patch-net__net_tcp_proc.c
Modified:
head/net/opensips/Makefile
head/net/opensips/distinfo
head/net/opensips/files/Makefile.conf
head/net/opensips/files/patch-Makefile
head/net/opensips/files/patch-Makefile.defs
head/net/opensips/files/patch-io_wait.h
head/net/opensips/pkg-plist
Modified: head/net/opensips/Makefile
==============================================================================
--- head/net/opensips/Makefile Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/Makefile Wed Nov 25 19:28:00 2015 (r402407)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= opensips
-PORTVERSION= 2.1.0
+PORTVERSION= 2.1.1
CATEGORIES= net
MASTER_SITES= http://opensips.org/pub/opensips/${PORTVERSION}/src/
-# DISTNAME= opensips-${PORTVERSION}
MAINTAINER= euan at potensol.com
COMMENT= Open SIP Server
@@ -31,9 +30,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PO
${LOCALBASE}/bin/python2:${PORTSDIR}/lang/python2 \
${LOCALBASE}/bin/grep:${PORTSDIR}/textproc/gnugrep
-#CFLAGS+= -I${LOCALBASE}/include/json-c
-#CPPFLAGS+= -I${LOCALBASE}/include/json-c
-
GINSTALL= ginstall
WRKSRC= ${WRKDIR}/opensips-${PORTVERSION}
@@ -44,6 +40,8 @@ USE_RC_SUBR= opensips
USES= gmake perl5 pkgconfig shebangfix
USE_GCC= yes
+NOPRECIOUSMAKEVARS= yes
+
OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL PGSQL RADIUS TESTS TLS UNIXODBC
OPTIONS_DEFAULT= DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
OPTIONS_SUB= yes
@@ -134,7 +132,6 @@ EXTRA_MODULES+= db_mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-#USES+= pgsql
EXTRA_MODULES+= db_postgres
.endif
@@ -146,10 +143,14 @@ EXTRA_MODULES+= aaa_radius
EXTRA_MODULES+= db_unixodbc
.endif
+.if ${PORT_OPTIONS:MTLS}
+EXTRA_MODULES+= proto_tls
+.endif
+
OPENSIPS_MAKE_ENV= CC="${CC}" CXX="${CXX}" CPP="${CPP}" _GCC_RUNTIME="${_GCC_RUNTIME}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
do-configure:
- (cp files/Makefile.conf ${WRKSRC})
+ @(cp files/Makefile.conf ${WRKSRC})
@${REINPLACE_CMD} -e "s|_PREFIX_|${PREFIX}|" ${WRKSRC}/Makefile.conf
@${REINPLACE_CMD} -e "s|_STAGE_DIR_|${STAGEDIR}|" ${WRKSRC}/Makefile.conf
@@ -158,14 +159,8 @@ do-configure:
@${REINPLACE_CMD} -e "s/\(^include_modules=.*\)/\1 ${i}/" ${WRKSRC}/Makefile.conf
.endfor
-.if ${PORT_OPTIONS:MTLS}
- @${REINPLACE_CMD} -e "s/^#DEFS+= -DUSE_TLS/DEFS+= -DUSE_TLS/" ${WRKSRC}/Makefile.conf
- @${ECHO_CMD} "TLS=1" >> ${WRKSRC}/Makefile.conf
-.endif
-
-.if ! ${PORT_OPTIONS:MDEBUG}
+do-configure-DEBUG-off:
@${REINPLACE_CMD} -e "s/^#DEFS+= -DNO_DEBUG/DEFS+= -DNO_DEBUG/" ${WRKSRC}/Makefile.conf
-.endif
do-build:
cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} ${ALL_TARGET}
@@ -173,13 +168,11 @@ do-build:
do-install:
cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
-.if ${PORT_OPTIONS:MTESTS}
+do-install-TESTS-on:
(cp -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/opensips)
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+do-install-EXAMPLES-on:
(cp -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/opensips)
-.endif
post-stage:
@${REINPLACE_CMD} -e "s|^# MD5=.*|MD5=\"md5\"|" ${STAGEDIR}${PREFIX}/etc/opensips/opensipsctlrc.sample
@@ -188,6 +181,9 @@ post-stage:
@${REINPLACE_CMD} -e "s|^# GREP=.*|GREP=\"${LOCALBASE}/bin/egrep\"|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample
(cp ${FILESDIR}/opensips.cfg.sample ${STAGEDIR}${ETCDIR}/opensips.cfg.sample)
+post-stage-RADIUS-on:
+ (mv ${STAGEDIR}${ETCDIR}/dictionary.opensips ${STAGEDIR}${ETCDIR}/dictionary.opensips.sample)
+
# Strip binaries in sbin
@${ECHO_CMD} "Stripping binaries in ${STAGEDIR}${PREFIX}/sbin/"
@@ -219,7 +215,7 @@ post-stage:
sms.so speeddial.so sst.so statistics.so stun.so textops.so tlsops.so tm.so uac.so \
uac_auth.so uac_redirect.so uac_registrant.so uri.so userblacklist.so usrloc.so \
xcap.so xcap_client.so xmpp.so topology_hiding.so fraud_detection.so rtpengine.so \
- proto_ws.so
+ proto_ws.so proto_tls.so cachedb_redis.so
@if [ -e ${STAGEDIR}${PREFIX}/lib/opensips/modules/${i} ]; then \
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opensips/modules/${i}; \
fi
Modified: head/net/opensips/distinfo
==============================================================================
--- head/net/opensips/distinfo Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/distinfo Wed Nov 25 19:28:00 2015 (r402407)
@@ -1,2 +1,2 @@
-SHA256 (opensips-2.1.0.tar.gz) = 9dffa61bcf91e17bc6d6d700f669516448875c61accf9c46a67731e260ad958c
-SIZE (opensips-2.1.0.tar.gz) = 8470358
+SHA256 (opensips-2.1.1.tar.gz) = cf6604550a259adcf5a8fa292285aa7bc9f75def7c5b24d920fe5dc7692ce3f0
+SIZE (opensips-2.1.1.tar.gz) = 4734597
Modified: head/net/opensips/files/Makefile.conf
==============================================================================
--- head/net/opensips/files/Makefile.conf Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/files/Makefile.conf Wed Nov 25 19:28:00 2015 (r402407)
@@ -54,7 +54,7 @@
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
-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
+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
DEFS+= -DPKG_MALLOC #Uses a faster malloc (exclusive w/ USE_SHM_MEM)
DEFS+= -DSHM_MMAP #Use mmap instead of SYSV shared memory
Modified: head/net/opensips/files/patch-Makefile
==============================================================================
--- head/net/opensips/files/patch-Makefile Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/files/patch-Makefile Wed Nov 25 19:28:00 2015 (r402407)
@@ -1,15 +1,15 @@
---- Makefile.orig 2015-04-22 08:20:03 UTC
+--- Makefile.orig 2015-08-27 15:06:47 UTC
+++ Makefile
-@@ -39,7 +39,7 @@ auto_gen=lex.yy.c cfg.tab.c #lexx, yac
+@@ -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 usefull
+ # (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?=
-@@ -540,38 +540,21 @@ install-cfg: $(cfg-prefix)/$(cfg-dir)
+@@ -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)
@@ -18,17 +18,6 @@
- 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 \
@@ -45,6 +34,6 @@
- mv -f $(cfg-prefix)/$(cfg-dir)/osipsconsolerc.sample \
- $(cfg-prefix)/$(cfg-dir)/osipsconsolerc; \
- fi
- #$(INSTALL_CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir)
- mkdir -p $(cfg-prefix)/$(cfg-dir)/tls ; \
- mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/rootCA ; \
+
+ install-console: $(bin-prefix)/$(bin-dir)
+ # install osipsconsole
Modified: head/net/opensips/files/patch-Makefile.defs
==============================================================================
--- head/net/opensips/files/patch-Makefile.defs Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/files/patch-Makefile.defs Wed Nov 25 19:28:00 2015 (r402407)
@@ -1,4 +1,4 @@
---- Makefile.defs.orig 2015-05-07 16:45:43 UTC
+--- Makefile.defs.orig 2015-08-27 15:06:47 UTC
+++ Makefile.defs
@@ -118,6 +118,14 @@ ifeq ($(OS),solaris)
ISSMP ?= yes
Modified: head/net/opensips/files/patch-io_wait.h
==============================================================================
--- head/net/opensips/files/patch-io_wait.h Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/files/patch-io_wait.h Wed Nov 25 19:28:00 2015 (r402407)
@@ -1,34 +1,12 @@
---- io_wait.h.orig 2015-05-07 14:13:54 UTC
+--- io_wait.h.orig 2015-08-27 15:06:47 UTC
+++ io_wait.h
-@@ -56,6 +56,7 @@
+@@ -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;
Added: head/net/opensips/files/patch-mem__shm_mem.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/opensips/files/patch-mem__shm_mem.h Wed Nov 25 19:28:00 2015 (r402407)
@@ -0,0 +1,10 @@
+--- mem/shm_mem.h.orig 2015-08-27 15:06:47 UTC
++++ mem/shm_mem.h
+@@ -62,6 +62,7 @@
+ #endif
+ #endif
+
++#include "../error.h"
+ #include "../dprint.h"
+ #include "../lock_ops.h" /* we don't include locking.h on purpose */
+ #include "common.h"
Added: head/net/opensips/files/patch-modules__proto_tls__proto_tls.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/opensips/files/patch-modules__proto_tls__proto_tls.c Wed Nov 25 19:28:00 2015 (r402407)
@@ -0,0 +1,10 @@
+--- modules/proto_tls/proto_tls.c.orig 2015-08-27 15:06:47 UTC
++++ modules/proto_tls/proto_tls.c
+@@ -42,6 +42,7 @@
+ #include <openssl/opensslv.h>
+ #include <openssl/err.h>
+
++#include <netinet/in.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/tcp.h>
+ #include <netinet/ip.h>
Modified: head/net/opensips/pkg-plist
==============================================================================
--- head/net/opensips/pkg-plist Wed Nov 25 18:55:37 2015 (r402406)
+++ head/net/opensips/pkg-plist Wed Nov 25 19:28:00 2015 (r402407)
@@ -1,7 +1,7 @@
- at sample etc/opensips/opensips.cfg.sample
- at sample etc/opensips/opensipsctlrc.sample
- at sample etc/opensips/osipsconsolerc.sample
-%%RADIUS%%@sample etc/opensips/dictionary.opensips.sample
+ at sample %%ETCDIR%%/opensips.cfg.sample
+ at sample %%ETCDIR%%/opensipsctlrc.sample
+ at 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
@@ -14,6 +14,7 @@ lib/opensips/modules/b2b_sca.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
@@ -126,6 +127,7 @@ lib/opensips/modules/xmpp.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
@@ -182,6 +184,7 @@ sbin/osipsconsole
%%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
@@ -281,15 +284,16 @@ sbin/osipsconsole
%%PORTDOCS%%%%DOCSDIR%%/README.xcap
%%PORTDOCS%%%%DOCSDIR%%/README.xcap_client
%%PORTDOCS%%%%DOCSDIR%%/README.xmpp
-%%PORTDOCS%%%%GEOIP%%%%DOCSDIR%%/README.mmgeoip
-%%PORTDOCS%%%%HTTP%%%%DOCSDIR%%/README.httpd
-%%PORTDOCS%%%%LDAP%%%%DOCSDIR%%/README.h350
-%%PORTDOCS%%%%LDAP%%%%DOCSDIR%%/README.ldap
-%%PORTDOCS%%%%MEMCACHED%%%%DOCSDIR%%/README.cachedb_memcached
-%%PORTDOCS%%%%MYSQL%%%%DOCSDIR%%/README.db_mysql
-%%PORTDOCS%%%%PGSQL%%%%DOCSDIR%%/README.db_postgres
-%%PORTDOCS%%%%RADIUS%%%%DOCSDIR%%/README.aaa_radius
-%%PORTDOCS%%%%UNIXODBC%%%%DOCSDIR%%/README.db_unixodbc
+%%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
@@ -427,6 +431,7 @@ sbin/osipsconsole
%%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
@@ -589,10 +594,25 @@ sbin/osipsconsole
%%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
- at dir %%ETCDIR%%/tls/rootCA/certs
- at dir %%ETCDIR%%/tls/rootCA/private
- at dir %%ETCDIR%%/tls/user
+%%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
More information about the svn-ports-all
mailing list