Fimeg/souveraine
Watch
1
0
Fork
You've already forked souveraine
 0
Code Releases Activity

upower: var/ is a legitimate prefix, not a leak

Browse source 
Run 1234 failed because the new stray check omitted var/lib/upower.
This commit is contained in:
Fimeg 2026-07-27 13:46:48 -04:00
commit 25d1e19246
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitea/workflows/ci.yml
View file

@ -255,7 +255,9 @@ jobs:
# /usr/lib/udev and present only under the junk path — so the fork's
# udev quirks had never once been applied on the device.
# Fold any leaked tree back before the tar, then refuse to ship a
# tree containing anything but usr/ and etc/.
# tree containing anything but the three prefixes upower legitimately
# installs into: usr/, etc/ (UPower.conf) and var/ (var/lib/upower).
# Leaving var/ out of that list is what failed run 1234.
DEST="$GITHUB_WORKSPACE/src/upower/dest-aarch64"
LEAK="$DEST$HOME/aarch64-sysroot"
if [ -d "$LEAK" ]; then
@ -263,9 +265,10 @@ jobs:
cp -a "$LEAK/." "$DEST/"
rm -rf "$LEAK"
fi
stray=$(find "$DEST" -mindepth 1 -maxdepth 1 ! -name usr ! -name etc -printf '%f\n')
stray=$(find "$DEST" -mindepth 1 -maxdepth 1 \
! -name usr ! -name etc ! -name var -printf '%f\n')
if [ -n "$stray" ]; then
echo "upower tree would ship outside usr/ and etc/: $stray" >&2
echo "upower tree would ship outside usr/, etc/ and var/: $stray" >&2
exit 1
fi
# And the rules must have landed where udev actually reads them.

6
packaging/arch/PKGBUILD.upower.prebuilt
View file

@ -35,8 +35,10 @@ package() {
# would put /home/<user>/aarch64-sysroot/... on the device and leave udev
# with no rules (measured on the phone 2026-07-27). Fail loudly instead.
local stray
stray=$(find "$pkgdir" -mindepth 1 -maxdepth 1 ! -name usr ! -name etc -printf '%f\n')
[[ -z $stray ]] || { error "upower tree ships outside usr/ and etc/: %s" "$stray"; return 1; }
# usr/, etc/ (UPower.conf) and var/ (var/lib/upower) are all legitimate.
stray=$(find "$pkgdir" -mindepth 1 -maxdepth 1 \
! -name usr ! -name etc ! -name var -printf '%f\n')
[[ -z $stray ]] || { error "upower tree ships outside usr/, etc/ and var/: %s" "$stray"; return 1; }
# Keep the canonical interface XML discoverable for introspection.
install -Dm644 "$srcdir/org.freedesktop.UPower.Device.xml" \
"$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml"