4 files changed, 48 insertions, 64 deletions

diff --git a/net/openser/Makefile b/net/openser/Makefile
index def86d859e6f..d76746f0cc11 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openser
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
@@ -21,11 +21,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-tls
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 MAKE_ENV=	CC="${CC}" \
+		CC_EXTRA_OPTS="${CFLAGS}" \
 		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/openserctl sbin/openserunix sbin/openser_postgresql.sh
 PLIST_DIRS=	lib/openser/modules lib/openser
 
 MODULES=	acc alias_db auth auth_db auth_diameter avpops cpl-c dbtext \
@@ -55,10 +56,6 @@ OPTIONS=	MYSQL "MySQL support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"the postgres module does not build on non-i386"
-.endif
-
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 MODULES+=	mysql
@@ -75,7 +72,6 @@ MAKE_ENV+=	POSTGRESQL=postgres
 
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
-PLIST_FILES+=	etc/openser/tls/README
 TLS_RC_FILES=	tls/rootCA/cacert.pem \
 		tls/rootCA/certs/01.pem \
 		tls/rootCA/index.txt \
@@ -104,6 +100,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|install-doc install-man|install-man|' \
 		${WRKSRC}/Makefile
 .endif
+	@${REINPLACE_CMD} -e 's|-g -O9 ||' -e 's|-O9 ||' ${WRKSRC}/Makefile.defs
 	@${REINPLACE_CMD} -e 's|/usr/local/etc/ser|${PREFIX}/etc/openser|' \
 		${WRKSRC}/scripts/sc.dbtext \
 		${WRKSRC}/modules/dispatcher/README
diff --git a/net/openser/distinfo b/net/openser/distinfo
index 9e1c66ff85fc..e295265c7c94 100644
--- a/net/openser/distinfo
+++ b/net/openser/distinfo
@@ -1,3 +1,3 @@
-MD5 (openser-1.0.0-tls_src.tar.gz) = d56814cc463d5ecd563c3ebee9feaa28
-SHA256 (openser-1.0.0-tls_src.tar.gz) = 0e2dbb17fcc9587b53f533995aecf279001ac5877ea1f76bfb55e3b52e60e21e
-SIZE (openser-1.0.0-tls_src.tar.gz) = 1360975
+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
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile
index 4cf5432f9d59..c65f092559d8 100644
--- a/net/openser/files/patch-Makefile
+++ b/net/openser/files/patch-Makefile
@@ -1,20 +1,24 @@
---- Makefile.orig	Fri Oct 28 23:27:18 2005
-+++ Makefile	Sun Oct 30 22:14:24 2005
+--- Makefile.orig	Sun Mar  5 19:40:19 2006
++++ Makefile	Sun Mar  5 20:40:04 2006
 @@ -46,7 +46,7 @@
  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) \
++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,17 +320,9 @@
+@@ -320,21 +320,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.sample
+-			< etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
+-		sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-prefix)/$(cfg-dir)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
 -		chmod 644 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
 -		if [ -z "${skip_cfg_install}" -a \
 -				! -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg ]; then \
@@ -28,9 +32,9 @@
  		#$(INSTALL-CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir)
  		if [ -z $(TLS) ]; then \
  			echo  "No TLS scripts installed" ; \
-@@ -341,36 +333,16 @@
- 			mkdir $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \
- 			mkdir $(cfg-prefix)/$(cfg-dir)/tls/user ; \
+@@ -345,25 +333,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-TOUCH) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
@@ -45,7 +49,7 @@
 -			$(INSTALL) 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-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/users/; \
+-			$(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/; \
@@ -55,27 +59,35 @@
  		fi
  
  install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 utils/$(NAME)unix/$(NAME)unix
- 		$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME) 
- 		$(INSTALL-BIN) $(NAME) $(bin-prefix)/$(bin-dir)
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/sc
--		$(INSTALL-BIN) scripts/sc $(bin-prefix)/$(bin-dir)
--		mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/$(NAME)ctl
-+		$(BSD_INSTALL_SCRIPT) scripts/sc $(bin-prefix)/$(bin-dir)/$(NAME)ctl
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/mysqldb.sh  
--		$(INSTALL-BIN) scripts/mysqldb.sh  $(bin-prefix)/$(bin-dir)
--		mv -f $(bin-prefix)/$(bin-dir)/mysqldb.sh $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh
-+		$(BSD_INSTALL_SCRIPT) scripts/mysqldb.sh  $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh
+@@ -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
- 		$(INSTALL-TOUCH)   $(bin-prefix)/$(bin-dir)/$(NAME)unix
-@@ -418,9 +390,7 @@
+@@ -431,9 +401,7 @@
  			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 2c7700ecea72..b29f880efa50 100644
--- a/net/openser/files/patch-Makefile.defs
+++ b/net/openser/files/patch-Makefile.defs
@@ -1,17 +1,18 @@
---- Makefile.defs.orig	Fri Oct 28 18:32:39 2005
-+++ Makefile.defs	Sun Oct 30 20:09:02 2005
-@@ -147,13 +147,13 @@
+--- Makefile.defs.orig	Wed Mar 15 12:38:03 2006
++++ Makefile.defs	Wed Mar 15 13:19:16 2006
+@@ -167,13 +167,13 @@
  TAR ?= tar
  endif
  
 -INSTALL-TOUCH = touch          # used to create the file first (good to 
-+INSTALL-TOUCH = :              # used to create the file first (good to 
-                                #  make solaris install work)
+-                               #  make solaris install work)
 -INSTALL-CFG = $(INSTALL) -m 644
 -INSTALL-BIN = $(INSTALL) -m 755
 -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
++                                #  make solaris install work)
 +INSTALL-CFG = $(BSD_INSTALL_DATA)
 +INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
 +INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
@@ -20,34 +21,8 @@
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -449,7 +449,7 @@
- 	found_lock_method=yes
- endif
- 
--CFLAGS=
-+saved_CFLAGS:=$(CFLAGS)
- LDFLAGS=
- # setting CFLAGS
- ifeq ($(mode), release)
-@@ -970,7 +970,8 @@
- 	ifneq ($(found_lock_method), yes)
- 		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
- 		found_lock_method=yes
--		LIBS= -pthread -lfl  #dlopen is in libc
-+		saved_CFLAGS+= $(PTHREAD_CFLAGS)
-+		LIBS= $(PTHREAD_LIBS) -lfl  #dlopen is in libc
- 	else
- 		LIBS= -lfl  #dlopen is in libc
- 	endif
-@@ -1045,10 +1046,15 @@
- 	endif
- endif
+@@ -1123,8 +1123,8 @@
  
-+CFLAGS=		$(saved_CFLAGS) -I$(LOCALBASE)/include
-+MOD_CFLAGS=	-fPIC $(CFLAGS)
-+LDFLAGS=	-L$(LOCALBASE)/lib
-+MOD_LDFLAGS=	-shared $(LDFLAGS)
-+
  #add libssl if needed
  ifneq ($(TLS),)
 -DEFS+= -I$(LOCALBASE)/ssl/include