Update to 3.6.4
PR: 120839 Submitted by: Raffaele De Lorenzo <raffaele.delorenzo@libero.it> (maintainer)
This commit is contained in:
parent
f1afd642c6
commit
fe22546d6f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=208446
@ -6,11 +6,11 @@
|
||||
#
|
||||
|
||||
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 @@ MAKE_ENV= DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
|
||||
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,10 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e 's,/usr/local/etc/opt/ss5,${PREFIX}/etc/ss5,' \
|
||||
${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
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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
|
||||
|
@ -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 )
|
||||
|
26
net/ss5/files/patch-src-SS5Utils.c
Normal file
26
net/ss5/files/patch-src-SS5Utils.c
Normal file
@ -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;
|
||||
}
|
||||
|
@ -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];
|
||||
|
||||
/*
|
@ -1,3 +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
|
||||
etc/ss5/ss5.conf
|
||||
etc/ss5/ss5.passwd
|
||||
lib/ss5/mod_authentication.so
|
||||
|
Loading…
Reference in New Issue
Block a user