[UPDATED] net/wiresep 0.9.0 -> 0.10.1

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[UPDATED] net/wiresep 0.9.0 -> 0.10.1

Tim Kuijsten-4
Here is WireSep version 0.10.1. I've upstreamed both patches and incorporated
some feedback I got from Klemens Nannie and Janne Johansson, big thanks!

-Tim

wiresep-0.10.1.tgz (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [UPDATED] net/wiresep 0.9.0 -> 0.10.1

Aaron Bieber-2
On Wed, 25 Mar 2020 at 23:43:12 +0100, Tim Kuijsten wrote:
> Here is WireSep version 0.10.1. I've upstreamed both patches and incorporated
> some feedback I got from Klemens Nannie and Janne Johansson, big thanks!
>
> -Tim

Awesome! Builds fine here!

Typically with port updates - one only needs to send a diff :D (makes it easy
to see what has changed in a glance).

OK abieber@ if someone wants to commit it!

Diff inline for convenience:

diff --git a/net/wiresep/Makefile b/net/wiresep/Makefile
index 92fa5a73b35..91a590d5a19 100644
--- a/net/wiresep/Makefile
+++ b/net/wiresep/Makefile
@@ -4,7 +4,7 @@ COMMENT = privilege separated implementation of WireGuard
 
 GH_ACCOUNT = timkuijsten
 GH_PROJECT = wiresep
-GH_TAGNAME = v0.9.0
+GH_TAGNAME = v0.10.1
 
 CATEGORIES = net
 
diff --git a/net/wiresep/distinfo b/net/wiresep/distinfo
index 739b8d97a52..c950ef62cb0 100644
--- a/net/wiresep/distinfo
+++ b/net/wiresep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wiresep-0.9.0.tar.gz) = SNdzSCMFfvRsssMRW3DbkbVj+H3pq9NpJQcNiR0oTEE=
-SIZE (wiresep-0.9.0.tar.gz) = 97932
+SHA256 (wiresep-0.10.1.tar.gz) = Dps3BN8zgtwKGbiG8mAAGMZ5jqA5oooVEHQhpdm8a48=
+SIZE (wiresep-0.10.1.tar.gz) = 99830
diff --git a/net/wiresep/patches/patch-ifn_c b/net/wiresep/patches/patch-ifn_c
deleted file mode 100644
index f87265ba274..00000000000
--- a/net/wiresep/patches/patch-ifn_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-ifn_c,v 1.2 2020/03/18 22:22:25 tb Exp $
-
-warning: left shift count >= width of type [-Wshift-count-overflow]
-    ifaddr->v4mask = htonl(((1UL << 32) - 1) <<
-                                 ^~
-warning: left shift count >= width of type [-Wshift-count-overflow]
-     allowedip->v4mask = ((1UL << 32) - 1) <<
-                               ^~
-
-Index: ifn.c
---- ifn.c.orig
-+++ ifn.c
-@@ -2937,7 +2937,7 @@ recvconfig(int masterport)
- } else if (ifaddr->addr.family == AF_INET) {
- assert(ifaddr->prefixlen <= 32);
-
-- ifaddr->v4mask = htonl(((1UL << 32) - 1) <<
-+ ifaddr->v4mask = htonl(((1ULL << 32) - 1) <<
-    (32 - ifaddr->prefixlen));
-
- sin = (struct sockaddr_in *)&ifaddr->addr;
-@@ -3057,7 +3057,7 @@ recvconfig(int masterport)
- } else if (allowedip->addr.family == AF_INET) {
- assert(allowedip->prefixlen <= 32);
-
-- allowedip->v4mask = ((1UL << 32) - 1) <<
-+ allowedip->v4mask = ((1ULL << 32) - 1) <<
-    (32 - allowedip->prefixlen);
-
- sin = (struct sockaddr_in *)&allowedip->addr;
diff --git a/net/wiresep/patches/patch-util_c b/net/wiresep/patches/patch-util_c
deleted file mode 100644
index b9c320742e2..00000000000
--- a/net/wiresep/patches/patch-util_c
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-util_c,v 1.2 2020/03/18 22:22:25 tb Exp $
-
-warning: comparison is always false due to limited range of data type [-Wtype-limits]
-   if (asciihexmap[(unsigned char)src[i]] < 0)
-                                          ^
-
-Index: util.c
---- util.c.orig
-+++ util.c
-@@ -43,7 +43,7 @@
-
- extern int background, verbose;
-
--const char asciihexmap[] = {
-+const signed char asciihexmap[] = {
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, /* ! */

--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE