Re: [Update] net/wireguard-tools : Update to 1.0.20191226

On 2019/12/27 19:06, Jason A. Donenfeld wrote:
> On Fri, Dec 27, 2019 at 6:46 PM Klemens Nanni <kn@openbsd.org> wrote:
> >
> > On Fri, Dec 27, 2019 at 05:38:20PM +0100, Jason A. Donenfeld wrote:
> > > -V = 0.0.20191212
> > > -DISTNAME = WireGuard-$V
> > > +V = 1.0.20191226
> > > +DISTNAME = wireguard-tools-$V
> > > PKGNAME = wireguard-tools-$V
> > Now they're the same, so PKGNAME can go as it defaults to DISTNAME.
>
> Feel free to make this change as you commit it to cvs.
>

Let's wait a bit for port maintainer comments first. The original diff had a
stray space at the end of the sha256 signature so here's a tidied version
with that fixed and merging V/PKGNAME/DISTNAME. Bonus typo in README.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/wireguard-tools/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 14 Dec 2019 14:13:23 -0000 1.12
+++ Makefile 27 Dec 2019 19:58:13 -0000
@@ -2,9 +2,7 @@

COMMENT = fast and secure VPN

-V = 0.0.20191212
-DISTNAME = WireGuard-$V
-PKGNAME = wireguard-tools-$V
+DISTNAME = wireguard-tools-1.0.20191226
EPOCH = 0

CATEGORIES = net security
@@ -18,7 +16,7 @@ PERMIT_PACKAGE = Yes

WANTLIB += c

-MASTER_SITES = https://git.zx2c4.com/WireGuard/snapshot/
+MASTER_SITES = https://git.zx2c4.com/wireguard-tools/snapshot/

EXTRACT_SUFX = .tar.xz

@@ -37,7 +35,7 @@ USE_GMAKE = Yes

NO_TEST = Yes

-WRKSRC = ${WRKDIST}/src/tools
+WRKSRC = ${WRKDIST}/src

ALL_TARGET = wg

Index: distinfo
===================================================================
RCS file: /cvs/ports/net/wireguard-tools/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 14 Dec 2019 14:13:23 -0000 1.8
+++ distinfo 27 Dec 2019 19:58:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (WireGuard-0.0.20191212.tar.xz) = sNcYOA96iCKy8S115GL6Tq+jp3hxACmB82fNT+KhsHE=
-SIZE (WireGuard-0.0.20191212.tar.xz) = 333024
+SHA256 (wireguard-tools-1.0.20191226.tar.xz) = qorw/cmHLTadjIkKhNvCokZrVXldzNW0dyGy2XZEsE8=
+SIZE (wireguard-tools-1.0.20191226.tar.xz) = 90720
Index: pkg/README
===================================================================
RCS file: /cvs/ports/net/wireguard-tools/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- pkg/README 18 Sep 2019 10:59:37 -0000 1.2
+++ pkg/README 27 Dec 2019 19:58:13 -0000
@@ -24,7 +24,7 @@ server and client:
Networking setup
----------------

-On wg1 a few setting are required:
+On wg1 a few settings are required:

# sysctl net.inet.ip.forwarding=1
# echo 'pass out on egress inet from (tun0:network) nat-to (egress:0)' >> /etc/pf.conf