- Update to 1.2.3

PR:		118878
Submitted by:	Aaron Seelye <aseelye@eltopia.com>
Approved by:	Jesus Rodriguez <jesusr@voztele.com> (maintainer)

4 files changed, 32 insertions, 22 deletions

diff --git a/net/openser/Makefile b/net/openser/Makefile
index 504ce151228c..f84144aca9aa 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openser
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	net
 MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
@@ -33,11 +33,11 @@ PLIST_FILES=	sbin/openser sbin/openserctl sbin/openserunix \
 
 PLIST_DIRS=	lib/openser/modules lib/openser/openserctl lib/openser
 
-MODULES=	acc alias_db auth auth_db auth_diameter avpops cpl-c dbtext \
+MODULES=	acc alias_db auth auth_db avpops cpl-c dbtext \
 		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 \
+		nathelper options pa path pdt permissions pike \
+		registrar rr siptrace sl sms speeddial sst statistics \
 		textops tm uac uac_redirect uri \
 		uri_db usrloc xlog
 
@@ -63,7 +63,8 @@ OPTIONS=	MYSQL "MySQL support" on \
 		POSTGRESQL "PostgreSQL support" off \
 		UNIXODBC "UnixODBC support" off \
 		TLS "TLS support" off \
-		SNMPSTATS "SNMPStats support" off
+		SNMPSTATS "SNMPStats support" off \
+		AUTHRADIUS "auth_radius module" off
 
 .include <bsd.port.pre.mk>
 
@@ -125,6 +126,14 @@ MODULES+=	snmpstats
 MAKE_ENV+=	SNMPSTATS=snmpstats
 .endif
 
+.if defined(WITH_AUTHRADIUS)
+USE_AUTHRADIUS=	yes
+MODULES+=	auth_radius
+PLIST_FILES+=	lib/openser/modules/auth_radius.so
+.else
+MAKE_ENV+=	AUTHRADIUS=auth_radius
+.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 84f86109fc56..a82b937639ae 100644
--- a/net/openser/distinfo
+++ b/net/openser/distinfo
@@ -1,3 +1,3 @@
-MD5 (openser-1.2.2-tls_src.tar.gz) = 840a0f7e2cc83cebf3701bb32b3ba745
-SHA256 (openser-1.2.2-tls_src.tar.gz) = 25042a9da8bef9b3fccd9f2eeb1c7fbcf536e7b027f448f07a3deac28fc16b57
-SIZE (openser-1.2.2-tls_src.tar.gz) = 2840210
+MD5 (openser-1.2.3-tls_src.tar.gz) = 077b057cdd50d273b70f7ea975ae85a0
+SHA256 (openser-1.2.3-tls_src.tar.gz) = 58baf7558e5ad9f19be3e47c007b67e38e4eec645ef8e180e3bbf6e5ea63900e
+SIZE (openser-1.2.3-tls_src.tar.gz) = 3325798
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile
index 7f230ad52c51..9da825037641 100644
--- a/net/openser/files/patch-Makefile
+++ b/net/openser/files/patch-Makefile
@@ -1,20 +1,21 @@
---- Makefile.orig	Thu May 24 11:16:04 2007
-+++ Makefile	Sat May 26 19:52:17 2007
-@@ -47,10 +47,9 @@
+--- Makefile.orig	Wed Jan 30 14:50:03 2008
++++ Makefile	Wed Jan 30 16:41:05 2008
+@@ -47,10 +47,10 @@
  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 xmpp \
--						presence pua pua_mi pua_usrloc \
+-						presence pua pua_mi pua_usrloc seas\
 -						mi_xmlrpc perl snmpstats
 +exclude_modules?= 		$(MYSQL) $(POSTGRESQL) $(SNMPSTATS) $(TLSOPS) $(UNIXODBC) \
-+					avp_radius auth_radius group_radius uri_radius \
-+					jabber osp mi_xmlrpc perl xmpp
++						$(AUTHRADIUS) avp_radius group_radius uri_radius xmpp \
++						presence pua pua_mi pua_usrloc seas mi_xmlrpc perl \
++						snmpstats jabber osp auth_diameter
  ifeq ($(TLS),)
  	exclude_modules+= tlsops
  endif
-@@ -343,21 +342,9 @@
+@@ -343,21 +343,9 @@
  		
  # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
  install-cfg: $(cfg-prefix)/$(cfg-dir)
@@ -37,7 +38,7 @@
  		# openserctl config
  		$(INSTALL_TOUCH)   $(cfg-prefix)/$(cfg-dir)/openserctlrc.sample
  		$(INSTALL_CFG) scripts/openserctlrc \
-@@ -391,7 +378,7 @@
+@@ -391,7 +379,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
@@ -46,7 +47,7 @@
  		rm -fr /tmp/openserctl
  		sed -e "s#/usr/local/sbin#$(bin-target)#g" \
  			< scripts/openserctl.base > /tmp/openserctl.base
-@@ -456,7 +443,7 @@
+@@ -456,7 +444,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 ; \
@@ -55,7 +56,7 @@
  			rm -fr /tmp/$(NAME)_mysql.sh ; \
  		fi
  		if [ "$(PGSQLON)" = "yes" ]; then \
-@@ -469,7 +456,7 @@
+@@ -469,7 +457,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 ; \
@@ -64,7 +65,7 @@
  				$(bin-prefix)/$(bin-dir) ; \
  			rm -fr /tmp/$(NAME)_postgresql.sh ; \
  		fi
-@@ -494,8 +481,6 @@
+@@ -494,8 +482,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 32f3114d3261..7899cece0d0a 100644
--- a/net/openser/files/patch-Makefile.defs
+++ b/net/openser/files/patch-Makefile.defs
@@ -1,5 +1,5 @@
---- Makefile.defs.orig	Thu May 24 11:21:19 2007
-+++ Makefile.defs	Sat May 26 19:52:01 2007
+--- Makefile.defs.orig	Thu Dec 20 13:34:23 2007
++++ Makefile.defs	Wed Jan 30 14:58:46 2008
 @@ -131,7 +131,7 @@
  ifeq ($(ARCH_B),64b)
  	LIBDIR ?= lib64
@@ -34,7 +34,7 @@
  
  #add libssl if needed
  ifneq ($(TLS),)
--DEFS+= -I$(LOCALBASE)/ssl/include
+-DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include
 -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl  -lcrypto
 +DEFS+= -I$(OPENSSLINC)
 +LIBS+= -L$(OPENSSLLIB) -lssl  -lcrypto