From 750ee0b2d0ef38738d5b13023f38e16fbeafc884 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 17 Sep 2021 08:08:03 -0600 Subject: [PATCH 1/4] Update package --- package/innernet/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/innernet/package b/package/innernet/package index 0fb929375..e938927cd 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -5,7 +5,7 @@ pkgnames=(innernet-client) pkgdesc="A private network system that uses WireGuard under the hood." url="https://github.com/tonarino/innernet" -pkgver=1.4.1-2 +pkgver=1.5.0-1 timestamp=2021-08-31T17:57:00Z section="utils" maintainer="plan5 <30434574+plan5@users.noreply.github.com>" @@ -20,7 +20,7 @@ source=( build.patch ) sha256sums=( - 3dd87538f53a7665713f88399f3388abe24b878765605dfadd25ca194cc47ac1 + 1f2f38a0c7cbc91391f84f86849bc57e6351fdc6605232b839df25e1009b68f9 SKIP ) From 7e4b070ee9ee4f61325784a531bd1d5f6b3264f2 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 20 Sep 2021 08:45:19 -0600 Subject: [PATCH 2/4] Update package --- package/innernet/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/innernet/package b/package/innernet/package index e938927cd..aa3d8d51b 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -31,9 +31,9 @@ prepare() { # Change binary path in service file sed -i "s/\/usr\/bin\/innernet/\/opt\/bin\/innernet/g" "$srcdir/client/innernet@.service" - + # Insert line to look for headers under $SYSROOT instead of root filesystem - patch -u "$srcdir/wgctrl-sys/build.rs" -i "$srcdir/build.patch" + patch -u "$srcdir/wireguard-control-sys/build.rs" -i "$srcdir/build.patch" #tbd: change wireguard config dir to /opt/etc/wireguard? #sed -i "s/\/etc\/wireguard/\/opt\/etc\/wireguard/g" "$srcdir/shared/src/lib.rs" From 9eca1cb35a6f1ee63d948a96f950ff799110e6bc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 20 Sep 2021 08:47:15 -0600 Subject: [PATCH 3/4] Update package --- package/innernet/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/innernet/package b/package/innernet/package index aa3d8d51b..c820419b7 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -31,7 +31,7 @@ prepare() { # Change binary path in service file sed -i "s/\/usr\/bin\/innernet/\/opt\/bin\/innernet/g" "$srcdir/client/innernet@.service" - + # Insert line to look for headers under $SYSROOT instead of root filesystem patch -u "$srcdir/wireguard-control-sys/build.rs" -i "$srcdir/build.patch" From 42ad4ea090dce3ea982f4be10f6dcd913302601f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Sat, 25 Sep 2021 00:26:38 +0200 Subject: [PATCH 4/4] Use build image rust:v2.2 --- package/innernet/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/innernet/package b/package/innernet/package index c820419b7..dc4b30555 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -13,7 +13,7 @@ license=MIT installdepends=(wireguard) makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang) -image=rust:v2.1 +image=rust:v2.2 _srcver="v${pkgver%-*}" source=( "https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip"