From fa68e4daffa7e5702ada0e607a2c8646cc888ce1 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 3 Jan 2024 16:10:20 -0700 Subject: [PATCH] Stable merge window for week 52 of 2023 (#812) ### New Packages - `bottom` - 0.9.6-1 (#804) ### Updated Packages - `webinterface-onboot` - 1.2.2-3 (#794 #816) - `lf` r31-2 - (#802 #811) - `webinterface-upload-button` - 1.1.1-1 (#790) - `7zip` - 23.01-1 (#805) - `ripgrep` - 14.0.3-1 (#801) --- package/7zip/package | 12 +++++----- package/bottom/package | 24 +++++++++++++++++++ package/lf/package | 13 +++++----- package/ripgrep/package | 12 +++++----- package/webinterface-onboot/package | 3 ++- .../webinterface-onboot-toltec.service | 2 +- package/webinterface-upload-button/package | 9 +++---- 7 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 package/bottom/package diff --git a/package/7zip/package b/package/7zip/package index c70744764..ebc6d6ad0 100644 --- a/package/7zip/package +++ b/package/7zip/package @@ -1,19 +1,19 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(7zip) pkgdesc="A file archiver with a high compression ratio." url="https://www.7-zip.org/" -section="util" -pkgver=22.01-1 -timestamp=2022-07-15T00:00:00Z +section="utils" +pkgver=23.01-1 +timestamp=2023-06-20T00:00:00Z maintainer="Eeems " license=LGPL-2.1-or-later source=( - https://www.7-zip.org/a/7z2201-linux-arm.tar.xz + https://www.7-zip.org/a/7z2301-linux-arm.tar.xz ) sha256sums=( - 428c11efd91fe1809c4750e8cd5d6eddfbed2826d8a5399ffcacb849f0d21cf8 + 9d67650982f819d7557c27dea748fa66ca6c04a3a1148d66716c463580b0550c ) package() { diff --git a/package/bottom/package b/package/bottom/package new file mode 100644 index 000000000..9637894de --- /dev/null +++ b/package/bottom/package @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(bottom) +pkgdesc="Cross-platform graphical process/system monitor" +url=https://github.com/ClementTsang/bottom +pkgver=0.9.6-1 +timestamp=2023-08-26T14:43Z +section="utils" +maintainer="gbyl " +license=MIT + +image=rust:v3.1 +source=("https://github.com/ClementTsang/bottom/archive/refs/tags/${pkgver%-*}.zip") +sha256sums=(38c1a544ceeac4792f8e4acbf3adbf0a6d7a935afb7ef9121aaba1e7ed25cea3) + +build() { + cargo build --release +} + +package() { + install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/btm "$pkgdir"/opt/bin/btm +} diff --git a/package/lf/package b/package/lf/package index 1b415a869..eae20ad5e 100644 --- a/package/lf/package +++ b/package/lf/package @@ -1,19 +1,20 @@ #!/usr/bin/env bash -# Copyright (c) 2022 The Toltec Contributors +# Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(lf) pkgdesc="Terminal file manager" url=https://github.com/gokcehan/lf -pkgver=r27-1 -timestamp=2022-04-02T09:40Z +pkgver=r31-2 +timestamp=2023-09-17T12:55Z section="utils" maintainer="gbyl " license=MIT +installdepends=(libncurses-dev) -image=golang:v2.3 -source=("https://github.com/gokcehan/lf/archive/refs/tags/r27.zip") -sha256sums=(a4f7b3ada4aa1348b7f102374d8580b6992977f7e84053aa04ef6aadb69dc205) +image=golang:v3.1 +source=("https://github.com/gokcehan/lf/archive/refs/tags/${pkgver%-*}.zip") +sha256sums=(217e152f09ae0cc8ab8f12fd92f705dd12630907de2b6a78ffc2727950921f97) build() { export GOARCH=arm diff --git a/package/ripgrep/package b/package/ripgrep/package index a6a13a6ea..88aae0388 100644 --- a/package/ripgrep/package +++ b/package/ripgrep/package @@ -1,19 +1,19 @@ #!/usr/bin/env bash -# Copyright (c) 2022 The Toltec Contributors +# Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(ripgrep) pkgdesc="Modern grep for recursive regex pattern searching" url=https://github.com/BurntSushi/ripgrep -pkgver=13.0.0-1 -timestamp=2021-06-12T10:54Z +pkgver=14.0.3-1 +timestamp=2023-11-28T21:22Z section="utils" maintainer="gbyl " license=MIT -image=rust:v2.3 -source=("https://github.com/BurntSushi/ripgrep/archive/refs/tags/13.0.0.zip") -sha256sums=(5f9d35c2db0513d9d1cbc5254aa9d48fcd74243259b7b15955e131f36f627745) +image=rust:v3.1 +source=("https://github.com/BurntSushi/ripgrep/archive/refs/tags/${pkgver%-*}.zip") +sha256sums=(eb91f202fc25d51755390736775a7e7f8e146eb97e584aaa01fb0c45aa5de654) build() { cargo build --release diff --git a/package/webinterface-onboot/package b/package/webinterface-onboot/package index 1d0613caa..3e7552815 100644 --- a/package/webinterface-onboot/package +++ b/package/webinterface-onboot/package @@ -6,12 +6,13 @@ _pkgname='webinterface-onboot' pkgnames=("$_pkgname") pkgdesc="Start the web interface without the cable, on boot." url="https://github.com/rM-self-serve/$_pkgname" -pkgver=1.2.2-2 +pkgver=1.2.2-4 timestamp=2023-12-03T11:43:00Z section="utils" maintainer="rM-self-serve <122753594+rM-self-serve@users.noreply.github.com>" license=MIT conflicts=(ddvk-hacks signature-rm) +installdepends=(libbfd) source=( "$url"/archive/cdfe457435974f7ca309b1ac50f1b2ef67000813.zip diff --git a/package/webinterface-onboot/webinterface-onboot-toltec.service b/package/webinterface-onboot/webinterface-onboot-toltec.service index 407d2c0f2..563cba5bd 100644 --- a/package/webinterface-onboot/webinterface-onboot-toltec.service +++ b/package/webinterface-onboot/webinterface-onboot-toltec.service @@ -2,7 +2,7 @@ Description=Enable the web interface on boot StartLimitIntervalSec=600 StartLimitBurst=4 -After=home.mount +After=home.mount sys-subsystem-net-devices-usb0.device [Service] Environment=HOME=/home/root diff --git a/package/webinterface-upload-button/package b/package/webinterface-upload-button/package index 8341150ca..201285a15 100644 --- a/package/webinterface-upload-button/package +++ b/package/webinterface-upload-button/package @@ -6,21 +6,22 @@ _pkgname='webinterface-upload-button' pkgnames=("$_pkgname") pkgdesc="A simple upload button for the web interface" url="https://github.com/rM-self-serve/$_pkgname" -pkgver=1.0.1-1 -timestamp=2023-12-06T11:43:00Z +pkgver=1.1.1-1 +timestamp=2023-12-16T15:35:49Z section="utils" maintainer="rM-self-serve <122753594+rM-self-serve@users.noreply.github.com>" license=MIT source=( - "$url"/archive/1c69d4fcaa1cb8e2cf4b022a190429dc39946498.zip + "$url"/archive/1d28b2d91c0179059017696ae5a33aa49e1e7c7d.zip ) sha256sums=( - a388d1db49a3c35782600efbd94ee449c59f46c223f14c254cb74d9509255d96 + 99ac382e665b55c43876e8991c9dfa7f11a625d4f3ed4f35d3bc58762e04db39 ) package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir/$_pkgname" + install -D -m 644 -t "$pkgdir"/usr/share/remarkable/webui/ "$srcdir/$_pkgname.js" touch "$srcdir"/emptyfile install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/"$_pkgname" "$srcdir"/emptyfile