svn commit: r540741 - in head/security: softether softether-devel softether-devel/files softether/files

[Koichiro Iwao]

Author: meta
Date: Mon Jun 29 03:02:15 2020
New Revision: 540741
URL: https://svnweb.freebsd.org/changeset/ports/540741

Log:
  security/softether: deprecate UNLOCK option as well as r540740

Added:
  head/security/softether-devel/files/patch-unrestrict-enterprise-functions
     - copied unchanged from r540740, head/security/softether-devel/files/extra-patch-unrestrict-enterprise-functions
  head/security/softether/files/patch-unrestrict-enterprise-functions
     - copied unchanged from r540740, head/security/softether/files/extra-patch-unrestrict-enterprise-functions
Deleted:
  head/security/softether-devel/files/extra-patch-unrestrict-enterprise-functions
  head/security/softether/files/extra-patch-unrestrict-enterprise-functions
Modified:
  head/security/softether-devel/Makefile
  head/security/softether/Makefile

Modified: head/security/softether-devel/Makefile
==============================================================================
--- head/security/softether-devel/Makefile	Mon Jun 29 02:49:43 2020	(r540740)
+++ head/security/softether-devel/Makefile	Mon Jun 29 03:02:15 2020	(r540741)
@@ -2,6 +2,7 @@
 
 PORTNAME=	softether
 DISTVERSION=	4.34-9745-beta
+PORTREVISION=	1
 CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-2020.04.05-tree/Source_Code/
 PKGNAMESUFFIX=	-devel
@@ -24,17 +25,7 @@ USE_RC_SUBR=	softether_bridge softether_client softeth
 DOS2UNIX_FILES=	ChangeLog LICENSE README *.TXT \
 		src/Cedar/*.* src/Mayaqua/*.*
 
-OPTIONS_DEFINE=	DOCS UNLOCK
-
-# Use of some functions in Japan and China is restricted.
-# This option Unlocks regional lockout following functions:
-#  - RADIUS / NT Domain user authentication function
-#  - RSA certificate user authentication function
-#  - Deep-inspect packet logging function
-#  - Source IP address control list function
-#  - syslog transfer function
-UNLOCK_DESC=	Unlock regional lockout (JP and CN)
-UNLOCK_EXTRA_PATCHES=	${FILESDIR}/extra-patch-unrestrict-enterprise-functions
+OPTIONS_DEFINE=	DOCS
 
 CONFLICTS_INSTALL=	softether-4.* softether5
 PORTDOCS=	AUTHORS.TXT ChangeLog LICENSE README THIRD_PARTY.TXT WARNING.TXT

Copied: head/security/softether-devel/files/patch-unrestrict-enterprise-functions (from r540740, head/security/softether-devel/files/extra-patch-unrestrict-enterprise-functions)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/softether-devel/files/patch-unrestrict-enterprise-functions	Mon Jun 29 03:02:15 2020	(r540741, copy of r540740, head/security/softether-devel/files/extra-patch-unrestrict-enterprise-functions)
@@ -0,0 +1,27 @@
+--- src/Cedar/Server.c.orig	2016-04-24 14:49:31 UTC
++++ src/Cedar/Server.c
+@@ -10822,23 +10822,7 @@ bool SiCheckCurrentRegion(CEDAR *c, char
+ // 
+ bool SiIsEnterpriseFunctionsRestrictedOnOpenSource(CEDAR *c)
+ {
+-	char region[128];
+-	bool ret = false;
+-	// Validate arguments
+-	if (c == NULL)
+-	{
+-		return false;
+-	}
+-
+-
+-	SiGetCurrentRegion(c, region, sizeof(region));
+-
+-	if (StrCmpi(region, "JP") == 0 || StrCmpi(region, "CN") == 0)
+-	{
+-		ret = true;
+-	}
+-
+-	return ret;
++	return false;
+ }
+ 
+ // Update the current region

Modified: head/security/softether/Makefile
==============================================================================
--- head/security/softether/Makefile	Mon Jun 29 02:49:43 2020	(r540740)
+++ head/security/softether/Makefile	Mon Jun 29 03:02:15 2020	(r540741)
@@ -2,6 +2,7 @@
 
 PORTNAME=	softether
 DISTVERSION=	4.34-9745
+PORTREVISION=	1
 CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2020.04.05-tree/Source_Code/
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}-rtm
@@ -22,17 +23,7 @@ USE_RC_SUBR=	softether_bridge softether_client softeth
 DOS2UNIX_FILES=	ChangeLog LICENSE README *.TXT \
 		src/Cedar/*.* src/Mayaqua/*.*
 
-OPTIONS_DEFINE=	DOCS UNLOCK
-
-# Use of some functions in Japan and China is restricted.
-# This option Unlocks regional lockout following functions:
-#  - RADIUS / NT Domain user authentication function
-#  - RSA certificate user authentication function
-#  - Deep-inspect packet logging function
-#  - Source IP address control list function
-#  - syslog transfer function
-UNLOCK_DESC=	Unlock regional lockout (JP and CN)
-UNLOCK_EXTRA_PATCHES=	${FILESDIR}/extra-patch-unrestrict-enterprise-functions
+OPTIONS_DEFINE=	DOCS
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS_INSTALL=	softether-devel-4.* softether5

Copied: head/security/softether/files/patch-unrestrict-enterprise-functions (from r540740, head/security/softether/files/extra-patch-unrestrict-enterprise-functions)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/softether/files/patch-unrestrict-enterprise-functions	Mon Jun 29 03:02:15 2020	(r540741, copy of r540740, head/security/softether/files/extra-patch-unrestrict-enterprise-functions)
@@ -0,0 +1,27 @@
+--- src/Cedar/Server.c.orig	2016-04-24 14:49:31 UTC
++++ src/Cedar/Server.c
+@@ -10822,23 +10822,7 @@ bool SiCheckCurrentRegion(CEDAR *c, char
+ // 
+ bool SiIsEnterpriseFunctionsRestrictedOnOpenSource(CEDAR *c)
+ {
+-	char region[128];
+-	bool ret = false;
+-	// Validate arguments
+-	if (c == NULL)
+-	{
+-		return false;
+-	}
+-
+-
+-	SiGetCurrentRegion(c, region, sizeof(region));
+-
+-	if (StrCmpi(region, "JP") == 0 || StrCmpi(region, "CN") == 0)
+-	{
+-		ret = true;
+-	}
+-
+-	return ret;
++	return false;
+ }
+ 
+ // Update the current region