Merge branch 'testing' into upower

toltec-dev · Oct 12, 2024 · fab0702 · fab0702
2 parents 4b66b43 + 3d9fb76
commit fab0702
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -8,7 +8,7 @@ runs:
             sudo apt-get update -yq
             echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV
         - name: Cache Apt packages
-          uses: actions/cache@v3
+          uses: actions/cache@v4
           id: cache-apt
           with:
             path: ~/.aptcache
@@ -26,7 +26,7 @@ runs:
                 sudo cp --verbose --force --recursive ~/.aptcache/* /
             fi
         - name: Cache shfmt
-          uses: actions/cache@v3
+          uses: actions/cache@v4
           with:
             path: /usr/local/bin/shfmt
             key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be
@@ -44,7 +44,7 @@ runs:
                 sudo chmod a+x "$install_dir"/shfmt
             fi
         - name: Cache Shellcheck
-          uses: actions/cache@v3
+          uses: actions/cache@v4
           with:
             path: /usr/local/bin/shellcheck
             key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8
@@ -68,11 +68,11 @@ runs:
                 sudo mv shellcheck "$install_dir"
             fi
         - name: Setup Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
             python-version: '3.12'
         - name: Cache Python environment
-          uses: actions/cache@v3
+          uses: actions/cache@v4
           id: cache-python
           with:
             path: .venv

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Check formatting
@@ -20,13 +20,13 @@ jobs:
         needs: lint
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages
               run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
             - name: Save the build output
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                 name: repo
                 path: build/repo

diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml
@@ -9,7 +9,7 @@ jobs:
         runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -9,7 +9,7 @@ jobs:
         runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

diff --git a/package/innernet/package b/package/innernet/package
@@ -50,3 +50,12 @@ configure() {
         mkdir -p /opt/var/lib/innernet
     fi
 }
+
+preremove() {
+    disable-unit innernet.target
+    disable-unit [email protected]
+}
+
+postremove() {
+    systemctl daemon-reload
+}
diff --git a/package/wireguard/package b/package/wireguard/package
@@ -5,32 +5,32 @@ archs=(rm1os2 rm2os2)
 pkgnames=(wireguard)
 pkgdesc="Fast, modern, secure VPN tunnel"
 url=https://www.wireguard.com
-pkgver=1.0.20210219-5
+pkgver=1.0.20220627-1
 timestamp=2021-02-19T14:08Z
 section=kernel
 maintainer="Jonah Weissman <[email protected]>"
 license=GPL-2.0-only
-makedepends=(build:bc build:lzop build:git)
+makedepends=(build:bc build:lzop build:git build:flex build:bison build:libssl-dev)
 flags=(nostrip)
 installdepends=(wireguard-tools)
 
 _kernelrepo=https://github.com/remarkable/linux
 _kernelrevs=(
-    1774e2a6a091fdc081324e966d3db0aa9df75c0b
-    d4e7e07a390f8b2544ca09d69142d18114149004
+    bb6be69d6f71fced2fc63c61372bf96e5f7da565
+    bb6be69d6f71fced2fc63c61372bf96e5f7da565
 )
 _defconfigs=(
     arch/arm/configs/zero-gravitas_defconfig
     arch/arm/configs/zero-sugar_defconfig
 )
 
-image=base:v2.1
+image=base:v3.2
 source=(
     "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver%-*}.tar.xz"
     fix-multiple-yylloc-definitions.patch
 )
 sha256sums=(
-    99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00
+    362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
     SKIP
 )