Date: Tue, 19 Feb 2008 15:36:59 GMT From: Raffaele De Lorenzo <raffaele.delorenzo@libero.it> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/120839: Update port: net/ss5 Update net/ss5 to the version 3.6.4.R3 Message-ID: <200802191536.m1JFaxMU096894@freefall.freebsd.org> Resent-Message-ID: <200802191540.m1JFe8wn097389@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120839
>Category: ports
>Synopsis: Update port: net/ss5 Update net/ss5 to the version 3.6.4.R3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 19 15:40:08 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Raffaele De Lorenzo
>Release: 7.0RC2
>Organization:
>Environment:
FreeBSD noel 7.0-RC2-p1 FreeBSD 7.0-RC2-p1 #0: Tue Feb 12 22:23:33 UTC 2008 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update port: net/ss5 Update net/ss5 to the version 3.6.4.R3
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -bBc -ruN /usr/ports/net/ss5/Makefile ./ss5_port_3_6_4_3/Makefile
--- /usr/ports/net/ss5/Makefile 2007-06-22 13:35:10.000000000 +0200
+++ ./ss5_port_3_6_4_3/Makefile 2008-02-19 11:59:23.000000000 +0100
@@ -1,16 +1,16 @@
# New ports collection makefile for: ss5
-# Date created: 25 August 2006
+# Date created: 19 February 2008
# Whom: Raffaele De Lorenzo - raffaele.delorenzo@libero.it
#
# $FreeBSD: ports/net/ss5/Makefile,v 1.2 2007/06/22 11:35:10 mm Exp $
#
PORTNAME= ss5
-PORTVERSION= 3.6.2
+PORTVERSION= 3.6.4
CATEGORIES= net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ss5
-DISTNAME= ${PORTNAME}-${PORTVERSION}-1
+DISTNAME= ${PORTNAME}-${PORTVERSION}-3
MAINTAINER= raffaele.delorenzo@libero.it
COMMENT= SOCKS v4/v5 application layer gateway with many features
@@ -31,7 +31,7 @@
CFLAGS+= -DLDAP_DEPRECATED
MAN1= ss5.1
-MAN5= ss5.conf.5 ss5.pam.5 ss5.passwd.5 ss5.peers.5
+MAN5= ss5.conf.5 ss5.pam.5 ss5.passwd.5 ss5.ha.5
MANCOMPRESSED= yes
post-patch:
@@ -39,4 +39,7 @@
@${REINPLACE_CMD} -e 's,/usr/local/etc/opt/ss5,${PREFIX}/etc/ss5,' \
${WRKSRC}/include/config.h.in
+post-install:
+ @${PRINTF} "*** WARNING *** Now you must run manually: touch /usr/local/etc/ss5/ss5.ha\n **** "
+
.include <bsd.port.mk>
diff -bBc -ruN /usr/ports/net/ss5/distinfo ./ss5_port_3_6_4_3/distinfo
--- /usr/ports/net/ss5/distinfo 2007-06-22 13:35:10.000000000 +0200
+++ ./ss5_port_3_6_4_3/distinfo 2008-02-19 09:23:58.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (ss5-3.6.2-1.tar.gz) = 482eca1e29e1f768939eca639ce3d30c
-SHA256 (ss5-3.6.2-1.tar.gz) = cfd32637e68c8a59ce7cb9918ac91c670f5ae30e8a2025319209fea02979798d
-SIZE (ss5-3.6.2-1.tar.gz) = 404602
+MD5 (ss5-3.6.4-3.tar.gz) = 9d9b27a538747d397fadf4bd2b897f6f
+SHA256 (ss5-3.6.4-3.tar.gz) = c091fde7c56226ccb8b6fb3ad09c9778627dd88f93fba9e89ab077ed7eadc27b
+SIZE (ss5-3.6.4-3.tar.gz) = 348303
diff -bBc -ruN /usr/ports/net/ss5/files/patch-Makefile.in ./ss5_port_3_6_4_3/files/patch-Makefile.in
--- /usr/ports/net/ss5/files/patch-Makefile.in 2007-04-16 13:59:08.000000000 +0200
+++ ./ss5_port_3_6_4_3/files/patch-Makefile.in 2008-02-19 09:33:33.000000000 +0100
@@ -63,7 +63,7 @@
- @( cp man/$(OS)/ss5.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.peers.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 )
+ @( if [ $(OS) = "FreeBSD" ] && [ ! -d $(ss5_man)/man1 ]; then mkdir -p $(ss5_man)/man1; fi )
@@ -73,8 +73,8 @@
+ @( 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/; \
+ else cp man/$(OS)/ss5.passwd.5* $(dst_dir)$(man_path_base)/man5/; fi )
-+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.peers.5* $(ss5_man)/man5/; \
-+ else cp man/$(OS)/ss5.peers.5* $(dst_dir)$(man_path_base)/man5/; fi )
++ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.ha.5* $(ss5_man)/man5/; \
++ else cp man/$(OS)/ss5.ha.5* $(dst_dir)$(man_path_base)/man5/; fi )
+ @( if [ $(OS) = "FreeBSD" ]; then cp man/$(OS)/ss5.pam.5* $(ss5_man)/man5/; \
+ 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/; \
@@ -113,10 +113,10 @@
@( 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)/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.peers.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.peers.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.peers.5 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.peers.5; fi )
-+ @( if [ -f $(ss5_man)/man5/ss5.peers.5 ]; then rm -f $(ss5_man)/man5/ss5.peers.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 $(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 )
@@ -125,8 +125,8 @@
+ @( 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)/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.peers.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.peers.5.gz; fi )
-+ @( if [ -f $(ss5_man)/man5/ss5.peers.5.gz ]; then rm -f $(ss5_man)/man5/ss5.peers.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 )
++ @( if [ -f $(ss5_man)/man5/ss5.ha.5.gz ]; then rm -f $(ss5_man)/man5/ss5.ha.5.gz; fi )
@( if [ -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.gz ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.conf.5.gz; fi )
+ @( 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 )
@@ -135,8 +135,8 @@
+ @( 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)/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.peers.5.bz2 ]; then rm -f $(dst_dir)$(man_path_base)/man5/ss5.peers.5.bz2; fi )
-+ @( if [ -f $(ss5_man)/man5/ss5.peers.5.bz2 ]; then rm -f $(ss5_man)/man5/ss5.peers.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 )
diff -bBc -ruN /usr/ports/net/ss5/files/patch-src-SS5Utils.c ./ss5_port_3_6_4_3/files/patch-src-SS5Utils.c
--- /usr/ports/net/ss5/files/patch-src-SS5Utils.c 1970-01-01 01:00:00.000000000 +0100
+++ ./ss5_port_3_6_4_3/files/patch-src-SS5Utils.c 2008-02-19 11:51:50.000000000 +0100
@@ -0,0 +1,26 @@
+*** 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;
+ }
+
diff -bBc -ruN /usr/ports/net/ss5/files/patch-src_SS5Modules.c ./ss5_port_3_6_4_3/files/patch-src_SS5Modules.c
--- /usr/ports/net/ss5/files/patch-src_SS5Modules.c 2007-06-22 13:35:10.000000000 +0200
+++ ./ss5_port_3_6_4_3/files/patch-src_SS5Modules.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- src/SS5Modules.c.orig Thu Apr 5 02:28:26 2007
-+++ src/SS5Modules.c
-@@ -29,7 +29,7 @@ S5RetCode S5LoadModules( void )
- {
- S5RetCode (*InitModule)(struct _module *m);
-
-- char *error;
-+ const char *error;
- char libpath[128];
-
- /*
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802191536.m1JFaxMU096894>