Stable merge window for week 49 of 2023 (#782)

### New Packages - `webinterface-onboot` 1.2.2-2 - (#770 #721) - Allows the usb web interface to start without the USB cable being connected. - `webinterface-upload-button` - 1.0.1-1 (#771) - Adds an upload button to the usb web interface. - `signature-rm` - 1.0.2-1 (#772) - Removes the `Sent from my reMarkable` signature from emails sent by the device. ### Updated Packages - `linux-stracciatella` - 5.4.70-3 (#742) - Updated to RM1XX_5.4.70_v1.3.4 tag from upstream kernel. - Added wireguard module. - `wireguard` - 1.0.20210219-4 (#743 #784) - Removed wireguard-tools and wg-quick from wireguard package. These packages are provided by entware already. - `display` and `rm2fb-client` - 1:0.0.32-2 (#758 #721) - Add support for OS 3.3.2.1666 - `rmfm` - 1.5.1-1 (#766) - Fix issue where listing a directory with an invalid symlink would crash the application. - `neofetch` - 1.1.0-1 (#769) - `webinterface-wifi` - 2.0.0-2 (#768 #721) - `micro` - 2.0.13-1 (#738) - `koreader` - 2023.10-2 (#749 #721) - `ddvk-hacks` - 39.01-2 (#720 #778) - Fix issue where `ddvk-hacks` wouldn't be reapplied when using `toltecctl reenable`. - `draft` - 0.2.0-22 (#721) - `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 2.6-3 (#721) - `reboot-guard` - 1.0.1-8 (#721) - `rmfakecloud-proxy` - 0.0.3-4 (#721) - `genie` - 0.1.6-3 (#721) - `remux` - 0.2.4-2 (#721) - `tailscale-systemd` - 0.0.0-2 (#721) - `toltec-base` - 1.2-3 (#721) - `xochitl` - 0.0.0-17 (#721) ### Tooling - New `provides=()` field added for packages. - Added `unit-exists` and `disable-unit` methods to install-lib **Note:** This doesn't change what OS version that toltec supports, as full support still requires various packages to be updated, removed, or replaced. Along with proper testing of all packages in the repository, as well as the upgrade process. https://github.com/toltec-dev/toltec/milestone/7 contains the current list of issues and pull requests required for 3.x support.
toltec-dev · Dec 26, 2023 · f97179c · f97179c
1 parent 37e693f
commit f97179c
Show file tree

Hide file tree

Showing 25 changed files with 384 additions and 129 deletions.
diff --git a/docs/package.md b/docs/package.md
@@ -405,6 +405,21 @@ A list of packages that the current package replaces.
 Setting this field allows the current package to overwrite and take ownership of files from other packages.
 Note that the replaced packages will not be automatically uninstalled unless you also declare a conflict with them using the [`conflicts` field](#conflicts-field).
 
+#### `provides` field
+
+<table>
+    <tr>
+        <th>Required?</th>
+        <td>No, defaults to <code>()</code></th>
+    </tr>
+    <tr>
+        <th>Type</th>
+        <td>Array of strings</td>
+    </tr>
+</table>
+
+A list of virtual packages that the current package provides.
+
 #### `package()` function
 
 The `package()` function populates the `$pkgdir` directory with the files and directories that need to be installed using artifacts from the `$srcdir` directory.

diff --git a/package/ddvk-hacks/package b/package/ddvk-hacks/package
@@ -6,12 +6,13 @@ archs=(rm1 rm2)
 pkgnames=(ddvk-hacks)
 pkgdesc="Enhance Xochitl with additional features"
 url=https://github.com/ddvk/remarkable-hacks
-pkgver=39.01-1
+pkgver=39.01-2
 timestamp=2022-11-09T18:31:51Z
 section="readers"
 maintainer="Mattéo Delabre <spam@delab.re>"
 license=MIT
 flags=(nostrip)
+conflicts=(webinterface-onboot signature-rm)
 
 source=(https://github.com/ddvk/remarkable-hacks/archive/90e7e3e7ffc269373de191085453be50c9f8da0c.zip)
 sha256sums=(d3b1413bb9219804581afab598e7f5308233e7467d64e8084e67aae7346beaba)
@@ -66,6 +67,8 @@ package() {
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21501067_rm2/patch_38.2.03
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/21511189_rm2/patch_39.2.01
     fi
+    touch "$srcdir"/emptyfile
+    install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/ddvk-hacks "$srcdir"/emptyfile
 }
 
 configure() {

diff --git a/package/display/package b/package/display/package
@@ -4,11 +4,11 @@
 
 archs=(rm1 rm2)
 pkgnames=(display rm2fb-client)
-timestamp=2023-04-16T20:53:38Z
+timestamp=2023-08-27T02:39:10Z
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.31-2
+pkgver=1:0.0.32-2
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
@@ -23,7 +23,7 @@ source=(
     rm2fb-preload.env
 )
 sha256sums=(
-    c27081be9b4fa000e41489b42d53fb8254bd8bf348a34756799488827dbc0f0b
+    603eef1688a8c3adb1df23f4f00fe12b80938fe99801b515cd74f84c8cede5b1
     SKIP
     SKIP
     SKIP
@@ -66,13 +66,13 @@ display() {
             systemctl daemon-reload
             if systemctl enable rm2fb --now; then
                 # Restart xochitl if it's running
-                if systemctl --quiet is-active xochitl; then
+                if is-active xochitl; then
                     # Reset the crash count so we don't trigger remarkable-fail
                     echo "0" > /tmp/crashnum
                     systemctl restart xochitl
                 fi
             else
-                systemctl disable rm2fb --now
+                disable-unit rm2fb.service
                 echo "Failed to start rm2fb. Keeping it disabled for now."
                 echo "Please check the logs and open an issue:"
                 echo "  https://github.com/toltec-dev/toltec/issues/new"
@@ -83,9 +83,7 @@ display() {
 
     preremove() {
         if [[ $arch = rm2 ]]; then
-            if systemctl list-units --full -all | grep -Fq 'rm2fb.service'; then
-                systemctl disable rm2fb --now
-            fi
+            disable-unit rm2fb.service
             echo -n "make sure "
             if ! is-enabled xochitl.service; then
                 echo "to re-enable xochitl with 'systemctl enable xochitl --now'"

diff --git a/package/draft/package b/package/draft/package
@@ -5,7 +5,7 @@
 pkgnames=(draft)
 pkgdesc="Launcher which wraps around the standard interface"
 url=https://github.com/dixonary/draft-reMarkable
-pkgver=0.2.0-21
+pkgver=0.2.0-22
 timestamp=2020-07-20T10:23Z
 section="launchers"
 maintainer="Mattéo Delabre <spam@delab.re>"
@@ -60,10 +60,7 @@ configure() {
 }
 
 preremove() {
-    if systemctl list-units --full -all | grep -Fq "$pkgname.service"; then
-        echo "Disabling $pkgname"
-        systemctl disable --now "$pkgname"
-    fi
+    disable-unit "$pkgname.service"
 }
 
 postremove() {

diff --git 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=2023.08-2
-timestamp=2023-08-29T16:21:01Z
+pkgver=2023.10-2
+timestamp=2023-10-30T17:19:28Z
 section="readers"
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
     koreader
 )
 sha256sums=(
-    8cc9fad1cbcda5519c20afe6e33c4f80a51587daed7b959ef7284ce8b0c41ec0
+    fdb72bdb80c74b6c955ffde8852ce67b77ebc7d88ceb4a439b622aff74ad858e
     SKIP
     SKIP
     SKIP
@@ -62,15 +62,7 @@ MSG
 }
 
 preremove() {
-    if is-active "$pkgname"; then
-        echo "Stopping $pkgname"
-        systemctl stop "$pkgname"
-    fi
-
-    if is-enabled "$pkgname"; then
-        echo "Disabling $pkgname"
-        systemctl disable "$pkgname"
-    fi
+    disable-unit "$pkgname.service"
 }
 
 postremove() {

diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package
@@ -6,17 +6,37 @@ archs=(rm1 rm2)
 pkgnames=(linux-stracciatella)
 pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
 url=https://github.com/Etn40ff/linux-remarkable
-pkgver=5.4.70-2
-timestamp=2022-09-26T21:23:39Z
+pkgver=5.4.70-3
+timestamp=2023-09-23T00:12:00Z
 section="kernel"
 maintainer="Salvatore Stella <etn45p4m@gmail.com>"
 makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod)
 license=GPL-2.0-only
 flags=(nostrip)
 installdepends=(kernelctl)
-image=base:v2.3
-source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz)
-sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa)
+image=base:v3.1
+_wireguard_version=1.0.20220627
+source=(
+    https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz
+    "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz"
+)
+sha256sums=(
+    2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea
+    362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
+)
+noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")
+
+prepare() {
+    # Jury-rig the wireguard module into sources and enable it
+    mkdir "$srcdir/net/wireguard"
+    bsdtar --strip-components 2 -xJ -C "$srcdir/net/wireguard" \
+        -f "$srcdir/wireguard-linux-compat-$_wireguard_version.tar.xz" \
+        "wireguard-linux-compat-$_wireguard_version/src"
+    sed -i "/^obj-\\\$(CONFIG_NETFILTER).*+=/a obj-\$(CONFIG_WIREGUARD) += wireguard/" "$srcdir/net/Makefile"
+    sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" "$srcdir/net/Kconfig"
+    echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-gravitas_defconfig"
+    echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-sugar_defconfig"
+}
 
 build() {
     if [[ $arch = rm1 ]]; then

diff --git 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.10-1
-timestamp=2021-08-07T00:57:40Z
+pkgver=2.0.13-1
+timestamp=2023-10-21T22:38:29Z
 section="utils"
 maintainer="Eeems <eeems@eeems.email>"
 license=MIT
 
-source=(https://github.com/zyedidia/micro/releases/download/v2.0.10/micro-2.0.10-linux-arm.tar.gz)
-sha256sums=(b60478ac87f41f00d91cf6ca58b6d7e05af99ee5fa73fa8881b140ac428fa278)
+source=("https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-linux-arm.tar.gz")
+sha256sums=(cbbed4e69567871462464049646dc11fdad8b8c75fde5d75856068c2cfbd2d38)
 
 package() {
     install -Dm644 "$srcdir"/LICENSE "$pkgdir/opt/usr/share/licenses/$pkgname/LICENSE"

diff --git a/package/neofetch/package b/package/neofetch/package
@@ -5,20 +5,28 @@
 pkgnames=(neofetch)
 pkgdesc="A command-line system information tool"
 url="https://github.com/rM-self-serve/neofetch-rM"
-pkgver=0.0.0-1
-timestamp=2023-02-09T11:43:00Z
+pkgver=1.1.0-1
+timestamp=2023-12-06T11:43:00Z
 section="utils"
 maintainer="rM-self-serve <122753594+rM-self-serve@users.noreply.github.com>"
 license=MIT
 
 source=(
-    https://github.com/rM-self-serve/neofetch-rM/archive/c497597ba4b481042cbb48b7c2c55e45dda25543.zip
+    https://github.com/rM-self-serve/neofetch-rM/archive/955997e4e3b8be682f40ee54366e44337df68959.zip
 )
 
 sha256sums=(
-    06492898eac6fb4f2cc95ca52c65f8f4f580ada57b4fe433722dabeae884b633
+    451017bd2517cf8c124af772e77b316ad784507709219e5831b28f613830f7e5
 )
 
 package() {
     install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/neofetch
 }
+
+configure() {
+    if [ -f '/home/root/.config/neofetch/config.conf' ]; then
+        echo ""
+        echo "You may choose to remove ~/.config/neofetch/config.conf"
+        echo "in order to get the latest default config."
+    fi
+}
diff --git a/package/oxide/package b/package/oxide/package
@@ -4,7 +4,7 @@
 
 pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry)
 _oxidever=2.6
-pkgver=$_oxidever-2
+pkgver=$_oxidever-3
 _sentryver=0.5.0
 timestamp=2023-06-05T23:27:53Z
 maintainer="Eeems <eeems@eeems.email>"
@@ -98,14 +98,7 @@ tarnish() {
         fi
     }
     preremove() {
-        if is-active tarnish; then
-            echo "Stopping tarnish"
-            systemctl stop tarnish
-        fi
-        if is-enabled tarnish; then
-            echo "Disabling tarnish"
-            systemctl disable tarnish
-        fi
+        disable-unit tarnish.service
     }
     postremove() {
         systemctl daemon-reload

diff --git a/package/reboot-guard/package b/package/reboot-guard/package
@@ -5,7 +5,7 @@
 pkgnames=(reboot-guard)
 pkgdesc="Block systemd-initiated poweroff/reboot/halt until configurable condition checks pass"
 url=https://github.com/stephanritscher/reboot-guard
-pkgver=1.0.1-7
+pkgver=1.0.1-8
 timestamp=2020-05-04T06:16Z
 section="devel"
 maintainer="Eeems <eeems@eeems.email>"
@@ -34,14 +34,7 @@ configure() {
 }
 
 preremove() {
-    if is-active rguard.service; then
-        echo "Stopping rguard.service"
-        systemctl stop rguard.service
-    fi
-    if is-enabled rguard.service; then
-        echo "Disabling rguard.service"
-        systemctl disable rguard.service
-    fi
+    disable-unit rguard.service
 }
 
 postremove() {

diff --git a/package/rmfakecloud-proxy/package b/package/rmfakecloud-proxy/package
@@ -7,7 +7,7 @@ pkgdesc="Connect Xochitl to a rmfakecloud server"
 _url=https://github.com/ddvk/rmfakecloud-proxy
 url="$_url"
 _upver=0.0.3
-pkgver="$_upver-3"
+pkgver="$_upver-4"
 timestamp=2022-02-26T22:59Z
 section="utils"
 maintainer="Mattéo Delabre <spam@delab.re>"
@@ -55,7 +55,7 @@ configure() {
         install-hosts
     else
         uninstall-certificates
-        systemctl disable --now rmfakecloud-proxy
+        disable-unit rmfakecloud-proxy.service
         uninstall-hosts
     fi
 

diff --git a/package/rmfm/package b/package/rmfm/package
@@ -5,19 +5,19 @@
 pkgnames=(rmfm)
 pkgdesc="Bare-bones file manager using Node.js and sas"
 url="https://forgejo.sny.sh/sun/rmFM"
-pkgver=1.5.0-2
-timestamp=2023-08-08T22:19:23+02:00
+pkgver=1.5.1-1
+timestamp=2023-12-06T08:51:41+01:00
 section=utils
 maintainer="Sunny <sunny@sny.sh>"
 license=Unlicense
 installdepends=(node simple)
 
 source=(
-    https://forgejo.sny.sh/sun/rmFM/archive/1.5.0.zip
+    https://forgejo.sny.sh/sun/rmFM/archive/1.5.1.zip
     path_fix.patch
 )
 sha256sums=(
-    515cc1843bf61f628c3a0b2b2dcb3256a0182352c6b491585fd52cf96a554b26
+    054569a5e1f420b9046ee2c4067749a1e0bccd88acc216e485b9665a42f4dd60
     SKIP
 )
 

diff --git a/package/rmkit/package b/package/rmkit/package
@@ -52,7 +52,7 @@ dumbskull() {
 genie() {
     pkgdesc="Gesture engine that connects commands to gestures"
     url="https://rmkit.dev/apps/genie"
-    pkgver=0.1.6-2
+    pkgver=0.1.6-3
     section="utils"
 
     package() {
@@ -67,8 +67,7 @@ genie() {
     }
 
     preremove() {
-        echo "Disabling $pkgname"
-        systemctl disable --now "$pkgname"
+        disable-unit "$pkgname.service"
     }
 
     postremove() {
@@ -146,7 +145,7 @@ nao() {
 remux() {
     pkgdesc="Launcher that supports multi-tasking applications"
     url="https://rmkit.dev/apps/remux"
-    pkgver=0.2.4-1
+    pkgver=0.2.4-2
     section="launchers"
 
     package() {
@@ -166,8 +165,7 @@ remux() {
     }
 
     preremove() {
-        echo "Disabling $pkgname"
-        systemctl disable --now "$pkgname"
+        disable-unit "$pkgname.service"
     }
 
     postremove() {