main/unl0kr: upgrade to 3.5.1
This also adds support for building the unl0kr password agent for systems running systemd. Co-authored-by: Clayton Craft <craftyguy@postmarketos.org> Signed-off-by: Clayton Craft <craftyguy@postmarketos.org> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6463>
This commit is contained in:
Justin
The Friendly Meow (merge) Bot
parent
6b9bf2c0d0
commit
5491bc9c04
2 changed files with 76 additions and 12 deletions
|
|
@ -0,0 +1,47 @@
|
|||
From 6329d62aacbc97f5beb8d617402a1f8b898210d1 Mon Sep 17 00:00:00 2001
|
||||
From: Clayton Craft <clayton@craftyguy.net>
|
||||
Date: Tue, 3 Mar 2026 09:16:24 -0800
|
||||
Subject: [PATCH] uinput: remove initialization of .time.* in static
|
||||
input_event
|
||||
|
||||
time.tv_usec and tv_sec are apparently not available any more on 32-bit
|
||||
archs, possibly due to some year 2038 thing?
|
||||
|
||||
../buffyboard/uinput_device.c:35:8: error: 'struct input_event' has no member named 'time'
|
||||
35 | .time.tv_usec = 0,
|
||||
| ^~~~
|
||||
|
||||
This works around it by removing the explicit initialization of these
|
||||
members of the input_event struct, since static int/float vars in C are
|
||||
automatically initialized to 0.
|
||||
---
|
||||
buffyboard/uinput_device.c | 12 ++----------
|
||||
1 file changed, 2 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/buffyboard/uinput_device.c b/buffyboard/uinput_device.c
|
||||
index f014e02..cc39ed2 100644
|
||||
--- a/buffyboard/uinput_device.c
|
||||
+++ b/buffyboard/uinput_device.c
|
||||
@@ -25,17 +25,9 @@
|
||||
|
||||
static int fd = -1;
|
||||
static struct input_event events[2] = {
|
||||
- { .time.tv_sec = 0,
|
||||
- .time.tv_usec = 0,
|
||||
- .type = EV_KEY,
|
||||
- .code = 0,
|
||||
- .value = 0
|
||||
- },
|
||||
- { .time.tv_sec = 0,
|
||||
- .time.tv_usec = 0,
|
||||
- .type = EV_SYN,
|
||||
+ { .type = EV_KEY },
|
||||
+ { .type = EV_SYN,
|
||||
.code = SYN_REPORT,
|
||||
- .value = 0
|
||||
}
|
||||
};
|
||||
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
maintainer="Johannes Marbach <n0-0ne+gitlab@mailbox.org>"
|
||||
pkgname=unl0kr
|
||||
pkgver=3.2.0
|
||||
pkgrel=8
|
||||
_commit_lvgl=ceadda8a468b7d5fa6ba973bd82cf610166278d8
|
||||
pkgver=3.5.1
|
||||
pkgrel=0
|
||||
_commit_lvgl=85aa60d18b3d5e5588d7b247abf90198f07c8a63
|
||||
pkgdesc="Framebuffer-based disk unlocker for the initramfs based on LVGL"
|
||||
url="https://gitlab.postmarketos.org/postmarketOS/buffybox"
|
||||
arch="all"
|
||||
|
|
@ -31,35 +31,45 @@ source="
|
|||
unl0kr.files
|
||||
unlock.sh
|
||||
10-fb-force-refresh.conf
|
||||
|
||||
0001-uinput-remove-initialization-of-.time.-in-static-inp.patch
|
||||
"
|
||||
options="!check" # No tests
|
||||
# "providing" osk-sdl, since it was dropped from pmaports
|
||||
provides="postmarketos-fde-unlocker osk-sdl=$pkgver-r$pkgrel"
|
||||
provider_priority=1000
|
||||
subpackages="$pkgname-doc $pkgname-fbforcerefresh"
|
||||
builddir="$srcdir/buffybox-$pkgver/unl0kr"
|
||||
subpackages="
|
||||
$pkgname-agent
|
||||
$pkgname-agent-systemd
|
||||
$pkgname-doc
|
||||
$pkgname-fbforcerefresh
|
||||
"
|
||||
builddir="$srcdir/buffybox-$pkgver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
mkdir -p ../lvgl
|
||||
mv "$srcdir/lvgl-$_commit_lvgl"/* ../lvgl
|
||||
mkdir -p "$builddir/lvgl"
|
||||
mv "$srcdir/lvgl-$_commit_lvgl"/* "$builddir/lvgl"
|
||||
}
|
||||
|
||||
build() {
|
||||
abuild-meson build
|
||||
abuild-meson \
|
||||
-Dsystemd=true \
|
||||
build
|
||||
meson compile ${JOBS:+-j ${JOBS}} -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" meson install --no-rebuild -C build
|
||||
find "$pkgdir" -name "*buffyboard*" -exec rm "{}" \;
|
||||
|
||||
install -Dm644 "$srcdir"/unl0kr.conf -t "$pkgdir"/etc/
|
||||
|
||||
install -Dm755 "$srcdir"/unlock.sh \
|
||||
"$pkgdir"/usr/bin/fde-unlock
|
||||
|
||||
touch unl0kr
|
||||
install -Dm644 unl0kr \
|
||||
touch unl0kr/unl0kr
|
||||
install -Dm644 unl0kr/unl0kr \
|
||||
"$pkgdir"/usr/share/mkinitfs-triggers/unl0kr
|
||||
|
||||
install -dm755 "$pkgdir"/etc/unl0kr.conf.d/
|
||||
|
|
@ -75,11 +85,18 @@ fbforcerefresh() {
|
|||
-t "$subpkgdir"/etc/unl0kr.conf.d/
|
||||
}
|
||||
|
||||
agent() {
|
||||
description="Password agent for unl0kr"
|
||||
depends="$pkgname=$pkgver-r$pkgrel"
|
||||
amove usr/libexec/unl0kr-agent
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
83d6724750e6f7e048063863e78251d32a23b1c7aa9e3529a0b176c415bda70c91b83924f6a71cc7f5ca29f019e7a974b406f6e83ff038dae92430b53183d5fa buffybox-3.2.0.tar.gz
|
||||
d3611fe9d55ed105d9567b6019dc49fc0510ac4ed6ca6e15ba0c1bae47f2833d8784b3e008a4dec76dce55bf3809531d07c62e4ba24bafad69c6c54fdd0b70c0 lvgl-ceadda8a468b7d5fa6ba973bd82cf610166278d8.tar.gz
|
||||
4558edf2d4f43adcee1d12da359ad5c4b9a3f65eadabc354b945c46a08f51f06e0323e0825953b2f9cf08aeefef3161e32dc359a1733cdc2f033c2d60c2c9b50 buffybox-3.5.1.tar.gz
|
||||
b2a7c72e81cb60c9eb059bb7fb1f4a3765586941222591addc8f493af0bd45b5412fa24fb875a9878b2a8e8c16486b20c6d1715a6cd3ae26c9825eb9ad1f86c6 lvgl-85aa60d18b3d5e5588d7b247abf90198f07c8a63.tar.gz
|
||||
7155c2f95dcf3716c0f392cf5717e96f1414c383a1f7c2ed30a1f8518dfe0b17c3c0e0e93f6476a342504aa855404099e2f5444eeb099023491c9a9a26fa3d90 unl0kr.conf
|
||||
b57260da131a4f40a0a3ee045e8394d4ab79caede9926d77f241afe79c1813fa77f4e312fa3b5e2e5c9fc1b9af082e7c59717abdaf30d512a7eb838a5f623ef8 unl0kr.files
|
||||
5386f434cd4f1fb9e0d561a8689e5e85d6a8b3c562823122c082d4932d2fb0ad4edcd635f14f0c61e5c8b5e53648c9937b042409c21683007700faea8894c750 unlock.sh
|
||||
f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825 10-fb-force-refresh.conf
|
||||
c83555dd9105ddff4f1925ae34470877478d83eeb2cf605d679a30e9703ca8a52fb5661b7000796fe77fca954589c997d838008d2c8fc939b388aa2365628637 0001-uinput-remove-initialization-of-.time.-in-static-inp.patch
|
||||
"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue