5 files changed, 114 insertions, 75 deletions

diff --git a/net/openser/Makefile b/net/openser/Makefile
index d76746f0cc11..2100f06bdf29 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openser
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
@@ -25,25 +25,30 @@ MAKE_ENV=	CC="${CC}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-PLIST_FILES=	sbin/openser sbin/openser_gen_ha1 sbin/openser_mysql.sh \
-		sbin/openserctl sbin/openserunix sbin/openser_postgresql.sh
-PLIST_DIRS=	lib/openser/modules lib/openser
+PLIST_FILES=	sbin/openser sbin/openserctl sbin/openserunix \
+		lib/openser/openserctl/openserctl.base lib/openser/openserctl/openserctl.ctlbase \
+		lib/openser/openserctl/openserctl.fifo lib/openser/openserctl/openserctl.sqlbase \
+		lib/openser/openserctl/openserctl.unixsock etc/openser/openserctlrc
+
+PLIST_DIRS=	lib/openser/modules lib/openser/openserctl lib/openser
 
 MODULES=	acc alias_db auth auth_db auth_diameter avpops cpl-c dbtext \
-		dispatcher diversion domain enum exec flatstore gflags group \
-		lcr mangler maxfwd mediaproxy msilo nathelper options pa pdt \
-		permissions pike registrar rr sl sms speeddial textops tm uac \
-		uac_redirect uri uri_db usrloc xlog
+		dialog dispatcher diversion domain enum exec flatstore gflags \
+		group lcr mangler maxfwd mediaproxy msilo nathelper options \
+		pa path pdt permissions pike registrar rr siptrace sl sms \
+		speeddial statistics textops tm uac uac_redirect uri \
+		uri_db usrloc xlog
 
 RC_FILES=	acc/radiusclient.conf \
 		acc/servers \
-		acc/sip_dictionary \
 		dictionary.radius \
 		openser.cfg
 RC_DIRS=	acc
 
 MAN5=		openser.cfg.5
-MAN8=		openser.8
+MAN8=		openser.8 \
+		openserctl.8 \
+		openserunix.8
 
 PORTDOCS=	*
 
@@ -52,6 +57,7 @@ SUB_LIST=	RC_DIRS="${RC_DIRS}" RC_FILES="${RC_FILES}"
 
 OPTIONS=	MYSQL "MySQL support" on \
 		POSTGRESQL "PostgreSQL support" on \
+		UNIXODBC "UnixODBC support" on \
 		TLS "TLS support" on
 
 .include <bsd.port.pre.mk>
@@ -59,6 +65,7 @@ OPTIONS=	MYSQL "MySQL support" on \
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 MODULES+=	mysql
+PLIST_FILES+=	lib/openser/openserctl/openserctl.mysql sbin/openser_mysql.sh
 .else
 MAKE_ENV+=	MYSQL=mysql
 .endif
@@ -66,10 +73,18 @@ MAKE_ENV+=	MYSQL=mysql
 .if defined(WITH_POSTGRESQL)
 USE_PGSQL=	yes
 MODULES+=	postgres
+PLIST_FILES+=	lib/openser/openserctl/openserctl.pgsql sbin/openser_postgresql.sh
 .else
 MAKE_ENV+=	POSTGRESQL=postgres
 .endif
 
+.if defined(WITH_UNIXODBC)
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+MODULES+=	unixodbc
+.else
+MAKE_ENV+=	UNIXODBC=unixodbc
+.endif
+
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 TLS_RC_FILES=	tls/rootCA/cacert.pem \
@@ -105,16 +120,16 @@ post-patch:
 		${WRKSRC}/scripts/sc.dbtext \
 		${WRKSRC}/modules/dispatcher/README
 	@${REINPLACE_CMD} -e 's|/etc/openser|${PREFIX}/etc/openser|' \
-		${WRKSRC}/modules/mediaproxy/README
+		${WRKSRC}/modules/mediaproxy/README \
+		${WRKSRC}/modules/cpl-c/README \
+		${WRKSRC}/INSTALL
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/etc/openser.cfg \
 		${WRKSRC}/scripts/mysqldb.sh \
 		${WRKSRC}/scripts/postgresqldb.sh \
-		${WRKSRC}/scripts/sc \
 		${WRKSRC}/scripts/sc.dbtext \
 		${WRKSRC}/modules/speeddial/README
-	@${REINPLACE_CMD} -e 's|/home/jiri/sip_router/modules/acc/etc|${PREFIX}/etc/openser/acc|; \
-		s|/usr/local|${LOCALBASE}|' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/modules/acc/etc/radiusclient.conf
 	@${REINPLACE_CMD} -e 's|/usr/local/etc/radiusclient|${PREFIX}/etc/openser/acc|' \
 		${WRKSRC}/modules/acc/acc_mod.c ${WRKSRC}/modules/acc/README
@@ -127,8 +142,6 @@ post-install:
 		${PREFIX}/etc/openser/acc/radiusclient.conf.default
 	${INSTALL_DATA} ${WRKSRC}/modules/acc/etc/servers \
 		${PREFIX}/etc/openser/acc/servers.default
-	${INSTALL_DATA} ${WRKSRC}/modules/acc/etc/sip_dictionary \
-		${PREFIX}/etc/openser/acc/sip_dictionary.default
 .for d in ${TLS_RC_DIRS}
 	${MKDIR} ${PREFIX}/etc/openser/${d}
 .endfor
diff --git a/net/openser/distinfo b/net/openser/distinfo
index e295265c7c94..b134e50886a8 100644
--- a/net/openser/distinfo
+++ b/net/openser/distinfo
@@ -1,3 +1,3 @@
-MD5 (openser-1.0.1-tls_src.tar.gz) = cce062bfc253f31991f6291b6b3a2251
-SHA256 (openser-1.0.1-tls_src.tar.gz) = d0f0612e222de76be5d4be8c436f8a8520d38923659708c67ecaa4a31b1a70d2
-SIZE (openser-1.0.1-tls_src.tar.gz) = 1369316
+MD5 (openser-1.1.1-tls_src.tar.gz) = 024757459ccef485d47322cbbe49fa72
+SHA256 (openser-1.1.1-tls_src.tar.gz) = 92c97f50a62f30ed670a71009fbecda18e7b124ca0436a247c4cd41e27283965
+SIZE (openser-1.1.1-tls_src.tar.gz) = 1582833
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile
index c65f092559d8..50f357b55a96 100644
--- a/net/openser/files/patch-Makefile
+++ b/net/openser/files/patch-Makefile
@@ -1,21 +1,23 @@
---- Makefile.orig	Sun Mar  5 19:40:19 2006
-+++ Makefile	Sun Mar  5 20:40:04 2006
-@@ -46,7 +46,7 @@
+--- Makefile.orig	Thu Jul 27 18:18:37 2006
++++ Makefile	Wed Feb 28 17:36:04 2007
+@@ -46,8 +46,8 @@
  skip_modules?=
  
  # if not set on the cmd. line or the env, exclude this modules:
--exclude_modules?= 		jabber cpl-c pa postgres mysql \
-+exclude_modules?=			jabber $(POSTGRESQL) $(MYSQL) \
- 						avp_radius auth_radius group_radius uri_radius
- # always exclude the CVS dir
- override exclude_modules+= CVS $(skip_modules)
-@@ -320,21 +320,9 @@
+-exclude_modules?= 		jabber cpl-c mysql pa postgres osp unixodbc \
+-						avp_radius auth_radius group_radius uri_radius
++exclude_modules?= 		jabber osp $(POSTGRESQL) $(MYSQL) $(UNIXODBC) \
++					avp_radius auth_radius group_radius uri_radius
+ ifeq ($(TLS),)
+ 	exclude_modules+= tlsops
+ endif
+@@ -335,21 +335,9 @@
  		
  # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
  install-cfg: $(cfg-prefix)/$(cfg-dir)
 -		sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \
 -			< etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
--		sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-prefix)/$(cfg-dir)tls/#g" \
+-		sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-target)tls/#g" \
 -			< $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 \
 -			> $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
 -		rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
@@ -29,65 +31,69 @@
  		$(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.radius
 -		$(INSTALL-CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)
 +		$(INSTALL-CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)/dictionary.radius.default
- 		#$(INSTALL-CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir)
- 		if [ -z $(TLS) ]; then \
- 			echo  "No TLS scripts installed" ; \
-@@ -345,25 +333,7 @@
+ 		# openserctl config
+ 		$(INSTALL-TOUCH)   $(cfg-prefix)/$(cfg-dir)/openserctlrc.sample
+ 		$(INSTALL-CFG) scripts/openserctlrc \
+@@ -368,25 +356,7 @@
  			mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \
  			mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/user ; \
  			$(INSTALL-TOUCH) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
--			$(INSTALL) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
+-			$(INSTALL-CFG) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
 -			$(INSTALL-TOUCH) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
--			$(INSTALL) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
+-			$(INSTALL-CFG) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
 -			$(INSTALL-TOUCH) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
--			$(INSTALL) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
+-			$(INSTALL-CFG) etc/tls/rootCA/serial $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
 -			$(INSTALL-TOUCH) etc/tls/rootCA/cacert.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
--			$(INSTALL) etc/tls/rootCA/cacert.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
+-			$(INSTALL-CFG) etc/tls/rootCA/cacert.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
 -			$(INSTALL-TOUCH) etc/tls/rootCA/certs/01.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/certs/; \
--			$(INSTALL) etc/tls/rootCA/certs/01.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/certs/; \
+-			$(INSTALL-CFG) etc/tls/rootCA/certs/01.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/certs/; \
 -			$(INSTALL-TOUCH) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \
--			$(INSTALL) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \
+-			$(INSTALL-CFG) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \
 -			$(INSTALL-TOUCH) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
--			$(INSTALL) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
+-			$(INSTALL-CFG) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
 -			$(INSTALL-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
 -			$(INSTALL) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
 -			$(INSTALL-TOUCH) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
--			$(INSTALL) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
+-			$(INSTALL-CFG) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
 -			$(INSTALL-TOUCH) etc/tls/user/user-cert_req.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
--			$(INSTALL) etc/tls/user/user-cert_req.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
+-			$(INSTALL-CFG) etc/tls/user/user-cert_req.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
 +			$(BSD_INSTALL_DATA) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
  		fi
  
- install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 utils/$(NAME)unix/$(NAME)unix
-@@ -372,17 +342,17 @@
- 		sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
- 			< scripts/sc > /tmp/$(NAME)ctl
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)ctl
--		$(INSTALL-BIN) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir)
-+		$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir)
- 		rm -fr /tmp/$(NAME)ctl
- 		sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
- 			< scripts/mysqldb.sh > /tmp/$(NAME)_mysql.sh
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh
--		$(INSTALL-BIN) /tmp/$(NAME)_mysql.sh  $(bin-prefix)/$(bin-dir)
-+		$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_mysql.sh  $(bin-prefix)/$(bin-dir)
- 		rm -fr /tmp/$(NAME)_mysql.sh
- 		sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
- 			< scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh
--		$(INSTALL-BIN) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir)
-+		$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir)
- 		rm -fr /tmp/$(NAME)_postgresql.sh
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)_gen_ha1
- 		$(INSTALL-BIN) utils/gen_ha1/gen_ha1 $(bin-prefix)/$(bin-dir)/$(NAME)_gen_ha1
-@@ -431,9 +401,7 @@
+ install-bin: $(bin-prefix)/$(bin-dir) utils
+@@ -397,7 +367,7 @@
+ 		sed -e "s#/usr/local/lib/openser#$(lib-target)#g" | \
+ 		sed -e "s#/usr/local/etc/openser#$(cfg-target)#g"  >/tmp/openserctl
+ 		$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/openserctl
+-		$(INSTALL-BIN) /tmp/openserctl $(bin-prefix)/$(bin-dir)
++		$(BSD_INSTALL_SCRIPT) /tmp/openserctl $(bin-prefix)/$(bin-dir)
+ 		rm -fr /tmp/openserctl
+ 		sed -e "s#/usr/local/sbin#$(bin-target)#g" \
+ 			< scripts/openserctl.base > /tmp/openserctl.base
+@@ -461,7 +431,7 @@
+ 			sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \
+ 				< scripts/mysqldb.sh > /tmp/$(NAME)_mysql.sh ; \
+ 			$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh ; \
+-			$(INSTALL-BIN) /tmp/$(NAME)_mysql.sh  $(bin-prefix)/$(bin-dir) ; \
++			$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_mysql.sh  $(bin-prefix)/$(bin-dir) ; \
+ 			rm -fr /tmp/$(NAME)_mysql.sh ; \
+ 		fi
+ 		if [ "$(PGSQLON)" = "yes" ]; then \
+@@ -474,7 +444,7 @@
+ 			sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \
+ 				< scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh ; \
+ 			$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh ; \
+-			$(INSTALL-BIN) /tmp/$(NAME)_postgresql.sh \
++			$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh \
+ 				$(bin-prefix)/$(bin-dir) ; \
+ 			rm -fr /tmp/$(NAME)_postgresql.sh ; \
+ 		fi
+@@ -499,8 +469,6 @@
  			if [ -f modules/"$$r"/README ]; then \
  				$(INSTALL-TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
  				$(INSTALL-DOC)  modules/"$$r"/README  \
 -									$(doc-prefix)/$(doc-dir)/README ; \
 -				mv -f $(doc-prefix)/$(doc-dir)/README \
--						$(doc-prefix)/$(doc-dir)/README."$$r" ; \
-+					$(doc-prefix)/$(doc-dir)/README."$$r" ; \
+ 						$(doc-prefix)/$(doc-dir)/README."$$r" ; \
  			fi ; \
  		fi ; \
- 	done 
diff --git a/net/openser/files/patch-Makefile.defs b/net/openser/files/patch-Makefile.defs
index b29f880efa50..09ec64474523 100644
--- a/net/openser/files/patch-Makefile.defs
+++ b/net/openser/files/patch-Makefile.defs
@@ -1,6 +1,18 @@
---- Makefile.defs.orig	Wed Mar 15 12:38:03 2006
-+++ Makefile.defs	Wed Mar 15 13:19:16 2006
-@@ -167,13 +167,13 @@
+--- Makefile.defs.orig	Thu Feb 22 15:46:16 2007
++++ Makefile.defs	Wed Feb 28 10:53:25 2007
+@@ -116,9 +116,9 @@
+ 
+ ARCH_B= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
+ ifeq ($(ARCH_B),64b)
+-	LIBDIR ?= lib64
++	LIBDIR = lib64
+ else
+-	LIBDIR ?= lib
++	LIBDIR = lib
+ 	# assume 32b - it is not really used further
+ 	ARCH_B=32b
+ endif
+@@ -198,13 +198,13 @@
  TAR ?= tar
  endif
  
@@ -12,7 +24,7 @@
 -INSTALL-DOC = $(INSTALL) -m 644
 -INSTALL-MAN = $(INSTALL) -m 644
 +INSTALL-TOUCH = :		# used to create the file first (good to
-+                                #  make solaris install work)
++				#  make solaris install work)
 +INSTALL-CFG = $(BSD_INSTALL_DATA)
 +INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
 +INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
@@ -21,7 +33,7 @@
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -1123,8 +1123,8 @@
+@@ -1203,8 +1203,8 @@
  
  #add libssl if needed
  ifneq ($(TLS),)
diff --git a/net/openser/pkg-descr b/net/openser/pkg-descr
index 146c6cc9f73b..43070b6cc378 100644
--- a/net/openser/pkg-descr
+++ b/net/openser/pkg-descr
@@ -1,4 +1,12 @@
-OpenSER is a scalable and robust SIP server, spawned from FhG FOKUS SIP
-Express Router (SER).
+OpenSER is a very fast and flexible SIP (RFC3261)
+proxy server. Written entirely in C, openser can handle thousands calls
+per second even on low-budget hardware. A C Shell like scripting language
+provides full control over the server's behaviour. It's modular
+architecture allows only required functionality to be loaded.
+Currently the following modules are available: digest authentication,
+CPL scripts, instant messaging, MySQL and UNIXODBC support, a presence agent,
+radius authentication, record routing, an SMS gateway, a jabber gateway, a 
+transaction and dialog module, OSP module, statistics support, 
+registrar and user location.
 
 WWW: http://www.openser.org/