From owner-svn-ports-all@freebsd.org Mon Jun 29 03:02:17 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 01B0935C224; Mon, 29 Jun 2020 03:02:17 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49wC2c60YGz4D8p; Mon, 29 Jun 2020 03:02:16 +0000 (UTC) (envelope-from meta@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 B2A3B20CE3; Mon, 29 Jun 2020 03:02:16 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05T32GrN042162; Mon, 29 Jun 2020 03:02:16 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05T32FYS042157; Mon, 29 Jun 2020 03:02:15 GMT (envelope-from meta@FreeBSD.org) Message-Id: <202006290302.05T32FYS042157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Mon, 29 Jun 2020 03:02:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540741 - in head/security: softether softether-devel softether-devel/files softether/files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/security: softether softether-devel softether-devel/files softether/files X-SVN-Commit-Revision: 540741 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.33 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: Mon, 29 Jun 2020 03:02:17 -0000 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