1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00

security/softether-devel: add unlock regional lockout option

As well as r462449, applying the same patch to -devel port.

PR:		225750
Submitted by:	myself
Approved by:	maintainer timeout, pi (mentor)
This commit is contained in:
Koichiro Iwao 2018-07-26 01:03:40 +00:00
parent 371234076f
commit ac757470cf
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=475341
2 changed files with 39 additions and 2 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= softether-devel
PORTVERSION= 4.21.9613
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security
MAINTAINER= hrs@FreeBSD.org
@ -25,7 +25,17 @@ USE_RC_SUBR= vpnserver vpnclient vpnbridge
PORTDOCS= AUTHORS.TXT BUILD_UNIX.TXT ChangeLog README THIRD_PARTY.TXT \
WARNING.TXT
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
post-patch:
${INSTALL_DATA} ${WRKSRC}/src/makefiles/freebsd_32bit.mak \

View File

@ -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