From 8f00e88aba20f5f6ba6d3dd61a1305b76e8e77dc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 16 Dec 2024 15:33:33 -0700 Subject: [PATCH] Stable merge for week 41 of 2024 (#927) ### Updated Packages - `innernet` - 1.6.1-1 (#868 #884) - `koreader` - 2024.07-1 (#916) - `launcherctl` - 0.0.1-3 (#922) - `micro` - 2.0.14-1 (#914) - `mmc-utils` - 1.0-1 (#878) - `quickjs` - 2024.01.13-1 (#851) - `sysfs_preload` - 1.0.1-2 (#923) - `tilem` - 0.1.2-1 (#913) - `wireguard` - 1.0.20220627-1 (#651) - `yaft` - 0.1.2-1 (#913) - `zerotier`, `zerotier-one`, `zerotier-one-doc`, and `zerotier-selftest` - 1.14.1-1 (#918) ### Documentation - Added writing category for packages (#924) ### Tooling - Updated github actions to the latest versions (#895) --- .github/actions/setup/action.yml | 10 +++++----- .github/workflows/pr.yml | 6 +++--- .github/workflows/stable.yml | 2 +- .github/workflows/testing.yml | 2 +- docs/package.md | 1 + package/innernet/package | 22 ++++++++++++++-------- package/koreader/package | 6 +++--- package/launcherctl/package | 4 ++-- package/micro/package | 8 ++++---- package/mmc-utils/package | 20 ++++++++++++++------ package/quickjs/package | 19 ++++++++----------- package/quickjs/quickjs.patch | 13 ------------- package/sysfs_preload/package | 4 ++-- package/tilem/package | 23 ++++++++++++++--------- package/wireguard/package | 12 ++++++------ package/yaft/package | 23 ++++++++++++++--------- package/zerotier-one/package | 4 ++-- 17 files changed, 94 insertions(+), 85 deletions(-) delete mode 100644 package/quickjs/quickjs.patch diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index dfb09584b..3e34d796a 100644 --- 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 index a0dbca99c..c6b30ff9b 100644 --- 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 index caa8c28c8..2ad14c7bf 100644 --- 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 index ed52c0ecf..24446c870 100644 --- 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/docs/package.md b/docs/package.md index bdaf7807a..072da60b5 100644 --- a/docs/package.md +++ b/docs/package.md @@ -336,6 +336,7 @@ screensharing | Apps for streaming the display between the PC and tablet. templates | Templates for xochitl notebooks. splashscreens | Splashscreens for device startup, poweroff, suspend, etc. utils | System tools and various apps. +writing | Apps for writing text. If the package does not fit into one of the existing sections, you are free to create a new one and document it here. diff --git a/package/innernet/package b/package/innernet/package index db2510734..b34064f7a 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -1,26 +1,26 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT 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 -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 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" ) 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() { @@ -53,3 +50,12 @@ configure() { mkdir -p /opt/var/lib/innernet fi } + +preremove() { + disable-unit innernet.target + disable-unit innernet@.service +} + +postremove() { + systemctl daemon-reload +} diff --git a/package/koreader/package b/package/koreader/package index 182d6d237..99099b8db 100644 --- a/package/koreader/package +++ b/package/koreader/package @@ -5,8 +5,8 @@ pkgnames=(koreader) pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats" url=https://github.com/koreader/koreader -pkgver=2024.04-5 -timestamp=2024-04-29T19:56:05Z +pkgver=2024.07-1 +timestamp=2024-07-15T16:21:26Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -22,7 +22,7 @@ source=( launcherctl-koreader ) sha256sums=( - e6b3a5a2c8cde8ca0c469fe542d6e170502fcf39b9a55e4447a7acd02b4a12c0 + 1040894434421b52076473f7947f139e2c98fcc04b1acadfe29b3362f262f9b7 SKIP SKIP SKIP diff --git a/package/launcherctl/package b/package/launcherctl/package index 7a7743845..3b217bf3e 100644 --- a/package/launcherctl/package +++ b/package/launcherctl/package @@ -5,9 +5,9 @@ pkgnames=(launcherctl) pkgdesc="Manage your installed launcher" url=https://toltec-dev.org/ -pkgver=0.0.1-2 +pkgver=0.0.1-3 timestamp=2023-12-18T03:32Z -section="launcher" +section="launchers" maintainer="Eeems " license=MIT diff --git a/package/micro/package b/package/micro/package index 61cc10432..e1651a49a 100644 --- a/package/micro/package +++ b/package/micro/package @@ -5,14 +5,14 @@ pkgnames=(micro) pkgdesc="Modern and intuitive terminal-based text editor" url=https://micro-editor.github.io/ -pkgver=2.0.13-2 -timestamp=2023-10-21T22:38:29Z +pkgver=2.0.14-1 +timestamp=2024-08-27T18:13:07Z section="utils" maintainer="Eeems " license=MIT -source=("https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-linux-arm.tar.gz") -sha256sums=(adb9cf644354a5c85819db40e1a427f0f4951b172597bbcd3ef94ecc4a8c4b75) +source=("https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-linux-arm.tar.gz") +sha256sums=(9f490d88bd30a548af99a905f50244dc6c80f3c7a3c6f98faeb5b0a7329f7dea) package() { install -Dm644 "$srcdir"/LICENSE "$pkgdir/opt/usr/share/licenses/$pkgname/LICENSE" diff --git a/package/mmc-utils/package b/package/mmc-utils/package index a91ae561b..948dffa99 100644 --- a/package/mmc-utils/package +++ b/package/mmc-utils/package @@ -6,7 +6,7 @@ archs=(rmall) pkgnames=(mmc-utils) pkgdesc="A tool for monitoring the eMMC protocol" url=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/ -pkgver=1.0-0 +pkgver=1.0-1 timestamp=2021-08-12T19:41:07Z section="devel" maintainer="Alistair Francis " @@ -14,13 +14,22 @@ license=GPL-2.0-only image=base:v2.2 source=( - "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-7769a4d7abe339ce273c13a203394a79a11fcff9.tar.gz" 0001-Makefile-Remove-Werror.patch ) sha256sums=( - 0578e546d8893b6207180def7966e7314cae54c237a931b8f94779ce5c7d0668 SKIP ) +_commit=7769a4d7abe339ce273c13a203394a79a11fcff9 + +prepare() { + cd "$srcdir" + mkdir mmc-utils + cd mmc-utils + git init + git fetch --depth=1 "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git" "$_commit" + git checkout -f "$_commit" + patch < "$srcdir"/0001-Makefile-Remove-Werror.patch +} build() { # Use our toolchain @@ -28,10 +37,9 @@ build() { export CC=arm-linux-gnueabihf-gcc export STRIP=arm-linux-gnueabihf-strip - patch < "$srcdir"/0001-Makefile-Remove-Werror.patch - make -j4 + make -C "$srcdir"/mmc-utils -j4 } package() { - DESTDIR="$pkgdir" make -C "$srcdir" install + DESTDIR="$pkgdir" make -C "$srcdir"/mmc-utils install } diff --git a/package/quickjs/package b/package/quickjs/package index 78467226b..ef41e2092 100644 --- a/package/quickjs/package +++ b/package/quickjs/package @@ -5,29 +5,26 @@ pkgnames=(quickjs) pkgdesc="A small and embeddable Javascript engine" url=https://bellard.org/quickjs/ -pkgver=2020.11.08-2 +pkgver=2024.01.13-1 section="devel" -timestamp=2020-11-08T13:44Z +timestamp=2024-01-13T00:00Z maintainer="khanhas " license=MIT -image=base:v2.1 +image=base:v3.1 source=( - https://bellard.org/quickjs/quickjs-2020-11-08.tar.xz - quickjs.patch + https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz ) sha256sums=( - 2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b - SKIP + 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 ) build() { - patch -u Makefile -i quickjs.patch - make qjs.arm + make CROSS_PREFIX="$CROSS_COMPILE" qjs qjscalc } package() { install -d "$pkgdir"/opt/bin - install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs.arm - mv "$pkgdir"/opt/bin/qjs.arm "$pkgdir"/opt/bin/qjs + install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs + ln -s qjs "$pkgdir"/opt/bin/qjscalc } diff --git a/package/quickjs/quickjs.patch b/package/quickjs/quickjs.patch deleted file mode 100644 index 250c666b5..000000000 --- a/package/quickjs/quickjs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile 2020-11-08 23:21:09.000000000 +1000 -+++ Makefile.new 2021-02-10 14:36:08.954392400 +1000 -@@ -60,8 +60,8 @@ - endif - EXE=.exe - else -- CROSS_PREFIX= -- EXE= -+ CROSS_PREFIX=$(CROSS_COMPILE) -+ EXE=.arm - endif - ifdef CONFIG_CLANG - HOST_CC=clang diff --git a/package/sysfs_preload/package b/package/sysfs_preload/package index 0fcd903d6..73deb2392 100644 --- a/package/sysfs_preload/package +++ b/package/sysfs_preload/package @@ -5,9 +5,9 @@ pkgnames=(sysfs_preload) pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead." url="https://github.com/Eeems-Org/sysfs_preload" -pkgver=1.0.1-1 +pkgver=1.0.1-2 timestamp=2024-06-22T05:19Z -section=util +section=utils maintainer="Eeems " license=MIT diff --git a/package/tilem/package b/package/tilem/package index 17be922d7..adca938fe 100644 --- a/package/tilem/package +++ b/package/tilem/package @@ -5,14 +5,15 @@ pkgnames=(tilem) pkgdesc="TI-84+ calculator emulator" url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem -_tag=0.1.1 +_tag=0.1.2 pkgver=${_tag}-1 -timestamp=2023-11-25T20:49:48Z +timestamp=2024-05-29T17:05:56Z maintainer="Mattéo Delabre " license=GPL-3.0 section="utils" image=base:v3.1 installdepends=(display) +flags=(nostrip) source=() sha256sums=() @@ -31,14 +32,18 @@ prepare() { } build() { - mkdir build + cd "$srcdir" mkdir install - cd build - cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ - -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../tilem - cd apps/tilem - make - make install + cd tilem + cmake --preset release-toltec + cmake \ + --build build/release-toltec \ + --target tilem + cmake \ + --install build/release-toltec \ + --prefix ../install \ + --component tilem \ + --strip } package() { diff --git a/package/wireguard/package b/package/wireguard/package index 9a46b62c6..80c511938 100755 --- 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 " 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 ) diff --git a/package/yaft/package b/package/yaft/package index 251dc0f77..5a635896a 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -5,14 +5,15 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft -_tag=0.1.1 +_tag=0.1.2 pkgver=${_tag}-1 -timestamp=2023-11-25T20:49:48Z +timestamp=2024-05-29T17:05:56Z maintainer="Mattéo Delabre " license=GPL-3.0 section="admin" image=base:v3.1 installdepends=(display terminfo) +flags=(nostrip) source=() sha256sums=() @@ -31,14 +32,18 @@ prepare() { } build() { - mkdir build + cd "$srcdir" mkdir install - cd build - cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ - -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../yaft - cd apps/yaft - make - make install + cd yaft + cmake --preset release-toltec + cmake \ + --build build/release-toltec \ + --target yaft + cmake \ + --install build/release-toltec \ + --prefix ../install \ + --component yaft \ + --strip } package() { diff --git a/package/zerotier-one/package b/package/zerotier-one/package index 2baabf2ef..5e4827fb4 100644 --- a/package/zerotier-one/package +++ b/package/zerotier-one/package @@ -4,7 +4,7 @@ pkgnames=(zerotier zerotier-one zerotier-one-doc zerotier-selftest) url=https://github.com/zerotier/ZeroTierOne -_upver=1.12.2 +_upver=1.14.1 pkgver=${_upver}-1 timestamp=2023-03-23T17:39:31Z maintainer="Eeems " @@ -13,7 +13,7 @@ section="utils" image=base:v3.0 source=("https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${_upver}.zip") -sha256sums=(2089fc824c84985610f0bd60186c72e94e2592d8f38259a1c80ea8f696edd16b) +sha256sums=(fcf30ce797dbca757f3e882e004a3f953ebe12ae13f03d804b3fb184ee3c9714) build() { sed -i \