diff --git a/packages/q/qol-assist/files/0001-Makefile-Fix-typo-in-USRDIR.patch b/packages/q/qol-assist/files/0001-Makefile-Fix-typo-in-USRDIR.patch deleted file mode 100644 index 817d30fc2280..000000000000 --- a/packages/q/qol-assist/files/0001-Makefile-Fix-typo-in-USRDIR.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e0564db4971d2d0282b58c3a47ca020e52b275f3 Mon Sep 17 00:00:00 2001 -From: Joey Riches -Date: Wed, 3 May 2023 20:21:56 +0100 -Subject: [PATCH 1/1] Makefile: Fix typo in USRDIR - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index fa405dd..1b193b9 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ PREFIX?=/usr/local - BINDIR?=$(DESTDIR)$(PREFIX)/bin - MANDIR?=$(DESTDIR)$(PREFIX)/man - SYSDIR?=$(DESTDIR)/etc/$(PKGNAME).d --USRDIR?=$(DESTDIR)$(PREFIX)/share/default/$(PKGNAME).d -+USRDIR?=$(DESTDIR)$(PREFIX)/share/defaults/$(PKGNAME).d - TRACKDIR?=$(DESTDIR)/var/lib/$(PKGNAME) - SYSTEMDUNITDIR?=$(DESTDIR)/etc/systemd/system - GO?=go --- -2.40.1 - diff --git a/packages/q/qol-assist/files/0001-core-context-Exclude-root-from-admin-users.patch b/packages/q/qol-assist/files/0001-core-context-Exclude-root-from-admin-users.patch deleted file mode 100644 index 0d9227ead671..000000000000 --- a/packages/q/qol-assist/files/0001-core-context-Exclude-root-from-admin-users.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 447c68986f29ba8b832a5844f7e10ed1c94713dc Mon Sep 17 00:00:00 2001 -From: Joey Riches -Date: Wed, 3 May 2023 20:49:24 +0100 -Subject: [PATCH 1/1] core/context: Exclude root from admin users - -root is well, root. It doesn't need to be added to special groups, right? ---- - core/context.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/context.go b/core/context.go -index e419848..7fa1dff 100644 ---- a/core/context.go -+++ b/core/context.go -@@ -77,7 +77,7 @@ func (c *Context) FilterUsers(filters ...string) (filtered []User) { - fallthrough - case !it.IsActive && contains(filters, "system"): - fallthrough -- case (it.IsRoot || it.IsAdmin) && contains(filters, "admin"): -+ case it.IsAdmin && contains(filters, "admin"): - filtered = append(filtered, it) - } - } --- -2.40.1 - diff --git a/packages/q/qol-assist/files/add-subids.toml b/packages/q/qol-assist/files/add-subids.toml new file mode 100644 index 000000000000..1491c943798a --- /dev/null +++ b/packages/q/qol-assist/files/add-subids.toml @@ -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 diff --git a/packages/q/qol-assist/package.yml b/packages/q/qol-assist/package.yml index 3ed13fb59aa9..724acba584eb 100644 --- a/packages/q/qol-assist/package.yml +++ b/packages/q/qol-assist/package.yml @@ -1,8 +1,8 @@ name : qol-assist -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 @@ -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 : | @@ -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 diff --git a/packages/q/qol-assist/pspec_x86_64.xml b/packages/q/qol-assist/pspec_x86_64.xml index c7ef294d8543..a329f6b74c5d 100644 --- a/packages/q/qol-assist/pspec_x86_64.xml +++ b/packages/q/qol-assist/pspec_x86_64.xml @@ -3,8 +3,8 @@ qol-assist https://github.com/getsolus/qol-assist - Jakob Gezelius - jakob@knugen.nu + Rune Morling + ermo@serpentos.com Apache-2.0 system.base @@ -23,6 +23,7 @@ /usr/lib/systemd/system/qol-assist-migration.service /usr/lib/systemd/system/sysinit.target.wants/qol-assist-migration.service /usr/sbin/qol-assist + /usr/share/defaults/qol-assist.d/add-subids.toml /usr/share/defaults/qol-assist.d/audio_group.toml /usr/share/defaults/qol-assist.d/fuse_group.toml /usr/share/defaults/qol-assist.d/plugdev_group.toml @@ -33,12 +34,12 @@ - - 2024-04-03 - 0.9.0 + + 2024-07-02 + 1.1.0 Packaging update - Jakob Gezelius - jakob@knugen.nu + Rune Morling + ermo@serpentos.com \ No newline at end of file