Re: git: c90e6c2d0308 - main - net/amnezia-tools: Improve port
Date: Sun, 10 Aug 2025 01:27:54 UTC
Hello,
MASTER_SITES should be removed since USE_GITHUB is fetching.
Cheers,
Vladimir Druzenko <vvd@freebsd.org> escreveu (sábado, 9/08/2025 à(s) 22:37):
> The branch main has been updated by vvd:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=c90e6c2d0308cfb17ebdb543f1c091fcbc10e7f0
>
> commit c90e6c2d0308cfb17ebdb543f1c091fcbc10e7f0
> Author: Vova <vova@fbsd.ru>
> AuthorDate: 2025-08-09 21:31:32 +0000
> Commit: Vladimir Druzenko <vvd@FreeBSD.org>
> CommitDate: 2025-08-09 21:36:38 +0000
>
> net/amnezia-tools: Improve port
>
> - Move "-tools" from PORTNAME to PKGNAMESUFFIX.
> - Properly use PREFIX and ETCDIR.
> - Add shebangfix.
> - Make portclippy happy.
> - Fix manpages.
> - Fix bash completion.
>
> PR: 288730
> Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org>
> ---
> net/amnezia-tools/Makefile | 26 +--
> net/amnezia-tools/distinfo | 6 +-
> net/amnezia-tools/files/amnezia.in | 7 +-
> net/amnezia-tools/files/patch-man_wg-quick.8 | 204
> +++++++++++++++++++++
> net/amnezia-tools/files/patch-man_wg.8 | 140 +++++++++++++-
> .../files/patch-wg-quick_freebsd.bash | 2 +-
> 6 files changed, 364 insertions(+), 21 deletions(-)
>
> diff --git a/net/amnezia-tools/Makefile b/net/amnezia-tools/Makefile
> index 2c15bcdb024f..f017fea7b5e1 100644
> --- a/net/amnezia-tools/Makefile
> +++ b/net/amnezia-tools/Makefile
> @@ -1,8 +1,10 @@
> -PORTNAME= amnezia-tools
> -PORTVERSION= 1.0.20241018
> -PORTREVISION= 1
> +PORTNAME= amnezia
> +DISTVERSIONPREFIX= v
> +DISTVERSION= 1.0.20241018
> +PORTREVISION= 2
> CATEGORIES= net net-vpn
> MASTER_SITES= https://github.com/amnezia-vpn/amneziawg-tools/
> +PKGNAMESUFFIX= -tools
>
> MAINTAINER= vova@zote.me
> COMMENT= Fast, modern and secure VPN Tunnel with AmneziaVPN
> anti-detection
> @@ -12,27 +14,29 @@ LICENSE= GPLv2
>
> RUN_DEPENDS= bash:shells/bash
>
> -USES= gmake
> +USES= gmake shebangfix
> USE_GITHUB= yes
> GH_ACCOUNT= amnezia-vpn
> GH_PROJECT= amneziawg-tools
> -GH_TAGNAME= v${PORTVERSION}
> +USE_RC_SUBR= ${PORTNAME}
> +
> +SHEBANG_FILES= wg-quick/freebsd.bash
>
> -WRKSRC_SUBDIR= src
> MAKE_ARGS+= DEBUG=no WITH_BASHCOMPLETION=yes WITH_SYSTEMDUNITS=no
> MAKE_ENV+= MANDIR="${PREFIX}/share/man" \
> SYSCONFDIR="${PREFIX}/etc"
>
> -USE_RC_SUBR= amnezia
> -
> -.include <bsd.port.options.mk>
> +WRKSRC_SUBDIR= src
>
> post-patch:
> - @${REINPLACE_CMD} -e 's|wg s|awg s|g' \
> + @${REINPLACE_CMD} -e 's|wg s|awg s|g; \
> + s|/usr/local/etc/wireguard|${ETCDIR}|' \
> ${WRKSRC}/completion/wg-quick.bash-completion
> + @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|' \
> + ${WRKSRC}/wg-quick/freebsd.bash
>
> post-install:
> - @${RMDIR} ${STAGEDIR}${PREFIX}/etc/amnezia/amneziawg
> + @${RMDIR} ${STAGEDIR}${ETCDIR}/amneziawg
> ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/awg
>
> .include <bsd.port.mk>
> diff --git a/net/amnezia-tools/distinfo b/net/amnezia-tools/distinfo
> index 3703c8bf36a2..4121ea84aa23 100644
> --- a/net/amnezia-tools/distinfo
> +++ b/net/amnezia-tools/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1744661306
> -SHA256
> (amnezia-vpn-amneziawg-tools-1.0.20241018-v1.0.20241018_GH0.tar.gz) =
> 60f1cec1774fb871a2d8dc24e4f731625516d90f663d6e0d2c77d9247222f2f9
> -SIZE (amnezia-vpn-amneziawg-tools-1.0.20241018-v1.0.20241018_GH0.tar.gz)
> = 156259
> +TIMESTAMP = 1754646104
> +SHA256 (amnezia-vpn-amneziawg-tools-v1.0.20241018_GH0.tar.gz) =
> 60f1cec1774fb871a2d8dc24e4f731625516d90f663d6e0d2c77d9247222f2f9
> +SIZE (amnezia-vpn-amneziawg-tools-v1.0.20241018_GH0.tar.gz) = 156259
> diff --git a/net/amnezia-tools/files/amnezia.in b/net/amnezia-tools/files/
> amnezia.in
> index 11a5daf89861..98010c013bdb 100644
> --- a/net/amnezia-tools/files/amnezia.in
> +++ b/net/amnezia-tools/files/amnezia.in
> @@ -17,7 +17,7 @@
> # (default:
> "if_amn", "" - no module)
> #
> # amnezia_confdirs (str): Directory to store the configuration files.
> -# (default:
> "/usr/local/etc/amnezia")
> +# (default:
> "%%ETCDIR%%")
>
> . /etc/rc.subr
>
> @@ -33,7 +33,6 @@ status_cmd="${name}_status"
> amnezia_start()
> {
> kmod=${amnezia_kmod:-if_amn}
> - ${amnezia_confdirs:+eval export
> AWG_QUICK_CONFIG_SEARCH_PATHS="$amnezia_confdirs"}
> ${amnezia_env:+eval export $amnezia_env}
> [ -n "${kmod}" ] && kldstat -q -n ${kmod} || kldload -n ${kmod}
>
> @@ -76,6 +75,8 @@ load_rc_config $name
> : ${amnezia_interfaces=""}
> : ${amnezia_env=""}
> : ${amnezia_kmod="if_amn"}
> -: ${amnezia_confdirs="/usr/local/etc/amnezia"}
> +: ${amnezia_confdirs="%%ETCDIR%%"}
> +
> +${amnezia_confdirs:+eval export
> AWG_QUICK_CONFIG_SEARCH_PATHS="$amnezia_confdirs"}
>
> run_rc_command "$1"
> diff --git a/net/amnezia-tools/files/patch-man_wg-quick.8
> b/net/amnezia-tools/files/patch-man_wg-quick.8
> new file mode 100644
> index 000000000000..96d988cf7162
> --- /dev/null
> +++ b/net/amnezia-tools/files/patch-man_wg-quick.8
> @@ -0,0 +1,204 @@
> +--- man/wg-quick.8.orig 2024-10-01 13:02:42 UTC
> ++++ man/wg-quick.8
> +@@ -1,10 +1,10 @@
> +-.TH WG-QUICK 8 "2016 January 1" ZX2C4 "WireGuard"
> ++.TH AWG-QUICK 8 "2025 August 8" AWG "AmneziaWG"
> +
> + .SH NAME
> +-wg-quick - set up a WireGuard interface simply
> ++awg-quick - set up a WireGuard interface simply
> +
> + .SH SYNOPSIS
> +-.B wg-quick
> ++.B awg-quick
> + [
> + .I up
> + |
> +@@ -13,6 +13,8 @@ wg-quick - set up a WireGuard interface simply
> + .I save
> + |
> + .I strip
> ++|
> ++.I reload
> + ] [
> + .I CONFIG_FILE
> + |
> +@@ -31,9 +33,9 @@ with all
> + runs pre/post down scripts. Running \fIsave\fP saves the configuration
> of an existing
> + interface without bringing the interface down. Use \fIstrip\fP to output
> a configuration file
> + with all
> +-.BR wg-quick (8)-specific
> ++.BR awg-quick (8)-specific
> + options removed, suitable for use with
> +-.BR wg (8).
> ++.BR awg (8).
> +
> + \fICONFIG_FILE\fP is a configuration file, whose filename is the
> interface name
> + followed by `.conf'. Otherwise, \fIINTERFACE\fP is an interface name,
> with configuration
> +@@ -41,24 +43,24 @@ Generally speaking, this utility is just a simple scri
> + search paths.
> +
> + Generally speaking, this utility is just a simple script that wraps
> invocations to
> +-.BR wg (8)
> ++.BR awg (8)
> + and
> +-.BR ip (8)
> +-in order to set up a WireGuard interface. It is designed for users with
> simple
> ++.BR ifconfig (8)
> ++in order to set up a AmneziaWG interface. It is designed for users with
> simple
> + needs, and users with more advanced needs are highly encouraged to use a
> more
> + specific tool, a more complete network manager, or otherwise just use
> +-.BR wg (8)
> ++.BR awg (8)
> + and
> +-.BR ip (8),
> ++.BR route (8),
> + as usual.
> +
> + .SH CONFIGURATION
> +
> + The configuration file adds a few extra configuration values to the
> format understood by
> +-.BR wg (8)
> ++.BR awg (8)
> + in order to configure additional attributes of an interface. It handles
> the
> + values that it understands, and then it passes the remaining ones
> directly to
> +-.BR wg (8)
> ++.BR awg (8)
> + for further processing.
> +
> + It infers all routes from the list of peers' allowed IPs, and
> automatically adds
> +@@ -67,7 +69,7 @@ to handle overriding of the default gateway.
> + .BR ip-rule (8)
> + to handle overriding of the default gateway.
> +
> +-The configuration file will be passed directly to \fBwg\fP(8)'s `setconf'
> ++The configuration file will be passed directly to \fBawg\fP(8)'s
> `setconf'
> + sub-command, with the exception of the following additions to the
> \fIInterface\fP section,
> + which are handled by this tool:
> +
> +@@ -102,9 +104,29 @@ interface is removed will therefore be overwritten.
> + SaveConfig \(em if set to `true', the configuration is saved from the
> current state of the
> + interface upon shutdown. Any changes made to the configuration file
> before the
> + interface is removed will therefore be overwritten.
> ++.IP \(bu
> ++Description \(em will setup interface description visible in ifconfig
> and SNMP.
> ++.IP \(bu
> ++UserLand \(em enforce to use amnezia-go instead of kernel driver, you
> can use
> ++\fBamnezia-wireguard-go\fP to install it.
> ++.IP \(bu
> ++Routes \(em list of routes for the peer to be installed into FIB - that
> option provides a way to have AllowedIPs list wider then routes installed.
> Empty list is allowed.
> ++That is useful if routing protocol will work over the link.
> ++But remember that internal wireguard routing will happen according to
> AllowedIPs anyway.
> ++Suggested use in case dynamic route - one interface -> one link.
> ++.IP \(bu
> ++Monitor default route change \(em do not run `route monitor` when there
> is no need to do anything on default
> ++change. That will help to avoid keeping two bashes and one route binaries
> ++per interface always.
> ++Default value is true.
> ++.IP \(bu
> ++Track DNS Changes \(em if peer endpoint defined as a hostname -
> periodically (timeout in seconds)
> ++check if hostname was changed, and if changed update peer endpoint
> according
> ++to new hostname. Quite useful in case of DDNS configurations.
> ++Default values is 0, disabled.
> +
> + .P
> +-Recommended \fIINTERFACE\fP names include `wg0' or `wgvpn0' or even
> `wgmgmtlan0'.
> ++Recommended \fIINTERFACE\fP names include `amn0' or `awg0'.
> + However, the number at the end is in fact optional, and really
> + any free-form string [a-zA-Z0-9_=+.-]{1,15} will work. So even interface
> names corresponding
> + to geographic locations would suffice, such as `cincinnati', `nyc', or
> `paris', if that's
> +@@ -113,9 +135,9 @@ These examples draw on the same syntax found for
> + .SH EXAMPLES
> +
> + These examples draw on the same syntax found for
> +-.BR wg (8),
> ++.BR awg (8),
> + and a more complete description may be found there. Bold lines below are
> for options that extend
> +-.BR wg (8).
> ++.BR awg (8).
> +
> + The following might be used for connecting as a client to a VPN gateway
> for tunneling all
> + traffic:
> +@@ -151,15 +173,15 @@ two lines `PostUp` and `PreDown` lines to the
> `[Interf
> + to prevent the flow of unencrypted packets through the non-WireGuard
> interfaces, by adding the following
> + two lines `PostUp` and `PreDown` lines to the `[Interface]` section:
> +
> +- \fBPostUp = iptables -I OUTPUT ! -o %i -m mark ! --mark $(wg show %i
> fwmark) -m addrtype ! --dst-type LOCAL -j REJECT\fP
> ++ \fBPostUp = iptables -I OUTPUT ! -o %i -m mark ! --mark $(awg show
> %i fwmark) -m addrtype ! --dst-type LOCAL -j REJECT\fP
> + .br
> +- \fBPreDown = iptables -D OUTPUT ! -o %i -m mark ! --mark $(wg show
> %i fwmark) -m addrtype ! --dst-type LOCAL -j REJECT\fP
> ++ \fBPreDown = iptables -D OUTPUT ! -o %i -m mark ! --mark $(awg show
> %i fwmark) -m addrtype ! --dst-type LOCAL -j REJECT\fP
> + .br
> +
> + The `PostUp' and `PreDown' fields have been added to specify an
> + .BR iptables (8)
> + command which, when used with interfaces that have a peer that specifies
> 0.0.0.0/0 as part of the
> +-`AllowedIPs', works together with wg-quick's fwmark usage in order to
> drop all packets that
> ++`AllowedIPs', works together with awg-quick's fwmark usage in order to
> drop all packets that
> + are either not coming out of the tunnel encrypted or not going through
> the tunnel itself. (Note
> + that this continues to allow most DHCP traffic through, since most DHCP
> clients make use of PF_PACKET
> + sockets, which bypass Netfilter.) When IPv6 is in use, additional
> similar lines could be added using
> +@@ -168,7 +190,7 @@ Or, perhaps it is desirable to store private keys in e
> + Or, perhaps it is desirable to store private keys in encrypted form,
> such as through use of
> + .BR pass (1):
> +
> +- \fBPreUp = wg set %i private-key <(pass WireGuard/private-keys/%i)\fP
> ++ \fBPreUp = awg set %i private-key <(pass
> WireGuard/private-keys/%i)\fP
> + .br
> +
> + For use on a server, the following is a more complicated example
> involving multiple peers:
> +@@ -242,36 +264,43 @@ in the filename:
> + These configuration files may be placed in any directory, putting the
> desired interface name
> + in the filename:
> +
> +-\fB # wg-quick up /path/to/wgnet0.conf\fP
> ++\fB # awg-quick up amn0\fP
> +
> ++or
> ++
> ++\fB # awg-quick up /path/to/amn0.conf\fP
> ++
> + For convenience, if only an interface name is supplied, it automatically
> chooses a path in
> + `/etc/wireguard/':
> +
> +-\fB # wg-quick up wgnet0\fP
> ++\fB # awg-quick up amn0\fP
> +
> + This will load the configuration file `/etc/wireguard/wgnet0.conf'.
> +
> + The \fIstrip\fP command is useful for reloading configuration files
> without disrupting active
> + sessions:
> +
> +-\fB # wg syncconf wgnet0 <(wg-quick strip wgnet0)\fP
> ++\fB # awg syncconf amn0 <(awg-quick strip amn)\fP
> +
> ++or
> ++
> ++\fB # awg-quick reload amn0\fP
> ++
> ++
> + .SH SEE ALSO
> +-.BR wg (8),
> +-.BR ip (8),
> +-.BR ip-link (8),
> +-.BR ip-address (8),
> +-.BR ip-route (8),
> +-.BR ip-rule (8),
> +-.BR resolvconf (8).
> ++.BR awg (8),
> ++.BR ifconfig (8),
> ++.BR route (8),
> +
> + .SH AUTHOR
> ++.B awg-quick
> ++based on
> + .B wg-quick
> + was written by
> + .MT Jason@zx2c4.com
> + Jason A. Donenfeld
> + .ME .
> + For updates and more information, a project page is available on the
> +-.UR https://\:www.wireguard.com/
> ++.UR https://\:github.com/amnezia-vpn/amneziawg-tools/
> + World Wide Web
> + .UE .
> diff --git a/net/amnezia-tools/files/patch-man_wg.8
> b/net/amnezia-tools/files/patch-man_wg.8
> index ab226a3cc1e7..87e018ff2856 100644
> --- a/net/amnezia-tools/files/patch-man_wg.8
> +++ b/net/amnezia-tools/files/patch-man_wg.8
> @@ -1,15 +1,60 @@
> --- man/wg.8.orig 2024-10-01 13:02:42 UTC
> +++ man/wg.8
> -@@ -55,7 +55,7 @@ by \fICONFIGURATION FILE FORMAT\fP below.
> +@@ -1,10 +1,10 @@
> +-.TH WG 8 "2015 August 13" ZX2C4 "WireGuard"
> ++.TH AWG 8 "2025 August 8" AWG "AmneziaWG"
> +
> + .SH NAME
> +-wg - set and retrieve configuration of WireGuard interfaces
> ++awg - set and retrieve configuration of WireGuard interfaces
> +
> + .SH SYNOPSIS
> +-.B wg
> ++.B awg
> + [
> + .I COMMAND
> + ] [
> +@@ -15,17 +15,15 @@ wg - set and retrieve configuration of WireGuard inter
> +
> + .SH DESCRIPTION
> +
> +-.B wg
> ++.B awg
> + is the configuration utility for getting and setting the configuration of
> + WireGuard tunnel interfaces. The interfaces themselves can be added and
> removed
> + using
> +-.BR ip-link (8)
> ++.BR ifconfig (8)
> + and their IP addresses and routing tables can be set using
> +-.BR ip-address (8)
> +-and
> +-.BR ip-route (8).
> ++.BR route (8).
> + The
> +-.B wg
> ++.B awg
> + utility provides a series of sub-commands for changing WireGuard-specific
> + aspects of WireGuard interfaces.
> +
> +@@ -36,7 +34,7 @@ Sub-commands that take an INTERFACE must be passed a W
> + .SH COMMANDS
> +
> + .TP
> +-\fBshow\fP { \fI<interface>\fP | \fIall\fP | \fIinterfaces\fP }
> [\fIpublic-key\fP | \fIprivate-key\fP | \fIlisten-port\fP | \fIfwmark\fP |
> \fIpeers\fP | \fIpreshared-keys\fP | \fIendpoints\fP | \fIallowed-ips\fP |
> \fIlatest-handshakes\fP | \fIpersistent-keepalive\fP | \fItransfer\fP |
> \fIdump\fP]
> ++\fBshow\fP { \fI<interface>\fP | \fIall\fP | \fIinterfaces\fP }
> [\fIpublic-key\fP | \fIprivate-key\fP | \fIlisten-port\fP | \fIfwmark\fP |
> \fIpeers\fP | \fIpreshared-keys\fP | \fIendpoints\fP | \fIallowed-ips\fP |
> \fIlatest-handshakes\fP | \fIpersistent-keepalive\fP | \fItransfer\fP |
> \fIdump\fP | \fIjc\fP | \fIjmin\fP | \fIjmax\fP | \fIs1\fP | \fIs2\fP |
> \fIh1\fP | \fIh2\fP | \fIh3\fP | \fIh4\fP]
> + Shows current WireGuard configuration and runtime information of
> specified \fI<interface>\fP.
> + If no \fI<interface>\fP is specified, \fI<interface>\fP defaults to
> \fIall\fP.
> + If \fIinterfaces\fP is specified, prints a list of all WireGuard
> interfaces,
> +@@ -55,7 +53,7 @@ by \fICONFIGURATION FILE FORMAT\fP below.
> Shows the current configuration of \fI<interface>\fP in the format
> described
> by \fICONFIGURATION FILE FORMAT\fP below.
> .TP
> -\fBset\fP \fI<interface>\fP [\fIlisten-port\fP \fI<port>\fP]
> [\fIfwmark\fP \fI<fwmark>\fP] [\fIprivate-key\fP \fI<file-path>\fP]
> [\fIpeer\fP \fI<base64-public-key>\fP [\fIremove\fP] [\fIpreshared-key\fP
> \fI<file-path>\fP] [\fIendpoint\fP \fI<ip>:<port>\fP]
> [\fIpersistent-keepalive\fP \fI<interval seconds>\fP] [\fIallowed-ips\fP
> \fI<ip1>/<cidr1>\fP[,\fI<ip2>/<cidr2>\fP]...] ]...
> -+\fBset\fP \fI<interface>\fP [\fIlisten-port\fP \fI<port>\fP]
> [\fIfwmark\fP \fI<fwmark>\fP] [\fIprivate-key\fP \fI<file-path>\fP]
> [\fIpeer\fP \fI<base64-public-key>\fP [\fIremove\fP] [\fIpreshared-key\fP
> \fI<file-path>\fP] [\fIendpoint\fP \fI<ip>:<port>\fP]
> [\fIpersistent-keepalive\fP \fI<interval seconds>\fP] [\fIallowed-ips\fP
> \fI[+|-]<ip1>/<cidr1>\fP[,\fI[+|-]<ip2>/<cidr2>\fP]...] ]...
> ++\fBset\fP \fI<interface>\fP [\fIlisten-port\fP \fI<port>\fP]
> [\fIfwmark\fP \fI<fwmark>\fP] [\fIprivate-key\fP \fI<file-path>\fP] [\fIjc
> <jc>]\fP [\fI<jmin <jmin>]\fP [\fIjmax <jmax>\fP] [\fIs1 <s1>\fP] [\fIs2
> <s2>\fP] [\fIh1\fP] [\fIh2 <h2>\fP] [\fIh3 <h3>\fP] [\fIh4 <h4>\fP]
> [\fIpeer\fP \fI<base64-public-key>\fP [\fIremove\fP] [\fIpreshared-key\fP
> \fI<file-path>\fP] [\fIendpoint\fP \fI<ip>:<port>\fP]
> [\fIpersistent-keepalive\fP \fI<interval seconds>\fP] [\fIallowed-ips\fP
> \fI[+|-]<ip1>/<cidr1>\fP[,\fI[+|-]<ip2>/<cidr2>\fP]...] ]...
> Sets configuration values for the specified \fI<interface>\fP. Multiple
> \fIpeer\fPs may be specified, and if the \fIremove\fP argument is given
> for a peer, that peer is removed, not configured. If \fIlisten-port\fP
> -@@ -72,7 +72,11 @@ If \fIallowed-ips\fP is specified, but the value is th
> +@@ -72,7 +70,11 @@ If \fIallowed-ips\fP is specified, but the value is th
> it adds an additional layer of symmetric-key cryptography to be mixed
> into
> the already existing public-key cryptography, for post-quantum
> resistance.
> If \fIallowed-ips\fP is specified, but the value is the empty string, all
> @@ -22,3 +67,92 @@
> is optional and is by default off; setting it to 0 or "off" disables it.
> Otherwise it represents, in seconds, between 1 and 65535 inclusive, how
> often
> to send an authenticated empty packet to the peer, for the purpose of
> keeping
> +@@ -119,11 +121,52 @@ A private key and a corresponding public key may be
> ge
> + .br
> + $ umask 077
> + .br
> +- $ wg genkey | tee private.key | wg pubkey > public.key
> ++ $ awg genkey | tee private.key | awg pubkey > public.key
> + .TP
> + \fBhelp\fP
> + Shows usage message.
> +
> ++.SH AMNEZIA OPTIONS
> ++Configuration options to be use in order to bypass DPI filters, these
> options appears in
> ++\fBshow\fP, \fBset\fP, \fBsetconf\fP, \fBaddconf\fP commands.
> ++
> ++.TP
> ++\fBjc\fP
> ++Number of junk packets before handshake.
> ++.br
> ++1–128 (recomended 3–10)
> ++
> ++.TP
> ++\fBjmin\fP
> ++Minimum size of junk packets.
> ++.br
> ++jmin: < jmax (recomended ~ 8)
> ++
> ++.TP
> ++\fBjmax\fP
> ++Maximum size of junk packets.
> ++.br
> ++jmax: ≤ 1280 (recomended ~ 80)
> ++
> ++.TP
> ++\fBs1\fP
> ++Size of handshake initiation packet prepend junk. Should be the same on
> both ends.
> ++.br
> ++0–1132 (recomended 15–150), s1 + 56 ≠ s2
> ++
> ++.TP
> ++\fBs2\fP
> ++Size of handshake response packet prepend junk. Should be the same on
> both ends.
> ++.br
> ++0–1188 (recomended 15–150), s1 + 56 ≠ s2
> ++
> ++.TP
> ++\fBh1-h4\fP
> ++Custom identifiers for initiation/response/cookie/data packets. Should
> be the same on both ends.
> ++.br
> ++The unique value in range of 5 - 4,294,967,295 (0x5 - 0xFFFFFFFF), h1 !=
> h2 != h3 != h4
> ++
> ++
> + .SH CONFIGURATION FILE FORMAT
> + The configuration file format is based on \fIINI\fP. There are two top
> level sections
> + -- \fIInterface\fP and \fIPeer\fP. Multiple \fIPeer\fP sections may be
> specified, but
> +@@ -224,7 +267,7 @@ on a per-interface basis by using
> + on a per-interface basis by using
> + .BR ifconfig (1):
> +
> +-\fB # ifconfig wg0 debug
> ++\fB # ifconfig amn0 debug\fP
> +
> + On userspace implementations, it is customary to set the \fILOG_LEVEL\fP
> environment variable to \fIverbose\fP.
> +
> +@@ -240,19 +283,18 @@ If set to an integer or to \fIinfinity\fP, DNS
> resolut
> + If set to an integer or to \fIinfinity\fP, DNS resolution for each
> peer's endpoint will be retried that many times for non-permanent errors,
> with an increasing delay between retries. If unset, the default is 15
> retries.
> +
> + .SH SEE ALSO
> +-.BR wg-quick (8),
> +-.BR ip (8),
> +-.BR ip-link (8),
> +-.BR ip-address (8),
> +-.BR ip-route (8).
> ++.BR awg-quick (8),
> ++.BR ifconfig (8),
> ++.BR route (8).
> +
> + .SH AUTHOR
> ++awg based on
> + .B wg
> +-was written by
> ++that was written by
> + .MT Jason@zx2c4.com
> + Jason A. Donenfeld
> + .ME .
> + For updates and more information, a project page is available on the
> +-.UR https://\:www.wireguard.com/
> ++.UR https://\:github.com/amnezia-vpn/amneziawg-tools/
> + World Wide Web
> + .UE .
> diff --git a/net/amnezia-tools/files/patch-wg-quick_freebsd.bash
> b/net/amnezia-tools/files/patch-wg-quick_freebsd.bash
> index f130e5f49a6d..6d218f256182 100644
> --- a/net/amnezia-tools/files/patch-wg-quick_freebsd.bash
> +++ b/net/amnezia-tools/files/patch-wg-quick_freebsd.bash
> @@ -26,7 +26,7 @@
> }
>
> -CONFIG_SEARCH_PATHS=( /etc/amnezia/amneziawg
> /usr/local/etc/amnezia/amneziawg )
> -+CONFIG_SEARCH_PATHS=(
> ${AWG_QUICK_CONFIG_SEARCH_PATHS:-/usr/local/etc/amnezia} )
> ++CONFIG_SEARCH_PATHS=( ${AWG_QUICK_CONFIG_SEARCH_PATHS:-%%ETCDIR%%} )
>
> unset ORIGINAL_TMPDIR
> make_temp() {
>
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org