From owner-svn-ports-all@freebsd.org Tue Feb 20 20:52:03 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 848AEF01995; Tue, 20 Feb 2018 20:52:03 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 347086EDE3; Tue, 20 Feb 2018 20:52:03 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A1106CF7; Tue, 20 Feb 2018 20:52:03 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KKq36r067154; Tue, 20 Feb 2018 20:52:03 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KKq2iW067152; Tue, 20 Feb 2018 20:52:02 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201802202052.w1KKq2iW067152@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 20 Feb 2018 20:52:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462449 - in head/security/softether: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/security/softether: . files X-SVN-Commit-Revision: 462449 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2018 20:52:03 -0000 Author: pi Date: Tue Feb 20 20:52:02 2018 New Revision: 462449 URL: https://svnweb.freebsd.org/changeset/ports/462449 Log: security/softether: add unlock regional lockout option PR: 225751 Submitted by: Koichiro IWAO Approved by: net@arrishq.net (maintainer) Added: head/security/softether/files/extra-patch-unrestrict-enterprise-functions (contents, props changed) Modified: head/security/softether/Makefile Modified: head/security/softether/Makefile ============================================================================== --- head/security/softether/Makefile Tue Feb 20 20:28:59 2018 (r462448) +++ head/security/softether/Makefile Tue Feb 20 20:52:02 2018 (r462449) @@ -35,7 +35,17 @@ DOS2UNIX_FILES= AUTHORS.TXT ChangeLog LICENSE README T src/Mayaqua/Table.h \ src/Mayaqua/Unix.c -OPTIONS_DEFINE= DOCS +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 ONLY_FOR_ARCHS= i386 amd64 Added: 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/extra-patch-unrestrict-enterprise-functions Tue Feb 20 20:52:02 2018 (r462449) @@ -0,0 +1,29 @@ +diff --git src/Cedar/Server.c src/Cedar/Server.c +index 2a100ec..ee58f37 100644 +--- src/Cedar/Server.c ++++ src/Cedar/Server.c +@@ -10859,23 +10859,7 @@ bool SiCheckCurrentRegion(CEDAR *c, char *r) + // + 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