Skip to content

Commit

Permalink
qol-assist: Update to v1.1.0 (sync with git)
Browse files Browse the repository at this point in the history
**Summary**
- Add functionality to remove user from group and delete groups
- Add support for removing users from the system
- Add support for adding subuids and subgids to users

Signed-off-by: Rune Morling <[email protected]>
  • Loading branch information
ermo committed Jul 2, 2024
1 parent cb5462c commit fad8518
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 65 deletions.
25 changes: 0 additions & 25 deletions packages/q/qol-assist/files/0001-Makefile-Fix-typo-in-USRDIR.patch

This file was deleted.

This file was deleted.

10 changes: 10 additions & 0 deletions packages/q/qol-assist/files/add-subids.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description = """
Adds subuids and subgids to root and all users, if necessary.
We typically want this to enable support for rootless container like solutions e.g. podman OOTB. The subgid/subuid files will only be created, and the commands adding the ids only run, if they are not already present. After creation, these files should be maintained by shadow.
"""

[[add-subids]]
group = "users"
range-start = 1000000
range-end = 1065535
12 changes: 5 additions & 7 deletions packages/q/qol-assist/package.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name : qol-assist

Check notice on line 1 in packages/q/qol-assist/package.yml

View workflow job for this annotation

GitHub Actions / Checks

This package is included in the ISO. Consider validating the functionality in a newly built ISO.
version : 0.9.0
release : 17
version : 1.1.0
release : 18
source :
- https://github.com/getsolus/qol-assist/releases/download/v0.9.0/qol-assist-v0.9.0.tar.gz : c62a112ad5e9511ec2c8e51bf0cb6f7896092114be92b0069203b4ff8a6547c4
- https://github.com/getsolus/qol-assist/archive/refs/tags/v1.1.0.tar.gz : df00f484690e0558ac290208b1d0a62114dcaebe3981001aca00e7f598a14bc1
homepage : https://github.com/getsolus/qol-assist
license : Apache-2.0
component : system.base
Expand All @@ -13,9 +13,7 @@ builddeps :
- pkgconfig(systemd)
- golang
- scdoc # man
setup : |
%patch -p1 -i $pkgfiles/0001-Makefile-Fix-typo-in-USRDIR.patch
%patch -p1 -i $pkgfiles/0001-core-context-Exclude-root-from-admin-users.patch
networking : yes
build : |
%make PREFIX=/usr BINDIR=/usr/sbin
install : |
Expand All @@ -27,7 +25,7 @@ install : |
# Install all legacy triggers (just in case tm) as well as for testing
for i in $pkgfiles/*.toml; do
install -Dm00644 ${i} $installdir/usr/share/defaults/qol-assist.d/`basename ${i}`
install -Dm00644 ${i} $installdir/usr/share/defaults/qol-assist.d/$(basename ${i})
done
install -D -d -m 00755 $installdir/usr/lib/systemd/system/sysinit.target.wants
Expand Down
15 changes: 8 additions & 7 deletions packages/q/qol-assist/pspec_x86_64.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Name>qol-assist</Name>
<Homepage>https://github.com/getsolus/qol-assist</Homepage>
<Packager>
<Name>Jakob Gezelius</Name>
<Email>[email protected]</Email>
<Name>Rune Morling</Name>
<Email>[email protected]</Email>
</Packager>
<License>Apache-2.0</License>
<PartOf>system.base</PartOf>
Expand All @@ -23,6 +23,7 @@
<Path fileType="library">/usr/lib/systemd/system/qol-assist-migration.service</Path>
<Path fileType="library">/usr/lib/systemd/system/sysinit.target.wants/qol-assist-migration.service</Path>
<Path fileType="executable">/usr/sbin/qol-assist</Path>
<Path fileType="data">/usr/share/defaults/qol-assist.d/add-subids.toml</Path>
<Path fileType="data">/usr/share/defaults/qol-assist.d/audio_group.toml</Path>
<Path fileType="data">/usr/share/defaults/qol-assist.d/fuse_group.toml</Path>
<Path fileType="data">/usr/share/defaults/qol-assist.d/plugdev_group.toml</Path>
Expand All @@ -33,12 +34,12 @@
</Files>
</Package>
<History>
<Update release="17">
<Date>2024-04-03</Date>
<Version>0.9.0</Version>
<Update release="18">
<Date>2024-07-02</Date>
<Version>1.1.0</Version>
<Comment>Packaging update</Comment>
<Name>Jakob Gezelius</Name>
<Email>[email protected]</Email>
<Name>Rune Morling</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>

0 comments on commit fad8518

Please sign in to comment.