svn commit: r494160 - in head/security/softether: . files

[Koichiro Iwao]

Author: meta
Date: Thu Feb 28 16:46:35 2019
New Revision: 494160
URL: https://svnweb.freebsd.org/changeset/ports/494160

Log:
  security/softether: Update to 4.29.9680
  
  - Upstream switched license from GPLv2 to Apache License 2.0
  - Regenerate some patches
  - Remove some patches merged into upstream
  
  Relnotes:	https://www.softether.org/5-download/history
  		https://www.softether.org/5-download/src/190121_switch_to_apache_license

Deleted:
  head/security/softether/files/patch-fix-build-openssl111
  head/security/softether/files/patch-src__Mayaqua__Network.c
Modified:
  head/security/softether/Makefile
  head/security/softether/distinfo
  head/security/softether/files/patch-chain-certs-dir
  head/security/softether/files/patch-piddir

Modified: head/security/softether/Makefile
==============================================================================
--- head/security/softether/Makefile	Thu Feb 28 16:44:05 2019	(r494159)
+++ head/security/softether/Makefile	Thu Feb 28 16:46:35 2019	(r494160)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	softether
-DISTVERSION=	4.25-9656
-PORTREVISION=	2
+DISTVERSION=	4.29-9680
 CATEGORIES=	security
-MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2018.01.15-tree/Source_Code/
+MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2019.02.28-tree/Source_Code/
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}-rtm
 
 MAINTAINER=	meta at FreeBSD.org

Modified: head/security/softether/distinfo
==============================================================================
--- head/security/softether/distinfo	Thu Feb 28 16:44:05 2019	(r494159)
+++ head/security/softether/distinfo	Thu Feb 28 16:46:35 2019	(r494160)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517525651
-SHA256 (softether-src-v4.25-9656-rtm.tar.gz) = b946dec3da5833ad2be69125224784b8a8e2a4149297d0c0a907ba0e1c4535f8
-SIZE (softether-src-v4.25-9656-rtm.tar.gz) = 33743898
+TIMESTAMP = 1551353603
+SHA256 (softether-src-v4.29-9680-rtm.tar.gz) = e6035fa7d9aaf59bdb342cd7ab5ecfdff89811a875f62a3230208cdc8a4e26e4
+SIZE (softether-src-v4.29-9680-rtm.tar.gz) = 33759397

Modified: head/security/softether/files/patch-chain-certs-dir
==============================================================================
--- head/security/softether/files/patch-chain-certs-dir	Thu Feb 28 16:44:05 2019	(r494159)
+++ head/security/softether/files/patch-chain-certs-dir	Thu Feb 28 16:46:35 2019	(r494160)
@@ -1,6 +1,6 @@
---- src/Cedar/Protocol.c.orig	2019-02-03 19:43:50 UTC
+--- src/Cedar/Protocol.c.orig	2019-02-28 08:10:54 UTC
 +++ src/Cedar/Protocol.c
-@@ -58,7 +58,7 @@ bool TryGetRootCertChain(LIST *o, X *x, bool auto_save
+@@ -164,7 +164,7 @@ bool TryGetRootCertChain(LIST *o, X *x, bool auto_save
  		wchar_t exedir[MAX_SIZE];
  
  		GetExeDirW(exedir, sizeof(exedir));
@@ -9,7 +9,7 @@
  		MakeDirExW(dirname);
  
  		if (auto_save)
-@@ -365,7 +365,7 @@ void AddAllChainCertsToCertList(LIST *o)
+@@ -471,7 +471,7 @@ void AddAllChainCertsToCertList(LIST *o)
  
  	GetExeDirW(exedir, sizeof(exedir));
  
@@ -18,9 +18,9 @@
  
  	MakeDirExW(dirname);
  
---- src/Mayaqua/Network.c.orig	2019-02-03 19:43:50 UTC
+--- src/Mayaqua/Network.c.orig	2019-02-28 08:10:54 UTC
 +++ src/Mayaqua/Network.c
-@@ -11520,7 +11520,7 @@ void AddChainSslCertOnDirectory(struct ssl_ctx_st *ctx
+@@ -12821,7 +12821,7 @@ void AddChainSslCertOnDirectory(struct ssl_ctx_st *ctx
  
  	GetExeDirW(exedir, sizeof(exedir));
  

Modified: head/security/softether/files/patch-piddir
==============================================================================
--- head/security/softether/files/patch-piddir	Thu Feb 28 16:44:05 2019	(r494159)
+++ head/security/softether/files/patch-piddir	Thu Feb 28 16:46:35 2019	(r494160)
@@ -1,6 +1,6 @@
---- src/Mayaqua/Unix.c.orig	2019-02-03 19:43:50 UTC
+--- src/Mayaqua/Unix.c.orig	2019-02-28 08:10:54 UTC
 +++ src/Mayaqua/Unix.c
-@@ -774,7 +774,7 @@ void *UnixNewSingleInstance(char *instance_name)
+@@ -927,7 +927,7 @@ void *UnixNewSingleInstance(char *instance_name)
  	GetExeDir(dir, sizeof(dir));
  
  	// File name generation
@@ -9,8 +9,8 @@
  
  	fd = open(name, O_WRONLY);
  	if (fd == -1)
-@@ -2194,7 +2194,7 @@ void UnixGenPidFileName(char *name, UINT size)
- 	Md5(hash, exe_name, StrLen(exe_name));
+@@ -2385,7 +2385,7 @@ void UnixGenPidFileName(char *name, UINT size)
+ 	Hash(hash, exe_name, StrLen(exe_name), false);
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.pid_%s", dir, tmp1);
@@ -18,8 +18,8 @@
  }
  
  // Delete the PID file
-@@ -2239,7 +2239,7 @@ void UnixGenCtlFileName(char *name, UINT size)
- 	Md5(hash, exe_name, StrLen(exe_name));
+@@ -2430,7 +2430,7 @@ void UnixGenCtlFileName(char *name, UINT size)
+ 	Hash(hash, exe_name, StrLen(exe_name), false);
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.ctl_%s", dir, tmp1);