6 files changed, 87 insertions, 73 deletions

diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 706cd6abfaf3..68b965c42dd9 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ss5
-PORTVERSION=	3.6.4
-PORTREVISION=	2
+PORTVERSION=	3.8.5
 CATEGORIES=	net security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-3
-DISTNAME=	${PORTNAME}-${PORTVERSION}-3
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-1
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	raffaele.delorenzo@libero.it
 COMMENT=	SOCKS v4/v5 application layer gateway with many features
@@ -29,8 +28,8 @@ CONFIGURE_ARGS=	--with-binpathbase=${PREFIX}/sbin \
 MAKE_ENV=	DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
 CFLAGS+=	-DLDAP_DEPRECATED
 
-MAN1=		ss5.1
-MAN5=		ss5.conf.5 ss5.pam.5 ss5.passwd.5 ss5.ha.5
+MAN1=		ss5.1 ss5srv.1
+MAN5=		ss5.conf.5 ss5.pam.5 ss5.passwd.5 ss5.ha.5 ss5_gss.5 ss5_supa.5
 MANCOMPRESSED=	yes
 
 post-patch:
@@ -39,9 +38,13 @@ post-patch:
 		${WRKSRC}/include/config.h.in
 
 post-install:
-	${TOUCH} ${PREFIX}/etc/ss5/ss5.ha.default
-.if !exists(${PREFIX}/etc/ss5/ss5.ha)
-	${TOUCH} ${PREFIX}/etc/ss5/ss5.ha
-.endif
+#	${TOUCH} ${PREFIX}/etc/ss5/ss5.ha.default
+#.if !exists(${PREFIX}/etc/ss5/ss5.ha)
+#	${TOUCH} ${PREFIX}/etc/ss5/ss5.ha
+#.endif
+	${INSTALL_DATA} ${WRKSRC}/conf/examples/ss5.ha ${PREFIX}/etc/${PORTNAME}/ss5.ha.default
+	if [ ! -f ${PREFIX}/etc/${PORTNAME}.ha ]; then \
+		${INSTALL_DATA} ${WRKSRC}/conf/examples/ss5.ha ${PREFIX}/etc/${PORTNAME}/ss5.ha ; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/net/ss5/distinfo b/net/ss5/distinfo
index cdbcc007699d..31e475847be9 100644
--- a/net/ss5/distinfo
+++ b/net/ss5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ss5-3.6.4-3.tar.gz) = c091fde7c56226ccb8b6fb3ad09c9778627dd88f93fba9e89ab077ed7eadc27b
-SIZE (ss5-3.6.4-3.tar.gz) = 348303
+SHA256 (ss5-3.8.5-1.tar.gz) = e3ab2ced6dc4edd5aa0594dafc865bafac89c4b46ca52e234be65d263c2ff68b
+SIZE (ss5-3.8.5-1.tar.gz) = 378761
diff --git a/net/ss5/files/patch-Makefile.in b/net/ss5/files/patch-Makefile.in
index dcd6de787db0..70d1ac7bf1bf 100644
--- a/net/ss5/files/patch-Makefile.in
+++ b/net/ss5/files/patch-Makefile.in
@@ -1,25 +1,18 @@
---- Makefile.in.orig	Thu Sep  7 17:29:01 2006
-+++ Makefile.in	Mon Apr 16 19:56:30 2007
-@@ -10,6 +10,18 @@
+--- Makefile.in.orig	2009-07-17 18:03:01.000000000 -0300
++++ Makefile.in	2011-05-11 15:16:05.000000000 -0300
+@@ -10,6 +10,11 @@
  log_path_base   = @log_path_base@
  trc_path_base   = @trc_path_base@
  
-+# FreeBSD changes for correct pathname
++ss5_pam         = ${PREFIX}/etc/pam.d/ss5
++ss5_share       = ${DATADIR}
++ss5_examples    = ${EXAMPLESDIR}
++ss5_man         = ${MANPREFIX}/man
 +
