Re: git: c90e6c2d0308 - main - net/amnezia-tools: Improve port
- In reply to: Nuno Teixeira : "Re: git: c90e6c2d0308 - main - net/amnezia-tools: Improve port"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 10 Aug 2025 12:05:40 UTC
10.08.2025 04:27, Nuno Teixeira пишет:
> Hello,
>
> MASTER_SITES should be removed since USE_GITHUB is fetching.
>
> Cheers,
Hi!
So many small fixes that I missed it…
Fixed in
https://cgit.freebsd.org/ports/commit/?id=a1712f92677929a99efacd78cb678fda456c1e57
Thanks.
> 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
> <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 <http://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 <http://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 <http://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
> <http://amnezia.in> b/net/amnezia-tools/files/amnezia.in
> <http://amnezia.in>
> index 11a5daf89861..98010c013bdb 100644
> --- a/net/amnezia-tools/files/amnezia.in <http://amnezia.in>
> +++ b/net/amnezia-tools/files/amnezia.in <http://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 @@
>
> ...
>
> 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 @@
>
> ...
>
> 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
> <https://FreeBSD.org>
--
Best regards,
Vladimir Druzenko