Date: Tue, 17 Sep 2019 08:02:40 +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: r512198 - in head/security/softether5: . files Message-ID: <201909170802.x8H82eLY078821@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Tue Sep 17 08:02:40 2019 New Revision: 512198 URL: https://svnweb.freebsd.org/changeset/ports/512198 Log: security/softether5: make LogFileList command [1] work properly - Move patch files to my GitHub fork to follow upstream easier - Use separate PIDDIR from DBDIR [1] https://www.softether.org/4-docs/1-manual/6._Command_Line_Management_Utility_Manual/6.3_VPN_Server_%2F%2F_VPN_Bridge_Management_Command_Reference_(For_Entire_Server)#6.3.55_.22LogFileList.22:_Get_List_of_Log_Files Deleted: head/security/softether5/files/extra-patch-unrestrict-enterprise-functions head/security/softether5/files/patch-chain-certs-dir head/security/softether5/files/patch-piddir head/security/softether5/files/patch-use-system-cpu_features Modified: head/security/softether5/Makefile head/security/softether5/distinfo head/security/softether5/files/pkg-message.in head/security/softether5/pkg-plist Modified: head/security/softether5/Makefile ============================================================================== --- head/security/softether5/Makefile Tue Sep 17 04:45:06 2019 (r512197) +++ head/security/softether5/Makefile Tue Sep 17 08:02:40 2019 (r512198) @@ -2,24 +2,27 @@ PORTNAME= softether DISTVERSION= 5.01.9671 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security net-vpn PKGNAMESUFFIX= 5 +DIST_SUBDIR= ${PORTNAME} +# Some patches are managed in my GitHub fork +PATCH_SITES= https://github.com/metalefty/${GH_ACCOUNT}/commit/ +PATCHFILES= dc2f94f1.patch:-p1 b2e3b1f5.patch:-p1 572a3531.patch:-p1 9929817.patch:-p1 + MAINTAINER= meta@FreeBSD.org COMMENT= SoftEther VPN 5 (Developer Edition) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES+= cmake:noninja compiler:c11 dos2unix iconv:wchar_t \ +USES+= cmake:noninja compiler:c11 iconv:wchar_t \ localbase:ldflags ncurses readline ssl USE_RC_SUBR= softether_bridge softether_client softether_server USE_LDCONFIG= yes USE_GITHUB= yes -DOS2UNIX_GLOB= *.h *.c - GH_ACCOUNT= SoftEtherVPN GH_PROJECT= SoftEtherVPN @@ -33,15 +36,16 @@ OPTIONS_DEFINE= DOCS UNLOCK # - 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 +UNLOCK_PATCHFILES= d1456861.patch:-p1 PORTDOCS= DISCLAIMER.md WARNING.TXT CONFLICTS_INSTALL= softether-4.[0-9]* softether-devel-4.[0-9]* SE_DBDIR?= /var/db/${PORTNAME} SE_LOGDIR?= /var/log/${PORTNAME} -PLIST_SUB= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" -SUB_LIST= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" +SE_PIDDIR?= /var/run/${PORTNAME} +PLIST_SUB= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}" +SUB_LIST= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}" SUB_FILES= pkg-message .include <bsd.port.pre.mk> @@ -62,51 +66,13 @@ post-patch: # SoftEther scatters logs, config files and PID files in PREFIX/libexec # directory. To write them in the right place, replace it. ${REINPLACE_CMD} \ - -e "s|@vpn_server_template|${SE_DBDIR}/vpn_server_template|" \ - -e "s|@vpn_server|${SE_DBDIR}/vpn_server|" \ - -e "s|@vpn_bridge|${SE_DBDIR}/vpn_bridge|" \ - -e "s|@vpn_gate_svc|${SE_DBDIR}/vpn_gate_svc|" \ - -e "s|@vpn_gate_relay|${SE_DBDIR}/vpn_gate_relay|" \ - ${WRKSRC}/src/Cedar/Server.c - - ${REINPLACE_CMD} \ - -e "s|@adminip|${SE_DBDIR}/adminip|" \ - -e "s|@etherlogger|${SE_DBDIR}/etherlogger|" \ - -e "s|@vpn_client|${SE_DBDIR}/vpn_client|" \ - -e "s|@vpn_router|${SE_DBDIR}/vpn_router|" \ - -e "s|@custom|${SE_DBDIR}/custom|" \ - -e "s|@backup|${SE_DBDIR}/backup|" \ - -e "s|@save_binary|${SE_DBDIR}/save_binary|" \ - -e "s|@lang|${SE_DBDIR}/lang|" \ - -e "s|@azureserver|${SE_DBDIR}/azureserver|" \ - -e "s|@server_log|${SE_LOGDIR}/server|" \ - -e "s|@security_log|${SE_LOGDIR}/security|" \ - -e "s|@packet_log|${SE_LOGDIR}/packet|" \ - -e "s|@secure_nat_log|${SE_LOGDIR}/secure_nat|" \ - -e "s|@client_log|${SE_LOGDIR}/client|" \ - -e "s|@tiny_log|${SE_LOGDIR}/tiny|" \ - -e "s|@carrier_log|${SE_LOGDIR}/carrier|" \ - -e "s|@etherlogger_log|${SE_LOGDIR}/etherlogger|" \ - ${WRKSRC}/src/Cedar/Cedar.h \ - ${WRKSRC}/src/Cedar/Client.h \ - ${WRKSRC}/src/Cedar/Nat.h \ - ${WRKSRC}/src/Cedar/Server.c \ - ${WRKSRC}/src/Mayaqua/Cfg.c \ - ${WRKSRC}/src/Mayaqua/Cfg.h \ - ${WRKSRC}/src/Mayaqua/Table.h - - ${REINPLACE_CMD} \ - -e "s|abort_error_log\.txt|${SE_LOGDIR}/abort_error_log.txt|" \ - ${WRKSRC}/src/Mayaqua/Kernel.c - - ${REINPLACE_CMD} \ -e "s|%%SE_DBDIR%%|${SE_DBDIR}|g" \ - ${WRKSRC}/src/Cedar/Protocol.c \ - ${WRKSRC}/src/Mayaqua/Unix.c \ - ${WRKSRC}/src/Mayaqua/Network.c + -e "s|%%SE_LOGDIR%%|${SE_LOGDIR}|g" \ + -e "s|%%SE_PIDDIR%%|${SE_PIDDIR}|g" \ + ${WRKSRC}/src/Mayaqua/FileIO.c post-install: - @${MKDIR} ${STAGEDIR}${SE_LOGDIR} ${STAGEDIR}${SE_DBDIR} + @${MKDIR} ${STAGEDIR}${SE_LOGDIR} ${STAGEDIR}${SE_DBDIR} ${STAGEDIR}${SE_PIDDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/security/softether5/distinfo ============================================================================== --- head/security/softether5/distinfo Tue Sep 17 04:45:06 2019 (r512197) +++ head/security/softether5/distinfo Tue Sep 17 08:02:40 2019 (r512198) @@ -1,3 +1,13 @@ -TIMESTAMP = 1562804347 -SHA256 (SoftEtherVPN-SoftEtherVPN-5.01.9671_GH0.tar.gz) = 867f63327e1007a1c448e072d7597d25bb06e9333199bf57bd2e442ef79bbce8 -SIZE (SoftEtherVPN-SoftEtherVPN-5.01.9671_GH0.tar.gz) = 66960472 +TIMESTAMP = 1568706136 +SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.01.9671_GH0.tar.gz) = 867f63327e1007a1c448e072d7597d25bb06e9333199bf57bd2e442ef79bbce8 +SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.01.9671_GH0.tar.gz) = 66960472 +SHA256 (softether/dc2f94f1.patch) = 2e74f3fba4d62b2d06d8ec07a79d177883ff331d36240ec6fb3ee8f5dfe82f83 +SIZE (softether/dc2f94f1.patch) = 1079 +SHA256 (softether/b2e3b1f5.patch) = 61604f1bcaf7127581df781694c7731d8975d9412b78284f3683f6418eb7798c +SIZE (softether/b2e3b1f5.patch) = 12536 +SHA256 (softether/572a3531.patch) = 41a94a9718b64dfc6a872be86ce72e4a2054881fe49f998c8350e2e8b1b660a0 +SIZE (softether/572a3531.patch) = 4896 +SHA256 (softether/9929817.patch) = 28931acee597200976db431a9f2650308a1e50158b9c9301042addc9a623ceae +SIZE (softether/9929817.patch) = 2044 +SHA256 (softether/d1456861.patch) = 020dc96da0a7f8f65045fe76f7ea70d3bce8b61d1d0477b2f113e9bff97b6c3d +SIZE (softether/d1456861.patch) = 928 Modified: head/security/softether5/files/pkg-message.in ============================================================================== --- head/security/softether5/files/pkg-message.in Tue Sep 17 04:45:06 2019 (r512197) +++ head/security/softether5/files/pkg-message.in Tue Sep 17 08:02:40 2019 (r512198) @@ -20,6 +20,7 @@ When removing SoftEther VPN without the desire to rein ensure to remove the following dirctories as well: - %%SE_DBDIR%% - %%SE_LOGDIR%% +- %%SE_PIDDIR%% EOM } ] Modified: head/security/softether5/pkg-plist ============================================================================== --- head/security/softether5/pkg-plist Tue Sep 17 04:45:06 2019 (r512197) +++ head/security/softether5/pkg-plist Tue Sep 17 08:02:40 2019 (r512198) @@ -18,3 +18,4 @@ libexec/softether/vpnserver/vpnserver @dir libexec/softether/vpnserver @dir %%SE_DBDIR%% @dir %%SE_LOGDIR%% +@dir %%SE_PIDDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909170802.x8H82eLY078821>