-+#ss5_pam 	= /usr/local/etc/pam.d/ss5
-+#ss5_share	= /usr/local/share/ss5
-+#ss5_examples	= /usr/local/share/examples/ss5
-+#ss5_man	= /usr/local/share/man
-+
-+ss5_pam 	= ${PREFIX}/etc/pam.d/ss5
-+ss5_share	= ${DATADIR}
-+ss5_examples	= ${EXAMPLESDIR}
-+ss5_man		= ${MANPREFIX}/man
-+
- SSOBJ  = SS5Main.o 		\
- 	SS5Core.o 		\
- 	SS5Server.o 		\
-@@ -42,10 +54,21 @@
+ CC = gcc
+ 
+ CFLAGS=@CFLAGS@ -I . @EXTRA_CFLAGS@ 
+@@ -41,10 +46,21 @@
  
  	@( if [ ! -d $(dst_dir)$(lib_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(lib_path_base)/ss5; fi )
  	@( find modules -name *.so -exec cp {} $(dst_dir)$(lib_path_base)/ss5/ \; )
@@ -37,15 +30,15 @@
 +	fi )
 +
 +	@( if [ $(OS) = "Linux" ] || [ $(OS) = "SunOS" ]; then \
-+         cp modules/mod_statistics/statmgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ; \
-+         cp modules/mod_balance/balamgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ; \
-+         cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ; \
-+         cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ; \
++	 cp modules/mod_statistics/statmgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ; \
++	 cp modules/mod_balance/balamgr.cgi $(dst_dir)$(lib_path_base)/ss5/ ; \
++	 cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ; \
++	 cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ; \
 +	fi )
  
  	@( if [ $(OS) = "Linux" ]; then \
  	if [ ! -d $(dst_dir)/etc/rc.d/init.d ]; then mkdir -p $(dst_dir)/etc/rc.d/init.d; fi ; \
-@@ -61,10 +84,6 @@
+@@ -67,10 +83,6 @@
  	if [ ! -f $(dst_dir)/etc/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/init.d/ss5; \
  	else cp conf/ss5.init $(dst_dir)/etc/init.d/ss5.rpmnew ; fi ; \
          fi )
@@ -56,19 +49,24 @@
  
  	@( if [ ! -d $(dst_dir)$(doc_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(doc_path_base)/ss5; fi )
  	@( cp License $(dst_dir)$(doc_path_base)/ss5 )
-@@ -74,27 +93,40 @@
+@@ -80,32 +92,47 @@
  	@( cp modules/mod_balance/README.balamgr $(dst_dir)$(doc_path_base)/ss5 )
  
  	@( if [ ! -d $(dst_dir)$(man_path_base)/man1 ]; then mkdir -p $(dst_dir)$(man_path_base)/man1; fi )
 -	@( cp man/$(OS)/ss5.1* $(dst_dir)$(man_path_base)/man1 )
+-	@( cp man/$(OS)/ss5srv.1* $(dst_dir)$(man_path_base)/man1 )
 -	@( if [ ! -d $(dst_dir)$(man_path_base)/man5 ]; then mkdir -p $(dst_dir)$(man_path_base)/man5; fi )
 -	@( cp man/$(OS)/ss5.passwd.5* $(dst_dir)$(man_path_base)/man5 )
 -	@( cp man/$(OS)/ss5.ha.5* $(dst_dir)$(man_path_base)/man5 )
 -	@( cp man/$(OS)/ss5.pam.5* $(dst_dir)$(man_path_base)/man5 )
 -	@( cp man/$(OS)/ss5.conf.5* $(dst_dir)$(man_path_base)/man5 )
+-	@( cp man/$(OS)/ss5_gss.5* $(dst_dir)$(man_path_base)/man5 )
+-	@( cp man/$(OS)/ss5_supa.5* $(dst_dir)$(man_path_base)/man5 )
 +	@( if [ $(OS) = "FreeBSD" ] && [ ! -d $(ss5_man)/man1 ]; then mkdir -p $(ss5_man)/man1; fi )
 +	@( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.1* $(ss5_man)/man1/; \
 +	 else cp man/$(OS)/ss5.1* $(dst_dir)$(man_path_base)/man1/; fi )
++	@( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5srv.1* $(ss5_man)/man1/; \
++	 else cp man/$(OS)/ss5srv.1* $(dst_dir)$(man_path_base)/man1/; fi )
 +	@( if [ ! -d $(dst_dir)$(man_path_base)/man5 ]; then mkdir -p $(dst_dir)$(man_path_base)/man5/; fi )
 +	@( if [ $(OS) = "FreeBSD" ] && [ ! -d $(ss5_man)/man5 ]; then mkdir -p $(ss5_man)/man5; fi )
 +	@( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.passwd.5* $(ss5_man)/man5/; \
@@ -79,14 +77,21 @@
 +	 else cp man/$(OS)/ss5.pam.5* $(dst_dir)$(man_path_base)/man5/; fi )
 +	@( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.conf.5* $(ss5_man)/man5/; \
 +	 else cp man/$(OS)/ss5.conf.5* $(dst_dir)$(man_path_base)/man5/; fi )
++	@( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5_gss.5* $(ss5_man)/man5/; \
++	 else cp man/$(OS)/ss5_gss.5* $(dst_dir)$(man_path_base)/man5/; fi )
++	@( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5_supa.5* $(ss5_man)/man5/; \
++	 else cp man/$(OS)/ss5_supa.5* $(dst_dir)$(man_path_base)/man5/; fi )
  
  	@( if [ ! -d $(dst_dir)$(conf_path_base) ]; then mkdir -p $(dst_dir)$(conf_path_base); fi )
  	@( if [ ! -d $(dst_dir)$(conf_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(conf_path_base)/ss5; fi )
  	@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.conf ]; then cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5; \
  	else cp conf/ss5.conf $(dst_dir)$(conf_path_base)/ss5/ss5.conf.rpmnew ; fi )
+-	@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.ha ]; then cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5; \
+-	else cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5/ss5.ha.rpmnew ; fi )
 -	@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; \
 -	else cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5/ss5.passwd.rpmnew ; fi )
-+	@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; fi)
++	@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.ha ]; then cp conf/ss5.ha $(dst_dir)$(conf_path_base)/ss5; fi )
++	@( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; fi )
  
 -	@( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \
 +	@( if [ $(OS) = "Linux" ]; then \
@@ -102,27 +107,35 @@
 +	if [ ! -f $(ss5_examples) ]; then cp doc/pam/examples/ss5.pam $(ss5_examples); \
 +	 cp doc/ldap/examples/* $(ss5_examples); \
 +	 rm -rf /usr/local/share/doc/ss5/examples/; \
-+         fi; \
++	  fi; \
 +	fi )
  
+ 	@( if [ ! -d $(dst_dir)/var/run/ss5 ]; then mkdir -p $(dst_dir)/var/run/ss5; fi )
  
- .PHONY : uninstall
-@@ -108,29 +140,48 @@
+@@ -122,40 +149,68 @@
  	@( if [ -d $(dst_dir)$(doc_path_base)/ss5 ]; then rm -rf $(dst_dir)$(doc_path_base)/ss5; fi )
  
  	@( if [ -f $(dst_dir)$(man_path_base)/man1/ss5.1 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5.1; fi )
 +	@( if [ -f $(ss5_man)/man1/ss5.1 ]; then rm -f $(ss5_man)/man1/ss5.1; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man1/ss5srv.1 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5srv.1; fi )
++	@( if [ -f $(ss5_man)/man1/ss5srv.1 ]; then rm -f $(ss5_man)/man1/ss5srv.1; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5; fi )
--	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.passwd.5 ]; then rm -f $(ss5_man)/man5/ss5.passwd.5; fi )
-+	@( if [ -f $(man_path_base)/man5/ss5.ha.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.ha.5 ]; then rm -f $(ss5_man)/man5/ss5.ha.5; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.conf.5 ]; then rm -f $(ss5_man)/man5/ss5.conf.5; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.pam.5 ]; then rm -f $(ss5_man)/man5/ss5.pam.5; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5; fi )
++	@( if [ -f $(ss5_man)/man5/ss5_gss.5 ]; then rm -f $(ss5_man)/man5/ss5_gss.5; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5; fi )
++	@( if [ -f $(ss5_man)/man5/ss5_supa.5 ]; then rm -f $(ss5_man)/man5/ss5_supa.5; fi )
+ 
  	@( if [ -f $(dst_dir)$(man_path_base)/man1/ss5.1.gz ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5.1.gz; fi )
 +	@( if [ -f $(ss5_man)/man1/ss5.1.gz ]; then rm -f $(ss5_man)/man1/ss5.1.gz; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.gz ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.gz; fi )
++	@( if [ -f $(ss5_man)/man1/ss5srv.1.gz ]; then rm -f $(ss5_man)/man1/ss5srv.1.gz; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.gz; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.passwd.5.gz ]; then rm -f $(ss5_man)/man5/ss5.passwd.5.gz; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.gz; fi )
@@ -131,22 +144,32 @@
 +	@( if [ -f $(ss5_man)/man5/ss5.conf.5.gz ]; then rm -f $(ss5_man)/man5/ss5.conf.5.gz; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.gz; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.pam.5.gz ]; then rm -f $(ss5_man)/man5/ss5.pam.5.gz; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.gz; fi )
++	@( if [ -f $(ss5_man)/man5/ss5_gss.5.gz ]; then rm -f $(ss5_man)/man5/ss5_gss.5.gz; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.gz; fi )
++	@( if [ -f $(ss5_man)/man5/ss5_supa.5.gz ]; then rm -f $(ss5_man)/man5/ss5_supa.5.gz; fi )
+ 
  	@( if [ -f $(dst_dir)$(man_path_base)/man1/ss5.1.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5.1.bz2; fi )
 +	@( if [ -f $(ss5_man)/man1/ss5.1.bz2 ]; then rm -f $(ss5_man)/man1/ss5.1.bz2; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man1/ss5srv.1.bz2; fi )
++	@( if [ -f $(ss5_man)/man1/ss5srv.1.bz2 ]; then rm -f $(ss5_man)/man1/ss5srv.1.bz2; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.passwd.5.bz2; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.passwd.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.passwd.5.bz2; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.ha.5.bz2; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.ha.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.ha.5.bz2; fi )
  	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.bz2; fi )
--	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.conf.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.conf.5.bz2; fi )
-+	@( if [ -f $(man_path_base)/man5/ss5.pam.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.pam.5.bz2; fi )
 +	@( if [ -f $(ss5_man)/man5/ss5.pam.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.pam.5.bz2; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_gss.5.bz2; fi )
++	@( if [ -f $(ss5_man)/man5/ss5_gss.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5_gss.5.bz2; fi )
+ 	@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5_supa.5.bz2; fi )
++	@( if [ -f $(ss5_man)/man5/ss5_supa.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5_supa.5.bz2; fi )
  
  	@( if [ -d $(dst_dir)$(conf_path_base)/ss5 ]; then rm -rf $(dst_dir)$(conf_path_base)/ss5; fi )
  
 -	@( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \
-+	@( if [ $(OS) = "Linux" ] ; then \
++	@( if [ $(OS) = "Linux" ]; then \
  	if [ -f $(dst_dir)/etc/pam.d/ss5 ]; then rm -f $(dst_dir)/etc/pam.d/ss5; fi ; \
          fi )
  
diff --git a/net/ss5/files/patch-src-SS5Utils.c b/net/ss5/files/patch-src-SS5Utils.c
index b8a6afb186df..14b6c280fb9c 100644
--- a/net/ss5/files/patch-src-SS5Utils.c
+++ b/net/ss5/files/patch-src-SS5Utils.c
@@ -1,26 +1,13 @@
-*** src/SS5Utils.c.orig	Tue Jun 12 17:16:55 2007
---- src/SS5Utils.c	Tue Feb 19 11:49:50 2008
-***************
-*** 130,135 ****
---- 130,140 ----
-      case ALONE:
-        snprintf(logString,256 - 1,"[VERB] Role is ALONE.");
-      break;
-+ 
-+     default:
-+ 	fprintf (stderr, "[WARN] - Don't know Role %s\n", logString);
-+ 	return ERR;
-+ 	break;
-    }
-    LOGUPDATE()
-  
-***************
-*** 152,157 ****
---- 157,163 ----
-     * Open ss5.ha file
-     */
-    if( (S5PeerFile = fopen(S5PeersFile,"r")) == NULL ) {
-+     fprintf (stderr, "[ERR] Cannot Load %s file!\n", S5PeersFile);
-      return ERR;
-    }
-  
+--- src/SS5Utils.c.orig	2009-08-02 17:57:19.000000000 +1100
++++ src/SS5Utils.c	2011-02-25 13:34:42.311808628 +1000
+@@ -117,6 +117,10 @@
+     case ALONE:
+       snprintf(logString,256 - 1,"[VERB] Role is ALONE.");
+     break;
++    default:
++      fprintf (stderr, "[WARN] - Don't know Role %s\n", logString);
++      return ERR;
++    break;
+   }
+   LOGUPDATE()
+ 
diff --git a/net/ss5/files/ss5.in b/net/ss5/files/ss5.in
index e1842ad722e6..6a79ed2958c1 100644
--- a/net/ss5/files/ss5.in
+++ b/net/ss5/files/ss5.in
@@ -14,7 +14,7 @@
 
 name="ss5"
 rcvar=${name}_enable
-
+pidfile="/var/run/ss5/ss5.pid"
 command=%%PREFIX%%/sbin/${name}
 
 load_rc_config $name
diff --git a/net/ss5/pkg-plist b/net/ss5/pkg-plist
index 2408896b945d..ecc1dfdba216 100644
--- a/net/ss5/pkg-plist
+++ b/net/ss5/pkg-plist
@@ -1,6 +1,6 @@
 @unexec if cmp -s %D/etc/ss5/ss5.ha %D/etc/ss5/ss5.ha.default; then rm -f %D/etc/ss5/ss5.ha; fi
 etc/ss5/ss5.ha.default
-@exec [ -f %B/ss5.ha ] || cp %B/%f %B/ss5.ha
+@exec if [ ! -f %D/etc/ss5/ss5.ha ]; then cp %B/%f %D/etc/ss5/ss5.ha; fi
 etc/ss5/ss5.conf
 etc/ss5/ss5.passwd
 lib/ss5/mod_authentication.so
@@ -15,6 +15,7 @@ lib/ss5/mod_socks4.so
 lib/ss5/mod_socks5.so
 lib/ss5/mod_statistics.so
 sbin/ss5
+sbin/ss5srv
 %%DATADIR%%/SS5Logo.jpg
 %%DATADIR%%/balamgr.cgi
 %%DATADIR%%/statmgr.cgi