From d94ab2bfb177f9dc61ef43a1ee52171013649bc5 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Tue, 4 Jun 2024 14:28:41 -0600 Subject: [PATCH 1/3] Fix #779 --- package/innernet/package | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/innernet/package b/package/innernet/package index db2510734..9110ca6ff 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -6,7 +6,7 @@ archs=(rmallos2) pkgnames=(innernet-client) pkgdesc="A private network system that uses WireGuard under the hood." url="https://github.com/tonarino/innernet" -pkgver=1.5.3-3 +pkgver=1.5.3-4 timestamp=2022-01-31T20:08:43Z section="utils" maintainer="plan5 <30434574+plan5@users.noreply.github.com>" @@ -53,3 +53,12 @@ configure() { mkdir -p /opt/var/lib/innernet fi } + +preremove() { + disable-unit innernet.target + disable-unit innernet@.service +} + +postremove() { + systemctl daemon-reload +} From e4eb236ac110287a1efb71fcc179f16dd8ffd9cc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 11 Sep 2024 18:46:54 -0600 Subject: [PATCH 2/3] Update to rust:v3.1 --- package/innernet/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/innernet/package b/package/innernet/package index 9110ca6ff..9182e8d9c 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -14,7 +14,7 @@ license=MIT installdepends=(wireguard) makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang) -image=rust:v2.2.2 +image=rust:v3.1 _srcver="v${pkgver%-*}" source=( "https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip" From cf944851248a921e0d5f8d9877afac31065b9819 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 11 Sep 2024 18:55:52 -0600 Subject: [PATCH 3/3] Update innernet to v1.6.1 --- package/innernet/package | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/innernet/package b/package/innernet/package index 9182e8d9c..9379ddb2e 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -6,8 +6,8 @@ archs=(rmallos2) pkgnames=(innernet-client) pkgdesc="A private network system that uses WireGuard under the hood." url="https://github.com/tonarino/innernet" -pkgver=1.5.3-4 -timestamp=2022-01-31T20:08:43Z +pkgver=1.6.1-1 +timestamp=2024-01-19T14:24:40Z section="utils" maintainer="plan5 <30434574+plan5@users.noreply.github.com>" license=MIT @@ -20,7 +20,7 @@ source=( "https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip" ) sha256sums=( - 2f7ca1d802d898b1c4fd090cba9e0562a1e80d617b55f23ba596e81c99441a1c + fd9ec6eb75dcc46c818696e7fcb87eb772dc024e0c326360f0f8c473c937c37c ) prepare() { @@ -43,9 +43,6 @@ package() { install -D -m 700 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/innernet install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/innernet@.service" install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/innernet.target" - - # Link /opt/bin/innernet to /opt/bin/inn - ln -s /opt/bin/innernet "$pkgdir"/opt/bin/inn } configure() {