5 files changed, 58 insertions, 65 deletions

diff --git a/net/openser/Makefile b/net/openser/Makefile
index 1cb37ee7d08d..6a981b14bcc8 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openser
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
@@ -28,15 +28,17 @@ MAKE_ENV=	CC="${CC}" \
 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
+		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 \
-		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 \
+		dialog dispatcher diversion domain domainpolicy enum exec flatstore \
+		gflags group imc lcr mangler maxfwd mediaproxy mi_fifo msilo \
+		nathelper options pa path pdt permissions pike presence pua pua_mi \
+		pua_usrloc registrar rr seas siptrace sl sms speeddial sst statistics \
+		textops tm uac uac_redirect uri \
 		uri_db usrloc xlog
 
 RC_FILES=	acc/radiusclient.conf \
@@ -58,9 +60,10 @@ SUB_FILES=	pkg-install pkg-deinstall
 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
+		POSTGRESQL "PostgreSQL support" off \
+		UNIXODBC "UnixODBC support" off \
+		TLS "TLS support" off \
+		SNMPSTATS "SNMPStats support" off
 
 .include <bsd.port.pre.mk>
 
@@ -88,6 +91,7 @@ MAKE_ENV+=	UNIXODBC=unixodbc
 .endif
 
 .if defined(WITH_TLS)
+MODULES+=	tlsops
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 TLS_RC_FILES=	tls/rootCA/cacert.pem \
 		tls/rootCA/certs/01.pem \
@@ -97,7 +101,11 @@ TLS_RC_FILES=	tls/rootCA/cacert.pem \
 		tls/user/user-calist.pem \
 		tls/user/user-cert.pem \
 		tls/user/user-cert_req.pem \
-		tls/user/user-privkey.pem
+		tls/user/user-privkey.pem \
+		tls/README \
+		tls/ca.conf \
+		tls/request.conf \
+		tls/user.conf
 RC_FILES+=	${TLS_RC_FILES}
 TLS_RC_DIRS=	tls/user \
 		tls/rootCA/certs \
@@ -106,9 +114,17 @@ TLS_RC_DIRS=	tls/user \
 		tls
 RC_DIRS+=	${TLS_RC_DIRS}
 .else
+MAKE_ENV+=	TLSOPS=tlsops
 MAKE_ARGS+=	TLS=""
 .endif
 
+.if defined(WITH_SNMPSTATS)
+RUN_DEPENDS+=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp
+MODULES+=	snmpstats
+.else
+MAKE_ENV+=	SNMPSTATS=snmpstats
+.endif
+
 PLIST_FILES+=	${MODULES:S|^|lib/openser/modules/|:S|$|.so|} \
 		${RC_FILES:S|^|etc/openser/|:S|$|.default|}
 
diff --git a/net/openser/distinfo b/net/openser/distinfo
index b134e50886a8..32ec7aedbd4d 100644
--- a/net/openser/distinfo
+++ b/net/openser/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (openser-1.2.0-tls_src.tar.gz) = fbf929ed9d3ef1c3f41e4ebecbc4dd26
+SHA256 (openser-1.2.0-tls_src.tar.gz) = 1ecba7dc85865b85b8570618837323d6e12fe8af3eb092e74e2b9546eedcdc67
+SIZE (openser-1.2.0-tls_src.tar.gz) = 2814102
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile
index 50f357b55a96..0ef613ffe769 100644
--- a/net/openser/files/patch-Makefile
+++ b/net/openser/files/patch-Makefile
@@ -1,17 +1,23 @@
---- Makefile.orig	Thu Jul 27 18:18:37 2006
-+++ Makefile	Wed Feb 28 17:36:04 2007
-@@ -46,8 +46,8 @@
+--- Makefile.orig	Mon Apr  9 11:54:01 2007
++++ Makefile	Mon Apr  9 13:44:55 2007
+@@ -47,13 +47,9 @@
  skip_modules?=
  
  # if not set on the cmd. line or the env, exclude this modules:
 -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 @@
