Index: branches/2018Q1/security/softether/Makefile =================================================================== --- branches/2018Q1/security/softether/Makefile (revision 460791) +++ branches/2018Q1/security/softether/Makefile (revision 460792) @@ -1,93 +1,92 @@ # $FreeBSD$ PORTNAME= softether -PORTVERSION= 4.20.9608 -PORTREVISION= 1 +PORTVERSION= 4.25.9656 CATEGORIES= security -MASTER_SITES= http://www.softether-download.com/files/softether/v4.20-9608-rtm-2016.04.17-tree/Source_Code/ -DISTNAME= ${PORTNAME}-src-v4.20-9608-rtm +MASTER_SITES= http://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/ +DISTNAME= ${PORTNAME}-src-v4.25-9656-rtm MAINTAINER= net@arrishq.net COMMENT= Softether VPN solution LICENSE= GPLv2 CONFLICTS_INSTALL= softether-devel CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT \ WARNING.TXT \ src/Cedar/Cedar.h \ src/Cedar/Cedar.h \ src/Cedar/Client.h \ src/Cedar/Nat.h \ src/Cedar/Server.c \ src/Cedar/Server.h \ src/Cedar/Virtual.h \ src/Mayaqua/Cfg.c \ src/Mayaqua/Cfg.h \ src/Mayaqua/Kernel.c \ src/Mayaqua/Mayaqua.c \ src/Mayaqua/Network.c \ src/Mayaqua/Network.h \ src/Mayaqua/Table.h \ src/Mayaqua/Unix.c OPTIONS_DEFINE= DOCS ONLY_FOR_ARCHS= i386 amd64 USES= dos2unix gmake iconv:wchar_t localbase:ldflags ncurses \ readline ssl USE_RC_SUBR= softether_bridge softether_client softether_server SUB_FILES= vpncmd MAKE_JOBS_UNSAFE= yes LOGDIR?= /var/log/softether PLIST_SUB+= LOGDIR="${LOGDIR}" SUB_LIST= LOGDIR="${LOGDIR}" # a pity the source directory has such a naming scheme, but well -WRKSRC= ${WRKDIR}/v4.20-9608 +WRKSRC= ${WRKDIR}/v4.25-9656 ALL_TARGET= build .include # skip configure at all and copy the corresponding Makefile in place post-extract: .if ${ARCH} != "amd64" @${CP} ${WRKSRC}/src/makefiles/freebsd_32bit.mak ${WRKSRC}/Makefile .else @${CP} ${WRKSRC}/src/makefiles/freebsd_64bit.mak ${WRKSRC}/Makefile .endif # pull in user specific CFLAGS and LDFLAGS @${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile # manually install to ${PREFIX}/libexec/softether, then the final install will copy scripts # into ${PREFIX}/sbin do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd ${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver ${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2 ${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd post-install: .for i in vpnbridge vpnclient vpncmd vpnserver @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i} .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${LOGDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include Index: branches/2018Q1/security/softether/distinfo =================================================================== --- branches/2018Q1/security/softether/distinfo (revision 460791) +++ branches/2018Q1/security/softether/distinfo (revision 460792) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488228971 -SHA256 (softether-src-v4.20-9608-rtm.tar.gz) = e559644e34ec6feba43d99f4083f77f9b082dd0574d0bb1e416a65f32ccbc51e -SIZE (softether-src-v4.20-9608-rtm.tar.gz) = 33691945 +TIMESTAMP = 1517525651 +SHA256 (softether-src-v4.25-9656-rtm.tar.gz) = b946dec3da5833ad2be69125224784b8a8e2a4149297d0c0a907ba0e1c4535f8 +SIZE (softether-src-v4.25-9656-rtm.tar.gz) = 33743898 Index: branches/2018Q1/security/softether/files/patch-src__Mayaqua__Network.c =================================================================== --- branches/2018Q1/security/softether/files/patch-src__Mayaqua__Network.c (revision 460791) +++ branches/2018Q1/security/softether/files/patch-src__Mayaqua__Network.c (revision 460792) @@ -1,19 +1,19 @@ --- src/Mayaqua/Network.c.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Network.c -@@ -12983,7 +12983,16 @@ bool StartSSLEx(SOCK *sock, X *x, K *pri +@@ -13025,10 +13025,15 @@ { if (client_tls == false) { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L +#ifndef OPENSSL_NO_SSL3 SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method()); -+#else -+ SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method()); + #else + SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method()); + SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1 +#ifdef SSL_OP_NO_TLSv1_2 + | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 +#endif + ); -+#endif + #endif } else - { Index: branches/2018Q1/security/softether/files/patch-src__Mayaqua__Table.h =================================================================== --- branches/2018Q1/security/softether/files/patch-src__Mayaqua__Table.h (revision 460791) +++ branches/2018Q1/security/softether/files/patch-src__Mayaqua__Table.h (revision 460792) @@ -1,11 +1,11 @@ --- src/Mayaqua/Table.h.orig 2016-05-03 06:16:53 UTC +++ src/Mayaqua/Table.h -@@ -117,7 +117,7 @@ - #define UNICODE_CACHE_FILE L".unicode_cache_%s.dat" - +@@ -119,7 +119,7 @@ #define LANGLIST_FILENAME "|languages.txt" + #define LANGLIST_FILENAME_WINE "|languages_wine.txt" + -#define LANG_CONFIG_FILENAME L"@lang.config" +#define LANG_CONFIG_FILENAME L"/var/db/softether/lang.config" #define LANG_CONFIG_TEMPLETE "|lang.config" // Language constant Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 460791) +++ branches/2018Q1 (revision 460792) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r460718