Date: Mon, 25 Feb 2019 05:34:13 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493836 - in head/security/softether5: . files Message-ID: <201902250534.x1P5YDiF008130@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Mon Feb 25 05:34:12 2019 New Revision: 493836 URL: https://svnweb.freebsd.org/changeset/ports/493836 Log: security/softether5: Avoid hardcoded path in patches Respect SE_LOGDIR, SE_DBDIR defined in Makefile. Unintended replaced with hardcoded path by `make makepatch`. While here, bump PORTREVISION to force rebuild with these paths. Sponsored by: HAW International, Inc. Modified: head/security/softether5/Makefile head/security/softether5/files/patch-chain-certs-dir head/security/softether5/files/patch-piddir head/security/softether5/files/softether_bridge.in head/security/softether5/files/softether_client.in head/security/softether5/files/softether_server.in Modified: head/security/softether5/Makefile ============================================================================== --- head/security/softether5/Makefile Mon Feb 25 05:07:08 2019 (r493835) +++ head/security/softether5/Makefile Mon Feb 25 05:34:12 2019 (r493836) @@ -2,6 +2,7 @@ PORTNAME= softether DISTVERSION= 5.01.9669 +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= 5 Modified: head/security/softether5/files/patch-chain-certs-dir ============================================================================== --- head/security/softether5/files/patch-chain-certs-dir Mon Feb 25 05:07:08 2019 (r493835) +++ head/security/softether5/files/patch-chain-certs-dir Mon Feb 25 05:34:12 2019 (r493836) @@ -5,7 +5,7 @@ GetExeDirW(exedir, sizeof(exedir)); - CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs"); -+ CombinePathW(dirname, sizeof(dirname), L"/var/db/softether", L"chain_certs"); ++ CombinePathW(dirname, sizeof(dirname), L"%%SE_DBDIR%%", L"chain_certs"); MakeDirExW(dirname); if (auto_save) @@ -14,7 +14,7 @@ GetExeDirW(exedir, sizeof(exedir)); - CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs"); -+ CombinePathW(dirname, sizeof(dirname), L"/var/db/softether", L"chain_certs"); ++ CombinePathW(dirname, sizeof(dirname), L"%%SE_DBDIR%%", L"chain_certs"); MakeDirExW(dirname); @@ -25,7 +25,7 @@ GetExeDirW(exedir, sizeof(exedir)); - CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs"); -+ CombinePathW(dirname, sizeof(dirname), L"/var/db/softether", L"chain_certs"); ++ CombinePathW(dirname, sizeof(dirname), L"%%SE_DBDIR%%", L"chain_certs"); MakeDirExW(dirname); Modified: head/security/softether5/files/patch-piddir ============================================================================== --- head/security/softether5/files/patch-piddir Mon Feb 25 05:07:08 2019 (r493835) +++ head/security/softether5/files/patch-piddir Mon Feb 25 05:34:12 2019 (r493836) @@ -5,7 +5,7 @@ // File name generation - Format(name, sizeof(name), "%s/.%s", dir, tmp); -+ Format(name, sizeof(name), "/var/db/softether/.%s", tmp); ++ Format(name, sizeof(name), "%%SE_DBDIR%%/.%s", tmp); fd = open(name, O_WRONLY); if (fd == -1) @@ -14,7 +14,7 @@ BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash)); - Format(name, size, "%s/.pid_%s", dir, tmp1); -+ Format(name, size, "/var/db/softether/.pid_%s", tmp1); ++ Format(name, size, "%%SE_DBDIR%%/.pid_%s", tmp1); } // Delete the PID file @@ -23,7 +23,7 @@ BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash)); - Format(name, size, "%s/.ctl_%s", dir, tmp1); -+ Format(name, size, "/var/db/softether/.ctl_%s", tmp1); ++ Format(name, size, "%%SE_DBDIR%%/.ctl_%s", tmp1); } // Write the CTL file Modified: head/security/softether5/files/softether_bridge.in ============================================================================== --- head/security/softether5/files/softether_bridge.in Mon Feb 25 05:07:08 2019 (r493835) +++ head/security/softether5/files/softether_bridge.in Mon Feb 25 05:34:12 2019 (r493836) @@ -20,7 +20,7 @@ load_rc_config ${name} command="%%PREFIX%%/libexec/softether/vpnbridge/vpnbridge" -datadir="/var/db/softether" +datadir="%%SE_DBDIR%%" start_precmd="${name}_precmd" start_cmd="${command} start" Modified: head/security/softether5/files/softether_client.in ============================================================================== --- head/security/softether5/files/softether_client.in Mon Feb 25 05:07:08 2019 (r493835) +++ head/security/softether5/files/softether_client.in Mon Feb 25 05:34:12 2019 (r493836) @@ -20,7 +20,7 @@ load_rc_config ${name} command="%%PREFIX%%/libexec/softether/vpnclient/vpnclient" -datadir="/var/db/softether" +datadir="%%SE_DBDIR%%" start_precmd="${name}_precmd" start_cmd="${command} start" Modified: head/security/softether5/files/softether_server.in ============================================================================== --- head/security/softether5/files/softether_server.in Mon Feb 25 05:07:08 2019 (r493835) +++ head/security/softether5/files/softether_server.in Mon Feb 25 05:34:12 2019 (r493836) @@ -20,7 +20,7 @@ load_rc_config ${name} command="%%PREFIX%%/libexec/softether/vpnserver/vpnserver" -datadir="/var/db/softether" +datadir="%%SE_DBDIR%%" start_precmd="${name}_precmd" start_cmd="${command} start"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902250534.x1P5YDiF008130>