+-						avp_radius auth_radius group_radius uri_radius xmpp \
+-						presence pua pua_mi pua_usrloc \
+-						mi_xmlrpc perl snmpstats
+-ifeq ($(TLS),)
+-	exclude_modules+= tlsops
+-endif
++exclude_modules?= 		$(MYSQL) $(POSTGRESQL) $(SNMPSTATS) $(TLSOPS) $(UNIXODBC) \
++						avp_radius auth_radius group_radius uri_radius \
++						jabber osp mi_xmlrpc perl xmpp
+ # always exclude the SVN dir
+ override exclude_modules+= .svn $(skip_modules)
+ 
+@@ -339,21 +335,9 @@
  		
  # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
  install-cfg: $(cfg-prefix)/$(cfg-dir)
@@ -34,34 +40,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-CFG) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
--			$(INSTALL-TOUCH) 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-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-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-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-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-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-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-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
-@@ -397,7 +367,7 @@
+@@ -389,7 +373,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
@@ -70,7 +49,7 @@
  		rm -fr /tmp/openserctl
  		sed -e "s#/usr/local/sbin#$(bin-target)#g" \
  			< scripts/openserctl.base > /tmp/openserctl.base
-@@ -461,7 +431,7 @@
+@@ -454,7 +438,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 ; \
@@ -79,7 +58,7 @@
  			rm -fr /tmp/$(NAME)_mysql.sh ; \
  		fi
  		if [ "$(PGSQLON)" = "yes" ]; then \
-@@ -474,7 +444,7 @@
+@@ -467,7 +451,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 ; \
@@ -88,7 +67,7 @@
  				$(bin-prefix)/$(bin-dir) ; \
  			rm -fr /tmp/$(NAME)_postgresql.sh ; \
  		fi
-@@ -499,8 +469,6 @@
+@@ -492,8 +476,6 @@
  			if [ -f modules/"$$r"/README ]; then \
  				$(INSTALL-TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
  				$(INSTALL-DOC)  modules/"$$r"/README  \
diff --git a/net/openser/files/patch-Makefile.defs b/net/openser/files/patch-Makefile.defs
index 09ec64474523..68d2d58e6a6d 100644
--- a/net/openser/files/patch-Makefile.defs
+++ b/net/openser/files/patch-Makefile.defs
@@ -1,18 +1,15 @@
---- 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/')
+--- Makefile.defs.orig	Mon Apr  9 12:01:20 2007
++++ Makefile.defs	Mon Apr  9 11:59:14 2007
+@@ -128,7 +128,7 @@
  ifeq ($(ARCH_B),64b)
--	LIBDIR ?= lib64
-+	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 @@
+@@ -208,13 +208,13 @@
  TAR ?= tar
  endif
  
@@ -23,7 +20,7 @@
 -INSTALL-MODULES = $(INSTALL) -m 755
 -INSTALL-DOC = $(INSTALL) -m 644
 -INSTALL-MAN = $(INSTALL) -m 644
-+INSTALL-TOUCH = :		# used to create the file first (good to
++INSTALL-TOUCH = :		# used to create the file first (good to 
 +				#  make solaris install work)
 +INSTALL-CFG = $(BSD_INSTALL_DATA)
 +INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
@@ -33,7 +30,7 @@
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -1203,8 +1203,8 @@
+@@ -1196,8 +1196,8 @@
  
  #add libssl if needed
  ifneq ($(TLS),)
diff --git a/net/openser/pkg-descr b/net/openser/pkg-descr
index 43070b6cc378..999c8e06889a 100644
--- a/net/openser/pkg-descr
+++ b/net/openser/pkg-descr
@@ -7,6 +7,7 @@ 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.
+registrar and user location, SIMPLE Presence, Perl programming interface,
+SNMP and Java SIP Servlet.
 
 WWW: http://www.openser.org/