Skip to content

Commit

Permalink
security/softether-devel: add unlock regional lockout option
Browse files Browse the repository at this point in the history
As well as r462449, applying the same patch to -devel port.

PR:		225750
Submitted by:	myself
Approved by:	maintainer timeout, pi (mentor)
  • Loading branch information
metalefty committed Jul 26, 2018
1 parent 8e64ab7 commit 89bf5bd
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 2 deletions.
14 changes: 12 additions & 2 deletions security/softether-devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= softether-devel
PORTVERSION= 4.21.9613
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security

MAINTAINER= [email protected]
Expand All @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 89bf5bd

Please sign in to comment.