Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update innernet to v1.5.0 #434

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1d86a93
First working version of gocryptfs package
Mar 22, 2021
78054e9
Fix timestamp of gocryptfs package
Mar 22, 2021
63509b5
Remove trailing spaces
Mar 22, 2021
dcea1c5
Merge branch 'testing' into testing
plan5 Mar 23, 2021
69ad7cb
Update package/gocryptfs/package
plan5 Mar 23, 2021
c802e74
Remove the v from srcver
plan5 Mar 23, 2021
df2f49d
gocryptfs: put srcdir variable in quotes
plan5 Mar 23, 2021
ac119e9
Switch build image to golang:v1.5 and remove golang makedeps
Mar 23, 2021
c460fd8
Merge branch 'testing' of https://www.github.com/plan5/toltec into te…
Mar 23, 2021
856ab5b
Merge branch 'testing' into testing
plan5 Mar 23, 2021
a5eeaf4
Quote all variables
Mar 23, 2021
caa8160
Merge branch 'testing' of https://www.github.com/plan5/toltec into te…
Mar 23, 2021
889945c
Remove obsolete makedeps (git)
Mar 23, 2021
ac090f1
Merge branch 'testing' into testing
matteodelabre Apr 4, 2021
40eb8cc
depends field renamed to installdepends in latest testing
matteodelabre Apr 4, 2021
8198d5e
Add fusemodule dependency for rM1
Apr 6, 2021
ca958d2
Fix device specific dependency: rm1 not rm2
Apr 6, 2021
cdad932
Adapt installdepends to reflect new name of fuse module package
Apr 8, 2021
6c98ea2
Move fuse to general installdepends. It's empty for rm2
Apr 8, 2021
494ee4d
Merge branch 'testing' into testing
Eeems Apr 20, 2021
127565d
Remove gocryptfs from local testing branch
Apr 23, 2021
324dc3a
Merge branch 'testing' of https://www.github.com/plan5/toltec into te…
Apr 24, 2021
83d306d
Revert "Merge branch 'testing' of https://www.github.com/plan5/toltec…
Apr 25, 2021
50447f3
Revert "Remove gocryptfs from local testing branch"
Apr 25, 2021
38dcf1a
Merge remote-tracking branch 'toltec-dev/toltec/testing' into testing
Apr 26, 2021
ade9ed2
Align with upstream testing
Apr 26, 2021
93201db
Re-add gocryptfs
Apr 26, 2021
7ad164e
Merge branch 'testing' into testing
Eeems May 3, 2021
a82223b
Merge branch 'testing' into testing
Eeems May 17, 2021
936985d
Merge remote-tracking branch 'upstream/testing' into testing
May 21, 2021
fcc86d4
Merge branch 'testing' of https://www.github.com/plan5/toltec into te…
May 21, 2021
17025e7
Merge branch 'toltec-dev:testing' into testing
plan5 Aug 29, 2021
8d49dbf
Update innernet to new version
Aug 29, 2021
b9f1d11
Patch to look for headers in SYSROOT and remove unnecessary gcc/g++-m…
Aug 31, 2021
025c022
Bump package build number
Aug 31, 2021
803e44d
Merge branch 'testing' into plan5-innernet-new
matteodelabre Sep 1, 2021
91b97f9
Update to innernet 1.5.0
Sep 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions package/innernet/build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- build.rs 2021-08-31 14:35:34.226760718 +0200
+++ build-patched.rs 2021-08-31 17:16:52.195765743 +0200
@@ -6,6 +6,7 @@
let bindings = bindgen::Builder::default()
.rust_target(bindgen::RustTarget::Stable_1_40)
.derive_default(true)
+ .clang_arg("--sysroot=".to_owned() + &env::var("SYSROOT").unwrap())
.header("c/wireguard.h")
.impl_debug(true)
.allowlist_function("wg_.*")
21 changes: 15 additions & 6 deletions package/innernet/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,36 @@
pkgnames=(innernet-client)
pkgdesc="A private network system that uses WireGuard under the hood."
url="https://github.com/tonarino/innernet"
pkgver=1.4.1-1
timestamp=2021-08-29T13:00:00Z
pkgver=1.5.0-1
timestamp=2021-09-18T17:57:00Z
section="utils"
maintainer="plan5 <30434574+plan5@users.noreply.github.com>"
license=MIT
installdepends=(wireguard)
makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang build:gcc-multilib build:g++-multilib)
makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)

image=rust:v2.1
_srcver="v${pkgver%-*}"
source=("https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip")
sha256sums=(3dd87538f53a7665713f88399f3388abe24b878765605dfadd25ca194cc47ac1)
source=(
"https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip"
build.patch
)
sha256sums=(
1f2f38a0c7cbc91391f84f86849bc57e6351fdc6605232b839df25e1009b68f9
SKIP
)

prepare() {
# Change config folders to live under /opt
sed -i "s/\/etc\/innernet/\/opt\/etc\/innernet/g" "$srcdir/shared/src/lib.rs"
sed -i "s/\/var\/lib\/innernet/\/opt\/var\/lib\/innernet/g" "$srcdir/shared/src/lib.rs"

#Change binary path in service file
# 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"

#tbd: change wireguard config dir to /opt/etc/wireguard?
#sed -i "s/\/etc\/wireguard/\/opt\/etc\/wireguard/g" "$srcdir/shared/src/lib.rs"
}
Expand Down